|
|
@@ -1558,379 +1558,6 @@ describe( 'table clipboard', () => {
|
|
|
/* eslint-enable no-multi-spaces */
|
|
|
} );
|
|
|
} );
|
|
|
-
|
|
|
- describe.skip( 'content table has spans', () => {
|
|
|
- it( 'handles pasting simple table over a table with colspans (no colspan exceeds selection)', () => {
|
|
|
- setModelData( model, modelTable( [
|
|
|
- [ '00[]', '01', '02', '03' ],
|
|
|
- [ { colspan: 3, contents: '10' }, '13' ],
|
|
|
- [ { colspan: 2, contents: '20' }, '22', '23' ],
|
|
|
- [ '30', '31', { colspan: 2, contents: '31' } ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- tableSelection.setCellSelection(
|
|
|
- modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
|
|
|
- modelRoot.getNodeByPath( [ 0, 2, 1 ] )
|
|
|
- );
|
|
|
-
|
|
|
- pasteTable( [
|
|
|
- [ 'aa', 'ab', 'ac' ],
|
|
|
- [ 'ba', 'bb', 'bc' ],
|
|
|
- [ 'ca', 'cb', 'cc' ]
|
|
|
- ] );
|
|
|
-
|
|
|
- assertEqualMarkup( getModelData( model, { withoutSelection: true } ), modelTable( [
|
|
|
- [ 'aa', 'ab', 'ac', '03' ],
|
|
|
- [ 'ba', 'bb', 'bc', '13' ],
|
|
|
- [ 'ca', 'cb', 'cc', '23' ],
|
|
|
- [ '30', '31', { colspan: 2, contents: '31' } ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- /* eslint-disable no-multi-spaces */
|
|
|
- assertSelectedCells( model, [
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 0, 0, 0 ]
|
|
|
- ] );
|
|
|
- /* eslint-enable no-multi-spaces */
|
|
|
- } );
|
|
|
-
|
|
|
- it( 'handles pasting simple table over a table with rowspans (no rowspan exceeds selection)', () => {
|
|
|
- setModelData( model, modelTable( [
|
|
|
- [ '00', { rowspan: 3, contents: '01' }, { rowspan: 2, contents: '02' }, '03' ],
|
|
|
- [ { rowspan: 2, contents: '10' }, '13' ],
|
|
|
- [ '22', '23' ],
|
|
|
- [ '30', '31', '32', '33' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- tableSelection.setCellSelection(
|
|
|
- modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
|
|
|
- modelRoot.getNodeByPath( [ 0, 2, 0 ] )
|
|
|
- );
|
|
|
-
|
|
|
- pasteTable( [
|
|
|
- [ 'aa', 'ab', 'ac' ],
|
|
|
- [ 'ba', 'bb', 'bc' ],
|
|
|
- [ 'ca', 'cb', 'cc' ]
|
|
|
- ] );
|
|
|
-
|
|
|
- assertEqualMarkup( getModelData( model, { withoutSelection: true } ), modelTable( [
|
|
|
- [ 'aa', 'ab', 'ac', '03' ],
|
|
|
- [ 'ba', 'bb', 'bc', '13' ],
|
|
|
- [ 'ca', 'cb', 'cc', '23' ],
|
|
|
- [ '30', '31', '32', '33' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- assertSelectedCells( model, [
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 0, 0, 0, 0 ]
|
|
|
- ] );
|
|
|
- } );
|
|
|
-
|
|
|
- it( 'handles pasting simple table over table with multi-spans (no span exceeds selection)', () => {
|
|
|
- // +----+----+----+----+----+----+
|
|
|
- // | 00 | 02 | 03 | 05 |
|
|
|
- // + + + +----+
|
|
|
- // | | | | 15 |
|
|
|
- // +----+----+----+ +----+
|
|
|
- // | 20 | 21 | | 25 |
|
|
|
- // + +----+----+----+----+----+
|
|
|
- // | | 31 | 32 | 34 | 35 |
|
|
|
- // +----+----+----+----+----+----+
|
|
|
- // | 40 | 41 | 42 | 43 | 44 | 45 |
|
|
|
- // +----+----+----+----+----+----+
|
|
|
- setModelData( model, modelTable( [
|
|
|
- [
|
|
|
- { contents: '00', colspan: 2, rowspan: 2 },
|
|
|
- { contents: '02', rowspan: 2 },
|
|
|
- { contents: '03', colspan: 2, rowspan: 3 },
|
|
|
- '05'
|
|
|
- ],
|
|
|
- [ '15' ],
|
|
|
- [ { contents: '20', rowspan: 2 }, { contents: '21', colspan: 2 }, '25' ],
|
|
|
- [ '31', { contents: '32', colspan: 2 }, '34', '35' ],
|
|
|
- [ '40', '41', '42', '43', '44', '45' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- tableSelection.setCellSelection(
|
|
|
- modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
|
|
|
- modelRoot.getNodeByPath( [ 0, 3, 2 ] )
|
|
|
- );
|
|
|
-
|
|
|
- pasteTable( [
|
|
|
- [ 'aa', 'ab', 'ac', 'ad', 'ae' ],
|
|
|
- [ 'ba', 'bb', 'bc', 'bd', 'be' ],
|
|
|
- [ 'ca', 'cb', 'cc', 'cd', 'ce' ],
|
|
|
- [ 'da', 'db', 'dc', 'dd', 'de' ]
|
|
|
- ] );
|
|
|
-
|
|
|
- assertEqualMarkup( getModelData( model, { withoutSelection: true } ), modelTable( [
|
|
|
- [ 'aa', 'ab', 'ac', 'ad', 'ae', '05' ],
|
|
|
- [ 'ba', 'bb', 'bc', 'bd', 'be', '15' ],
|
|
|
- [ 'ca', 'cb', 'cc', 'cd', 'ce', '25' ],
|
|
|
- [ 'da', 'db', 'dc', 'dd', 'de', '35' ],
|
|
|
- [ '40', '41', '42', '43', '44', '45' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- assertSelectedCells( model, [
|
|
|
- [ 1, 1, 1, 1, 1, 0 ],
|
|
|
- [ 1, 1, 1, 1, 1, 0 ],
|
|
|
- [ 1, 1, 1, 1, 1, 0 ],
|
|
|
- [ 1, 1, 1, 1, 1, 0 ],
|
|
|
- [ 0, 0, 0, 0, 0, 0 ]
|
|
|
- ] );
|
|
|
- } );
|
|
|
-
|
|
|
- // TODO: Skipped case - should allow pasting but no tools to compare areas (like in MergeCellsCommand).
|
|
|
- it.skip( 'handles pasting table that has cell with colspan (last row in selection is spanned)', () => {
|
|
|
- // +----+----+----+----+
|
|
|
- // | 00 | 01 | 02 | 03 |
|
|
|
- // +----+----+----+----+
|
|
|
- // | 10 | 11 | 13 |
|
|
|
- // + + +----+
|
|
|
- // | | | 23 |
|
|
|
- // +----+----+----+----+
|
|
|
- // | 30 | 31 | 32 | 33 |
|
|
|
- // +----+----+----+----+
|
|
|
- setModelData( model, modelTable( [
|
|
|
- [ '00', '01', '02', '03' ],
|
|
|
- [ { contents: '10', rowspan: 2 }, { contents: '11', colspan: 2, rowspan: 2 }, '13' ],
|
|
|
- [ '23' ],
|
|
|
- [ '30', '31', '32', '33' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- tableSelection.setCellSelection(
|
|
|
- modelRoot.getNodeByPath( [ 0, 0, 2 ] ),
|
|
|
- modelRoot.getNodeByPath( [ 0, 1, 0 ] )
|
|
|
- );
|
|
|
-
|
|
|
- pasteTable( [
|
|
|
- [ 'aa', 'ab', 'ac' ],
|
|
|
- [ 'ba', 'bb', 'bc' ],
|
|
|
- [ 'ca', 'cb', 'cc' ]
|
|
|
- ] );
|
|
|
-
|
|
|
- assertEqualMarkup( getModelData( model, { withoutSelection: true } ), modelTable( [
|
|
|
- [ 'aa', 'ab', 'ac', '03' ],
|
|
|
- [ 'ba', 'bb', 'bc', '13' ],
|
|
|
- [ 'ca', 'cb', 'cc', '23' ],
|
|
|
- [ '30', '31', '32', '33' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- assertSelectedCells( model, [
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 0, 0, 0, 0 ]
|
|
|
- ] );
|
|
|
- } );
|
|
|
- } );
|
|
|
-
|
|
|
- describe.skip( 'content and paste tables have spans', () => {
|
|
|
- it( 'handles pasting colspanned table over table with colspans (no colspan exceeds selection)', () => {
|
|
|
- setModelData( model, modelTable( [
|
|
|
- [ '00[]', '01', '02', '03' ],
|
|
|
- [ { colspan: 3, contents: '10' }, '13' ],
|
|
|
- [ { colspan: 2, contents: '20' }, '22', '23' ],
|
|
|
- [ '30', '31', { colspan: 2, contents: '31' } ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- tableSelection.setCellSelection(
|
|
|
- modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
|
|
|
- modelRoot.getNodeByPath( [ 0, 2, 1 ] )
|
|
|
- );
|
|
|
-
|
|
|
- pasteTable( [
|
|
|
- [ 'aa', { colspan: 2, contents: 'ab' } ],
|
|
|
- [ { colspan: 3, contents: 'ba' } ],
|
|
|
- [ 'ca', 'cb', 'cc' ]
|
|
|
- ] );
|
|
|
-
|
|
|
- assertEqualMarkup( getModelData( model, { withoutSelection: true } ), modelTable( [
|
|
|
- [ 'aa', { colspan: 2, contents: 'ab' }, '03' ],
|
|
|
- [ { colspan: 3, contents: 'ba' }, '13' ],
|
|
|
- [ 'ca', 'cb', 'cc', '23' ],
|
|
|
- [ '30', '31', { colspan: 2, contents: '31' } ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- /* eslint-disable no-multi-spaces */
|
|
|
- assertSelectedCells( model, [
|
|
|
- [ 1, 1, 0 ],
|
|
|
- [ 1, 0 ],
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 0, 0, 0 ]
|
|
|
- ] );
|
|
|
- /* eslint-enable no-multi-spaces */
|
|
|
- } );
|
|
|
-
|
|
|
- it( 'handles pasting rowspanned table over table with rowspans (no rowspan exceeds selection)', () => {
|
|
|
- setModelData( model, modelTable( [
|
|
|
- [ { rowspan: 3, contents: '00' }, { rowspan: 2, contents: '01' }, '02', '03' ],
|
|
|
- [ { rowspan: 2, contents: '12' }, '13' ],
|
|
|
- [ '21', '23' ],
|
|
|
- [ '30', '31', '32', '33' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- tableSelection.setCellSelection(
|
|
|
- modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
|
|
|
- modelRoot.getNodeByPath( [ 0, 2, 1 ] )
|
|
|
- );
|
|
|
-
|
|
|
- pasteTable( [
|
|
|
- [ 'aa', { rowspan: 3, contents: 'ab' }, { rowspan: 2, contents: 'ac' }, 'ad' ],
|
|
|
- [ { rowspan: 2, contents: 'ba' }, 'bd' ],
|
|
|
- [ 'cc', 'cd' ]
|
|
|
- ] );
|
|
|
-
|
|
|
- assertEqualMarkup( getModelData( model, { withoutSelection: true } ), modelTable( [
|
|
|
- [ 'aa', { rowspan: 3, contents: 'ab' }, { rowspan: 2, contents: 'ac' }, 'ad' ],
|
|
|
- [ { rowspan: 2, contents: 'ba' }, 'bd' ],
|
|
|
- [ 'cc', 'cd' ],
|
|
|
- [ '30', '31', '32', '33' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- /* eslint-disable no-multi-spaces */
|
|
|
- assertSelectedCells( model, [
|
|
|
- [ 1, 1, 1, 1 ],
|
|
|
- [ 1, 1 ],
|
|
|
- [ 1, 1 ],
|
|
|
- [ 0, 0, 0, 0 ]
|
|
|
- ] );
|
|
|
- /* eslint-enable no-multi-spaces */
|
|
|
- } );
|
|
|
-
|
|
|
- it( 'handles pasting multi-spanned table over table with multi-spans (no span exceeds selection)', () => {
|
|
|
- // +----+----+----+----+----+----+
|
|
|
- // | 00 | 02 | 03 | 05 |
|
|
|
- // + + + +----+
|
|
|
- // | | | | 15 |
|
|
|
- // +----+----+----+ +----+
|
|
|
- // | 20 | 21 | | 25 |
|
|
|
- // + +----+----+----+----+----+
|
|
|
- // | | 31 | 32 | 34 | 35 |
|
|
|
- // +----+----+----+----+----+----+
|
|
|
- // | 40 | 41 | 42 | 43 | 44 | 45 |
|
|
|
- // +----+----+----+----+----+----+
|
|
|
- setModelData( model, modelTable( [
|
|
|
- [
|
|
|
- { contents: '00', colspan: 2, rowspan: 2 },
|
|
|
- { contents: '02', rowspan: 2 },
|
|
|
- { contents: '03', colspan: 2, rowspan: 3 },
|
|
|
- '05'
|
|
|
- ],
|
|
|
- [ '15' ],
|
|
|
- [ { contents: '20', rowspan: 2 }, { contents: '21', colspan: 2 }, '25' ],
|
|
|
- [ '31', { contents: '32', colspan: 2 }, '34', '35' ],
|
|
|
- [ '40', '41', '42', '43', '44', '45' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- tableSelection.setCellSelection(
|
|
|
- modelRoot.getNodeByPath( [ 0, 0, 0 ] ),
|
|
|
- modelRoot.getNodeByPath( [ 0, 3, 2 ] )
|
|
|
- );
|
|
|
-
|
|
|
- // +----+----+----+----+----+
|
|
|
- // | aa | ac | ad | ae |
|
|
|
- // +----+----+----+----+ +
|
|
|
- // | ba | bb | |
|
|
|
- // +----+ +----+
|
|
|
- // | ca | | ce |
|
|
|
- // + +----+----+----+----+
|
|
|
- // | | db | dc | dd |
|
|
|
- // +----+----+----+----+----+
|
|
|
- pasteTable( [
|
|
|
- [ { contents: 'aa', colspan: 2 }, 'ac', 'ad', { contents: 'ae', rowspan: 2 } ],
|
|
|
- [ 'ba', { contents: 'bb', colspan: 3, rowspan: 2 } ],
|
|
|
- [ { contents: 'ca', rowspan: 2 }, 'ce' ],
|
|
|
- [ 'db', 'dc', { contents: 'dd', colspan: 2 } ]
|
|
|
- ] );
|
|
|
-
|
|
|
- // +----+----+----+----+----+----+
|
|
|
- // | aa | ac | ad | ae | 05 |
|
|
|
- // +----+----+----+----+ +----+
|
|
|
- // | ba | bb | | 15 |
|
|
|
- // +----+ +----+----+
|
|
|
- // | ca | | ce | 25 |
|
|
|
- // + +----+----+----+----+----+
|
|
|
- // | | db | dc | dd | 35 |
|
|
|
- // +----+----+----+----+----+----+
|
|
|
- // | 40 | 41 | 42 | 43 | 44 | 45 |
|
|
|
- // +----+----+----+----+----+----+
|
|
|
- assertEqualMarkup( getModelData( model, { withoutSelection: true } ), modelTable( [
|
|
|
- [ { contents: 'aa', colspan: 2 }, 'ac', 'ad', { contents: 'ae', rowspan: 2 }, '05' ],
|
|
|
- [ 'ba', { contents: 'bb', colspan: 3, rowspan: 2 }, '15' ],
|
|
|
- [ { contents: 'ca', rowspan: 2 }, 'ce', '25' ],
|
|
|
- [ 'db', 'dc', { contents: 'dd', colspan: 2 }, '35' ],
|
|
|
- [ '40', '41', '42', '43', '44', '45' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- /* eslint-disable no-multi-spaces */
|
|
|
- assertSelectedCells( model, [
|
|
|
- [ 1, 1, 1, 1, 0 ],
|
|
|
- [ 1, 1, 0 ],
|
|
|
- [ 1, 1, 0 ],
|
|
|
- [ 1, 1, 1, 0 ],
|
|
|
- [ 0, 0, 0, 0, 0, 0 ]
|
|
|
- ] );
|
|
|
- /* eslint-enable no-multi-spaces */
|
|
|
- } );
|
|
|
-
|
|
|
- // TODO: Skipped case - should allow pasting but no tools to compare areas (like in MergeCellsCommand).
|
|
|
- it.skip( 'handles pasting table that has cell with colspan (last row in selection is spanned)', () => {
|
|
|
- // +----+----+----+----+
|
|
|
- // | 00 | 01 | 02 | 03 |
|
|
|
- // +----+----+----+----+
|
|
|
- // | 10 | 11 | 13 |
|
|
|
- // + + +----+
|
|
|
- // | | | 23 |
|
|
|
- // +----+----+----+----+
|
|
|
- // | 30 | 31 | 32 | 33 |
|
|
|
- // +----+----+----+----+
|
|
|
- setModelData( model, modelTable( [
|
|
|
- [ '00', '01', '02', '03' ],
|
|
|
- [ { contents: '10', rowspan: 2 }, { contents: '11', colspan: 2, rowspan: 2 }, '13' ],
|
|
|
- [ '23' ],
|
|
|
- [ '30', '31', '32', '33' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- tableSelection.setCellSelection(
|
|
|
- modelRoot.getNodeByPath( [ 0, 0, 2 ] ),
|
|
|
- modelRoot.getNodeByPath( [ 0, 1, 0 ] )
|
|
|
- );
|
|
|
-
|
|
|
- // +----+----+----+
|
|
|
- // | aa | ab | ac |
|
|
|
- // +----+----+----+
|
|
|
- // | ba | bc |
|
|
|
- // + +----+
|
|
|
- // | | cc |
|
|
|
- // +----+----+----+
|
|
|
- pasteTable( [
|
|
|
- [ 'aa', 'ab', 'ac' ],
|
|
|
- [ { contents: 'ba', colspan: 2, rowspan: 2 }, 'bc' ],
|
|
|
- [ 'cc' ]
|
|
|
- ] );
|
|
|
-
|
|
|
- assertEqualMarkup( getModelData( model, { withoutSelection: true } ), modelTable( [
|
|
|
- [ '00', '01', '02', '03' ],
|
|
|
- [ '10', { colspan: 2, contents: 'aa' }, '13' ],
|
|
|
- [ '20', 'ba', 'bb', '23' ],
|
|
|
- [ '30', '31', '32', '33' ]
|
|
|
- ] ) );
|
|
|
-
|
|
|
- /* eslint-disable no-multi-spaces */
|
|
|
- assertSelectedCells( model, [
|
|
|
- [ 0, 0, 0, 0 ],
|
|
|
- [ 0, 1, 0 ],
|
|
|
- [ 0, 1, 1, 0 ],
|
|
|
- [ 0, 0, 0, 0 ]
|
|
|
- ] );
|
|
|
- /* eslint-enable no-multi-spaces */
|
|
|
- } );
|
|
|
- } );
|
|
|
} );
|
|
|
|
|
|
describe( 'pasted table is smaller than the selected area', () => {
|