@ckeditor/ckeditor5-typing 31.0.0 → 31.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-typing",
-  "version": "31.0.0",
+  "version": "31.1.0",
   "description": "Typing feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -12,24 +12,24 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^31.0.0",
-    "@ckeditor/ckeditor5-engine": "^31.0.0",
-    "@ckeditor/ckeditor5-utils": "^31.0.0",
+    "@ckeditor/ckeditor5-core": "^31.1.0",
+    "@ckeditor/ckeditor5-engine": "^31.1.0",
+    "@ckeditor/ckeditor5-utils": "^31.1.0",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^31.0.0",
-    "@ckeditor/ckeditor5-block-quote": "^31.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^31.0.0",
-    "@ckeditor/ckeditor5-enter": "^31.0.0",
-    "@ckeditor/ckeditor5-essentials": "^31.0.0",
-    "@ckeditor/ckeditor5-heading": "^31.0.0",
-    "@ckeditor/ckeditor5-image": "^31.0.0",
-    "@ckeditor/ckeditor5-link": "^31.0.0",
-    "@ckeditor/ckeditor5-list": "^31.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^31.0.0",
-    "@ckeditor/ckeditor5-undo": "^31.0.0",
-    "@ckeditor/ckeditor5-code-block": "^31.0.0"
+    "@ckeditor/ckeditor5-basic-styles": "^31.1.0",
+    "@ckeditor/ckeditor5-block-quote": "^31.1.0",
+    "@ckeditor/ckeditor5-editor-classic": "^31.1.0",
+    "@ckeditor/ckeditor5-enter": "^31.1.0",
+    "@ckeditor/ckeditor5-essentials": "^31.1.0",
+    "@ckeditor/ckeditor5-heading": "^31.1.0",
+    "@ckeditor/ckeditor5-image": "^31.1.0",
+    "@ckeditor/ckeditor5-link": "^31.1.0",
+    "@ckeditor/ckeditor5-list": "^31.1.0",
+    "@ckeditor/ckeditor5-paragraph": "^31.1.0",
+    "@ckeditor/ckeditor5-undo": "^31.1.0",
+    "@ckeditor/ckeditor5-code-block": "^31.1.0"
   },
   "engines": {
     "node": ">=12.0.0",

package/src/deleteobserver.js

@@ -12,6 +12,7 @@ import DomEventData from '@ckeditor/ckeditor5-engine/src/view/observer/domeventd
 import BubblingEventInfo from '@ckeditor/ckeditor5-engine/src/view/observer/bubblingeventinfo';
 import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
 import env from '@ckeditor/ckeditor5-utils/src/env';
+import { isShiftDeleteOnNonCollapsedSelection } from './utils/utils';
 
 /**
  * Delete observer introduces the {@link module:engine/view/document~Document#event:delete} event.
@@ -35,6 +36,15 @@ export default class DeleteObserver extends Observer {
 		} );
 
 		document.on( 'keydown', ( evt, data ) => {
+			// Do not fire the `delete` event, if Shift + Delete key combination was pressed on a non-collapsed selection on Windows.
+			//
+			// The Shift + Delete key combination should work in the same way as the `cut` event on a non-collapsed selection on Windows.
+			// In fact, the native `cut` event is actually emitted in this case, but with lower priority. Therefore, in order to handle the
+			// Shift + Delete key combination correctly, it is enough not to emit the `delete` event.
+			if ( env.isWindows && isShiftDeleteOnNonCollapsedSelection( data, document ) ) {
+				return;
+			}
+
 			const deleteData = {};
 
 			if ( data.keyCode == keyCodes.delete ) {

package/src/utils/injectunsafekeystrokeshandling.js

@@ -9,6 +9,7 @@
 
 import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
 import env from '@ckeditor/ckeditor5-utils/src/env';
+import { isShiftDeleteOnNonCollapsedSelection } from './utils';
 
 /**
  * Handles keystrokes which are unsafe for typing. This handler's logic is explained
@@ -49,6 +50,15 @@ export default function injectUnsafeKeystrokesHandling( editor ) {
 	//
 	// @param {module:engine/view/observer/keyobserver~KeyEventData} evtData
 	function handleUnsafeKeystroke( evtData ) {
+		// Do not delete the content, if Shift + Delete key combination was pressed on a non-collapsed selection on Windows.
+		//
+		// The Shift + Delete key combination should work in the same way as the `cut` event on a non-collapsed selection on Windows.
+		// In fact, the native `cut` event is actually emitted in this case, but with lower priority. Therefore, in order to handle the
+		// Shift + Delete key combination correctly, it is enough to prevent the content deletion here.
+		if ( env.isWindows && isShiftDeleteOnNonCollapsedSelection( evtData, view.document ) ) {
+			return;
+		}
+
 		const doc = model.document;
 		const isComposing = view.document.isComposing;
 		const isSelectionUnchanged = latestCompositionSelection && latestCompositionSelection.isEqual( doc.selection );

package/src/utils/utils.js

@@ -9,6 +9,7 @@
 
 import diff from '@ckeditor/ckeditor5-utils/src/diff';
 import diffToChanges from '@ckeditor/ckeditor5-utils/src/difftochanges';
+import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
 
 /**
  * Returns true if container children have mutated or more than a single text node was changed.
@@ -83,3 +84,21 @@ export function compareChildNodes( oldChild, newChild ) {
 		return oldChild === newChild;
 	}
 }
+
+/**
+ * Checks if <kbd>Shift</kbd> + <kbd>Delete</kbd> keystroke was pressed on a non-collapsed selection.
+ *
+ * This key combination has a special meaning on Windows machines and it should work in the same way as the `cut` event on a non-collapsed
+ * selection.
+ *
+ * @param {module:engine/view/observer/domeventdata~DomEventData} domEventData Event data.
+ * @param {module:engine/view/document~Document} document The document instance on which the event has been fired.
+ * @returns {Boolean}
+ */
+export function isShiftDeleteOnNonCollapsedSelection( domEventData, document ) {
+	const selection = document.selection;
+	const isShiftDelete = domEventData.shiftKey && domEventData.keyCode === keyCodes.delete;
+	const isNonCollapsedSelection = !selection.isCollapsed;
+
+	return isShiftDelete && isNonCollapsedSelection;
+}