@ckeditor/ckeditor5-typing 45.2.1-alpha.4 → 45.2.1-alpha.5

package/dist/index.js

@@ -4,7 +4,7 @@
  */
 import { Command, Plugin } from '@ckeditor/ckeditor5-core/dist/index.js';
 import { env, EventInfo, count, isInsideSurrogatePair, isInsideCombinedSymbol, isInsideEmojiSequence, keyCodes, ObservableMixin } from '@ckeditor/ckeditor5-utils/dist/index.js';
-import { Observer, FocusObserver, DomEventData, LiveRange, BubblingEventInfo, MouseObserver, TouchObserver } from '@ckeditor/ckeditor5-engine/dist/index.js';
+import { Observer, FocusObserver, DomEventData, _tryFixingModelRange, LiveRange, BubblingEventInfo, MouseObserver, TouchObserver } from '@ckeditor/ckeditor5-engine/dist/index.js';
 import { debounce, escapeRegExp } from 'es-toolkit/compat';
 
 /**
@@ -359,6 +359,23 @@ const TYPING_INPUT_TYPES_ANDROID = [
             if (view.document.selection.isFake && viewSelection && view.document.selection.isSimilar(viewSelection)) {
                 data.preventDefault();
             }
+            // In case of typing on a non-collapsed range, we have to handle it ourselves as a browser
+            // could modify the DOM unpredictably.
+            // Noticed cases:
+            // * <pre><code>[foo</code></pre><p>]bar</p>
+            // * <p>[foo</p><pre>]<code>bar</code></pre>
+            // * <p>[foo</p><blockquote><p>]bar</p></blockquote>
+            //
+            // Especially tricky case is when a code block follows a paragraph as code block on the view side
+            // is rendered as a <code> element inside a <pre> element, but only the <code> element is mapped to the model.
+            // While mapping view position <pre>]<code> to model, the model position results before the <codeBlock> element,
+            // and this triggers selection fixer to cover only text in the previous paragraph.
+            //
+            // This is safe for composition as those events are not cancellable
+            // and the preventDefault() and defaultPrevented are not affected.
+            if (viewSelection && Array.from(viewSelection.getRanges()).some((range)=>!range.isCollapsed)) {
+                data.preventDefault();
+            }
             if (!insertTextCommand.isEnabled) {
                 // @if CK_DEBUG_TYPING // if ( ( window as any ).logCKETyping ) {
                 // @if CK_DEBUG_TYPING // 	console.log( ..._buildLogMessage( this, 'Input',
@@ -372,7 +389,7 @@ const TYPING_INPUT_TYPES_ANDROID = [
             let modelRanges;
             // If view selection was specified, translate it to model selection.
             if (viewSelection) {
-                modelRanges = Array.from(viewSelection.getRanges()).map((viewRange)=>mapper.toModelRange(viewRange));
+                modelRanges = Array.from(viewSelection.getRanges()).map((viewRange)=>mapper.toModelRange(viewRange)).map((modelRange)=>_tryFixingModelRange(modelRange, model.schema) || modelRange);
             } else {
                 modelRanges = Array.from(modelSelection.getRanges());
             }
@@ -1224,9 +1241,7 @@ const DELETE_EVENT_TYPES = {
                 sequence
             };
             if (unit == 'selection') {
-                const modelRanges = Array.from(selectionToRemove.getRanges()).map((viewRange)=>{
-                    return editor.editing.mapper.toModelRange(viewRange);
-                });
+                const modelRanges = Array.from(selectionToRemove.getRanges()).map((viewRange)=>editor.editing.mapper.toModelRange(viewRange)).map((modelRange)=>_tryFixingModelRange(modelRange, editor.model.schema) || modelRange);
                 commandData.selection = editor.model.createSelection(modelRanges);
             } else {
                 commandData.unit = unit;