devexpress-richedit 24.1.12-build-25093-0104 → 24.1.12

package/dist/dx.richedit.js

@@ -32115,6 +32115,14 @@ class LayoutPage extends rectangle.Rectangle {
         this.anchoredObjectHolder = new PageAnchoredObjectHolder(this);
         this.tableAnchoredObjectsHolder = new TableAnchoredObjectsHolder();
     }
+    get grids() {
+        const result = new Map();
+        for (let pageArea of this.mainSubDocumentPageAreas)
+            pageArea.grids.forEach((grid, table) => result.set(table, grid));
+        for (let pageArea of Object.values(this.otherPageAreas))
+            pageArea.grids.forEach((grid, table) => result.set(table, grid));
+        return result;
+    }
     setRenderLevelCalculator(anchorObjectsPositionInfo, compatibilityMode) {
         this.renderLevelCalculator = new RenderLevelCalculator();
         this.renderLevelCalculator.calcLevels(this.anchoredObjectHolder, anchorObjectsPositionInfo, compatibilityMode);
@@ -70460,6 +70468,12 @@ class DocumentLayout {
         this.anchorObjectsPositionInfo = anchorObjectsPositionInfo;
         this.setEmptyLayout(ColorHelper.NO_COLOR);
     }
+    get grids() {
+        return this.pages.reduce((res, page) => {
+            page.grids.forEach((grid, table) => res.set(table, grid));
+            return res;
+        }, new Map());
+    }
     setEmptyLayout(pageColor) {
         this.pages = [];
         this.validPageCount = 0;
@@ -81456,10 +81470,12 @@ class ParagraphSpacingDestination extends ParagraphFormattingLeafElementDestinat
             const spacingBefore = this.data.readerHelper.getWpSTIntegerValue(reader, 'before', constants.Constants.MIN_SAFE_INTEGER);
             if (spacingBefore >= 0)
                 this.paragraphProperties.setValue(ParagraphPropertyDescriptor.spacingBefore, spacingBefore);
-            this.paragraphProperties.setValue(ParagraphPropertyDescriptor.beforeAutoSpacing, spacingBefore == -1 ||
-                this.data.readerHelper.getWpSTOnOffValue(reader, new WordProcessingMLValue('beforeAutospacing', 'before-autospacing').openXmlValue, false));
-            this.paragraphProperties.setValue(ParagraphPropertyDescriptor.afterAutoSpacing, spacingAfter == -1 ||
-                this.data.readerHelper.getWpSTOnOffValue(reader, new WordProcessingMLValue('afterAutospacing', 'after-autospacing').openXmlValue, false));
+            const beforeAutoSpacing = this.data.readerHelper.getWpSTOnOffValue(reader, 'beforeAutospacing', null);
+            if (spacingBefore == -1 || beforeAutoSpacing != null)
+                this.paragraphProperties.setValue(ParagraphPropertyDescriptor.beforeAutoSpacing, spacingBefore == -1 || beforeAutoSpacing);
+            const afterAutoSpacing = this.data.readerHelper.getWpSTOnOffValue(reader, 'afterAutospacing', null);
+            if (spacingAfter == -1 || afterAutoSpacing != null)
+                this.paragraphProperties.setValue(ParagraphPropertyDescriptor.afterAutoSpacing, spacingAfter == -1 || afterAutoSpacing);
             const lineSpacing = this.data.readerHelper.getWpSTIntegerValue(reader, 'line', constants.Constants.MIN_SAFE_INTEGER);
             if (lineSpacing != constants.Constants.MIN_SAFE_INTEGER && lineSpacing > 0) {
                 const attribute = new WordProcessingMLValue('lineRule', 'line-rule');
@@ -90299,6 +90315,7 @@ class EffectExtent {
 
 
 
+
 class TableExporter extends BaseExporter {
     constructor() {
         super(...arguments);
@@ -90328,10 +90345,9 @@ class TableExporter extends BaseExporter {
         }
     }
     getTableGrid(table) {
-        if (table.rows[0].logicColumnCount < 64)
-            return [];
-        const colGrid = [];
-        return colGrid;
+        var _a, _b;
+        const grid = this.data.grids.get(table);
+        return ((_b = (_a = grid === null || grid === void 0 ? void 0 : grid.columns) === null || _a === void 0 ? void 0 : _a.width) === null || _b === void 0 ? void 0 : _b.map(unit_converter/* UnitConverter */.u.pixelsToTwips)) || [];
     }
     initNewTables(newIndexes, allowInitNextTable) {
         for (let levelIndex = this.tableIndexes.length; levelIndex < newIndexes.length; levelIndex++) {
@@ -90836,11 +90852,12 @@ class IdGenerator {
 
 
 class data_Data {
-    constructor(model, options) {
+    constructor(exportModelOptions, options) {
         this.drawingElementId = 1;
         this.exportSubDocumentsList = [];
         this.relationExporters = [];
-        this.model = model;
+        this.model = exportModelOptions.modelManager.model;
+        this.grids = exportModelOptions.grids;
         this.options = options;
         this.constants = new DocxConstants();
         this.writerStack = new stack/* Stack */.K();
@@ -91629,10 +91646,10 @@ class EndNoteExporter extends NoteExporter {
 
 
 class DocxExporter {
-    constructor(modelManipulator, options) {
-        this.modelManipulator = modelManipulator;
+    constructor(exportModelOptions, options) {
+        this.modelManipulator = exportModelOptions.modelManager.modelManipulator;
         this.options = options;
-        this.data = new data_Data(modelManipulator.model, options);
+        this.data = new data_Data(exportModelOptions, options);
     }
     exportToBlob(callback) {
         this.modelManipulator.picture.loader.ensureAllPicturesLoaded(this.options.ensurePictureLoadedTimeout, (_loaded) => {
@@ -91739,7 +91756,7 @@ function exportModelToBlob(exportModelOptions, callback) {
 function getExporter(exportModelOptions) {
     const { modelManipulator } = exportModelOptions.modelManager;
     switch (exportModelOptions.documentFormat) {
-        case DocumentFormat.OpenXml: return new DocxExporter(modelManipulator, new DocxExportOptions());
+        case DocumentFormat.OpenXml: return new DocxExporter(exportModelOptions, new DocxExportOptions());
         case DocumentFormat.Rtf: return new RtfExporter(modelManipulator, new RtfDocumentExporterOptions());
         case DocumentFormat.PlainText: return new TxtExporter(modelManipulator, new DocumentExporterOptions());
         case DocumentFormat.Html: return new HtmlDocumentExporter(exportModelOptions, new DocumentExporterOptions());
@@ -92251,7 +92268,7 @@ class AnchorObjectHorizontalPositionCalculator extends AnchorObjectPositionCalcu
     alignment(type, alignment) {
         switch (type) {
             case AnchorObjectHorizontalPositionType.Character:
-                return this.getAlignPosition(alignment, 0);
+                return this.getAnchorXPosition() + this.getAlignPosition(alignment, 0);
             case AnchorObjectHorizontalPositionType.Column:
                 return this.isRelativeCell ?
                     this.relativeColumnPos() + this.lp.row.tableCellInfo.x +
@@ -92300,17 +92317,8 @@ class AnchorObjectHorizontalPositionCalculator extends AnchorObjectPositionCalcu
                 return this.isRelativeCell ? this.relativeColumnPos() + this.lp.row.tableCellInfo.x : 0;
             case AnchorObjectHorizontalPositionType.Column:
                 return this.isRelativeCell ? this.relativeColumnPos() + this.lp.row.tableCellInfo.x + this.leftCellMargin : this.relativeColumnPos();
-            case AnchorObjectHorizontalPositionType.Character: {
-                const rowAbsPos = this.lp.getLogPosition(DocumentLayoutDetailsLevel.Row);
-                const ancBoxAbsPos = this.obj.rowOffset;
-                const boxIndex = search.SearchUtils.normedInterpolationIndexOf(this.lp.row.boxes, (box) => rowAbsPos + box.rowOffset, ancBoxAbsPos);
-                const box = this.lp.row.boxes[boxIndex];
-                if (!box)
-                    return this.lp.getLayoutX(null, DocumentLayoutDetailsLevel.Row);
-                const symbolCount = Math.max(0, ancBoxAbsPos - rowAbsPos - box.rowOffset);
-                return this.lp.getLayoutX(null, DocumentLayoutDetailsLevel.Row) + box.x +
-                    box.getCharOffsetXInPixels(this.manager.measurer, symbolCount);
-            }
+            case AnchorObjectHorizontalPositionType.Character:
+                return this.getAnchorXPosition();
             case AnchorObjectHorizontalPositionType.Margin:
                 return this.isRelativeCell ? this.relativeColumnPos() + this.lp.row.tableCellInfo.x + this.leftCellMargin :
                     this.manager.boundsCalculator.marginLeft;
@@ -92327,6 +92335,19 @@ class AnchorObjectHorizontalPositionCalculator extends AnchorObjectPositionCalcu
                 throw new Error(errors/* Errors */.D.InternalException);
         }
     }
+    getAnchorXPosition() {
+        const rowAbsPos = this.lp.getLogPosition(DocumentLayoutDetailsLevel.Row);
+        const ancBoxAbsPos = this.obj.rowOffset;
+        let boxIndex = search.SearchUtils.normedInterpolationIndexOf(this.lp.row.boxes, (box) => rowAbsPos + box.rowOffset, ancBoxAbsPos);
+        if (boxIndex < 0)
+            boxIndex = 0;
+        const box = this.lp.row.boxes[boxIndex];
+        if (!box)
+            return this.lp.getLayoutX(null, DocumentLayoutDetailsLevel.Row);
+        const symbolCount = Math.max(0, ancBoxAbsPos - rowAbsPos - box.rowOffset);
+        return this.lp.getLayoutX(null, DocumentLayoutDetailsLevel.Row) + box.x +
+            box.getCharOffsetXInPixels(this.manager.measurer, symbolCount);
+    }
     bookLayout() {
         return this.alignment(this.anchorInfo.horizontalPositionType, AnchorObjectHorizontalPositionCalculator.mapBookLayoutALignmentType[this.anchorInfo.horizontalPositionAlignment]);
     }
@@ -92557,6 +92578,12 @@ class LayoutPageArea extends rectangle.Rectangle {
         this.columns = [];
         this.subDocument = subDocument;
     }
+    get grids() {
+        return this.columns.reduce((res, column) => {
+            column.tablesInfo.forEach(tableInfo => res.set(tableInfo.logicInfo.grid.table, tableInfo.logicInfo.grid));
+            return res;
+        }, new Map());
+    }
     getEndPosition() {
         return this.pageOffset + utils_list.ListUtils.last(this.columns).getEndPosition();
     }
@@ -95400,8 +95427,6 @@ class RowBaseFormatterState {
             this.rowFormatter.finishRow();
     }
     addAnchorObject() {
-        if (!this.rowFormatter.wordHolder.pushBoxes())
-            return;
         this.rowFormatter.addAnchorObject();
     }
     addTextBox() {
@@ -95579,7 +95604,7 @@ class RowTabInfo {
         const lastInterval = utils_list.ListUtils.last(this.rowFormatter.rowSizesManager.rowFormattingInfo.intervals);
         if (tabXPosRelativePage > lastInterval.end) {
             if (lastInterval.end < this.rowFormatter.paragraphHorizontalBounds.end) {
-                if (this.rowFormatter.manager.model.compatibilitySettings.compatibilityMode < CompatibilityMode.Word2013) {
+                if (this.rowFormatter.manager.model.compatibilitySettings.compatibilityMode < CompatibilityMode.Word2013 && tabPosition !== null) {
                     this.currInterval.avaliableWidth = Number.MAX_SAFE_INTEGER - this.currInterval.busyWidth;
                     this.currInterval.length = Number.MAX_SAFE_INTEGER;
                     this.row.width = Number.MAX_SAFE_INTEGER;
@@ -102164,18 +102189,16 @@ class SimpleViewCanvasSizeManager {
         this.sizeUpdated = true;
     }
     changeSizeCore() {
-        {
-            utils_list.ListUtils.forEach(this.control.viewManager.cache, (_val) => this.control.viewManager.renderer.removePage(1), 1);
-            this.control.viewManager.ensureFirstPageIsRendered();
-            this.control.innerClientProperties.viewsSettings.widthOfPage = this.canvasManager.getCanvasWidth();
-            if (this.control.layoutFormatterManager) {
-                this.control.layoutFormatterManager.invalidator.onChangedAllLayout();
-                this.control.selection.scrollManager.setScroll(new ScrollState().byModelPosition(this.control.selection)
-                    .setModelPosition(this.control.selection.lastSelectedInterval.start).useStdRelativePosition().useStdOffset());
-            }
-            this.control.owner.adjustControl();
-            this.control.horizontalRulerControl.update();
+        utils_list.ListUtils.forEach(this.control.viewManager.cache, (_val) => this.control.viewManager.renderer.removePage(1), 1);
+        this.control.viewManager.ensureFirstPageIsRendered();
+        this.control.innerClientProperties.viewsSettings.widthOfPage = this.canvasManager.getCanvasWidth();
+        if (this.control.layoutFormatterManager) {
+            this.control.layoutFormatterManager.invalidator.onChangedAllLayout();
+            this.control.selection.scrollManager.setScroll(new ScrollState().byModelPosition(this.control.selection)
+                .setModelPosition(this.control.selection.lastSelectedInterval.start).useStdRelativePosition().useStdOffset());
         }
+        this.control.owner.adjustControl();
+        this.control.horizontalRulerControl.update();
     }
 }
 class DocumentRenderer {
@@ -102359,7 +102382,7 @@ class DocumentRenderer {
         }
     }
     updatePageSize(page, pageElement) {
-        if (pageElement.offsetHeight != page.height || pageElement.offsetWidth != page.width)
+        if (pageElement.offsetHeight != Math.round(page.height) || pageElement.offsetWidth != Math.round(page.width))
             dom.DomUtils.setStyleSize(pageElement.style, page);
     }
     updatePageClasses(pageElement) {
@@ -106213,40 +106236,31 @@ class MouseHandlerDefaultState extends MouseHandlerStateBase {
         this.processMouseDownOnMaxDetailsLevel(evt, htr, activeSubDocument);
     }
     processMouseDownOnMaxDetailsLevel(evt, htr, activeSubDocument) {
+        const selection = this.handler.control.selection;
         if (htr.floatingObject) {
-            if (htr.floatingObject.belongsToSubDocId != this.handler.control.selection.activeSubDocument.id)
-                MouseHandlerHelper.changeActiveSubDocumentToParent(this.handler.control);
             const box = htr.floatingObject;
-            this.selectFloatingObject(box);
-            const specRunInfo = this.handler.control.selection.specialRunInfo;
-            if (specRunInfo.isSelectedAnchorObject) {
-                if (box.getType() == LayoutBoxType.AnchorTextBox &&
-                    HitTestManager.isPointInTexBoxArea(evt.layoutPoint, box, activeSubDocument.isTextBox() ? 0 : box.rotationInRadians)) {
+            const rotationAngle = activeSubDocument.isTextBox() ? 0 : box.rotationInRadians;
+            if (box.getType() == LayoutBoxType.AnchorTextBox && HitTestManager.isPointInTexBoxArea(evt.layoutPoint, box, rotationAngle)) {
+                const textbox = box;
+                if (textbox.internalSubDocId !== selection.activeSubDocument.id && this.selectFloatingObject(box)) {
                     this.handler.control.commandManager.getCommand(RichEditClientCommand.ChangeActiveSubDocumentToTextBox).execute(this.handler.control.commandManager.isPublicApiCall);
                     this.handler.boxVisualizerManager.resizeBoxVisualizer.show(htr.pageIndex, null, null, null, box);
-                    htr = this.handler.control.hitTestManager.calculate(evt.layoutPoint, DocumentLayoutDetailsLevel.Max, this.handler.control.selection.activeSubDocument);
-                }
-                else {
-                    if (this.resizeRotationChecker(() => {
-                        const dragFloatingObjectState = new MouseHandlerDragFloatingObjectState(this.handler, evt);
-                        this.handler.switchState(new MouseHandlerBeginDragHelperState(evt.layoutPoint, this.handler, dragFloatingObjectState));
-                    }))
-                        return;
-                    else {
-                        if (specRunInfo.isPictureSelected()) {
-                            this.handler.control.selection.setSelection(new SetSelectionParams()
-                                .setInterval(new fixed.FixedInterval(specRunInfo.getPicturePosition(), 1)));
-                            return;
-                        }
-                    }
+                    htr = this.handler.control.hitTestManager.calculate(evt.layoutPoint, DocumentLayoutDetailsLevel.Max, selection.activeSubDocument);
                 }
             }
+            else {
+                if (this.selectFloatingObject(box) && this.resizeRotationChecker(() => {
+                    const dragFloatingObjectState = new MouseHandlerDragFloatingObjectState(this.handler, evt);
+                    this.handler.switchState(new MouseHandlerBeginDragHelperState(evt.layoutPoint, this.handler, dragFloatingObjectState));
+                }))
+                    return;
+            }
         }
         if (browser.Browser.TouchUI && htr.subDocument.isMain() && htr.exactlyDetailLevel < DocumentLayoutDetailsLevel.PageArea) {
             if (htr.deviations[DocumentLayoutDetailsLevel.PageArea] & rectangle.HitTestDeviation.Top || htr.deviations[DocumentLayoutDetailsLevel.PageArea] & rectangle.HitTestDeviation.Bottom)
                 this.handler.control.viewManager.canvasScrollManager.waitForDblClick();
         }
-        if (evt.button === MouseButton.Right && this.handler.control.selection.lastSelectedInterval.contains(htr.getPosition()))
+        if (evt.button === MouseButton.Right && selection.lastSelectedInterval.contains(htr.getPosition()))
             return;
         if (this.shouldSelectEntireTableColumn(htr))
             this.beginSelectEntireTableColumn(htr, evt);
@@ -106261,7 +106275,7 @@ class MouseHandlerDefaultState extends MouseHandlerStateBase {
                 this.beginSelectEntireTableCell(htr, evt);
         }
         else if (this.isLeftArea(htr, evt)) {
-            if (evt.modifiers & key/* ModifierKey */.tx.Ctrl && this.handler.control.selection.isCollapsed())
+            if (evt.modifiers & key/* ModifierKey */.tx.Ctrl && selection.isCollapsed())
                 this.handler.control.commandManager.getCommand(RichEditClientCommand.SelectAll).execute(this.handler.control.commandManager.isPublicApiCall, htr.getPosition());
             else if (this.isLeftAreaOffset(htr, evt))
                 this.beginLineSelection(htr, evt);
@@ -106469,8 +106483,14 @@ class MouseHandlerDefaultState extends MouseHandlerStateBase {
         this.handler.switchState(state);
     }
     selectFloatingObject(box) {
+        const selection = this.handler.control.selection;
+        if (box.belongsToSubDocId !== selection.activeSubDocument.id)
+            MouseHandlerHelper.changeActiveSubDocumentToParent(this.handler.control);
+        if (box.belongsToSubDocId !== selection.activeSubDocument.id)
+            return false;
         const pos = this.handler.control.layout.anchorObjectsPositionInfo.getPosition(box.objectId);
-        this.handler.control.selection.setSelection(new SetSelectionParams().setInterval(new fixed.FixedInterval(pos, 1)));
+        selection.setSelection(new SetSelectionParams().setInterval(new fixed.FixedInterval(pos, 1)));
+        return selection.specialRunInfo.isSelectedAnchorObject;
     }
 }
 class MouseHandlerHelper {
@@ -107643,31 +107663,56 @@ ResizeBoxListener.directionToSource = {
 };
 
 ;// CONCATENATED MODULE: ./src/common/utils/size-utils.ts
+
 class SizeUtils {
+    static getScrollbarsWidth() {
+        if (!(0,common.isDefined)(this._scrollbarsWidth)) {
+            const scrollDiv = document.createElement('div');
+            scrollDiv.style.visibility = 'hidden';
+            scrollDiv.style.overflow = 'scroll';
+            scrollDiv.style.position = 'absolute';
+            scrollDiv.style.top = '-9999px';
+            scrollDiv.style.width = '100px';
+            scrollDiv.style.height = '100px';
+            document.body.appendChild(scrollDiv);
+            const innerDiv = document.createElement('div');
+            innerDiv.style.width = '100%';
+            innerDiv.style.height = '100%';
+            scrollDiv.appendChild(innerDiv);
+            this._scrollbarsWidth = {
+                horizontal: SizeUtils.getOffsetHeight(scrollDiv) - SizeUtils.getOffsetHeight(innerDiv),
+                vertical: SizeUtils.getOffsetWidth(scrollDiv) - SizeUtils.getOffsetWidth(innerDiv)
+            };
+            scrollDiv.remove();
+        }
+        return this._scrollbarsWidth;
+    }
     static getWidthInfo(element) {
-        const offsetSize = SizeUtils.getOffsetWidth(element);
-        const style = getComputedStyle(element);
-        const inset = parseCssValue(style.borderLeftWidth)
-            + parseCssValue(style.borderRightWidth)
-            + parseCssValue(style.paddingLeft)
-            + parseCssValue(style.paddingRight);
-        const sizeWithScrollBar = offsetSize - inset;
-        const scrollBarSize = Math.round(sizeWithScrollBar) - element.clientWidth;
-        return new DimensionInfo(offsetSize, sizeWithScrollBar - scrollBarSize, scrollBarSize);
+        const computedStyle = getComputedStyle(element);
+        const offsetWidth = this.getOffsetWidth(element);
+        const offsetWidthWithoutBorder = offsetWidth
+            - parseCssValue(computedStyle.borderLeftWidth)
+            - parseCssValue(computedStyle.borderRightWidth);
+        let scrollbarWidth = 0;
+        if (Math.round(offsetWidthWithoutBorder) > element.clientWidth)
+            scrollbarWidth = SizeUtils.getScrollbarsWidth().vertical;
+        const clientWidth = offsetWidthWithoutBorder - scrollbarWidth;
+        return new DimensionInfo(offsetWidth, clientWidth, scrollbarWidth);
     }
     static getClientWidth(element) {
         return this.getWidthInfo(element).clientSize;
     }
     static getHeightInfo(element) {
-        const offsetSize = SizeUtils.getOffsetHeight(element);
-        const style = getComputedStyle(element);
-        const inset = parseCssValue(style.borderTopWidth)
-            + parseCssValue(style.borderBottomWidth)
-            + parseCssValue(style.paddingTop)
-            + parseCssValue(style.paddingBottom);
-        const sizeWithScrollBar = offsetSize - inset;
-        const scrollBarSize = Math.round(sizeWithScrollBar) - element.clientHeight;
-        return new DimensionInfo(offsetSize, sizeWithScrollBar - scrollBarSize, scrollBarSize);
+        const computedStyle = getComputedStyle(element);
+        const offsetHeight = this.getOffsetHeight(element);
+        const offsetHeightWithoutBorder = offsetHeight
+            - parseCssValue(computedStyle.borderTopWidth)
+            - parseCssValue(computedStyle.borderBottomWidth);
+        let scrollbarWidth = 0;
+        if (Math.round(offsetHeightWithoutBorder) > element.clientHeight)
+            scrollbarWidth = SizeUtils.getScrollbarsWidth().horizontal;
+        const clientHeight = offsetHeightWithoutBorder - scrollbarWidth;
+        return new DimensionInfo(offsetHeight, clientHeight, scrollbarWidth);
     }
     static getClientHeight(element) {
         return this.getHeightInfo(element).clientSize;
@@ -108014,17 +108059,23 @@ class CanvasManager extends batch_updatable/* BatchUpdatableObject */.IS {
     onScrollIntervalTick() {
         const evtX = this.lastMousePosition.x;
         const evtY = this.lastMousePosition.y;
-        const inHorizontalArea = evtX >= this.canvasPosition.x && evtX <= this.canvasPosition.x + this.sizes.getVisibleAreaWidth(true);
-        const inVerticalArea = evtY >= this.canvasPosition.y && evtY <= this.canvasPosition.y + this.sizes.getVisibleAreaHeight(true);
+        const inHorizontalArea = evtX >= this.canvasPosition.x && evtX <= this.canvasPosition.x + this.sizes.getVisibleAreaWidth(false);
+        const inVerticalArea = evtY >= this.canvasPosition.y && evtY <= this.canvasPosition.y + this.sizes.getVisibleAreaHeight(false);
         if (!inHorizontalArea && !inVerticalArea)
             return;
+        const yOffsetWithoutScrollbar = this.canvasPosition.y + this.sizes.getVisibleAreaHeight(false) - evtY;
+        const yOffsetWithScrollbar = this.canvasPosition.y + this.sizes.getVisibleAreaHeight(true) - evtY;
+        const outsideHorizontalScrollbar = yOffsetWithoutScrollbar > 0 || yOffsetWithScrollbar < 0;
         if (inHorizontalArea && evtY - this.canvasPosition.y <= AUTOSCROLL_AREA_SIZE)
             this.viewManager.canvas.scrollTop -= AUTOSCROLL_STEP;
-        else if (inHorizontalArea && this.canvasPosition.y + this.sizes.getVisibleAreaHeight(true) - evtY <= AUTOSCROLL_AREA_SIZE)
+        else if (inHorizontalArea && yOffsetWithoutScrollbar <= AUTOSCROLL_AREA_SIZE && outsideHorizontalScrollbar)
             this.viewManager.canvas.scrollTop += AUTOSCROLL_STEP;
+        const xOffsetWithoutScrollbar = this.canvasPosition.x + this.sizes.getVisibleAreaWidth(false) - evtX;
+        const xOffsetWithScrollbar = this.canvasPosition.x + this.sizes.getVisibleAreaWidth(true) - evtX;
+        const outsideVerticalScrollbar = xOffsetWithoutScrollbar > 0 || xOffsetWithScrollbar < 0;
         if (inVerticalArea && evtX - this.canvasPosition.x <= AUTOSCROLL_AREA_SIZE)
             this.viewManager.canvas.scrollLeft -= AUTOSCROLL_STEP;
-        else if (inVerticalArea && this.canvasPosition.x + this.sizes.getVisibleAreaWidth(true) - evtX <= AUTOSCROLL_AREA_SIZE)
+        else if (inVerticalArea && xOffsetWithoutScrollbar <= AUTOSCROLL_AREA_SIZE && outsideVerticalScrollbar)
             this.viewManager.canvas.scrollLeft += AUTOSCROLL_STEP;
     }
     static getCursorClassName(pointer) {
@@ -110314,17 +110365,17 @@ class InputEditorBase {
         clearTimeout(this.onKeyUpTimerId);
     }
     initialize() {
-        this.initializeIfNotReadOnly();
+        this.initializeEditableState();
         this.initEvents();
         this.prevKeyCode = EMPTY_KEYCODE;
     }
-    initializeIfNotReadOnly() {
-        if ((this.control.readOnly !== ReadOnlyMode.Persistent || this.control.modelManager.clientMode) && !this.initializedIfNotReadOnly) {
-            this.initializedIfNotReadOnly = true;
-            this.initializeIfNotReadOnlyCore();
+    initializeEditableState() {
+        if (!this.editableStateInitialized) {
+            this.editableStateInitialized = true;
+            this.initializeEditableStateCore();
         }
     }
-    initializeIfNotReadOnlyCore() {
+    initializeEditableStateCore() {
     }
     initEvents() {
         this.evtHandlersHolder.addListener(this.getEditableDocument(), "keydown", this.onKeyDown.bind(this));
@@ -110544,8 +110595,8 @@ class DivInputEditor extends InputEditorBase {
         clearTimeout(this.composEndTimerId);
         clearTimeout(this.onTextInputTimerId);
     }
-    initializeIfNotReadOnlyCore() {
-        this.inputElement.contentEditable = "true";
+    initializeEditableStateCore() {
+        this.inputElement.contentEditable = String(!this.control.isReadOnlyPersistent);
         this.clearInputElement();
     }
     setPosition(left, top) {
@@ -110793,11 +110844,11 @@ class IFrameInputEditor extends InputEditorBase {
         body.style.margin = "0px";
         body.style.overflow = "hidden";
     }
-    initializeIfNotReadOnlyCore() {
+    initializeEditableStateCore() {
         if (browser.Browser.WebKitFamily)
-            this.editableDocument.body.setAttribute("contenteditable", "true");
+            this.editableDocument.body.setAttribute("contenteditable", String(!this.control.isReadOnlyPersistent));
         else
-            this.editableDocument.designMode = "on";
+            this.editableDocument.designMode = this.control.isReadOnlyPersistent ? "off" : "on";
     }
     createInputElement() {
         const element = document.createElement("IFRAME");
@@ -110936,7 +110987,7 @@ class IFrameInputEditor extends InputEditorBase {
     recreateIfNeeded() {
         const iframeDocument = this.inputElement.contentDocument || this.inputElement.contentWindow.document;
         if (!iframeDocument.body.hasAttribute("loaded")) {
-            this.initializedIfNotReadOnly = false;
+            this.editableStateInitialized = false;
             this.createHierarchyCore();
             this.initialize();
         }
@@ -115242,7 +115293,7 @@ class RichEditCore {
                 this.invalidateLayoutAfterFontsLoaded();
             });
     }
-    get isReadOnlyPersistent() { return this.readOnly == ReadOnlyMode.Persistent; }
+    get isReadOnlyPersistent() { return this.readOnly === ReadOnlyMode.Persistent; }
     get model() { return this.modelManager.model; }
     get isDisposed() {
         return this._isDisposed;
@@ -115406,8 +115457,8 @@ class RichEditCore {
             this.readOnly = ReadOnlyMode.Persistent;
         else if (!readOnly && this.readOnly === ReadOnlyMode.Persistent) {
             this.readOnly = ReadOnlyMode.None;
-            this.inputController.inputEditor.initializeIfNotReadOnly();
         }
+        this.inputController.inputEditor.initializeEditableStateCore();
     }
     setWorkSession(sessionGuid, documentInfo) {
         this.sessionGuid = sessionGuid;
@@ -115533,6 +115584,7 @@ class RichEditCore {
             pictureRenderer: this.viewManager.renderer,
             uiUnitConverter: this.uiUnitConverter,
             lastMaxNumPages: this.layout.lastMaxNumPages,
+            grids: this.layout.grids,
             pageIndex: this.selection.pageIndex,
             sessionGuid: this.sessionGuid,
             clientGuid: this.clientGuid,
@@ -136878,7 +136930,8 @@ class MailMergeCommand extends CommandBase {
         return true;
     }
     executeCore(_state, options) {
-        const docxExporter = new DocxExporter(this.control.modelManager.modelManipulator, new DocxExportOptions());
+        const exportModelOptions = this.control.getExportModelOptions();
+        const docxExporter = new DocxExporter(exportModelOptions, new DocxExportOptions());
         docxExporter.exportToBlob((blob) => {
             const docxImporter = new Importer(new ImporterOptions());
             docxImporter.importFromFile(blob, this.control.modelManager.richOptions, (documentModel, formatImagesImporter) => {
@@ -141647,7 +141700,7 @@ class ClientRichEdit {
         this.contextMenuSettings = settings.contextMenuSettings;
         this.fullScreenHelper = new FullScreenHelper(element);
         if (true)
-            external_DevExpress_config_default()(JSON.parse(atob('eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVRXOVZka0ZEZWsxcVRsTmFiMjEyTmpsYVRGbHBlQ0lLZlE9PS5WN0NsMFNmUGxxMmpzWklzVVRDYSt3bUJ5VTRwazl1OFk1OVNMUEJWdWVRL2lrZWRHd3ljZDMrakpRejZ1cG9Sa3lPTGNuOEJJSitqa3MycGkyaHhyZjBRNkJoUW5zbjdZMDF5OXY5MWpWeDVVTW5XZWZaUlR6bWllK1M4TGl5OTVoUjJIQT09In0=')));
+            external_DevExpress_config_default()(JSON.parse(atob('eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVREZzBkbWxZYUZOS1MyWnRRams0U0VOTVkxTTRNaUlLZlE9PS53SkN1UVJhY3dIaU9DMEdWZFBPVlNacDJsRThrcTdTbUZTTWpIMXgvamxEMnowbzQvYWFkVm9zK1g2ZzlwSDZaYjdUUXdOdlZvQkduRUNwblB2M0ZaOUV4eWlkK3pybUxITE8yZnIyVzFTOEJOWE1YaE1mSlNPdjJ3aCs5SDBSd2lMejJxUT09In0=')));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);
@@ -144094,11 +144147,11 @@ class RichEditPublic {
         command.execute(true, type);
     }
     get readOnly() {
-        return this._native.core.readOnly == ReadOnlyMode.Persistent;
+        return this._native.core.readOnly === ReadOnlyMode.Persistent;
     }
     set readOnly(value) {
         if (this.readOnly != value) {
-            this._native.core.readOnly = value ? ReadOnlyMode.Persistent : ReadOnlyMode.None;
+            this._native.core.setPersistentReadOnly(value);
             this._native.core.barHolder.updateItemsState();
             this._native.core.horizontalRulerControl.update();
             this._native.core.beginUpdate();