@ckeditor/ckeditor5-table 35.2.1 → 35.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-table",
-  "version": "35.2.1",
+  "version": "35.3.1",
   "description": "Table feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -12,34 +12,34 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "^35.2.1",
+    "ckeditor5": "^35.3.1",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-alignment": "^35.2.1",
-    "@ckeditor/ckeditor5-basic-styles": "^35.2.1",
-    "@ckeditor/ckeditor5-block-quote": "^35.2.1",
-    "@ckeditor/ckeditor5-clipboard": "^35.2.1",
-    "@ckeditor/ckeditor5-core": "^35.2.1",
+    "@ckeditor/ckeditor5-alignment": "^35.3.1",
+    "@ckeditor/ckeditor5-basic-styles": "^35.3.1",
+    "@ckeditor/ckeditor5-block-quote": "^35.3.1",
+    "@ckeditor/ckeditor5-clipboard": "^35.3.1",
+    "@ckeditor/ckeditor5-core": "^35.3.1",
     "@ckeditor/ckeditor5-dev-utils": "^31.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^35.2.1",
-    "@ckeditor/ckeditor5-engine": "^35.2.1",
-    "@ckeditor/ckeditor5-highlight": "^35.2.1",
-    "@ckeditor/ckeditor5-horizontal-line": "^35.2.1",
-    "@ckeditor/ckeditor5-html-support": "^35.2.1",
-    "@ckeditor/ckeditor5-image": "^35.2.1",
-    "@ckeditor/ckeditor5-indent": "^35.2.1",
-    "@ckeditor/ckeditor5-link": "^35.2.1",
-    "@ckeditor/ckeditor5-list": "^35.2.1",
-    "@ckeditor/ckeditor5-media-embed": "^35.2.1",
-    "@ckeditor/ckeditor5-paragraph": "^35.2.1",
-    "@ckeditor/ckeditor5-theme-lark": "^35.2.1",
-    "@ckeditor/ckeditor5-typing": "^35.2.1",
-    "@ckeditor/ckeditor5-ui": "^35.2.1",
-    "@ckeditor/ckeditor5-undo": "^35.2.1",
-    "@ckeditor/ckeditor5-utils": "^35.2.1",
-    "@ckeditor/ckeditor5-widget": "^35.2.1",
-    "@ckeditor/ckeditor5-source-editing": "^35.2.1",
+    "@ckeditor/ckeditor5-editor-classic": "^35.3.1",
+    "@ckeditor/ckeditor5-engine": "^35.3.1",
+    "@ckeditor/ckeditor5-highlight": "^35.3.1",
+    "@ckeditor/ckeditor5-horizontal-line": "^35.3.1",
+    "@ckeditor/ckeditor5-html-support": "^35.3.1",
+    "@ckeditor/ckeditor5-image": "^35.3.1",
+    "@ckeditor/ckeditor5-indent": "^35.3.1",
+    "@ckeditor/ckeditor5-link": "^35.3.1",
+    "@ckeditor/ckeditor5-list": "^35.3.1",
+    "@ckeditor/ckeditor5-media-embed": "^35.3.1",
+    "@ckeditor/ckeditor5-paragraph": "^35.3.1",
+    "@ckeditor/ckeditor5-theme-lark": "^35.3.1",
+    "@ckeditor/ckeditor5-typing": "^35.3.1",
+    "@ckeditor/ckeditor5-ui": "^35.3.1",
+    "@ckeditor/ckeditor5-undo": "^35.3.1",
+    "@ckeditor/ckeditor5-utils": "^35.3.1",
+    "@ckeditor/ckeditor5-widget": "^35.3.1",
+    "@ckeditor/ckeditor5-source-editing": "^35.3.1",
     "json-diff": "^0.5.4",
     "webpack": "^5.58.1",
     "webpack-cli": "^4.9.0"

package/src/tablecaption/toggletablecaptioncommand.js

@@ -89,7 +89,7 @@ export default class ToggleTableCaptionCommand extends Command {
 		// Try restoring the caption from the TableCaptionEditing plugin storage.
 		const newCaptionElement = savedCaptionElement || writer.createElement( 'caption' );
 
-		writer.append( newCaptionElement, tableElement );
+		model.insertContent( newCaptionElement, tableElement, 'end' );
 
 		if ( focusCaptionOnShow ) {
 			writer.setSelection( newCaptionElement, 'in' );
@@ -114,7 +114,6 @@ export default class ToggleTableCaptionCommand extends Command {
 		// Store the caption content so it can be restored quickly if the user changes their mind.
 		tableCaptionEditing._saveCaption( tableElement, captionElement );
 
-		writer.setSelection( writer.createRangeIn( tableElement.getChild( 0 ).getChild( 0 ) ) );
-		writer.remove( captionElement );
+		model.deleteContent( writer.createSelection( captionElement, 'on' ) );
 	}
 }

package/src/tableselection.js

@@ -44,8 +44,10 @@ export default class TableSelection extends Plugin {
 	init() {
 		const editor = this.editor;
 		const model = editor.model;
+		const view = editor.editing.view;
 
 		this.listenTo( model, 'deleteContent', ( evt, args ) => this._handleDeleteContent( evt, args ), { priority: 'high' } );
+		this.listenTo( view.document, 'insertText', ( evt, data ) => this._handleInsertTextEvent( evt, data ), { priority: 'high' } );
 
 		this._defineSelectionConverter();
 		this._enablePluginDisabling(); // sic!
@@ -303,6 +305,41 @@ export default class TableSelection extends Plugin {
 		} );
 	}
 
+	/**
+	 * This handler makes it possible to remove the content of all selected cells by starting to type.
+	 * If you take a look at {@link #_defineSelectionConverter} you will find out that despite the multi-cell selection being set
+	 * in the model, the view selection is collapsed in the last cell (because most browsers are unable to render multi-cell selections;
+	 * yes, it's a hack).
+	 *
+	 * When multiple cells are selected in the model and the user starts to type, the
+	 * {@link module:engine/view/document~Document#event:insertText} event carries information provided by the
+	 * beforeinput DOM  event, that in turn only knows about this collapsed DOM selection in the last cell.
+	 *
+	 * As a result, the selected cells have no chance to be cleaned up. To fix this, this listener intercepts
+	 * the event and injects the custom view selection in the data that translates correctly to the actual state
+	 * of the multi-cell selection in the model.
+	 *
+	 * @private
+	 * @param {module:utils/eventinfo~EventInfo} event
+	 * @param {module:engine/view/observer/domeventdata~DomEventData} data Insert text event data.
+	 */
+	_handleInsertTextEvent( evt, data ) {
+		const editor = this.editor;
+		const model = editor.model;
+		const modelSelection = model.document.selection;
+		const selectedCells = this.getSelectedTableCells( modelSelection );
+
+		if ( !selectedCells ) {
+			return;
+		}
+
+		const view = editor.editing.view;
+		const mapper = editor.editing.mapper;
+		const viewRanges = selectedCells.map( tableCell => view.createRangeOn( mapper.toViewElement( tableCell ) ) );
+
+		data.selection = view.createSelection( viewRanges );
+	}
+
 	/**
 	 * Returns an array of table cells that should be selected based on the
 	 * given anchor cell and target (focus) cell.