@ckeditor/ckeditor5-typing 35.2.1 → 35.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-typing",
-  "version": "35.2.1",
+  "version": "35.3.0",
   "description": "Typing feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -12,24 +12,32 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^35.2.1",
-    "@ckeditor/ckeditor5-engine": "^35.2.1",
-    "@ckeditor/ckeditor5-utils": "^35.2.1",
+    "@ckeditor/ckeditor5-core": "^35.3.0",
+    "@ckeditor/ckeditor5-engine": "^35.3.0",
+    "@ckeditor/ckeditor5-utils": "^35.3.0",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^35.2.1",
-    "@ckeditor/ckeditor5-block-quote": "^35.2.1",
-    "@ckeditor/ckeditor5-editor-classic": "^35.2.1",
-    "@ckeditor/ckeditor5-enter": "^35.2.1",
-    "@ckeditor/ckeditor5-essentials": "^35.2.1",
-    "@ckeditor/ckeditor5-heading": "^35.2.1",
-    "@ckeditor/ckeditor5-image": "^35.2.1",
-    "@ckeditor/ckeditor5-link": "^35.2.1",
-    "@ckeditor/ckeditor5-list": "^35.2.1",
-    "@ckeditor/ckeditor5-paragraph": "^35.2.1",
-    "@ckeditor/ckeditor5-undo": "^35.2.1",
-    "@ckeditor/ckeditor5-code-block": "^35.2.1"
+    "@ckeditor/ckeditor5-autoformat": "^35.3.0",
+    "@ckeditor/ckeditor5-basic-styles": "^35.3.0",
+    "@ckeditor/ckeditor5-block-quote": "^35.3.0",
+    "@ckeditor/ckeditor5-code-block": "^35.3.0",
+    "@ckeditor/ckeditor5-editor-classic": "^35.3.0",
+    "@ckeditor/ckeditor5-enter": "^35.3.0",
+    "@ckeditor/ckeditor5-essentials": "^35.3.0",
+    "@ckeditor/ckeditor5-heading": "^35.3.0",
+    "@ckeditor/ckeditor5-image": "^35.3.0",
+    "@ckeditor/ckeditor5-indent": "^35.3.0",
+    "@ckeditor/ckeditor5-link": "^35.3.0",
+    "@ckeditor/ckeditor5-list": "^35.3.0",
+    "@ckeditor/ckeditor5-media-embed": "^35.3.0",
+    "@ckeditor/ckeditor5-mention": "^35.3.0",
+    "@ckeditor/ckeditor5-paragraph": "^35.3.0",
+    "@ckeditor/ckeditor5-table": "^35.3.0",
+    "@ckeditor/ckeditor5-undo": "^35.3.0",
+    "typescript": "^4.8.4",
+    "webpack": "^5.58.1",
+    "webpack-cli": "^4.9.0"
   },
   "engines": {
     "node": ">=14.0.0",
@@ -46,9 +54,14 @@
   },
   "files": [
     "lang",
-    "src",
+    "src/**/*.js",
+    "src/**/*.d.ts",
     "theme",
     "ckeditor5-metadata.json",
     "CHANGELOG.md"
-  ]
+  ],
+  "scripts": {
+    "build": "tsc -p ./tsconfig.release.json",
+    "postversion": "npm run build"
+  }
 }

package/src/delete.js

@@ -2,138 +2,83 @@
  * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-
 /**
  * @module typing/delete
  */
-
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import DeleteCommand from './deletecommand';
 import DeleteObserver from './deleteobserver';
