devexpress-richedit 24.1.5-build-24211-0105 → 24.1.5

package/lib/client/client-rich-edit.js

@@ -53,8 +53,8 @@ export class ClientRichEdit {
         this.rawDataSource = settings.rawDataSource;
         this.contextMenuSettings = settings.contextMenuSettings;
         this.fullScreenHelper = new FullScreenHelper(element);
-        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFYWkdXQzFTVkdFeU1IbFVPRGh0YzAxNmRsQTJaeUlLZlE9PS5GYjZ4U0JwU3BSVHBWajZ0dWtlQTJZaU1WVW5tb0ZoSDJKV3Ryak5iN3p6VlNrNzhKa294RVFKOW9rVlErYnh0SzM1WWlFZkpEWGJnNktrYVA1ZEljcnp0ZHlsOFlGL2ltc3BIWkY5aWlaeGtVK0FXbFVrV1RUb2c0ZnZDbWlxMTl2MWhIdz09In0=")
-            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWFYWkdXQzFTVkdFeU1IbFVPRGh0YzAxNmRsQTJaeUlLZlE9PS5GYjZ4U0JwU3BSVHBWajZ0dWtlQTJZaU1WVW5tb0ZoSDJKV3Ryak5iN3p6VlNrNzhKa294RVFKOW9rVlErYnh0SzM1WWlFZkpEWGJnNktrYVA1ZEljcnp0ZHlsOFlGL2ltc3BIWkY5aWlaeGtVK0FXbFVrV1RUb2c0ZnZDbWlxMTl2MWhIdz09In0=")));
+        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWExcHBaR1pSWjA1WGEyVkxaVmx6U2tJNFdHcFhaeUlLZlE9PS5mL01XY3Z5bDUyTFJMRWlMaEVyYnF1eW5yQ3FEQjdvZ0U1QVgxcGdpMXduSW9sT1MySFluNjBWeDBTb0VJVVpEUGhIRlBSQkdpSzg2cFA1K0xjMG56dUd6RFpEZkVUUS9CeklldjJoNTYzdWc2SzlKMCswMER0eTlvVW1GU2xvRTl6WTdQZz09In0=")
+            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaWExcHBaR1pSWjA1WGEyVkxaVmx6U2tJNFdHcFhaeUlLZlE9PS5mL01XY3Z5bDUyTFJMRWlMaEVyYnF1eW5yQ3FEQjdvZ0U1QVgxcGdpMXduSW9sT1MySFluNjBWeDBTb0VJVVpEUGhIRlBSQkdpSzg2cFA1K0xjMG56dUd6RFpEZkVUUS9CeklldjJoNTYzdWc2SzlKMCswMER0eTlvVW1GU2xvRTl6WTdQZz09In0=")));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);

package/lib/common/canvas/renderes/view-manager.js

@@ -7,7 +7,6 @@ import { LogListHelper } from '../../rich-utils/debug/logger/base-logger/log-lis
 import { LogSource } from '../../rich-utils/debug/logger/base-logger/log-source';
 import { LogObjToStrLayout } from '../../rich-utils/debug/logger/layout-logger/log-obj-to-str-layout';
 import { ViewType } from '../../view-settings/views-settings';
-import { Browser } from '@devexpress/utils/lib/browser';
 import { DomUtils } from '@devexpress/utils/lib/utils/dom';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { NumberMapUtils } from '@devexpress/utils/lib/utils/map/number';
@@ -102,14 +101,12 @@ export class ViewManager {
             this.selection.renderAllPageSelection(this.layout, 0, true);
         else
             this.selection.applySelectionChanges(this.layout);
-        if (Browser.WebKitTouchUI || (Browser.MacOSPlatform && Browser.MajorVersion >= 13) || Browser.Chrome) {
-            const pageIndex = ListUtils.reverseIndexBy(layoutSelection.selectionInfo.pageInfos, pageInfo => pageInfo.oldItems.length > 0);
-            if (pageIndex > -1) {
-                const pageInfo = layoutSelection.selectionInfo.pageInfos[pageIndex];
-                const item = pageInfo.oldItems[0];
-                const layoutPage = this.layout.pages[pageIndex];
-                this.inputController.setPosition(layoutPage.x + this.cache[pageIndex].page.offsetLeft + item.x, this.sizes.getPageOffsetY(layoutPage) + item.y);
-            }
+        const pageIndex = ListUtils.reverseIndexBy(layoutSelection.selectionInfo.pageInfos, pageInfo => pageInfo.oldItems.length > 0);
+        if (pageIndex > -1) {
+            const pageInfo = layoutSelection.selectionInfo.pageInfos[pageIndex];
+            const item = pageInfo.oldItems[0];
+            const layoutPage = this.layout.pages[pageIndex];
+            this.inputController.setPosition(layoutPage.x + this.cache[pageIndex].page.offsetLeft + item.x, this.sizes.getPageOffsetY(layoutPage) + item.y);
         }
     }
     NotifySearchSelectionLayoutChanged() {

package/lib/common/event-manager.d.ts

@@ -1,6 +1,7 @@
 import { LayoutPoint } from './layout/layout-point';
 import { Offset, Point } from '@devexpress/utils/lib/geometry/point';
 import { ModifierKey } from '@devexpress/utils/lib/utils/key';
+import { RichEditClientCommand } from './commands/client-command';
 import { IEventManager } from './interfaces/i-event-manager';
 import { IRichEditControl } from './interfaces/i-rich-edit-core';
 import { BoxVisualizerManager } from './layout-engine/visualizers/box-visualizer-manager';
@@ -17,6 +18,7 @@ export declare class EventManager implements IEventManager {
     control: IRichEditControl;
     mouseHandler: MouseHandler;
     touchHandler: TouchHandler;
+    inputTypeHandlers: Record<string, RichEditClientCommand>;
     moveLocked: boolean;
     shouldPreventContextMenuEvent: boolean;
     set mouseWheelEvent(val: boolean);
@@ -48,6 +50,8 @@ export declare class EventManager implements IEventManager {
     onFocusOut(): void;
     isFocused(): boolean;
     private lockMouseMove;
+    onInput(inputType: string): boolean;
+    private createInputTypeHandlers;
 }
 export declare class RichMouseEvent {
     layoutPoint: LayoutPoint;

package/lib/common/event-manager.js

@@ -40,6 +40,7 @@ export class EventManager {
         this.control = control;
         this.mouseHandler = new MouseHandler(control, boxVisualizerManager);
         this.touchHandler = new TouchHandler(control, boxVisualizerManager);
+        this.inputTypeHandlers = this.createInputTypeHandlers();
     }
     set mouseWheelEvent(val) {
         this.mouseHandler.mouseWheelEvent = val;
@@ -212,6 +213,19 @@ export class EventManager {
         this.moveLocked = true;
         this.lockMouseMoveTimerId = setTimeout(() => this.moveLocked = false, 0);
     }
+    onInput(inputType) {
+        const commandId = this.inputTypeHandlers[inputType];
+        if (!commandId)
+            return false;
+        const command = this.control.commandManager.getCommand(commandId);
+        command.execute(false);
+        return true;
+    }
+    createInputTypeHandlers() {
+        const result = {};
+        result["insertParagraph"] = RichEditClientCommand.InsertParagraph;
+        return result;
+    }
 }
 export class RichMouseEvent {
     constructor(evt, layoutPoint, source, scrollTop, scrollLeft) {

package/lib/common/input-controller.d.ts

@@ -5,6 +5,7 @@ import { IRichEditControl } from './interfaces/i-rich-edit-core';
 import { HtmlBuilder } from './formats/html/export/html-builder';
 export declare const INPUT_CLASS_NAME = "dxreInputTarget";
 export declare abstract class InputEditorBase<TInpElement extends HTMLElement> {
+    private newLineRegexp;
     eventManager: IEventManager;
     control: IRichEditControl;
     inputElement: TInpElement;
@@ -31,7 +32,7 @@ export declare abstract class InputEditorBase<TInpElement extends HTMLElement> {
     createHierarchy(parent: HTMLElement): void;
     createHierarchyCore(): void;
     createInputElement(): TInpElement;
-    onInput(evt: KeyboardEvent): void;
+    onInput(evt: InputEvent): void;
     onBlur(_evt: FocusEvent): void;
     onFocus(): void;
     onKeyDown(evt: KeyboardEvent): void;
@@ -47,7 +48,7 @@ export declare abstract class InputEditorBase<TInpElement extends HTMLElement> {
     tryObtainCodeFromChar(char: string): number;
     captureFocus(): void;
     canUseInputEvent(): boolean;
-    getEditableDocumentText(): string;
+    getEditableDocumentText(keepLineBreakes?: boolean): string;
     getEditableTextOwner(): HTMLElement;
     setPosition(left: number, top: number): void;
     clearInputElement(): void;
@@ -74,7 +75,7 @@ export declare class DivInputEditor extends InputEditorBase<HTMLElement> {
     createInputElement(): HTMLElement;
     onKeyDown(evt: KeyboardEvent): void;
     onKeyUp(evt: KeyboardEvent): void;
-    onInput(evt: KeyboardEvent): void;
+    onInput(evt: InputEvent): void;
     onFocus(): void;
     onBlur(evt: FocusEvent): void;
     onShortcutCore(evt: KeyboardEvent, shortcutCode: number): void;

package/lib/common/input-controller.js

@@ -25,6 +25,7 @@ const TAB_KEYCODE = 9;
 const IDEOGRAPHIC_SPACE_CHARCODE = 12288;
 export class InputEditorBase {
     constructor(control, eventManager, parent) {
+        this.newLineRegexp = /(\r\n|\n|\r)/gm;
         this.processTextOnKeyPress = false;
         this.evtHandlersHolder = new DomEventHandlersHolder();
         this.control = control;
@@ -63,8 +64,7 @@ export class InputEditorBase {
         this.evtHandlersHolder.addListener(this.getEditableDocument(), "focus", this.onFocus.bind(this));
         this.evtHandlersHolder.addListener(this.getEditableDocument(), "blur", (evt) => this.onBlurTimerId = setTimeout(() => this.onBlur(evt), 10));
         this.evtHandlersHolder.addListener(this.getEditableDocument(), "contextmenu", this.onContextMenu.bind(this));
-        if (this.canInsertTextOnInputEvent)
-            this.evtHandlersHolder.addListener(this.getEditableDocument(), "input", (evt) => this.onInput(evt));
+        this.evtHandlersHolder.addListener(this.getEditableDocument(), "input", (evt) => this.onInput(evt));
     }
     createHierarchy(parent) {
         this.inputElement = this.createInputElement();
@@ -78,8 +78,21 @@ export class InputEditorBase {
         return null;
     }
     onInput(evt) {
-        if (this.canInsertTextOnInputEvent)
-            this.onInputTimerId = setTimeout(() => this.onTextInput(evt.data), 0);
+        if (!this.processTextOnKeyPress) {
+            if (evt.inputType === "insertText") {
+                const text = this.getEditableTextOwner().innerText;
+                if (StringUtils.isNullOrEmpty(text))
+                    return;
+                if (this.newLineRegexp.test(text)) {
+                    this.eventManager.onInput("insertParagraph");
+                    this.clearInputElement();
+                }
+                else
+                    this.onInputTimerId = setTimeout(() => this.onTextInput(evt.data), 0);
+            }
+            else if (this.eventManager.onInput(evt.inputType))
+                this.clearInputElement();
+        }
     }
     onBlur(_evt) {
         const targetElement = document.activeElement;
@@ -135,11 +148,10 @@ export class InputEditorBase {
                 this.keyPressTimerId = setTimeout(() => this.onTextInput(undefined), 0);
             else if (this.processTextOnKeyPress) {
                 this.imeTimerId = setTimeout(() => {
-                    if (!this.isIME)
-                        this.onTextInput(undefined);
+                    this.onTextInput(undefined);
+                    this.processTextOnKeyPress = false;
                 }, 0);
             }
-            this.processTextOnKeyPress = false;
             this.inputWithAlt = false;
         }
     }
@@ -200,8 +212,9 @@ export class InputEditorBase {
     canUseInputEvent() {
         return Browser.Firefox && Browser.MajorVersion >= 14 || Browser.WebKitTouchUI;
     }
-    getEditableDocumentText() {
-        return DomUtils.getInnerText(this.getEditableTextOwner()).replace(/(\r\n|\n|\r)/gm, "");
+    getEditableDocumentText(keepLineBreakes = false) {
+        const text = DomUtils.getInnerText(this.getEditableTextOwner());
+        return keepLineBreakes ? text : text.replace(this.newLineRegexp, "");
     }
     getEditableTextOwner() {
         return null;

package/lib/common/interfaces/i-event-manager.d.ts

@@ -13,6 +13,7 @@ export interface IEventManager {
     onText(text: string, isUpdated: boolean): any;
     onTextReplace(text: string, length?: number): any;
     onShortcut(shortcutCode: number): any;
+    onInput(inputType: string): boolean;
     isFocused(): boolean;
     onFocusIn(): any;
     onFocusOut(): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.5-build-24211-0105",
+  "version": "24.1.5",
   "homepage": "https://www.devexpress.com/",
   "bugs": "https://www.devexpress.com/support/",
   "author": "Developer Express Inc.",
@@ -14,8 +14,8 @@
     "build-nspell": "webpack --mode production --config=bin/nspell.webpack.config.js"
   },
   "peerDependencies": {
-    "devextreme": "24.1.5-build-24209-1937",
-    "devextreme-dist": "24.1.5-build-24209-1937"
+    "devextreme": "24.1.5",
+    "devextreme-dist": "24.1.5"
   },
   "dependencies": {
     "jszip": "~3.10.1",