瀏覽代碼

Added: RemoveRow command.

Maciej Gołaszewski 7 年之前
父節點
當前提交
d1adc4a780

+ 120 - 0
packages/ckeditor5-table/src/commands/removerowcommand.js

@@ -0,0 +1,120 @@
+/**
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+/**
+ * @module table/commands/splitcell
+ */
+
+import Command from '@ckeditor/ckeditor5-core/src/command';
+import TableWalker from '../tablewalker';
+import Position from '../../../ckeditor5-engine/src/model/position';
+import Range from '../../../ckeditor5-engine/src/model/range';
+
+/**
+ * The split cell command.
+ *
+ * @extends module:core/command~Command
+ */
+export default class InsertTableCommand extends Command {
+	/**
+	 * @inheritDoc
+	 */
+	refresh() {
+		const model = this.editor.model;
+		const doc = model.document;
+
+		const element = doc.selection.getFirstPosition().parent;
+
+		this.isEnabled = element.is( 'tableCell' ) && element.parent.parent.childCount > 1;
+	}
+
+	/**
+	 * Executes the command.
+	 *
+	 * @fires execute
+	 */
+	execute() {
+		const model = this.editor.model;
+		const document = model.document;
+		const selection = document.selection;
+
+		const firstPosition = selection.getFirstPosition();
+		const tableCell = firstPosition.parent;
+		const tableRow = tableCell.parent;
+
+		const table = tableRow.parent;
+
+		const rowIndex = tableRow.index;
+
+		model.change( writer => {
+			const headingRows = ( table.getAttribute( 'headingRows' ) || 0 );
+
+			if ( headingRows && rowIndex <= headingRows ) {
+				writer.setAttribute( 'headingRows', headingRows - 1, table );
+			}
+
+			const cellsToMove = {};
+
+			// Cache cells from current row that have rowspan
+			for ( const tableWalkerValue of new TableWalker( table, { startRow: rowIndex, endRow: rowIndex } ) ) {
+				if ( tableWalkerValue.rowspan > 1 ) {
+					cellsToMove[ tableWalkerValue.column ] = {
+						cell: tableWalkerValue.cell,
+						updatedRowspan: tableWalkerValue.rowspan - 1
+					};
+				}
+			}
+
+			// Update rowspans on cells abover removed row
+			for ( const tableWalkerValue of new TableWalker( table, { endRow: rowIndex - 1 } ) ) {
+				const row = tableWalkerValue.row;
+				const rowspan = tableWalkerValue.rowspan;
+				const cell = tableWalkerValue.cell;
+
+				if ( row + rowspan > rowIndex ) {
+					const rowspanToSet = rowspan - 1;
+
+					if ( rowspanToSet > 1 ) {
+						writer.setAttribute( 'rowspan', rowspanToSet, cell );
+					} else {
+						writer.removeAttribute( 'rowspan', cell );
+					}
+				}
+			}
+
+			let previousCell;
+
+			// Move cells to another row
+			for ( const tableWalkerValue of new TableWalker( table, {
+				includeSpanned: true,
+				startRow: rowIndex + 1,
+				endRow: rowIndex + 1
+			} ) ) {
+				const cellToMoveData = cellsToMove[ tableWalkerValue.column ];
+
+				if ( cellToMoveData ) {
+					const targetPosition = previousCell ? Position.createAfter( previousCell ) :
+						Position.createAt( table.getChild( tableWalkerValue.row ) );
+
+					writer.move( Range.createOn( cellToMoveData.cell ), targetPosition );
+
+					const rowspanToSet = cellToMoveData.updatedRowspan;
+
+					if ( rowspanToSet > 1 ) {
+						writer.setAttribute( 'rowspan', rowspanToSet, cellToMoveData.cell );
+					} else {
+						writer.removeAttribute( 'rowspan', cellToMoveData.cell );
+					}
+
+					previousCell = cellToMoveData.cell;
+				} else {
+					previousCell = tableWalkerValue.cell;
+				}
+			}
+
+			writer.remove( tableRow );
+		} );
+	}
+}

+ 2 - 0
packages/ckeditor5-table/src/tableediting.js

@@ -18,6 +18,7 @@ import InsertTableCommand from './commands/inserttablecommand';
 import InsertRowCommand from './commands/insertrowcommand';
 import InsertColumnCommand from './commands/insertcolumncommand';
 import SplitCellCommand from './commands/splitcellcommand';
+import RemoveRowCommand from './commands/removerowcommand';
 import { getParentTable } from './commands/utils';
 
 import './../theme/table.css';
