devexpress-richedit 24.1.8-build-24316-0102 → 24.1.8-build-24340-0103

package/lib/client/formats/docx/export/exporters/styles.d.ts

@@ -4,8 +4,13 @@ export declare class StylesExporter extends ExporterBaseWithRootElement {
     get rootElement(): string;
     get rootNSPrefix(): string;
     get rootNSValue(): string;
+    private styleNameToIndex;
+    private sortedStyleIndexes;
+    private processedStyleNames;
     protected fillWriter(): void;
     private exportDocumentDefaults;
     private exportDocumentCharacterDefaults;
     private exportDocumentParagraphDefaults;
+    private getSortedStyleIndexes;
+    private sortStyleIndexRecursive;
 }

package/lib/client/formats/docx/export/exporters/styles.js

@@ -3,13 +3,20 @@ import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { DocxNsType } from '../../utils/constants';
 import { ExporterBaseWithRootElement } from './base';
 export class StylesExporter extends ExporterBaseWithRootElement {
+    constructor() {
+        super(...arguments);
+        this.styleNameToIndex = new Map();
+        this.sortedStyleIndexes = [];
+        this.processedStyleNames = new Set();
+    }
     get filePath() { return 'word/styles.xml'; }
     get rootElement() { return 'styles'; }
     get rootNSPrefix() { return this.data.constants.namespaces[DocxNsType.WordProcessing].prefix; }
     get rootNSValue() { return this.data.constants.namespaces[DocxNsType.WordProcessing].namespace; }
     fillWriter() {
         this.exportDocumentDefaults();
-        ListUtils.forEach(this.data.model.paragraphStyles, (style, index) => this.data.parStyleExporter.export(style, index));
+        const paragraphStyleIndexes = this.getSortedStyleIndexes();
+        ListUtils.forEach(paragraphStyleIndexes, (index) => this.data.parStyleExporter.export(this.data.model.paragraphStyles[index], index));
         ListUtils.forEach(this.data.model.characterStyles, (style, index) => this.data.charStyleExporter.export(style, index));
         ListUtils.forEach(this.data.model.tableStyles, (style, index) => this.data.tblStyleExporter.export(style, index));
     }
@@ -33,4 +40,26 @@ export class StylesExporter extends ExporterBaseWithRootElement {
         this.writer.endElement();
         this.writer.endElement();
     }
+    getSortedStyleIndexes() {
+        this.styleNameToIndex = new Map();
+        this.sortedStyleIndexes = [];
+        this.processedStyleNames = new Set();
+        const styles = this.data.model.paragraphStyles;
+        styles.forEach((style, index) => this.styleNameToIndex.set(style.styleName, index));
+        for (let index = 0; index < styles.length; index++)
+            this.sortStyleIndexRecursive(index);
+        return this.sortedStyleIndexes;
+    }
+    sortStyleIndexRecursive(index) {
+        const styles = this.data.model.paragraphStyles;
+        const style = styles[index];
+        if (this.processedStyleNames.has(style.styleName))
+            return;
+        this.processedStyleNames.add(style.styleName);
+        if (style.parent) {
+            const parentIndex = this.styleNameToIndex.get(style.parent.styleName);
+            this.sortStyleIndexRecursive(parentIndex);
+        }
+        this.sortedStyleIndexes.push(index);
+    }
 }

package/lib/client/model-api/api-utils/range-permission-finder.js

@@ -1,4 +1,5 @@
 import { IntervalAlgorithms } from '@devexpress/utils/lib/intervals/algorithms';
