devexpress-richedit 24.2.7-build-25100-0108 → 24.2.7

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 ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVZqWlNVWEpJWkdZelVXRmlNbGQ1YldsWlpIZFlUU0lLZlE9PS53aEFZRnYvUVRDWlVKalVITm14M25DLzVnWE9aV09wQmFYbm9JMlg1MHJadTdrbm9Mc2lIRUs0REoyZWlQZi9tSEExRk9ySlltanFtSWdKWTZpQ2prSTVtYlVnN1N6ZEI0SUIvektuMTdlQlRUQit0YThVZDNzSThNK3NES2ZRd3NMNU5tdz09In0=")
-            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVZqWlNVWEpJWkdZelVXRmlNbGQ1YldsWlpIZFlUU0lLZlE9PS53aEFZRnYvUVRDWlVKalVITm14M25DLzVnWE9aV09wQmFYbm9JMlg1MHJadTdrbm9Mc2lIRUs0REoyZWlQZi9tSEExRk9ySlltanFtSWdKWTZpQ2prSTVtYlVnN1N6ZEI0SUIvektuMTdlQlRUQit0YThVZDNzSThNK3NES2ZRd3NMNU5tdz09In0=")));
+        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVVUTmhiM0ZJYzFKRU0zWllaVlZOVUdSWVNEZHhOU0lLZlE9PS5rMTA4KzRjbVFYSU96S1F1bUlqUE5oQkw0ejc5N0VSNlByVkkxcTB3V1QwbnkwUTVNZnkzRkJONlV5Zk9PV2p1eUJwaDR1ZllMM0llb0g4UHhNUU5wQUhUb3VUTTFFOHZaM01CM0lac2c1L1ZoOXhUNkg4TFJQSGZoQk00Rk5HUE5zNkY0dz09In0=")
+            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVVUTmhiM0ZJYzFKRU0zWllaVlZOVUdSWVNEZHhOU0lLZlE9PS5rMTA4KzRjbVFYSU96S1F1bUlqUE5oQkw0ejc5N0VSNlByVkkxcTB3V1QwbnkwUTVNZnkzRkJONlV5Zk9PV2p1eUJwaDR1ZllMM0llb0g4UHhNUU5wQUhUb3VUTTFFOHZaM01CM0lac2c1L1ZoOXhUNkg4TFJQSGZoQk00Rk5HUE5zNkY0dz09In0=")));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);

package/lib/client/commands/mail-merge-command.js

