@ckeditor/ckeditor5-typing 38.2.0-alpha.1 → 39.0.1

package/README.md

@@ -4,7 +4,6 @@ CKEditor 5 typing feature
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-typing.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-typing)
 [![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor5/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5?branch=master)
 [![Build Status](https://travis-ci.com/ckeditor/ckeditor5.svg?branch=master)](https://app.travis-ci.com/github/ckeditor/ckeditor5)
-![Dependency Status](https://img.shields.io/librariesio/release/npm/@ckeditor/ckeditor5-typing)
 
 This package implements support for typing (inputting and deleting text) in CKEditor 5. It also includes the automatic text transformations (autocorrect) feature that lets you automatically turn predefined snippets into their improved forms.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-typing",
-  "version": "38.2.0-alpha.1",
+  "version": "39.0.1",
   "description": "Typing feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -11,12 +11,11 @@
     "ckeditor5-dll"
   ],
   "main": "src/index.js",
-  "type": "module",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "38.2.0-alpha.1",
-    "@ckeditor/ckeditor5-engine": "38.2.0-alpha.1",
-    "@ckeditor/ckeditor5-utils": "38.2.0-alpha.1",
-    "lodash-es": "^4.17.15"
+    "@ckeditor/ckeditor5-core": "39.0.1",
+    "@ckeditor/ckeditor5-engine": "39.0.1",
+    "@ckeditor/ckeditor5-utils": "39.0.1",
+    "lodash-es": "4.17.21"
   },
   "engines": {
     "node": ">=16.0.0",

package/src/augmentation.d.ts

@@ -2,7 +2,7 @@
  * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-import type { Delete, DeleteCommand, Input, InsertTextCommand, TextTransformation, TwoStepCaretMovement, Typing, TypingConfig } from './index.js';
+import type { Delete, DeleteCommand, Input, InsertTextCommand, TextTransformation, TwoStepCaretMovement, Typing, TypingConfig } from './index';
 declare module '@ckeditor/ckeditor5-core' {
     interface EditorConfig {
         /**

package/src/delete.js

@@ -6,8 +6,8 @@
  * @module typing/delete
  */
 import { Plugin } from '@ckeditor/ckeditor5-core';
-import DeleteCommand from './deletecommand.js';
-import DeleteObserver from './deleteobserver.js';
+import DeleteCommand from './deletecommand';
+import DeleteObserver from './deleteobserver';
 /**
  * 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.

package/src/deletecommand.d.ts

@@ -7,7 +7,7 @@
  */
 import { Command, type Editor } from '@ckeditor/ckeditor5-core';
 import type { DocumentSelection, Selection } from '@ckeditor/ckeditor5-engine';
-import ChangeBuffer from './utils/changebuffer.js';
+import ChangeBuffer from './utils/changebuffer';
 /**
  * The delete command. Used by the {@link module:typing/delete~Delete delete feature} to handle the <kbd>Delete</kbd> and
  * <kbd>Backspace</kbd> keys.

package/src/deletecommand.js

@@ -7,7 +7,7 @@
  */
 import { Command } from '@ckeditor/ckeditor5-core';
 import { count } from '@ckeditor/ckeditor5-utils';
-import ChangeBuffer from './utils/changebuffer.js';
+import ChangeBuffer from './utils/changebuffer';
 /**
  * The delete command. Used by the {@link module:typing/delete~Delete delete feature} to handle the <kbd>Delete</kbd> and
  * <kbd>Backspace</kbd> keys.

package/src/index.d.ts

@@ -5,20 +5,20 @@
 /**
  * @module typing
  */
-export { default as Typing } from './typing.js';
-export { default as Input } from './input.js';
-export { default as Delete } from './delete.js';
-export { default as TextWatcher } from './textwatcher.js';
-export { default as TwoStepCaretMovement } from './twostepcaretmovement.js';
-export { default as TextTransformation } from './texttransformation.js';
-export { default as inlineHighlight } from './utils/inlinehighlight.js';
-export { default as findAttributeRange, findAttributeRangeBound } from './utils/findattributerange.js';
-export { default as getLastTextLine, type LastTextLineData } from './utils/getlasttextline.js';
-export { default as InsertTextCommand, type InsertTextCommandExecuteEvent } from './inserttextcommand.js';
-export type { default as DeleteCommand } from './deletecommand.js';
-export type { TypingConfig } from './typingconfig.js';
-export type { ViewDocumentDeleteEvent } from './deleteobserver.js';
-export type { ViewDocumentInsertTextEvent, InsertTextEventData } from './inserttextobserver.js';
-export type { TextWatcherMatchedEvent } from './textwatcher.js';
-export type { TextWatcherMatchedDataEvent } from './textwatcher.js';
-import './augmentation.js';
+export { default as Typing } from './typing';
+export { default as Input } from './input';
+export { default as Delete } from './delete';
+export { default as TextWatcher } from './textwatcher';
+export { default as TwoStepCaretMovement } from './twostepcaretmovement';
+export { default as TextTransformation } from './texttransformation';
+export { default as inlineHighlight } from './utils/inlinehighlight';
+export { default as findAttributeRange, findAttributeRangeBound } from './utils/findattributerange';
+export { default as getLastTextLine, type LastTextLineData } from './utils/getlasttextline';
+export { default as InsertTextCommand, type InsertTextCommandExecuteEvent } from './inserttextcommand';
+export type { default as DeleteCommand } from './deletecommand';
+export type { TypingConfig } from './typingconfig';
+export type { ViewDocumentDeleteEvent } from './deleteobserver';
+export type { ViewDocumentInsertTextEvent, InsertTextEventData } from './inserttextobserver';
+export type { TextWatcherMatchedEvent } from './textwatcher';
+export type { TextWatcherMatchedDataEvent } from './textwatcher';
+import './augmentation';

package/src/index.js

@@ -5,14 +5,14 @@
 /**
  * @module typing
  */
-export { default as Typing } from './typing.js';
-export { default as Input } from './input.js';
-export { default as Delete } from './delete.js';
-export { default as TextWatcher } from './textwatcher.js';
-export { default as TwoStepCaretMovement } from './twostepcaretmovement.js';
-export { default as TextTransformation } from './texttransformation.js';
-export { default as inlineHighlight } from './utils/inlinehighlight.js';
-export { default as findAttributeRange, findAttributeRangeBound } from './utils/findattributerange.js';
-export { default as getLastTextLine } from './utils/getlasttextline.js';
-export { default as InsertTextCommand } from './inserttextcommand.js';
-import './augmentation.js';
+export { default as Typing } from './typing';
+export { default as Input } from './input';
+export { default as Delete } from './delete';
+export { default as TextWatcher } from './textwatcher';
+export { default as TwoStepCaretMovement } from './twostepcaretmovement';
+export { default as TextTransformation } from './texttransformation';
+export { default as inlineHighlight } from './utils/inlinehighlight';
+export { default as findAttributeRange, findAttributeRangeBound } from './utils/findattributerange';
+export { default as getLastTextLine } from './utils/getlasttextline';
+export { default as InsertTextCommand } from './inserttextcommand';
+import './augmentation';

package/src/input.js

@@ -7,8 +7,8 @@
  */
 import { Plugin } from '@ckeditor/ckeditor5-core';
 import { env } from '@ckeditor/ckeditor5-utils';
-import InsertTextCommand from './inserttextcommand.js';
-import InsertTextObserver from './inserttextobserver.js';
+import InsertTextCommand from './inserttextcommand';
+import InsertTextObserver from './inserttextobserver';
 /**
  * Handles text input coming from the keyboard or other input methods.
  */
@@ -82,6 +82,7 @@ export default class Input extends Plugin {
                 insertTextCommandData.resultRange = editor.editing.mapper.toModelRange(viewResultRange);
             }
             editor.execute('insertText', insertTextCommandData);
+            view.scrollToTheSelection();
         });
         if (env.isAndroid) {
             // On Android with English keyboard, the composition starts just by putting caret

package/src/inserttextcommand.d.ts

@@ -6,7 +6,7 @@
  * @module typing/inserttextcommand
  */
 import { Command, type Editor } from '@ckeditor/ckeditor5-core';
-import ChangeBuffer from './utils/changebuffer.js';
+import ChangeBuffer from './utils/changebuffer';
 import type { DocumentSelection, Range, Selection } from '@ckeditor/ckeditor5-engine';
 /**
  * The insert text command. Used by the {@link module:typing/input~Input input feature} to handle typing.

package/src/inserttextcommand.js

@@ -6,7 +6,7 @@
  * @module typing/inserttextcommand
  */
 import { Command } from '@ckeditor/ckeditor5-core';
-import ChangeBuffer from './utils/changebuffer.js';
+import ChangeBuffer from './utils/changebuffer';
 /**
  * The insert text command. Used by the {@link module:typing/input~Input input feature} to handle typing.
  */

package/src/inserttextobserver.d.ts

@@ -2,11 +2,16 @@
  * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-import { DomEventData, Observer, type View, type ViewDocumentSelection, type ViewRange, type ViewSelection } from '@ckeditor/ckeditor5-engine';
+import { DomEventData, Observer, FocusObserver, type View, type ViewDocumentSelection, type ViewRange, type ViewSelection } from '@ckeditor/ckeditor5-engine';
 /**
  * Text insertion observer introduces the {@link module:engine/view/document~Document#event:insertText} event.
  */
 export default class InsertTextObserver extends Observer {
+    /**
+     * Instance of the focus observer. Insert text observer calls
+     * {@link module:engine/view/observer/focusobserver~FocusObserver#flush} to mark the latest focus change as complete.
+     */
+    readonly focusObserver: FocusObserver;
     /**
      * @inheritDoc
      */

package/src/inserttextobserver.js

@@ -6,7 +6,7 @@
  * @module typing/inserttextobserver
  */
 import { env, EventInfo } from '@ckeditor/ckeditor5-utils';
-import { DomEventData, Observer } from '@ckeditor/ckeditor5-engine';
+import { DomEventData, Observer, FocusObserver } from '@ckeditor/ckeditor5-engine';
 const TYPING_INPUT_TYPES = [
     // For collapsed range:
     //	- This one is a regular typing (all browsers, all systems).
@@ -28,6 +28,7 @@ export default class InsertTextObserver extends Observer {
      */
     constructor(view) {
         super(view);
+        this.focusObserver = view.getObserver(FocusObserver);
         // On Android composition events should immediately be applied to the model. Rendering is not disabled.
         // On non-Android the model is updated only on composition end.
         // On Android we can't rely on composition start/end to update model.
@@ -43,6 +44,9 @@ export default class InsertTextObserver extends Observer {
             if (!TYPING_INPUT_TYPES.includes(inputType)) {
                 return;
             }
+            // Mark the latest focus change as complete (we are typing in editable after the focus
+            // so the selection is in the focused element).
+            this.focusObserver.flush();
             const eventInfo = new EventInfo(viewDocument, 'insertText');
             viewDocument.fire(eventInfo, new DomEventData(view, domEvent, {
                 text,

package/src/texttransformation.js

@@ -6,7 +6,7 @@
  * @module typing/texttransformation
  */
 import { Plugin } from '@ckeditor/ckeditor5-core';
-import TextWatcher from './textwatcher.js';
+import TextWatcher from './textwatcher';
 import { escapeRegExp } from 'lodash-es';
 // All named transformations.
 const TRANSFORMATIONS = {

package/src/textwatcher.js

@@ -6,7 +6,7 @@
  * @module typing/textwatcher
  */
 import { ObservableMixin } from '@ckeditor/ckeditor5-utils';
-import getLastTextLine from './utils/getlasttextline.js';
+import getLastTextLine from './utils/getlasttextline';
 /**
  * The text watcher feature.
  *

package/src/typing.d.ts

@@ -6,8 +6,8 @@
  * @module typing/typing
  */
 import { Plugin } from '@ckeditor/ckeditor5-core';
-import Input from './input.js';
-import Delete from './delete.js';
+import Input from './input';
+import Delete from './delete';
 /**
  * The typing feature. It handles typing.
  *

package/src/typing.js

@@ -6,8 +6,8 @@
  * @module typing/typing
  */
 import { Plugin } from '@ckeditor/ckeditor5-core';
-import Input from './input.js';
-import Delete from './delete.js';
+import Input from './input';
+import Delete from './delete';
 /**
  * The typing feature. It handles typing.
  *

package/src/utils/inlinehighlight.d.ts

@@ -18,7 +18,7 @@ import type { Editor } from '@ckeditor/ckeditor5-core';
  * Usage:
  *
  * ```ts
- * import inlineHighlight from '@ckeditor/ckeditor5-typing/src/utils/inlinehighlight.js';
+ * import inlineHighlight from '@ckeditor/ckeditor5-typing/src/utils/inlinehighlight';
  *
  * // Make `ck-link_selected` class be applied on an `a` element
  * // whenever the corresponding `linkHref` attribute element is selected.

package/src/utils/inlinehighlight.js

@@ -5,7 +5,7 @@
 /**
  * @module typing/utils/inlinehighlight
  */
-import findAttributeRange from './findattributerange.js';
+import findAttributeRange from './findattributerange';
 /**
  * Adds a visual highlight style to an attribute element in which the selection is anchored.
  * Together with two-step caret movement, they indicate that the user is typing inside the element.
@@ -21,7 +21,7 @@ import findAttributeRange from './findattributerange.js';
  * Usage:
  *
  * ```ts
- * import inlineHighlight from '@ckeditor/ckeditor5-typing/src/utils/inlinehighlight.js';
+ * import inlineHighlight from '@ckeditor/ckeditor5-typing/src/utils/inlinehighlight';
  *
  * // Make `ck-link_selected` class be applied on an `a` element
  * // whenever the corresponding `linkHref` attribute element is selected.