+import { Comparers } from '@devexpress/utils/lib/utils/comparers';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 export function findRangePermissionsByIntervals(sourceCollection, intervals) {
     const permissions = [];
@@ -19,5 +20,6 @@ export function findRangePermissions(sourceCollection, check) {
 }
 export function findRangePermission(sourceCollection, coreInterval, userName, group) {
     const intervals = findRangePermissionsByIntervals(sourceCollection, [coreInterval]);
-    return ListUtils.elementBy(intervals, (permission) => permission.userName == userName && permission.group == group);
+    return ListUtils.elementBy(intervals, (permission) => Comparers.stringIgnoreCase(permission.userName, userName) == 0 &&
+        Comparers.stringIgnoreCase(permission.group, group) == 0);
 }

package/lib/client/model-api/collections/drawing-object-collection.js

@@ -59,7 +59,7 @@ export class TextBoxCollection extends DrawingObjectCollectionBase {
         const anchorInfo = new AnchorInfo();
         anchorInfo.zOrder = this._processor.modelManager.modelManipulator.floatingObject.zOrder.getNewZOrder(this._subDocument);
         const inputPos = new InputPositionBase().setIntervals(SelectionIntervalsInfo.fromPosition(this._subDocument, position));
-        this._processor.modelManager.modelManipulator.textBox.insertAnchoredTextBoxViaHistoty(new SubDocumentPosition(this._subDocument, position), inputPos.charPropsBundle, new BaseTextBoxInfo(null, size, new Shape(ColorUtils.fromString(ColorUtils.colorNames.white), ColorHelper.BLACK_COLOR, UnitConverter.pointsToTwips(3.0 / 4)), anchorInfo, textBoxProperties, new NonVisualDrawingObjectInfo()));
+        this._processor.modelManager.modelManipulator.textBox.insertAnchoredTextBoxViaHistory(new SubDocumentPosition(this._subDocument, position), inputPos.charPropsBundle, new BaseTextBoxInfo(null, size, new Shape(ColorUtils.fromString(ColorUtils.colorNames.white), ColorHelper.BLACK_COLOR, UnitConverter.pointsToTwips(3.0 / 4)), anchorInfo, textBoxProperties, new NonVisualDrawingObjectInfo()));
         const textBoxRun = this._subDocument.getRunByPosition(position);
         return new TextBoxApi(this._processor.modelManager, this._subDocument, textBoxRun, position);
     }

package/lib/client/model-api/collections/range-permission-collection.js

@@ -10,6 +10,7 @@ import { ModelParametersChecker } from '../api-utils/model-parameter-checker';
 import { findRangePermission, findRangePermissions, findRangePermissionsByIntervals } from '../api-utils/range-permission-finder';
 import { RangePermissionApi } from '../range-permission';
 import { Collection } from './collection';
+import { Comparers } from '@devexpress/utils/lib/utils/comparers';
 export class RangePermissionCollection extends Collection {
     constructor(processor, subDocument) {
         super(processor);
@@ -81,13 +82,13 @@ function findByPosition(position, canBeUndefined, sourceCollection) {
 }
 function findByUserName(value, permissions) {
     return ListUtils.map(ApiParametersChecker.check(value, 1, true, [
-        ApiParametersChecker.stringDescriptor("userName", (userName) => findRangePermissions(permissions, permission => permission.userName == userName), false),
+        ApiParametersChecker.stringDescriptor("userName", (userName) => findRangePermissions(permissions, permission => Comparers.stringIgnoreCase(permission.userName, userName) == 0), false),
         ApiParametersChecker.regExpDescriptor('regexp', (regexp) => findRangePermissions(permissions, permission => regexp.test(permission.userName)))
     ]), (b) => b);
 }
 function findByGroup(value, permissions) {
     return ListUtils.map(ApiParametersChecker.check(value, 1, true, [
-        ApiParametersChecker.stringDescriptor("group", (group) => findRangePermissions(permissions, permission => permission.group == group), false),
+        ApiParametersChecker.stringDescriptor("group", (group) => findRangePermissions(permissions, permission => Comparers.stringIgnoreCase(permission.group, group) == 0), false),
         ApiParametersChecker.regExpDescriptor('regexp', (regexp) => findRangePermissions(permissions, permission => regexp.test(permission.group)))
     ]), (b) => b);
 }

package/lib/common/commands/floating-objects/floating-object-drag-drop-change-position-command.js

@@ -200,7 +200,7 @@ export class FloatingObjectDragDropChangePositionCommand extends CommandBase {
         const newRun = this.activeSubDocument.getRunAndIndexesByPosition(position).run;
         if (newRun.getType() == RunType.AnchoredTextBoxRun) {
             const oldTextBoxRun = oldRun;
-            const originalSubDocument = this.control.modelManager.model.subDocuments[oldTextBoxRun.subDocId];
+            const originalSubDocument = this.control.modelManager.model.subDocumentsCollection.collection[oldTextBoxRun.subDocId];
             this.history.addAndRedo(new SwitchTextBoxSubDocumentsStateHistoryItem(this.modelManipulator, originalSubDocument, this.activeSubDocument, position));
         }
     }

package/lib/common/commands/floating-objects/insert-anchored-text-box-command.js

@@ -44,7 +44,7 @@ export class InsertAnchoredTextBoxCommand extends CommandBase {
         anchorInfo.zOrder = this.modelManipulator.floatingObject.zOrder.getNewZOrder(options.subDocument);
         anchorInfo.layoutTableCell = true;
         history.addTransaction(() => {
-            this.modelManipulator.textBox.insertAnchoredTextBoxViaHistoty(new SubDocumentPosition(this.selection.activeSubDocument, this.selection.lastSelectedInterval.start), this.inputPosition.charPropsBundle, new BaseTextBoxInfo(null, size, new Shape(ColorUtils.fromString(ColorUtils.colorNames.white), ColorHelper.BLACK_COLOR, UnitConverter.pointsToTwips(3.0 / 4)), anchorInfo, textBoxProperties, new NonVisualDrawingObjectInfo()));
+            this.modelManipulator.textBox.insertAnchoredTextBoxViaHistory(new SubDocumentPosition(this.selection.activeSubDocument, this.selection.lastSelectedInterval.start), this.inputPosition.charPropsBundle, new BaseTextBoxInfo(null, size, new Shape(ColorUtils.fromString(ColorUtils.colorNames.white), ColorHelper.BLACK_COLOR, UnitConverter.pointsToTwips(3.0 / 4)), anchorInfo, textBoxProperties, new NonVisualDrawingObjectInfo()));
             this.history.addAndRedo(new SelectionHistoryItem(this.modelManipulator, this.selection, this.selection.getState(), this.selection.getState().setInterval(new FixedInterval(this.selection.lastSelectedInterval.start, 1))));
             this.control.commandManager.getCommand(RichEditClientCommand.ChangeActiveSubDocumentToTextBox)
                 .execute(this.control.commandManager.isPublicApiCall, options);

package/lib/common/formats/html/export/html-export.d.ts

@@ -6,6 +6,7 @@ import { SubDocument } from '../../../model/sub-document';
 import { HtmlBuilder } from './html-builder';
 import { IExportModelOptions } from '../../i-document-exporter';
 interface List {
+    parentList?: List;
     numberingListIndex: number;
     listLevelIndex: number;
     start: number;

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

@@ -24,6 +24,7 @@ import { TableWidthUnitType } from '../../../model/tables/secondary-structures/t
 import { HtmlConverter } from '../../../rich-utils/html-converter';
 import { HtmlBuilder } from './html-builder';
 import { isDefined } from '@devexpress/utils/lib/utils/common';
+import { ListUtils } from '@devexpress/utils/lib/utils/list';
 export class HtmlExporter {
     constructor(exportModelOptions) {
         this.rangeCopy = null;
@@ -455,42 +456,27 @@ export class HtmlExporter {
     }
     getListsByParagraphs(paragraphs) {
         const listsInInterval = [];
+        let previousList = null;
         for (let i = 0, paragraph; paragraph = paragraphs[i]; i++) {
             if (paragraph.isInList()) {
-                const paragraphNumberingListIndex = paragraph.getNumberingListIndex();
-                const paragraphListLevelIndex = paragraph.getListLevelIndex();
-                const paragraphStart = paragraph.startLogPosition.value;
-                const paragraphEnd = paragraph.getEndPosition();
-                let existingItem = null;
-                for (let j = 0; j < listsInInterval.length; j++) {
-                    if (listsInInterval[j].numberingListIndex === paragraphNumberingListIndex
-                        && listsInInterval[j].listLevelIndex === paragraphListLevelIndex) {
-                        existingItem = listsInInterval[j];
-                    }
-                }
-                if (existingItem && (paragraphListLevelIndex === 0 || existingItem.end == paragraphStart
-                    || listsInInterval[listsInInterval.length - 1].listLevelIndex > paragraphListLevelIndex)) {
-                    existingItem.end = paragraphEnd;
-                }
-                else {
-                    listsInInterval.push({
-                        numberingListIndex: paragraphNumberingListIndex,
-                        listLevelIndex: paragraphListLevelIndex,
-                        start: paragraphStart,
-                        end: paragraphEnd,
-                    });
-                }
-                let listLevelIndex = paragraphListLevelIndex;
-                while (listLevelIndex > 0) {
-                    let parentItem = null;
-                    for (let j = 0; j < listsInInterval.length; j++) {
-                        if (listsInInterval[j].listLevelIndex == listLevelIndex - 1)
-                            parentItem = listsInInterval[j];
-                    }
-                    if (parentItem)
-                        parentItem.end = paragraphEnd;
-                    listLevelIndex--;
+                const numberingListIndex = paragraph.getNumberingListIndex();
+                const listLevelIndex = paragraph.getListLevelIndex();
+                const start = paragraph.startLogPosition.value;
+                const end = paragraph.getEndPosition();
+                let list = ListUtils.reverseElementBy(listsInInterval, (list) => {
+                    return list.listLevelIndex <= (previousList === null || previousList === void 0 ? void 0 : previousList.listLevelIndex)
+                        && list.numberingListIndex === numberingListIndex
+                        && list.listLevelIndex === listLevelIndex;
+                });
+                if (!list) {
+                    const parentList = (previousList === null || previousList === void 0 ? void 0 : previousList.numberingListIndex) === numberingListIndex ? previousList : null;
+                    list = { parentList, numberingListIndex, listLevelIndex, start, end };
+                    listsInInterval.push(list);
                 }
+                previousList = list;
+                do {
+                    list.end = end;
+                } while (list = list.parentList);
             }
         }
         return listsInInterval;

package/lib/common/formats/html/import/importers/list-base.js

@@ -13,9 +13,7 @@ export class HtmlListTagImporterBase extends HtmlTagImporterBase {
         this.importer.addCurrLevelParagraphRunIfNeeded();
         const listIndex = this.importer.listIndex;
         const parentList = ListUtils.last(this.importer.listInfos);
-        const listLevel = parentList
-            ? parentList.listLevel + 1
-            : 0;
+        const listLevel = parentList ? parentList.listLevel + 1 : 0;
         if (listLevel === 9) {
             this._ignored = true;
             return;
@@ -31,6 +29,8 @@ export class HtmlListTagImporterBase extends HtmlTagImporterBase {
         if (this._ignored)
             return;
         this.importer.listInfos.pop();
-        this.importer.listIndex++;
+        const parentList = ListUtils.last(this.importer.listInfos);
+        if (!parentList)
+            this.importer.listIndex++;
     }
 }

package/lib/common/formats/rtf/export/helpers/rtf-export-helper.js

@@ -4,6 +4,7 @@ import { DXColor } from '../../../../model/color/dx-color';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { NumberMapUtils } from '@devexpress/utils/lib/utils/map/number';
 import { RtfContentExporter } from '../exporters/rtf-content-exporter';
+import { Comparers } from '@devexpress/utils/lib/utils/comparers';
 export class RtfExportHelper {
     constructor() {
         this.colorCollection = [];
@@ -39,11 +40,11 @@ export class RtfExportHelper {
         return DXColor.blend(color, DXColor.white);
     }
     getUserIndex(rangePermission) {
-        let index = this.userCollection.indexOf(rangePermission.userName);
+        let index = this.userCollection.findIndex((userName) => Comparers.stringIgnoreCase(userName, rangePermission.userName) == 0);
         if (index >= 0)
             return index + 1;
         const predefinedUserGroups = RtfContentExporter.predefinedUserGroups;
-        const id = NumberMapUtils.keyBy(predefinedUserGroups, (g) => g == rangePermission.group);
+        const id = NumberMapUtils.keyBy(predefinedUserGroups, (g) => Comparers.stringIgnoreCase(g, rangePermission.group) == 0);
         return id != null ? id : 0;
     }
 }

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

@@ -4,6 +4,11 @@ import { IEventManager } from './interfaces/i-event-manager';
 import { IRichEditControl } from './interfaces/i-rich-edit-core';
 import { HtmlBuilder } from './formats/html/export/html-builder';
 export declare const INPUT_CLASS_NAME = "dxreInputTarget";
+declare enum IMEState {
+    None = 0,
+    Start = 1,
+    Process = 2
+}
 export declare abstract class InputEditorBase<TInpElement extends HTMLElement> {
     private newLineRegexp;
     eventManager: IEventManager;
@@ -14,7 +19,7 @@ export declare abstract class InputEditorBase<TInpElement extends HTMLElement> {
     needProcessShortcut: boolean;
     initializedIfNotReadOnly: boolean;
     prevKeyCode: number;
-    isIME: boolean;
+    IMEState: IMEState;
     private inputWithAlt;
     private processTextOnKeyPress;
     protected evtHandlersHolder: DomEventHandlersHolder;
@@ -68,11 +73,15 @@ export declare class DivInputEditor extends InputEditorBase<HTMLElement> {
     private cursorWasSetOnLastPosition;
     private clearInputTimerId;
     private lastCursorPosition;
+    private composUpdateTimerId;
+    private composEndTimerId;
+    private onTextInputTimerId;
     constructor(control: IRichEditControl, eventManager: IEventManager, parent: HTMLElement);
     dispose(): void;
     initializeIfNotReadOnlyCore(): void;
     setPosition(left: number, top: number): void;
     createInputElement(): HTMLElement;
+    initEvents(): void;
     onKeyDown(evt: KeyboardEvent): void;
     onKeyUp(evt: KeyboardEvent): void;
     onInput(evt: InputEvent): void;
@@ -93,6 +102,9 @@ export declare class DivInputEditor extends InputEditorBase<HTMLElement> {
     getEditableDocumentContent(): string | NodeListOf<ChildNode>;
     getEditableDocumentCursorPosition(): number;
     selectEditableDocumentContent(): void;
+    onCompositionStart(_evt: KeyboardEvent): void;
+    onCompositionUpdate(_evt: KeyboardEvent): void;
+    onCompositionEnd(_evt: KeyboardEvent): void;
 }
 export declare class IFrameInputEditor extends InputEditorBase<HTMLIFrameElement> {
     editableDocument: Document;
@@ -145,3 +157,4 @@ export declare class InputController {
     getEditableDocumentContent(): string | NodeListOf<ChildNode>;
     selectEditableDocumentContent(): void;
 }
+export {};

package/lib/common/input-controller.js

@@ -23,9 +23,16 @@ export const INPUT_CLASS_NAME = "dxreInputTarget";
 const EMPTY_KEYCODE = 229;
 const TAB_KEYCODE = 9;
 const IDEOGRAPHIC_SPACE_CHARCODE = 12288;
+var IMEState;
+(function (IMEState) {
+    IMEState[IMEState["None"] = 0] = "None";
+    IMEState[IMEState["Start"] = 1] = "Start";
+    IMEState[IMEState["Process"] = 2] = "Process";
+})(IMEState || (IMEState = {}));
 export class InputEditorBase {
     constructor(control, eventManager, parent) {
         this.newLineRegexp = /(\r\n|\n|\r)/gm;
+        this.IMEState = IMEState.None;
         this.processTextOnKeyPress = false;
         this.evtHandlersHolder = new DomEventHandlersHolder();
         this.control = control;
@@ -33,7 +40,6 @@ export class InputEditorBase {
         this.canInsertTextOnInputEvent = this.canUseInputEvent();
         this.createHierarchy(parent);
         this.initialize();
-        this.isIME = false;
         this.inputWithAlt = false;
     }
     dispose() {
@@ -106,7 +112,7 @@ export class InputEditorBase {
     }
     onKeyDown(evt) {
         if (!this.control.clientSideEvents.raiseKeyDown(evt)) {
-            if (!this.isIME) {
+            if (this.IMEState === IMEState.None) {
                 evt = this.getNormalizedEvent(evt);
                 const keyCode = KeyUtils.getEventKeyCode(evt);
                 this.needProcessShortcut = !keyCode || keyCode == EMPTY_KEYCODE;
@@ -271,6 +277,9 @@ export class DivInputEditor extends InputEditorBase {
     dispose() {
         super.dispose();
         clearTimeout(this.clearInputTimerId);
+        clearTimeout(this.composUpdateTimerId);
+        clearTimeout(this.composEndTimerId);
+        clearTimeout(this.onTextInputTimerId);
     }
     initializeIfNotReadOnlyCore() {
         this.inputElement.contentEditable = "true";
@@ -281,14 +290,21 @@ export class DivInputEditor extends InputEditorBase {
     }
     createInputElement() {
         const element = document.createElement("DIV");
-        if (Browser.Safari)
-            element.autocapitalize = "off";
+        element.autocapitalize = "off";
         if (Browser.MacOSMobilePlatform && (Number(Browser.PlaformMajorVersion) >= 16
             || Browser.Safari && Browser.MajorVersion >= 16)) {
             element.classList.add('dxreiOS16');
         }
         return element;
     }
+    initEvents() {
+        super.initEvents();
+        this.evtHandlersHolder.addListener(this.getEditableDocument(), "compositionstart", this.onCompositionStart.bind(this));
+        this.evtHandlersHolder.addListener(this.getEditableDocument(), "compositionupdate", (evt) => Browser.IE || Browser.Edge ?
+            this.onCompositionUpdate(evt) : this.composUpdateTimerId = setTimeout(() => this.onCompositionUpdate(evt), 0));
+        this.evtHandlersHolder.addListener(this.getEditableDocument(), "compositionend", (evt) => !Browser.Safari ?
+            this.onCompositionEnd(evt) : this.composEndTimerId = setTimeout(() => this.onCompositionEnd(evt), 0));
+    }
     onKeyDown(evt) {
         var _a;
         this.handled = false;
@@ -357,21 +373,15 @@ export class DivInputEditor extends InputEditorBase {
                     this.onTextReplace(text.substr(lastWordStartIndex), text);
                 else
                     super.onTextInput(data);
-                if (this.previousText && text.length < this.previousText.length || !text.length) {
-                    let deletedCharacterCount = this.previousText ? this.previousText.length - text.length : 1;
-                    for (let i = 0; i < deletedCharacterCount; i++)
-                        this.eventManager.onShortcut(KeyCode.Backspace);
-                    this.previousText = text;
-                }
                 this.cursorWasSetOnLastPosition = true;
             }
             this.handled = true;
-            if (Browser.MacOSMobilePlatform && text[text.length - 1] == " ")
+            if (text[text.length - 1] == " ")
                 this.clearInputElement();
         }
     }
     tryHandleShortcutByInputString(data) {
-        if (data && !this.isIME) {
+        if (data && this.IMEState === IMEState.None) {
             let enteredChar = data.charAt(data.length - 1);
             const keyCode = this.tryObtainCodeFromChar(enteredChar);
             if (keyCode != EMPTY_KEYCODE) {
@@ -462,6 +472,31 @@ export class DivInputEditor extends InputEditorBase {
         selection.selectAllChildren(this.inputElement);
         super.selectEditableDocumentContent();
     }
+    onCompositionStart(_evt) {
+        this.IMEState = IMEState.Start;
+        this.needProcessShortcut = false;
+        this.clearInputElement();
+    }
+    onCompositionUpdate(_evt) {
+        const text = this.getEditableDocumentText();
+        if (text.length && this.previousText != text) {
+            if (this.IMEState === IMEState.Start)
+                this.onText(text, text, this.previousText.length > 0);
+            else if (this.IMEState === IMEState.Process)
+                this.onTextReplace(text, text);
+        }
+        this.IMEState = IMEState.Process;
+    }
+    onCompositionEnd(_evt) {
+        const text = this.getEditableDocumentText();
+        if (this.previousText != text) {
+            if (text.length > 0)
+                this.onTextReplace(text, text);
+            else
+                this.onShortcutCore(_evt, KeyCode.Backspace);
+        }
+        this.IMEState = IMEState.None;
+    }
 }
 export class IFrameInputEditor extends InputEditorBase {
     constructor(control, eventManager, parent) {
@@ -565,7 +600,7 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     setEditableDocumentContent(content) {
         super.setEditableDocumentContent(content);
-        this.isIME = false;
+        this.IMEState = IMEState.None;
         this.editableDocument.body.innerHTML = "";
         if (typeof content === "string")
             this.editableDocument.body.innerHTML = content;
@@ -613,7 +648,7 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     onBlur(evt) {
         super.onBlur(evt);
-        this.isIME = false;
+        this.IMEState = IMEState.None;
         this.endInputIME();
     }
     onShortcutCore(evt, shortcutCode) {
@@ -642,7 +677,7 @@ export class IFrameInputEditor extends InputEditorBase {
         }
     }
     onCompositionStart(_evt) {
-        this.isIME = true;
+        this.IMEState = IMEState.Start;
         this.needProcessShortcut = false;
         if (!Browser.IE && !Browser.Edge)
             this.clearInputElement();
@@ -650,10 +685,11 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     onCompositionUpdate(_evt) {
         const text = this.getEditableDocumentText();
-        if (this.isIME && text.length && this.previousText != text) {
+        if (this.IMEState !== IMEState.None && text.length && this.previousText != text) {
             this.onTextReplace(text, text);
             this.updateInputIME();
         }
+        this.IMEState = IMEState.Process;
     }
     onCompositionEnd(_evt) {
         const text = this.getEditableDocumentText();
@@ -663,7 +699,7 @@ export class IFrameInputEditor extends InputEditorBase {
             this.clearInputElement();
         if (text.charCodeAt(text.length - 1) == IDEOGRAPHIC_SPACE_CHARCODE)
             this.clearInputElement();
-        this.isIME = false;
+        this.IMEState = IMEState.None;
         this.endInputIME();
     }
     startInputIME() {
@@ -797,9 +833,8 @@ export class InputController {
             if (typeof html === 'string')
                 el.innerHTML = html;
         });
-        if (typeof html !== "string") {
+        if (typeof html !== "string")
             builder.assignFrom(html);
-        }
         builder.endChild('b');
         builder.endChild('span');
         builder.endChild('a');

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

@@ -19,7 +19,7 @@ export class AnchorObjectsPositionInfo {
     }
     add(obj, modelPosition) {
         this.delete(obj.objectId);
-        this.cache[obj.objectId] = new ModelPositionHolder(modelPosition, this.model.subDocuments[obj.belongsToSubDocId].positionManager);
+        this.cache[obj.objectId] = new ModelPositionHolder(modelPosition, this.model.subDocumentsCollection.collection[obj.belongsToSubDocId].positionManager);
     }
     delete(id) {
         const info = this.cache[id];

package/lib/common/layout/main-structures/layout-boxes/layout-space-box.js

@@ -22,7 +22,7 @@ export class LayoutSpaceBox extends LayoutBox {
         return LayoutBoxType.Space;
     }
     pushInfoForMeasure(info, showHiddenSymbols) {
-        info.push(new MeasureInfoNonText(" ", this.characterProperties));
+        info.push(new MeasureInfoNonText(RichUtils.specialCharacters.Space, this.characterProperties));
         if (showHiddenSymbols)
             info.push(new MeasureInfoNonText(RichUtils.specialCharacters.HiddenSpace, this.characterProperties));
     }

package/lib/common/model/history/items/floating-objects/insert-anchored-picture-history-item.js

@@ -23,6 +23,7 @@ export class InsertAnchoredTextBoxHistoryItem extends PositionBasedHistoryItem {
     }
     redo() {
         this.modelManipulator.textBox.insertAnchoredTextBox(this.subDocPos, this.charPropsBundle, this.textBoxInfo);
+        this.modelManipulator.model.subDocumentsCollection.restore(this.textBoxInfo.innerSubDocument.id);
     }
     undo() {
         this.modelManipulator.range.removeIntervalWithoutHistory(this.boundSubDocument, new FixedInterval(this.position, 1), false);

package/lib/common/model/history/items/switch-text-box-sub-documents-state-history-item.js

@@ -7,7 +7,6 @@ export class SwitchTextBoxSubDocumentsStateHistoryItem extends HistoryItem {
         this.position = position;
     }
     redo() {
-        this.oldSubDocument = this.oldSubDocument.getActualSubDocument();
         const newRun = this.textBoxParentSubDocument.getRunAndIndexesByPosition(this.position).run;
         this.newSubDocument = this.modelManipulator.model.subDocuments[newRun.subDocId];
         this.modelManipulator.model.subDocumentsCollection.replace(this.oldSubDocument.id, this.newSubDocument.id);

package/lib/common/model/manipulators/range/remove-interval-operation.js

@@ -54,8 +54,14 @@ export class RemoveIntervalOperation {
         var accumulatedInterval = new FixedInterval(this.position, 0);
         let removedTextList = [];
         while (iterator.moveNext()) {
-            if (EnumUtils.isAnyOf(iterator.currentRun.getType(), RunType.AnchoredPictureRun, RunType.AnchoredTextBoxRun))
-                this.modelManipulator.notifyModelChanged(new AnchorObjectRemovedSubDocumentChange(this.subDocument.id, (iterator.currentRun).anchoredObjectID, iterator.currentInterval().start));
+            if (EnumUtils.isAnyOf(iterator.currentRun.getType(), RunType.AnchoredPictureRun, RunType.AnchoredTextBoxRun)) {
+                const currentRun = iterator.currentRun;
+                const position = iterator.currentInterval().start;
+                const change = new AnchorObjectRemovedSubDocumentChange(this.subDocument.id, currentRun.anchoredObjectID, position);
+                if (currentRun instanceof AnchoredTextBoxRun)
+                    this.modelManipulator.model.subDocumentsCollection.replace(currentRun.subDocId, subDocument.id);
+                this.modelManipulator.notifyModelChanged(change);
+            }
             if (iterator.currentChunk !== subDocument.chunks[this.currentChunkIndex]) {
                 this.removeAccumulatedInterval(accumulatedInterval, this.position, 0, removedTextList);
                 this.currentChunkIndex++;

package/lib/common/model/manipulators/text-box-manipulator.d.ts

@@ -17,6 +17,6 @@ export declare class BaseTextBoxInfo {
     constructor(innerSubDocument: SubDocument, size: AnchorTextBoxSize, shape: Shape, anchorInfo: AnchorInfo, textBoxProperties: TextBoxProperties, containerProperties: NonVisualDrawingObjectInfo);
 }
 export declare class TextBoxManipulator extends RunsBaseManipulator {
-    insertAnchoredTextBoxViaHistoty(subDocPos: SubDocumentPosition, charPropsBundle: MaskedCharacterPropertiesBundle, textBoxInfo: BaseTextBoxInfo): void;
+    insertAnchoredTextBoxViaHistory(subDocPos: SubDocumentPosition, charPropsBundle: MaskedCharacterPropertiesBundle, textBoxInfo: BaseTextBoxInfo): void;
     insertAnchoredTextBox(subDocPos: SubDocumentPosition, charPropsBundle: MaskedCharacterPropertiesBundle, textBoxInfo: BaseTextBoxInfo): AnchoredTextBoxRun;
 }

package/lib/common/model/manipulators/text-box-manipulator.js

@@ -16,7 +16,7 @@ export class BaseTextBoxInfo {
     }
 }
 export class TextBoxManipulator extends RunsBaseManipulator {
-    insertAnchoredTextBoxViaHistoty(subDocPos, charPropsBundle, textBoxInfo) {
+    insertAnchoredTextBoxViaHistory(subDocPos, charPropsBundle, textBoxInfo) {
         this.history.addAndRedo(new InsertAnchoredTextBoxHistoryItem(this.modelManipulator, subDocPos, charPropsBundle, textBoxInfo));
     }
     insertAnchoredTextBox(subDocPos, charPropsBundle, textBoxInfo) {
@@ -33,6 +33,7 @@ export class TextBoxManipulator extends RunsBaseManipulator {
         let textBoxSubDoc = textBoxInfo.innerSubDocument ?
             textBoxInfo.innerSubDocument :
             this.model.createSubDocument(SubDocumentInfoType.TextBox, subDocument.id);
+        textBoxInfo.innerSubDocument = textBoxSubDoc;
         textBoxRun.subDocId = textBoxSubDoc.id;
         subDocument.chunks[insertedRun.chunkIndex].textRuns[insertedRun.runIndex].paragraph.length++;
         this.modelManipulator.notifyModelChanged(new AnchoredTextBoxInsertedSubDocumentChange(subDocument.id, textBoxRun.anchoredObjectID, textBoxRun.subDocId, insertPositionAtStartDocument, textBoxInfo.anchorInfo, textBoxRun.containerProperties));

package/lib/common/model/range-permissions.js

@@ -7,8 +7,8 @@ import { BookmarkBase } from './bookmarks';
 export class RangePermission extends BookmarkBase {
     constructor(positionManager, interval, userName, group) {
         super(positionManager, interval);
-        this.userName = userName.toLowerCase();
-        this.group = group.toLowerCase();
+        this.userName = userName;
+        this.group = group;
     }
     isGranted(settings) {
         return RangePermission.allow(this.group, RangePermission.Everyone_GROUP_NAME) ||
@@ -17,7 +17,7 @@ export class RangePermission extends BookmarkBase {
             RangePermission.allow(this.group, settings.authenticationGroup);
     }
     static allow(permissionValue, settingsValue) {
-        return settingsValue != "" && permissionValue == settingsValue;
+        return settingsValue != "" && Comparers.stringIgnoreCase(permissionValue, settingsValue) == 0;
     }
     get end() { return this._interval.end - 1; }
     get length() { return this.end - this.start; }
@@ -42,7 +42,9 @@ export class RangePermission extends BookmarkBase {
         return new RangePermission(positionManager, this.interval, this.userName, this.group);
     }
     equals(obj) {
-        return super.equals(obj) && (StringUtils.isNullOrEmpty(this.userName) ? this.group == obj.group : this.userName == obj.userName);
+        return super.equals(obj) && (StringUtils.isNullOrEmpty(this.userName) ?
+            Comparers.stringIgnoreCase(obj.group, this.group) == 0 :
+            Comparers.stringIgnoreCase(obj.userName, this.userName) == 0);
     }
 }
 RangePermission.Everyone_GROUP_NAME = "Everyone".toLowerCase();

package/lib/common/selection/selection.js

@@ -205,8 +205,9 @@ export class Selection extends BatchUpdatableObject {
         this.resetInputPositionIfNeeded();
     }
     shouldResetInputPosition() {
+        var _a;
         const currentState = this.getState();
-        return currentState.intervalsInfo.subDocument.id != this.prevState.intervalsInfo.subDocument.id ||
+        return currentState.intervalsInfo.subDocument.id != ((_a = this.prevState.intervalsInfo.subDocument) === null || _a === void 0 ? void 0 : _a.id) ||
             !ListUtils.equals(currentState.intervalsInfo.intervals, this.prevState.intervalsInfo.intervals);
     }
     resetInputPositionIfNeeded() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.8-build-24316-0102",
+  "version": "24.1.8-build-24340-0103",
   "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.8-build-24314-1936",
-    "devextreme-dist": "24.1.8-build-24314-1936"
+    "devextreme": "24.1.8-build-24338-1936",
+    "devextreme-dist": "24.1.8-build-24338-1936"
   },
   "dependencies": {
     "jszip": "~3.10.1",