-import env from '@ckeditor/ckeditor5-utils/src/env';
-
 /**
- * The delete and backspace feature. Handles the <kbd>Delete</kbd> and <kbd>Backspace</kbd> keys in the editor.
+ * The delete and backspace feature. Handles keys such as <kbd>Delete</kbd> and <kbd>Backspace</kbd>, other
+ * keystrokes and user actions that result in deleting content in the editor.
  *
  * @extends module:core/plugin~Plugin
  */
 export default class Delete extends Plugin {
-	/**
-	 * Whether pressing backspace should trigger undo action
-	 *
-	 * @private
-	 * @member {Boolean} #_undoOnBackspace
-	 */
-
-	/**
-	 * @inheritDoc
-	 */
-	static get pluginName() {
-		return 'Delete';
-	}
-
-	init() {
-		const editor = this.editor;
-		const view = editor.editing.view;
-		const viewDocument = view.document;
-		const modelDocument = editor.model.document;
-
-		view.addObserver( DeleteObserver );
-
-		this._undoOnBackspace = false;
-
-		const deleteForwardCommand = new DeleteCommand( editor, 'forward' );
-
-		// Register `deleteForward` command and add `forwardDelete` command as an alias for backward compatibility.
-		editor.commands.add( 'deleteForward', deleteForwardCommand );
-		editor.commands.add( 'forwardDelete', deleteForwardCommand );
-
-		editor.commands.add( 'delete', new DeleteCommand( editor, 'backward' ) );
-
-		this.listenTo( viewDocument, 'delete', ( evt, data ) => {
-			const deleteCommandParams = { unit: data.unit, sequence: data.sequence };
-
-			// If a specific (view) selection to remove was set, convert it to a model selection and set as a parameter for `DeleteCommand`.
-			if ( data.selectionToRemove ) {
-				const modelSelection = editor.model.createSelection();
-				const ranges = [];
-
-				for ( const viewRange of data.selectionToRemove.getRanges() ) {
-					ranges.push( editor.editing.mapper.toModelRange( viewRange ) );
-				}
-
-				modelSelection.setTo( ranges );
-
-				deleteCommandParams.selection = modelSelection;
-			}
-
-			editor.execute( data.direction == 'forward' ? 'deleteForward' : 'delete', deleteCommandParams );
-
-			data.preventDefault();
-
-			view.scrollToTheSelection();
-		}, { priority: 'low' } );
-
-		// Android IMEs have a quirk - they change DOM selection after the input changes were performed by the browser.
-		// This happens on `keyup` event. Android doesn't know anything about our deletion and selection handling. Even if the selection
-		// was changed during input events, IME remembers the position where the selection "should" be placed and moves it there.
-		//
-		// To prevent incorrect selection, we save the selection after deleting here and then re-set it on `keyup`. This has to be done
-		// on DOM selection level, because on `keyup` the model selection is still the same as it was just after deletion, so it
-		// wouldn't be changed and the fix would do nothing.
-		//
-		if ( env.isAndroid ) {
-			let domSelectionAfterDeletion = null;
-
-			this.listenTo( viewDocument, 'delete', ( evt, data ) => {
-				const domSelection = data.domTarget.ownerDocument.defaultView.getSelection();
-
-				domSelectionAfterDeletion = {
-					anchorNode: domSelection.anchorNode,
-					anchorOffset: domSelection.anchorOffset,
-					focusNode: domSelection.focusNode,
-					focusOffset: domSelection.focusOffset
-				};
-			}, { priority: 'lowest' } );
-
-			this.listenTo( viewDocument, 'keyup', ( evt, data ) => {
-				if ( domSelectionAfterDeletion ) {
-					const domSelection = data.domTarget.ownerDocument.defaultView.getSelection();
-
-					domSelection.collapse( domSelectionAfterDeletion.anchorNode, domSelectionAfterDeletion.anchorOffset );
-					domSelection.extend( domSelectionAfterDeletion.focusNode, domSelectionAfterDeletion.focusOffset );
-
-					domSelectionAfterDeletion = null;
-				}
-			} );
-		}
-
-		if ( this.editor.plugins.has( 'UndoEditing' ) ) {
-			this.listenTo( viewDocument, 'delete', ( evt, data ) => {
-				if ( this._undoOnBackspace && data.direction == 'backward' && data.sequence == 1 && data.unit == 'codePoint' ) {
-					this._undoOnBackspace = false;
-
-					editor.execute( 'undo' );
-
-					data.preventDefault();
-					evt.stop();
-				}
-			}, { context: '$capture' } );
-
-			this.listenTo( modelDocument, 'change', () => {
-				this._undoOnBackspace = false;
-			} );
-		}
-	}
-
-	/**
-	 * If the next user action after calling this method is pressing backspace, it would undo the last change.
-	 *
-	 * Requires {@link module:undo/undoediting~UndoEditing} plugin. If not loaded, does nothing.
-	 */
-	requestUndoOnBackspace() {
-		if ( this.editor.plugins.has( 'UndoEditing' ) ) {
-			this._undoOnBackspace = true;
-		}
-	}
+    /**
+     * @inheritDoc
+     */
+    static get pluginName() {
+        return 'Delete';
+    }
+    /**
+     * @inheritDoc
+     */
+    init() {
+        const editor = this.editor;
+        const view = editor.editing.view;
+        const viewDocument = view.document;
+        const modelDocument = editor.model.document;
+        view.addObserver(DeleteObserver);
+        this._undoOnBackspace = false;
+        const deleteForwardCommand = new DeleteCommand(editor, 'forward');
+        // Register `deleteForward` command and add `forwardDelete` command as an alias for backward compatibility.
+        editor.commands.add('deleteForward', deleteForwardCommand);
+        editor.commands.add('forwardDelete', deleteForwardCommand);
+        editor.commands.add('delete', new DeleteCommand(editor, 'backward'));
+        this.listenTo(viewDocument, 'delete', (evt, data) => {
+            // When not in composition, we handle the action, so prevent the default one.
+            // When in composition, it's the browser who modify the DOM (renderer is disabled).
+            if (!viewDocument.isComposing) {
+                data.preventDefault();
+            }
+            const { direction, sequence, selectionToRemove, unit } = data;
+            const commandName = direction === 'forward' ? 'deleteForward' : 'delete';
+            const commandData = { sequence };
+            if (unit == 'selection') {
+                const modelRanges = Array.from(selectionToRemove.getRanges()).map(viewRange => {
+                    return editor.editing.mapper.toModelRange(viewRange);
+                });
+                commandData.selection = editor.model.createSelection(modelRanges);
+            }
+            else {
+                commandData.unit = unit;
+            }
+            editor.execute(commandName, commandData);
+            view.scrollToTheSelection();
+        }, { priority: 'low' });
+        if (this.editor.plugins.has('UndoEditing')) {
+            this.listenTo(viewDocument, 'delete', (evt, data) => {
+                if (this._undoOnBackspace && data.direction == 'backward' && data.sequence == 1 && data.unit == 'codePoint') {
+                    this._undoOnBackspace = false;
+                    editor.execute('undo');
+                    data.preventDefault();
+                    evt.stop();
+                }
+            }, { context: '$capture' });
+            this.listenTo(modelDocument, 'change', () => {
+                this._undoOnBackspace = false;
+            });
+        }
+    }
+    /**
+     * If the next user action after calling this method is pressing backspace, it would undo the last change.
+     *
+     * Requires {@link module:undo/undoediting~UndoEditing} plugin. If not loaded, does nothing.
+     */
+    requestUndoOnBackspace() {
+        if (this.editor.plugins.has('UndoEditing')) {
+            this._undoOnBackspace = true;
+        }
+    }
 }