@@ -84,6 +85,7 @@ export default class TablesEditing extends Plugin {
 		editor.commands.add( 'insertRow', new InsertRowCommand( editor ) );
 		editor.commands.add( 'insertColumn', new InsertColumnCommand( editor ) );
 		editor.commands.add( 'splitCell', new SplitCellCommand( editor ) );
+		editor.commands.add( 'removeRow', new RemoveRowCommand( editor ) );
 
 		this.listenTo( editor.editing.view.document, 'keydown', ( ...args ) => this._handleTabOnSelectedTable( ...args ) );
 		this.listenTo( editor.editing.view.document, 'keydown', ( ...args ) => this._handleTabInsideTable( ...args ) );

+ 177 - 0
packages/ckeditor5-table/tests/commands/removerowcommand.js

@@ -0,0 +1,177 @@
+/**
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
+import { setData, getData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
+import { upcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
+
+import RemoveRowCommand from '../../src/commands/removerowcommand';
+import { downcastInsertTable } from '../../src/converters/downcast';
+import upcastTable from '../../src/converters/upcasttable';
+import { formatModelTable, formattedModelTable, modelTable } from '../_utils/utils';
+
+describe( 'RemoveRowCommand', () => {
+	let editor, model, command;
+
+	beforeEach( () => {
+		return ModelTestEditor.create()
+			.then( newEditor => {
+				editor = newEditor;
+				model = editor.model;
+				command = new RemoveRowCommand( editor );
+
+				const conversion = editor.conversion;
+				const schema = model.schema;
+
+				schema.register( 'table', {
+					allowWhere: '$block',
+					allowAttributes: [ 'headingRows' ],
+					isBlock: true,
+					isObject: true
+				} );
+
+				schema.register( 'tableRow', {
+					allowIn: 'table',
+					allowAttributes: [],
+					isBlock: true,
+					isLimit: true
+				} );
+
+				schema.register( 'tableCell', {
+					allowIn: 'tableRow',
+					allowContentOf: '$block',
+					allowAttributes: [ 'colspan', 'rowspan' ],
+					isBlock: true,
+					isLimit: true
+				} );
+
+				model.schema.register( 'p', { inheritAllFrom: '$block' } );
+
+				// Table conversion.
+				conversion.for( 'upcast' ).add( upcastTable() );
+				conversion.for( 'downcast' ).add( downcastInsertTable() );
+
+				// Table row upcast only since downcast conversion is done in `downcastTable()`.
+				conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'tableRow', view: 'tr' } ) );
+
+				// Table cell conversion.
+				conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'tableCell', view: 'td' } ) );
+				conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'tableCell', view: 'th' } ) );
+
+				conversion.attributeToAttribute( { model: 'colspan', view: 'colspan' } );
+				conversion.attributeToAttribute( { model: 'rowspan', view: 'rowspan' } );
+			} );
+	} );
+
+	afterEach( () => {
+		return editor.destroy();
+	} );
+
+	describe( 'isEnabled', () => {
+		it( 'should be true if selection is inside table cell', () => {
+			setData( model, modelTable( [
+				[ '00[]', '01' ],
+				[ '10[]', '11' ]
+			] ) );
+
+			expect( command.isEnabled ).to.be.true;
+		} );
+
+		it( 'should be false if selection is inside table with one row only', () => {
+			setData( model, modelTable( [
+				[ '00[]', '01' ]
+			] ) );
+
+			expect( command.isEnabled ).to.be.false;
+		} );
+
+		it( 'should be false if selection is outside a table', () => {
+			setData( model, '<p>11[]</p>' );
+
+			expect( command.isEnabled ).to.be.false;
+		} );
+	} );
+
+	describe( 'execute()', () => {
+		it( 'should remove a given row', () => {
+			setData( model, modelTable( [
+				[ '00', '01' ],
+				[ '[]10', '11' ],
+				[ '20', '21' ]
+			] ) );
+
+			command.execute();
+
+			expect( formatModelTable( getData( model ) ) ).to.equal( formattedModelTable( [
+				[ '00', '01[]' ],
+				[ '20', '21' ]
+			] ) );
+		} );
+
+		it( 'should remove a given row from a table start', () => {
+			setData( model, modelTable( [
+				[ '[]00', '01' ],
+				[ '10', '11' ],
+				[ '20', '21' ]
+			] ) );
+
+			command.execute();
+
+			expect( formatModelTable( getData( model ) ) ).to.equal( formattedModelTable( [
+				[ '[]10', '11' ],
+				[ '20', '21' ]
+			] ) );
+		} );
+
+		it( 'should change heading rows if removing a heading row', () => {
+			setData( model, modelTable( [
+				[ '00', '01' ],
+				[ '[]10', '11' ],
+				[ '20', '21' ]
+			], { headingRows: 2 } ) );
+
+			command.execute();
+
+			expect( formatModelTable( getData( model ) ) ).to.equal( formattedModelTable( [
+				[ '00', '01[]' ],
+				[ '20', '21' ]
+			], { headingRows: 1 } ) );
+		} );
+
+		it( 'should decrease rowspan of table cells from previous rows', () => {
+			setData( model, modelTable( [
+				[ { rowspan: 4, contents: '00' }, { rowspan: 3, contents: '01' }, { rowspan: 2, contents: '02' }, '03', '04' ],
+				[ { rowspan: 2, contents: '13' }, '14' ],
+				[ '22[]', '23', '24' ],
+				[ '30', '31', '32', '33', '34' ]
+			] ) );
+
+			command.execute();
+
+			expect( formatModelTable( getData( model ) ) ).to.equal( formattedModelTable( [
+				[ { rowspan: 3, contents: '00' }, { rowspan: 2, contents: '01' }, { rowspan: 2, contents: '02' }, '03', '04' ],
+				[ '13', '14[]' ],
+				[ '30', '31', '32', '33', '34' ]
+			] ) );
+		} );
+
+		it( 'should move rowspaned cells to row below removing it\'s row', () => {
+			setData( model, modelTable( [
+				[ { rowspan: 3, contents: '[]00' }, { rowspan: 2, contents: '01' }, '02' ],
+				[ '12' ],
+				[ '22' ],
+				[ '30', '31', '32' ]
+			] ) );
+
+			command.execute();
+
+			expect( formatModelTable( getData( model ) ) ).to.equal( formattedModelTable( [
+				[ { rowspan: 2, contents: '[]00' }, '01', '12' ],
+				[ '22' ],
+				[ '30', '31', '32' ]
+			] ) );
+		} );
+	} );
+} );