Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Select all columns in previous table rows when the last row is fully selected. #17697

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+75 −34
Open

Select all columns in previous table rows when the last row is fully selected. #17697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8473424
Select all columns in previous table rows when the last row is fully …
Mati365 Dec 30, 2024
ff4bbfd
Adjust doc.
Mati365 Dec 30, 2024
cba5413
Adjust doc.
Mati365 Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/ckeditor5-table/src/tableselection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,18 +360,37 @@ export default class TableSelection extends Plugin {
*/
private _getCellsToSelect( anchorCell: Element, targetCell: Element ) {
const tableUtils: TableUtils = this.editor.plugins.get( 'TableUtils' );

const startLocation = tableUtils.getCellLocation( anchorCell );
const endLocation = tableUtils.getCellLocation( targetCell );

const startRow = Math.min( startLocation.row, endLocation.row );
const endRow = Math.max( startLocation.row, endLocation.row );

const startColumn = Math.min( startLocation.column, endLocation.column );
const endColumn = Math.max( startLocation.column, endLocation.column );

// Adjust the selection to include the entire row if a cell with colspan is selected.
// This ensures that the selection covers the full width of the colspan cell.
//
// Example:
// +---+---+---+---+
// | A | B | C | D |
// +---+---+---+---+
// | E |
// +---+---+---+---+
//
// If the selection starts at `B` and ends at `E`, the entire first row should be selected.
//
// In other words, the selection will represent the following cells:
// * Without this adjustment, only `B`, `A` and `E` would be selected.
// * With this adjustment, `A`, `B`, `C`, `D`, and `E` are selected.
//
// See: https://github.com/ckeditor/ckeditor5/issues/17538
const endColumnExtraColspan = ( parseInt( targetCell.getAttribute( 'colspan' ) as string || '1' ) - 1 );
const endColumn = Math.max( startLocation.column, endLocation.column + endColumnExtraColspan );

// 2-dimensional array of the selected cells to ease flipping the order of cells for backward selections.
const selectionMap: Array<Array<Element>> = new Array( endRow - startRow + 1 ).fill( null ).map( () => [] );

const walkerOptions = {
startRow,
endRow,
Expand Down
64 changes: 32 additions & 32 deletions packages/ckeditor5-table/tests/tableclipboard-paste.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2527,15 +2527,15 @@ describe( 'table clipboard', () => {
// + + + +----+----+----+
// | | | | 14 | 15 | 16 |
// + +----+----+----+----+----+
// | | aa | ab | ac | |
// | | aa | ab | ac | aa | ab |
// +----+----+----+----+----+----+----+
// | 30 | 31 | ba | bb | bc | 35 | 36 |
// | 30 | 31 | ba | bb | bc | ba | bb |
// + +----+----+----+----+----+----+
// | | 41 | ca | cb | cc | ca | cb |
// + +----+----+----+----+----+----+
// | | 41 | ca | cb | cc | 45 |
// + +----+----+----+----+ +
// | | 51 | 52 | | 54 | |
// +----+----+----+ +----+ +
// | 60 | 61 | 62 | | 64 | |
// + +----+----+ +----+ +
// | | 61 | 62 | | 64 | |
// +----+----+----+----+----+----+----+
expect( getModelData( model, { withoutSelection: true } ) ).to.equalMarkup( modelTable( [
[
Expand All @@ -2545,10 +2545,10 @@ describe( 'table clipboard', () => {
{ contents: '04', colspan: 3 }
],
[ '14', '15', '16' ],
[ 'aa', 'ab', 'ac', { contents: '', colspan: 2 } ],
[ { contents: '30', rowspan: 3 }, '31', 'ba', 'bb', 'bc', '35', '36' ],
[ '41', 'ca', 'cb', 'cc', { contents: '45', colspan: 2, rowspan: 3 } ],
[ '51', '52', { contents: '', rowspan: 2 }, '54' ],
[ 'aa', 'ab', 'ac', 'aa', 'ab' ],
[ { contents: '30', rowspan: 3 }, '31', 'ba', 'bb', 'bc', 'ba', 'bb' ],
[ '41', 'ca', 'cb', 'cc', 'ca', 'cb' ],
[ '51', '52', { contents: '', rowspan: 2 }, '54', { contents: '', colspan: 2, rowspan: 2 } ],
[ '60', '61', '62', '64' ]
] ) );
} );
Expand Down Expand Up @@ -3082,23 +3082,23 @@ describe( 'table clipboard', () => {
// +----+----+----+ +----+----+
// | 10 | 11 | 12 | | 14 | 15 |
// +----+----+----+----+----+----+
// | aa | ab | aa | ab | aa | 25 |
// | aa | ab | aa | ab | aa | ab |
// +----+----+----+----+----+----+
// | ba | bb | ba | bb | ba | 35 |
// | ba | bb | ba | bb | ba | bb |
// +----+----+----+----+----+----+
// | aa | ab | aa | ab | aa | |
// +----+----+----+----+----+ +
// | 50 | 51 | 52 | | |
// | aa | ab | aa | ab | aa | ab |
// +----+----+----+----+----+----+
// | 50 | 51 | 52 | |
// +----+----+----+----+----+----+
// | 60 | 61 | 62 | 63 | 64 | 65 |
// +----+----+----+----+----+----+
expect( getModelData( model, { withoutSelection: true } ) ).to.equalMarkup( modelTable( [
[ '00', '01', '02', { contents: '03', rowspan: 2 }, '04', '05' ],
[ '10', '11', '12', '14', '15' ],
[ 'aa', 'ab', 'aa', 'ab', 'aa', '25' ],
[ 'ba', 'bb', 'ba', 'bb', 'ba', '35' ],
[ 'aa', 'ab', 'aa', 'ab', 'aa', { contents: '', rowspan: 2 } ],
[ '50', '51', { contents: '52', colspan: 2 }, '' ],
[ 'aa', 'ab', 'aa', 'ab', 'aa', 'ab' ],
[ 'ba', 'bb', 'ba', 'bb', 'ba', 'bb' ],
[ 'aa', 'ab', 'aa', 'ab', 'aa', 'ab' ],
[ '50', '51', { contents: '52', colspan: 2 }, { contents: '', colspan: 2 } ],
[ '60', '61', '62', '63', '64', '65' ]
] ) );
} );
Expand All @@ -3115,27 +3115,27 @@ describe( 'table clipboard', () => {
] );

// +----+----+----+----+----+----+
// | 00 | 01 | aa | ab | aa | 05 |
// | 00 | 01 | aa | ab | aa | ab |
// +----+----+----+----+----+----+
// | 10 | 11 | ba | bb | ba | 15 |
// | 10 | 11 | ba | bb | ba | bb |
// +----+----+----+----+----+----+
// | 20 | 21 | aa | ab | aa | 25 |
// | 20 | 21 | aa | ab | aa | ab |
// +----+----+----+----+----+----+
// | 30 | 31 | ba | bb | ba | 35 |
// | 30 | 31 | ba | bb | ba | bb |
// +----+----+----+----+----+----+
// | 40 | aa | ab | aa | |
// +----+----+----+----+----+ +
// | 50 | 51 | 52 | | |
// | 40 | aa | ab | aa | ab |
// +----+----+----+----+----+----+
// | 50 | 51 | 52 | |
// +----+----+----+----+----+----+
// | 60 | 61 | 62 | 63 | 64 | 65 |
// +----+----+----+----+----+----+
expect( getModelData( model, { withoutSelection: true } ) ).to.equalMarkup( modelTable( [
[ '00', '01', 'aa', 'ab', 'aa', '05' ],
[ '10', '11', 'ba', 'bb', 'ba', '15' ],
[ '20', '21', 'aa', 'ab', 'aa', '25' ],
[ '30', '31', 'ba', 'bb', 'ba', '35' ],
[ { contents: '40', colspan: 2 }, 'aa', 'ab', 'aa', { contents: '', rowspan: 2 } ],
[ '50', '51', { contents: '52', colspan: 2 }, '' ],
[ '00', '01', 'aa', 'ab', 'aa', 'ab' ],
[ '10', '11', 'ba', 'bb', 'ba', 'bb' ],
[ '20', '21', 'aa', 'ab', 'aa', 'ab' ],
[ '30', '31', 'ba', 'bb', 'ba', 'bb' ],
[ { contents: '40', colspan: 2 }, 'aa', 'ab', 'aa', 'ab' ],
[ '50', '51', { contents: '52', colspan: 2 }, { contents: '', colspan: 2 } ],
[ '60', '61', '62', '63', '64', '65' ]
] ) );
} );
Expand Down
22 changes: 22 additions & 0 deletions packages/ckeditor5-table/tests/tableselection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,28 @@ describe( 'TableSelection', () => {
expect( selection.isBackward ).to.be.true;
} );

it( 'should select all cells when selecting from a regular row to a row with colspan', () => {
setModelData( model, modelTable( [
[ '00', '01', '02' ],
[ { contents: '11', colspan: 3 } ]
] ) );

table = modelRoot.getChild( 0 );

const anchorCell = table.getChild( 0 ).getChild( 0 );
const targetCell = table.getChild( 1 ).getChild( 0 );

tableSelection.setCellSelection( anchorCell, targetCell );

const selectedCells = tableSelection.getSelectedTableCells();

expect( selectedCells ).to.have.length( 4 );
expect( selectedCells[ 0 ] ).to.equal( table.getChild( 0 ).getChild( 0 ) );
expect( selectedCells[ 1 ] ).to.equal( table.getChild( 0 ).getChild( 1 ) );
expect( selectedCells[ 2 ] ).to.equal( table.getChild( 0 ).getChild( 2 ) );
expect( selectedCells[ 3 ] ).to.equal( table.getChild( 1 ).getChild( 0 ) );
} );

function assertSelection( anchorCell, focusCell, count ) {
const cells = [ ...selection.getRanges() ].map( range => range.getContainedElement() );

Expand Down
Loading