devexpress-richedit 24.2.4-build-25009-0102 → 24.2.5-build-25037-0102

package/index.d.ts

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.d.ts)
-* Version: 24.2.4
+* Version: 24.2.5
 * Copyright (c) 2012 - 2025 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

package/index.js

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.js)
-* Version: 24.2.4
+* Version: 24.2.5
 * Copyright (c) 2012 - 2025 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

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

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

package/lib/client/model-api/collections/table/table-collection.js

@@ -1,6 +1,4 @@
 import { ApiParametersChecker } from '../../api-utils/parameter-checker';
-import { LayoutPositionCreatorConflictFlags } from '../../../../common/layout-engine/layout-position-creator';
-import { DocumentLayoutDetailsLevel } from '../../../../common/layout/document-layout-details-level';
 import { LayoutPosition } from '../../../../common/layout/layout-position';
 import { LayoutColumn } from '../../../../common/layout/main-structures/layout-column';
 import { Table } from '../../../../common/model/tables/main-structures/table';
@@ -26,7 +24,7 @@ export class TableCollection extends TableBaseCollection {
         rowCount = ApiParametersChecker.check(rowCount, 3, false, [
             ApiParametersChecker.numberDescriptor("rowCount", (n) => n, 1)
         ]);
-        const lp = LayoutPosition.ensure(this._processor.layoutFormatterManager, this._processor.selection, this._subDocument, position, DocumentLayoutDetailsLevel.Row, new LayoutPositionCreatorConflictFlags().setDefault(false), new LayoutPositionCreatorConflictFlags().setDefault(false));
+        const lp = LayoutPosition.ensure(this._processor.layoutFormatterManager, this._subDocument, position);
         const currentTable = Table.getTableByPosition(this._subDocument.tables, position, true);
         const availableWidth = currentTable ? lp.row.tableCellInfo.avaliableContentWidth :
             LayoutColumn.findSectionColumnWithMinimumWidth(lp.pageArea.columns);

package/lib/common/commands/tables/auto-fit-commands.js

@@ -1,5 +1,3 @@
-import { LayoutPositionCreatorConflictFlags } from '../../layout-engine/layout-position-creator';
-import { DocumentLayoutDetailsLevel } from '../../layout/document-layout-details-level';
 import { LayoutPosition } from '../../layout/layout-position';
 import { LayoutColumn } from '../../layout/main-structures/layout-column';
 import { TableCellPreferredWidthHistoryItem } from '../../model/history/items/tables/table-cell-properties-history-items';
@@ -60,7 +58,7 @@ export class FixedColumnWidthCommand extends AutoFitCommandBase {
         const table = state.value;
         const history = this.history;
         const subDocument = parameter.subDocument;
-        const lp = LayoutPosition.ensure(this.control.layoutFormatterManager, this.selection, subDocument, table.getStartPosition(), DocumentLayoutDetailsLevel.Row, new LayoutPositionCreatorConflictFlags().setDefault(false), new LayoutPositionCreatorConflictFlags().setDefault(false));
+        const lp = LayoutPosition.ensure(this.control.layoutFormatterManager, subDocument, table.getStartPosition());
         const grid = this.getGrid(table, lp);
         history.beginTransaction();
         history.addAndRedo(new TableLayoutTypeHistoryItem(this.modelManipulator, subDocument, table.index, TableLayoutType.Fixed, true));

package/lib/common/commands/tables/insert-table-core-command.js

@@ -1,5 +1,3 @@
-import { LayoutPositionCreatorConflictFlags } from '../../layout-engine/layout-position-creator';
-import { DocumentLayoutDetailsLevel } from '../../layout/document-layout-details-level';
 import { LayoutPosition } from '../../layout/layout-position';
 import { LayoutColumn } from '../../layout/main-structures/layout-column';
 import { ControlOptions } from '../../model/options/control';
@@ -20,7 +18,7 @@ export class InsertTableCoreCommand extends CommandBase {
         const parameter = options.param;
         const subDocument = this.selection.activeSubDocument;
         const position = this.selection.intervals[0].start;
-        const lp = LayoutPosition.ensure(this.control.layoutFormatterManager, this.control.selection, subDocument, position, DocumentLayoutDetailsLevel.Row, new LayoutPositionCreatorConflictFlags().setDefault(false), new LayoutPositionCreatorConflictFlags().setDefault(false));
+        const lp = LayoutPosition.ensure(this.control.layoutFormatterManager, subDocument, position);
         let currentTable = Table.getTableByPosition(subDocument.tables, position, true);
         let availableWidth = currentTable ? lp.row.tableCellInfo.avaliableContentWidth :
             LayoutColumn.findSectionColumnWithMinimumWidth(lp.pageArea.columns);

package/lib/common/event-manager.js

@@ -23,6 +23,7 @@ import { MouseHandler } from './mouse-handler/mouse-handler/mouse-handler';
 import { TouchHandler } from './mouse-handler/touch-handler/touch-handler';
 import { LogObjToStrCanvas } from './rich-utils/debug/logger/canvas-logger/log-obj-to-str-canvas';
 import { RichLayoutUtils } from './rich-utils/layout/rich-layout-utils';
+import { StringUtils } from '@devexpress/utils/lib/utils/string';
 export var MouseButton;
 (function (MouseButton) {
     MouseButton[MouseButton["None"] = 0] = "None";
@@ -145,10 +146,12 @@ export class EventManager {
     }
     modifyLastText(text, length) {
         if (length === 0) {
-            this.control.beginUpdate();
-            this.control.commandManager.getCommand(RichEditClientCommand.InsertText).execute(this.control.commandManager.isPublicApiCall, new CommandSimpleOptions(this.control, text));
-            this.control.endUpdate();
-            return;
+            if (!StringUtils.isNullOrEmpty(text)) {
+                this.control.beginUpdate();
+                this.control.commandManager.getCommand(RichEditClientCommand.InsertText).execute(this.control.commandManager.isPublicApiCall, new CommandSimpleOptions(this.control, text));
+                this.control.endUpdate();
+            }
+            return true;
         }
         let endInterval = this.control.selection.lastSelectedInterval.start;
         let startInterval = endInterval - length;
@@ -156,14 +159,19 @@ export class EventManager {
         const insertTextHistoryItem = this.control.modelManager.modelManipulator.text.getLastModifiableHistoryItem((hi) => hi instanceof InsertTextHistoryItem);
         if (!insertTextHistoryItem)
             return false;
-        const setSelectionHistoryItem = this.control.modelManager.modelManipulator.text.getLastModifiableHistoryItem((hi) => hi instanceof SelectionHistoryItem);
-        this.control.modelManager.modelManipulator.range.removeIntervalWithoutHistory(insertTextHistoryItem.params.subDocPos.subDocument, intervalForModify, false);
-        this.control.modelManager.modelManipulator.text.insertTextInner(new InsertTextManipulatorParams(new SubDocumentPosition(insertTextHistoryItem.params.subDocPos.subDocument, intervalForModify.start), insertTextHistoryItem.params.charPropsBundle, RunType.TextRun, text));
-        setSelectionHistoryItem.newState.intervalsInfo.intervals[0].start = startInterval + text.length;
-        insertTextHistoryItem.params.text = text;
-        var newPositionSelection = setSelectionHistoryItem.newState.intervalsInfo.intervals[0].start;
-        this.control.selection.changeState((newState) => newState.setPosition(newPositionSelection));
-        this.control.commandManager.lastTextInsertDate = new Date(0);
+        if (!StringUtils.isNullOrEmpty(text)) {
+            const setSelectionHistoryItem = this.control.modelManager.modelManipulator.text.getLastModifiableHistoryItem((hi) => hi instanceof SelectionHistoryItem);
+            this.control.modelManager.modelManipulator.range.removeIntervalWithoutHistory(insertTextHistoryItem.params.subDocPos.subDocument, intervalForModify, false);
+            this.control.modelManager.modelManipulator.text.insertTextInner(new InsertTextManipulatorParams(new SubDocumentPosition(insertTextHistoryItem.params.subDocPos.subDocument, intervalForModify.start), insertTextHistoryItem.params.charPropsBundle, RunType.TextRun, text));
+            setSelectionHistoryItem.newState.intervalsInfo.intervals[0].start = startInterval + text.length;
+            insertTextHistoryItem.params.text = text;
+            var newPositionSelection = setSelectionHistoryItem.newState.intervalsInfo.intervals[0].start;
+            this.control.selection.changeState((newState) => newState.setPosition(newPositionSelection));
+            this.control.commandManager.lastTextInsertDate = new Date(0);
+        }
+        else
+            this.control.modelManager.modelManipulator.range.removeIntervalInner(insertTextHistoryItem.params.subDocPos.subDocument, intervalForModify, false);
+        return true;
     }
     modifyLastInsertedSymbol(symbol) {
         if (symbol.length !== 1)
@@ -224,6 +232,7 @@ export class EventManager {
     createInputTypeHandlers() {
         const result = {};
         result["insertParagraph"] = RichEditClientCommand.InsertParagraph;
+        result["deleteContentBackward"] = RichEditClientCommand.ToggleBackspaceKey;
         return result;
     }
 }

package/lib/common/formats/html/export/html-document-exporter.js

@@ -2,6 +2,7 @@ import { FixedInterval } from "@devexpress/utils/lib/intervals/fixed";
 import { HtmlMimeType } from "@devexpress/utils/lib/utils/mime-type";
 import { RichUtils } from "../../../model/rich-utils";
 import { HtmlExporter } from "./html-export";
+import { Base64Utils } from "@devexpress/utils/lib/utils/base64";
 export class HtmlDocumentExporter {
     get modelManipulator() { return this.exportModelOptions.modelManager.modelManipulator; }
     constructor(exportModelOptions, options) {
@@ -14,9 +15,10 @@ export class HtmlDocumentExporter {
         });
     }
     exportToBase64(callback) {
-        this.modelManipulator.picture.loader.ensureAllPicturesLoaded(this.options.ensurePictureLoadedTimeout, (_loaded) => {
-            callback(btoa(this.exportAsString()));
-        });
+        this.exportToBlob(blob => Base64Utils.fromBlobAsDataUrl(blob, base64 => {
+            const splitted = base64.split(',');
+            callback(splitted.length === 2 ? splitted[1] : '');
+        }));
     }
     exportAsString() {
         const model = this.modelManipulator.model;

package/lib/common/input-controller.js

@@ -315,7 +315,7 @@ export class DivInputEditor extends InputEditorBase {
                 this.selectEditableDocumentContent();
         }
         super.onKeyDown(evt);
-        this.canSkipInputEvent = true;
+        this.canSkipInputEvent = KeyUtils.getEventKeyCode(evt) != EMPTY_KEYCODE;
     }
     onKeyUp(evt) {
         super.onKeyUp(evt);
@@ -685,7 +685,9 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     onCompositionUpdate(_evt) {
         const text = this.getEditableDocumentText();
-        if (this.IMEState !== IMEState.None && text.length && this.previousText != text) {
+        if (this.IMEState === IMEState.None)
+            return;
+        if (text.length && this.previousText != text) {
             this.onTextReplace(text, text);
             this.updateInputIME();
         }
@@ -693,7 +695,7 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     onCompositionEnd(_evt) {
         const text = this.getEditableDocumentText();
-        if (text.length && this.previousText != text)
+        if (this.previousText != text)
             this.onTextReplace(text, text);
         else if (!Browser.Edge)
             this.clearInputElement();

package/lib/common/layout/document-layout.d.ts

@@ -29,4 +29,5 @@ export declare class DocumentLayout {
     setEmptyLayout(pageColor: number): void;
     getLastValidPage(): LayoutPage;
     isPageValid(pageIndex: number): boolean;
+    getPageBySubDocumentId(subDocumentId: number): LayoutPage;
 }

package/lib/common/layout/document-layout.js

@@ -55,4 +55,7 @@ export class DocumentLayout {
     isPageValid(pageIndex) {
         return pageIndex < this.validPageCount && this.pages[pageIndex].isValid;
     }
+    getPageBySubDocumentId(subDocumentId) {
+        return this.pages.find((page) => !!page.mainSubDocumentPageAreas[subDocumentId] || !!page.otherPageAreas[subDocumentId]);
+    }
 }

package/lib/common/layout/layout-position.d.ts

@@ -1,10 +1,8 @@
 import { Offset } from '@devexpress/utils/lib/geometry/point';
 import { ICloneable, IEquatable } from '@devexpress/utils/lib/types';
-import { LayoutPositionCreatorConflictFlags } from '../layout-engine/layout-position-creator';
 import { FormatterManager } from '../layout-formatter/managers/formatter-manager';
 import { IMeasurer } from '../measurer/measurer';
 import { SubDocument } from '../model/sub-document';
-import { ISelectionBase } from '../selection/selection-base';
 import { DocumentLayout } from './document-layout';
 import { DocumentLayoutDetailsLevel } from './document-layout-details-level';
 import { LayoutPoint } from './layout-point';
@@ -49,7 +47,7 @@ export declare class LayoutPositionBase extends LayoutRowPosition implements IEq
 }
 export declare class LayoutPosition extends LayoutPositionBase implements ICloneable<LayoutPosition> {
     constructor(detailsLevel: DocumentLayoutDetailsLevel);
-    static ensure(formatterController: FormatterManager, selection: ISelectionBase, subDocument: SubDocument, logPosition: number, detailsLevel: DocumentLayoutDetailsLevel, endRowConflictFlags: LayoutPositionCreatorConflictFlags, middleRowConflictFlags: LayoutPositionCreatorConflictFlags): LayoutPosition;
+    static ensure(formatterController: FormatterManager, subDocument: SubDocument, logPosition: number, detailsLevel?: DocumentLayoutDetailsLevel): LayoutPosition;
     getLogPosition(detailsLevel?: DocumentLayoutDetailsLevel): number;
     isPositionBoxEnd(): boolean;
     isLastBoxInRow(): boolean;

package/lib/common/layout/layout-position.js

@@ -1,5 +1,5 @@
 import { Point } from '@devexpress/utils/lib/geometry/point';
-import { LayoutPositionMainSubDocumentCreator, LayoutPositionOtherSubDocumentCreator } from '../layout-engine/layout-position-creator';
+import { LayoutPositionCreatorConflictFlags, LayoutPositionMainSubDocumentCreator, LayoutPositionOtherSubDocumentCreator } from '../layout-engine/layout-position-creator';
 import { DocumentLayoutDetailsLevel } from './document-layout-details-level';
 import { LayoutPoint } from './layout-point';
 export class LayoutAndModelPositions {
@@ -188,12 +188,15 @@ export class LayoutPosition extends LayoutPositionBase {
         super();
         this.detailsLevel = detailsLevel;
     }
-    static ensure(formatterController, selection, subDocument, logPosition, detailsLevel, endRowConflictFlags, middleRowConflictFlags) {
+    static ensure(formatterController, subDocument, logPosition, detailsLevel = DocumentLayoutDetailsLevel.Row) {
         const layout = formatterController.layout;
+        const endRowConflictFlags = new LayoutPositionCreatorConflictFlags().setDefault(false);
+        const middleRowConflictFlags = new LayoutPositionCreatorConflictFlags().setDefault(false);
         if (subDocument.isMain())
             return LayoutPositionMainSubDocumentCreator.ensureLayoutPosition(formatterController, subDocument, logPosition, detailsLevel, endRowConflictFlags, middleRowConflictFlags);
         while (true) {
-            const lp = new LayoutPositionOtherSubDocumentCreator(layout, subDocument, logPosition, selection.pageIndex, detailsLevel)
+            const pageIndex = layout.getPageBySubDocumentId(subDocument.id).index;
+            const lp = new LayoutPositionOtherSubDocumentCreator(layout, subDocument, logPosition, pageIndex, detailsLevel)
                 .create(endRowConflictFlags, middleRowConflictFlags);
             if (lp)
                 return lp;

package/lib/common/rich-utils/layout/rich-layout-utils.d.ts

@@ -1,9 +1,4 @@
-import { FormatterManager } from '../../layout-formatter/managers/formatter-manager';
-import { SubDocument } from '../../model/sub-document';
-import { ISelectionBase } from '../../selection/selection-base';
-import { Size } from '@devexpress/utils/lib/geometry/size';
 import { IRichEditControl } from '../../interfaces/i-rich-edit-core';
 export declare class RichLayoutUtils {
-    static getAllowedSizeForImage(subDocument: SubDocument, layoutFormatterManager: FormatterManager, selection: ISelectionBase, logPosition: number): Size;
     static modifyTextUnderCursor(control: IRichEditControl, text: string): void;
 }

package/lib/common/rich-utils/layout/rich-layout-utils.js

@@ -1,21 +1,12 @@
 import { LayoutPositionCreatorConflictFlags, LayoutPositionMainSubDocumentCreator, LayoutPositionOtherSubDocumentCreator } from '../../layout-engine/layout-position-creator';
 import { DocumentLayoutDetailsLevel } from '../../layout/document-layout-details-level';
-import { LayoutPosition } from '../../layout/layout-position';
 import { InsertTextManipulatorParams } from '../../model/manipulators/text-manipulator/insert-text-manipulator-params';
 import { RunType } from '../../model/runs/run-type';
 import { SubDocumentInterval, SubDocumentPosition } from '../../model/sub-document';
 import { LayoutWordBounds } from '../../word-bounds-engine/layout-word-bounds';
-import { UnitConverter } from '@devexpress/utils/lib/class/unit-converter';
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 import { SelectionHistoryItem } from '../../model/history/selection/selection-history-item';
 export class RichLayoutUtils {
-    static getAllowedSizeForImage(subDocument, layoutFormatterManager, selection, logPosition) {
-        const layoutPosition = LayoutPosition.ensure(layoutFormatterManager, selection, subDocument, logPosition, DocumentLayoutDetailsLevel.Row, new LayoutPositionCreatorConflictFlags().setDefault(false), new LayoutPositionCreatorConflictFlags().setDefault(true));
-        const allowedSize = layoutPosition.column.createSize().applyConverter(UnitConverter.pixelsToTwips);
-        if (layoutPosition.row.tableCellInfo)
-            allowedSize.width = Math.min(UnitConverter.pixelsToTwips(layoutPosition.row.tableCellInfo.avaliableContentWidth), allowedSize.width);
-        return allowedSize;
-    }
     static modifyTextUnderCursor(control, text) {
         const subDocument = control.selection.activeSubDocument;
         let position = control.selection.lastSelectedInterval.start;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.2.4-build-25009-0102",
+  "version": "24.2.5-build-25037-0102",
   "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.2.4-build-25008-1340",
-    "devextreme-dist": "24.2.4-build-25008-1340"
+    "devextreme": "24.2.5-build-25035-1935",
+    "devextreme-dist": "24.2.5-build-25035-1935"
   },
   "dependencies": {
     "jszip": "~3.10.1",