@@ -44,7 +44,8 @@ export 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) => {

package/lib/client/formats/docx/export/data.d.ts

@@ -23,6 +23,9 @@ import { BaseSubDocumentExporter } from './exporters/sub-document/base-sub-docum
 import { TextBoxSubDocumentExporter } from './exporters/sub-document/text-box-content-exporter';
 import { IdGenerator } from './utils/id-generator';
 import { WriterHelper } from './utils/writer-helper';
+import { Grid } from '../../../../common/layout-formatter/table/grid-engine/grid';
+import { IExportModelOptions } from '../../../../common/formats/i-document-exporter';
+import { Table } from '../../../../common/model/tables/main-structures/table';
 export declare class Data {
     get writer(): XmlWriter;
     set writer(val: XmlWriter);
@@ -30,6 +33,7 @@ export declare class Data {
     get relationExporter(): RelationCollectionExporter;
     get mainSubDocumentRelations(): DocumentRelationsExporter;
     model: DocumentModel;
+    grids: Map<Table, Grid>;
     options: DocxExportOptions;
     headerCounter: number;
     footerCounter: number;
@@ -58,7 +62,7 @@ export declare class Data {
     endNotes: Map<SubDocument, number>;
     private writerStack;
     private relationExporters;
-    constructor(model: DocumentModel, options: DocxExportOptions);
+    constructor(exportModelOptions: IExportModelOptions, options: DocxExportOptions);
     popWriter(): void;
     pushRelationExporter(exporter: RelationCollectionExporter): void;
     popRelationExporter(): void;

package/lib/client/formats/docx/export/data.js

@@ -23,11 +23,12 @@ export class Data {
     get subDocumentExporter() { return this.subDocumentExporterStack.last; }
     get relationExporter() { return ListUtils.last(this.relationExporters); }
     get mainSubDocumentRelations() { return this.relationExporters[0]; }
-    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();

package/lib/client/formats/docx/export/exporter.d.ts

@@ -1,11 +1,10 @@
-import { IDocumentExporter } from '../../../../common/formats/i-document-exporter';
-import { ModelManipulator } from '../../../../common/model/manipulators/model-manipulator';
+import { IDocumentExporter, IExportModelOptions } from '../../../../common/formats/i-document-exporter';
 import { DocxExportOptions } from './docx-export-options';
 export declare class DocxExporter implements IDocumentExporter {
     private data;
     private modelManipulator;
     private options;
-    constructor(modelManipulator: ModelManipulator, options: DocxExportOptions);
+    constructor(exportModelOptions: IExportModelOptions, options: DocxExportOptions);
     exportToBlob(callback: (blob: Blob) => void): void;
     exportToBase64(callback: (base64: string) => void): void;
     private exportInner;

package/lib/client/formats/docx/export/exporter.js

@@ -9,10 +9,10 @@ import { MainSubDocumentExporter } from './exporters/sub-document/main-sub-docum
 import { ThemeExporter } from './exporters/theme';
 import { EndNoteExporter, FootNoteExporter } from './exporters/sub-document/note-sub-document-exporter';
 export class DocxExporter {
-    constructor(modelManipulator, options) {
-        this.modelManipulator = modelManipulator;
+    constructor(exportModelOptions, options) {
+        this.modelManipulator = exportModelOptions.modelManager.modelManipulator;
         this.options = options;
-        this.data = new Data(modelManipulator.model, options);
+        this.data = new Data(exportModelOptions, options);
     }
     exportToBlob(callback) {
         this.modelManipulator.picture.loader.ensureAllPicturesLoaded(this.options.ensurePictureLoadedTimeout, (_loaded) => {

package/lib/client/formats/docx/export/exporters/base/table/table.d.ts

@@ -8,7 +8,7 @@ export declare class TableExporter extends BaseExporter {
     private initTableDeferred;
     init(): void;
     checkTable(pos: number, allowInitNextTable: boolean): void;
-    getTableGrid(table: Table): number[];
+    private getTableGrid;
     private initNewTables;
     private closeTables;
     private handleNextCell;

package/lib/client/formats/docx/export/exporters/base/table/table.js

@@ -6,6 +6,7 @@ import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { BaseExporter } from '../../base';
 import { TableCellPropertiesExporter } from './table-cell-properties';
 import { TableRowPropertiesExporter } from './table-row-properties';
+import { UnitConverter } from '@devexpress/utils/lib/class/unit-converter';
 export class TableExporter extends BaseExporter {
     constructor() {
         super(...arguments);
@@ -35,10 +36,9 @@ export 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(UnitConverter.pixelsToTwips)) || [];
     }
     initNewTables(newIndexes, allowInitNextTable) {
         for (let levelIndex = this.tableIndexes.length; levelIndex < newIndexes.length; levelIndex++) {

package/lib/client/formats/docx/import/destination/paragraph-properties/properties/paragraph-spacing-destination.js

@@ -12,10 +12,12 @@ export class ParagraphSpacingDestination extends ParagraphFormattingLeafElementD
             const spacingBefore = this.data.readerHelper.getWpSTIntegerValue(reader, 'before', 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.MIN_SAFE_INTEGER);
             if (lineSpacing != Constants.MIN_SAFE_INTEGER && lineSpacing > 0) {
                 const attribute = new WordProcessingMLValue('lineRule', 'line-rule');

package/lib/client/model-api/formats/exporter.js

@@ -15,7 +15,7 @@ export 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());

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

@@ -158,11 +158,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();

package/lib/common/canvas/renderes/common/document-renderer.js

@@ -77,18 +77,16 @@ export class SimpleViewCanvasSizeManager {
         this.sizeUpdated = true;
     }
     changeSizeCore() {
-        {
-            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();
+        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();
     }
 }
 export class DocumentRenderer {
@@ -272,7 +270,7 @@ export 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))
             DomUtils.setStyleSize(pageElement.style, page);
     }
     updatePageClasses(pageElement) {

package/lib/common/formats/i-document-exporter.d.ts

@@ -1,6 +1,8 @@
 import { IPictureRenderer } from "../canvas/picture-renderer";
 import { DocumentFormat } from "../document-format";
+import { Grid } from "../layout-formatter/table/grid-engine/grid";
 import { IModelManager } from "../model-manager";
+import { Table } from "../model/tables/main-structures/table";
 import { IRichEditUnitConverter } from "../utils/unit-converter";
 export interface IDocumentExporter {
     exportToBlob(callback: (blob: Blob) => void): any;
@@ -14,5 +16,6 @@ export interface IExportModelOptions {
     sessionGuid: string;
     clientGuid: string;
     lastMaxNumPages?: number;
+    grids?: Map<Table, Grid>;
     pageIndex?: number;
 }

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

@@ -17,7 +17,7 @@ export declare abstract class InputEditorBase<TInpElement extends HTMLElement> {
     previousText: string;
     canInsertTextOnInputEvent: boolean;
     needProcessShortcut: boolean;
-    initializedIfNotReadOnly: boolean;
+    editableStateInitialized: boolean;
     prevKeyCode: number;
     IMEState: IMEState;
     private inputWithAlt;
@@ -31,8 +31,8 @@ export declare abstract class InputEditorBase<TInpElement extends HTMLElement> {
     constructor(control: IRichEditControl, eventManager: IEventManager, parent: HTMLElement);
     dispose(): void;
     initialize(): void;
-    initializeIfNotReadOnly(): void;
-    initializeIfNotReadOnlyCore(): void;
+    initializeEditableState(): void;
+    initializeEditableStateCore(): void;
     initEvents(): void;
     createHierarchy(parent: HTMLElement): void;
     createHierarchyCore(): void;
@@ -78,7 +78,7 @@ export declare class DivInputEditor extends InputEditorBase<HTMLElement> {
     private onTextInputTimerId;
     constructor(control: IRichEditControl, eventManager: IEventManager, parent: HTMLElement);
     dispose(): void;
-    initializeIfNotReadOnlyCore(): void;
+    initializeEditableStateCore(): void;
     setPosition(left: number, top: number): void;
     createInputElement(): HTMLElement;
     initEvents(): void;
@@ -114,7 +114,7 @@ export declare class IFrameInputEditor extends InputEditorBase<HTMLIFrameElement
     constructor(control: IRichEditControl, eventManager: IEventManager, parent: HTMLElement);
     dispose(): void;
     createHierarchyCore(): void;
-    initializeIfNotReadOnlyCore(): void;
+    initializeEditableStateCore(): void;
     createInputElement(): HTMLIFrameElement;
     initEvents(): void;
     private isModifyEnabled;

package/lib/common/input-controller.js

@@ -51,17 +51,17 @@ export 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));
@@ -281,8 +281,8 @@ export 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) {
@@ -530,11 +530,11 @@ export class IFrameInputEditor extends InputEditorBase {
         body.style.margin = "0px";
         body.style.overflow = "hidden";
     }
-    initializeIfNotReadOnlyCore() {
+    initializeEditableStateCore() {
         if (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");
@@ -673,7 +673,7 @@ export 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();
         }

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

@@ -2,6 +2,8 @@ import { DocumentModel } from '../model/document-model';
 import { PositionManager } from '../model/position/position-manager';
 import { LayoutAnchoredObjectBox } from './main-structures/layout-boxes/layout-anchored-object-box';
 import { LayoutPage } from './main-structures/layout-page';
+import { Grid } from '../layout-formatter/table/grid-engine/grid';
+import { Table } from '../model/tables/main-structures/table';
 export declare class ModelPositionHolder {
     private pos;
     private posManager;
@@ -25,6 +27,7 @@ export declare class DocumentLayout {
     isFullyFormatted: boolean;
     anchorObjectsPositionInfo: AnchorObjectsPositionInfo;
     pageColor: number;
+    get grids(): Map<Table, Grid>;
     constructor(anchorObjectsPositionInfo: AnchorObjectsPositionInfo);
     setEmptyLayout(pageColor: number): void;
     getLastValidPage(): LayoutPage;

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

@@ -37,6 +37,12 @@ export class AnchorObjectsPositionInfo {
     }
 }
 export class DocumentLayout {
+    get grids() {
+        return this.pages.reduce((res, page) => {
+            page.grids.forEach((grid, table) => res.set(table, grid));
+            return res;
+        }, new Map());
+    }
     constructor(anchorObjectsPositionInfo) {
         this.anchorObjectsPositionInfo = anchorObjectsPositionInfo;
         this.setEmptyLayout(ColorHelper.NO_COLOR);

package/lib/common/layout/main-structures/layout-page-area.d.ts

@@ -1,10 +1,13 @@
 import { Rectangle } from '@devexpress/utils/lib/geometry/rectangle';
 import { SubDocument } from '../../model/sub-document';
 import { LayoutColumn } from './layout-column';
+import { Grid } from '../../layout-formatter/table/grid-engine/grid';
+import { Table } from '../../model/tables/main-structures/table';
 export declare class LayoutPageArea extends Rectangle {
     subDocument: SubDocument;
     columns: LayoutColumn[];
     pageOffset: number;
+    get grids(): Map<Table, Grid>;
     constructor(subDocument: SubDocument);
     getEndPosition(): number;
     getLastColumn(): LayoutColumn;

package/lib/common/layout/main-structures/layout-page-area.js

@@ -1,6 +1,12 @@
 import { Rectangle } from '@devexpress/utils/lib/geometry/rectangle';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 export class LayoutPageArea extends Rectangle {
+    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());
+    }
     constructor(subDocument) {
         super(0, 0, 0, 0);
         this.columns = [];

package/lib/common/layout/main-structures/layout-page.d.ts

@@ -8,6 +8,8 @@ import { AnchorObjectsPositionInfo } from '../document-layout';
 import { LayoutAnchoredObjectBox } from './layout-boxes/layout-anchored-object-box';
 import { LayoutPageArea } from './layout-page-area';
 import { TableAnchoredObjectsHolder } from '../../layout-formatter/table/utils/table-anchored-objects-holder';
+import { Grid } from '../../layout-formatter/table/grid-engine/grid';
+import { Table } from '../../model/tables/main-structures/table';
 export declare enum LayoutPageFlags {
     MustBeRendered = 1,
     ContentRendered = 2,
@@ -42,6 +44,7 @@ export declare class LayoutPage extends Rectangle {
     tableAnchoredObjectsHolder: TableAnchoredObjectsHolder;
     renderLevelCalculator: RenderLevelCalculator;
     private contentIntervals;
+    get grids(): Map<Table, Grid>;
     constructor();
     setRenderLevelCalculator(anchorObjectsPositionInfo: AnchorObjectsPositionInfo, compatibilityMode: CompatibilityMode): void;
     setAbsolutePosition(pos: number): void;

package/lib/common/layout/main-structures/layout-page.js

@@ -38,6 +38,14 @@ export class LayoutOtherPageAreasInfo {
     }
 }
 export class LayoutPage extends Rectangle {
+    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;
+    }
     constructor() {
         super(0, 0, 0, 0);
         this.mainSubDocumentPageAreas = [];

package/lib/common/layout-formatter/floating/position-calculators/horizontal.d.ts

@@ -11,6 +11,7 @@ export declare class AnchorObjectHorizontalPositionCalculator extends AnchorObje
     private alignment;
     private getAlignPosition;
     private absolute;
+    private getAnchorXPosition;
     private bookLayout;
     private relative;
 }

package/lib/common/layout-formatter/floating/position-calculators/horizontal.js

@@ -41,7 +41,7 @@ export class AnchorObjectHorizontalPositionCalculator extends AnchorObjectPositi
     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 +
@@ -90,17 +90,8 @@ export class AnchorObjectHorizontalPositionCalculator extends AnchorObjectPositi
                 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 = 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;
@@ -117,6 +108,19 @@ export class AnchorObjectHorizontalPositionCalculator extends AnchorObjectPositi
                 throw new Error(Errors.InternalException);
         }
     }
+    getAnchorXPosition() {
+        const rowAbsPos = this.lp.getLogPosition(DocumentLayoutDetailsLevel.Row);
+        const ancBoxAbsPos = this.obj.rowOffset;
+        let boxIndex = 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]);
     }

package/lib/common/layout-formatter/row/states.js

@@ -21,8 +21,6 @@ export class RowBaseFormatterState {
             this.rowFormatter.finishRow();
     }
     addAnchorObject() {
-        if (!this.rowFormatter.wordHolder.pushBoxes())
-            return;
         this.rowFormatter.addAnchorObject();
     }
     addTextBox() {

package/lib/common/layout-formatter/row/tab-info.js

@@ -85,7 +85,7 @@ export class RowTabInfo {
         const lastInterval = 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;

package/lib/common/mouse-handler/mouse-handler/mouse-handler-default-state.d.ts

@@ -32,7 +32,7 @@ export declare class MouseHandlerDefaultState extends MouseHandlerStateBase {
     private shouldBeginDragExistingSelection;
     private selectImage;
     private beginDragExistingSelection;
-    selectFloatingObject(box: LayoutAnchoredObjectBox): void;
+    selectFloatingObject(box: LayoutAnchoredObjectBox): boolean;
 }
 export declare class MouseHandlerHelper {
     static selectParentsTextBox(control: IRichEditControl): void;

package/lib/common/mouse-handler/mouse-handler/mouse-handler-default-state.js

@@ -168,40 +168,31 @@ export 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 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.TouchUI && htr.subDocument.isMain() && htr.exactlyDetailLevel < DocumentLayoutDetailsLevel.PageArea) {
             if (htr.deviations[DocumentLayoutDetailsLevel.PageArea] & HitTestDeviation.Top || htr.deviations[DocumentLayoutDetailsLevel.PageArea] & 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);
@@ -216,7 +207,7 @@ export class MouseHandlerDefaultState extends MouseHandlerStateBase {
                 this.beginSelectEntireTableCell(htr, evt);
         }
         else if (this.isLeftArea(htr, evt)) {
-            if (evt.modifiers & ModifierKey.Ctrl && this.handler.control.selection.isCollapsed())
+            if (evt.modifiers & ModifierKey.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);
@@ -424,8 +415,14 @@ export 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 FixedInterval(pos, 1)));
+        selection.setSelection(new SetSelectionParams().setInterval(new FixedInterval(pos, 1)));
+        return selection.specialRunInfo.isSelectedAnchorObject;
     }
 }
 export class MouseHandlerHelper {

package/lib/common/rich-edit-core.js

@@ -45,7 +45,7 @@ import { HorizontalRulerControl } from './ui/ruler/ruler';
 import { SearchManager } from './ui/search-manager';
 import { isDefined } from '@devexpress/utils/lib/utils/common';
 export class RichEditCore {
-    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;
@@ -257,8 +257,8 @@ export 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;
@@ -384,6 +384,7 @@ export 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,