devexpress-richedit 25.1.1-alpha → 25.1.3

package/lib/common/formats/rtf/export/exporters/rtf-content-exporter.js

@@ -37,17 +37,18 @@ import { RtfTableExporter } from './table/rtf-table-exporter';
 export class RtfContentExporter {
     get shouldExportHiddenText() { return true; }
     ;
-    constructor(documentModel, options, rtfExportHelper) {
+    get documentModel() { return this.exportModelOptions.modelManager.modelManipulator.model; }
+    constructor(exportModelOptions, options, rtfExportHelper) {
         this.shouldFourceUpdateIterators = false;
-        this.documentModel = documentModel;
+        this.exportModelOptions = exportModelOptions;
         this.subDocument = this.documentModel.mainSubDocument;
         this.pieceTableNumberingListCounters = new PieceTableNumberingListCountersManager();
         this.rtfExportHelper = rtfExportHelper;
         this.options = options;
         this.rtfBuilder = this.createRtfBuilder();
-        this.paragraphPropertiesExporter = new RtfParagraphPropertiesExporter(documentModel, rtfExportHelper, this.rtfBuilder);
-        this.characterPropertiesExporter = new RtfCharacterPropertiesExporter(documentModel, rtfExportHelper, this.rtfBuilder, options);
-        this.sectionPropertiesExporter = new RtfSectionPropertiesExporter(documentModel, rtfExportHelper, this.rtfBuilder);
+        this.paragraphPropertiesExporter = new RtfParagraphPropertiesExporter(this.documentModel, rtfExportHelper, this.rtfBuilder);
+        this.characterPropertiesExporter = new RtfCharacterPropertiesExporter(this.documentModel, rtfExportHelper, this.rtfBuilder, options);
+        this.sectionPropertiesExporter = new RtfSectionPropertiesExporter(this.documentModel, rtfExportHelper, this.rtfBuilder);
         this.runHandlerMap = new MapCreator()
             .add(RunType.TextRun, this.exportTextRun)
             .add(RunType.FieldCodeStartRun, this.fieldCodeStartRunHandler)
@@ -257,7 +258,7 @@ export class RtfContentExporter {
             value = "00000000";
         }
         else {
-            const view = new DataView(hash, 0);
+            const view = new DataView(hash.buffer, 0);
             const hashValue = view.getInt32(0);
             value = this.documentModel.simpleFormattersManager.formatString("{0:x8}", hashValue);
         }
@@ -433,11 +434,14 @@ export class RtfContentExporter {
             this.exportSingleParagraph(paragraph);
             return paragraphIndex;
         }
-        else
-            return RtfTableExporter.exportTable(this, tablesInfo[0].table.getTopLevelParent()) - this.startSectionParagraphIndex;
+        else {
+            const table = tablesInfo[0].table.getTopLevelParent();
+            const grid = this.exportModelOptions.grids.get(table);
+            return RtfTableExporter.exportTable(this, table, grid) - this.startSectionParagraphIndex;
+        }
     }
     exportSingleParagraph(paragraph) {
-        this.exportParagraphCore(paragraph, 0, 0, -1);
+        this.exportParagraphCore(paragraph, 0, ConditionalTableStyleFormatting.None, -1);
         this.finishParagraph(paragraph);
     }
     finishParagraph(paragraph) {

package/lib/common/formats/rtf/export/exporters/table/rtf-table-exporter.d.ts

@@ -1,6 +1,7 @@
+import { Grid } from '../../../../../layout-formatter/table/grid-engine/grid';
 import { Table } from '../../../../../model/tables/main-structures/table';
 import { RtfContentExporter } from '../rtf-content-exporter';
 export declare class RtfTableExporter {
-    static exportTable(rtfContentExporter: RtfContentExporter, table: Table): number;
-    static exportNestedTable(rtfContentExporter: RtfContentExporter, table: Table, nestingLevel: number): number;
+    static exportTable(rtfContentExporter: RtfContentExporter, table: Table, grid: Grid): number;
+    static exportNestedTable(rtfContentExporter: RtfContentExporter, table: Table, grid: Grid, nestingLevel: number): number;
 }

package/lib/common/formats/rtf/export/exporters/table/rtf-table-exporter.js

@@ -1,13 +1,13 @@
 import { RtfNestedTableExporterState } from './states/rtf-nested-table-exporter-state';
 import { RtfTableExporterState } from './states/rtf-table-exporter-state';
 export class RtfTableExporter {
-    static exportTable(rtfContentExporter, table) {
-        new RtfTableExporterState(rtfContentExporter, table).export();
+    static exportTable(rtfContentExporter, table, grid) {
+        new RtfTableExporterState(rtfContentExporter, table, grid).export();
         rtfContentExporter.tableIterator.update(table.getEndPosition());
         return rtfContentExporter.subDocument.getParagraphIndexByPosition(table.getEndPosition() - 1);
     }
-    static exportNestedTable(rtfContentExporter, table, nestingLevel) {
-        new RtfNestedTableExporterState(rtfContentExporter, table, nestingLevel).export();
+    static exportNestedTable(rtfContentExporter, table, grid, nestingLevel) {
+        new RtfNestedTableExporterState(rtfContentExporter, table, grid, nestingLevel).export();
         rtfContentExporter.tableIterator.update(table.getEndPosition());
         return rtfContentExporter.subDocument.getParagraphIndexByPosition(table.getEndPosition() - 1);
     }

package/lib/common/formats/rtf/export/exporters/table/states/rtf-nested-table-exporter-state.d.ts

@@ -1,9 +1,10 @@
+import { Grid } from '../../../../../../layout-formatter/table/grid-engine/grid';
 import { Table } from '../../../../../../model/tables/main-structures/table';
 import { TableRow } from '../../../../../../model/tables/main-structures/table-row';
 import { RtfContentExporter } from '../../rtf-content-exporter';
 import { RtfTableExporterStateBase } from './rtf-table-exporter-state-base';
 export declare class RtfNestedTableExporterState extends RtfTableExporterStateBase {
-    constructor(rtfExporter: RtfContentExporter, table: Table, nestingLevel: number);
+    constructor(rtfExporter: RtfContentExporter, table: Table, grid: Grid, nestingLevel: number);
     export(): void;
     protected writeParagraphEndMark(): void;
     protected exportRow(row: TableRow, rowIndex: number): void;

package/lib/common/formats/rtf/export/exporters/table/states/rtf-nested-table-exporter-state.js

@@ -1,8 +1,8 @@
 import { RtfExportSR } from '../../../../translation-table/rtf-export-sr';
 import { RtfTableExporterStateBase } from './rtf-table-exporter-state-base';
 export class RtfNestedTableExporterState extends RtfTableExporterStateBase {
-    constructor(rtfExporter, table, nestingLevel) {
-        super(rtfExporter, table, nestingLevel);
+    constructor(rtfExporter, table, grid, nestingLevel) {
+        super(rtfExporter, table, grid, nestingLevel);
     }
     export() {
         super.exportBase();

package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state-base.d.ts

@@ -6,6 +6,7 @@ import { TableCell } from '../../../../../../model/tables/main-structures/table-
 import { TableRow } from '../../../../../../model/tables/main-structures/table-row';
 import { ConditionalTableStyleFormatting } from '../../../../../../model/tables/secondary-structures/table-base-structures';
 import { TableWidthUnit } from '../../../../../../model/tables/secondary-structures/table-units';
+import { Grid } from '../../../../../../layout-formatter/table/grid-engine/grid';
 import { RtfBuilder } from '../../../rtf-builder';
 import { RtfContentExporter } from '../../rtf-content-exporter';
 import { RtfTableCellPropertiesExporter } from '../rtf-table-cell-properties-exporter';
@@ -17,10 +18,11 @@ export declare abstract class RtfTableExporterStateBase {
     tableStyleIndex: number;
     rowLeftOffset: number;
     readonly table: Table;
+    readonly grid: Grid;
     readonly tableRowPropertiesExporter: RtfTableRowPropertiesExporter;
     readonly tableCellPropertiesExporter: RtfTableCellPropertiesExporter;
     readonly tablePropertiesExporter: RtfTablePropertiesExporter;
-    protected constructor(rtfExporter: RtfContentExporter, table: Table, nestingLevel: number);
+    protected constructor(rtfExporter: RtfContentExporter, table: Table, grid: Grid, nestingLevel: number);
     protected get rtfBuilder(): RtfBuilder;
     protected get documentModel(): DocumentModel;
     protected get subDocument(): SubDocument;
@@ -36,7 +38,7 @@ export declare abstract class RtfTableExporterStateBase {
     protected abstract exportRow(row: TableRow, rowIndex: number): void;
     protected abstract writeParagraphEndMark(): void;
     exportRowProperties(row: TableRow, rowIndex: number): void;
-    getCellWidth(virtualColumnIndex: number): number;
+    getCellWidth(leftSideIndex: number, columnSpan: number): number;
     calculateRowLeft(row: TableRow, indent: TableWidthUnit): number;
     protected calculateRowLeftOffset(row: TableRow): number;
     getActualWidth(unit: TableWidthUnit): number;

package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state-base.js

@@ -4,6 +4,7 @@ import { TableCellMergingState, TableLookTypes } from '../../../../../../model/t
 import { TableWidthUnitType } from '../../../../../../model/tables/secondary-structures/table-units';
 import { Errors } from '@devexpress/utils/lib/errors';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
+import { UnitConverter } from '@devexpress/utils/lib/class/unit-converter';
 import { RtfExportSR } from '../../../../translation-table/rtf-export-sr';
 import { RtfTableCellPropertiesMerger } from '../../../../utils/mergers/rtf-table-cell-properties-merger';
 import { RtfTablePropertiesMerger } from '../../../../utils/mergers/rtf-table-properties-merger';
@@ -14,10 +15,11 @@ import { RtfTableExporter } from '../rtf-table-exporter';
 import { RtfTablePropertiesExporter } from '../rtf-table-properties-exporter';
 import { RtfTableRowPropertiesExporter } from '../rtf-table-row-properties-exporter';
 export class RtfTableExporterStateBase {
-    constructor(rtfExporter, table, nestingLevel) {
+    constructor(rtfExporter, table, grid, nestingLevel) {
         this.rtfExporter = rtfExporter;
         this._nestingLevel = nestingLevel;
         this.table = table;
+        this.grid = grid;
         this.tableRowPropertiesExporter = new RtfTableRowPropertiesExporter(rtfExporter.documentModel, rtfExporter.rtfExportHelper, rtfExporter.rtfBuilder);
         this.tableCellPropertiesExporter = new RtfTableCellPropertiesExporter(rtfExporter.documentModel, rtfExporter.rtfExportHelper, rtfExporter.rtfBuilder);
         this.tablePropertiesExporter = new RtfTablePropertiesExporter(rtfExporter.documentModel, rtfExporter.rtfExportHelper, rtfExporter.rtfBuilder);
@@ -92,7 +94,7 @@ export class RtfTableExporterStateBase {
         while (parentCell !== nestedTable.parentCell) {
             nestedTable = nestedTable.parentCell.parentRow.parentTable;
         }
-        return RtfTableExporter.exportNestedTable(this.rtfExporter, nestedTable, this.nestingLevel + 1);
+        return RtfTableExporter.exportNestedTable(this.rtfExporter, nestedTable, this.grid, this.nestingLevel + 1);
     }
     exportRowProperties(row, rowIndex) {
         const rowLeft = this.calculateRowLeft(row, row.parentTable.getActualTableIndent(this.documentModel.defaultTableProperties));
@@ -100,20 +102,25 @@ export class RtfTableExporterStateBase {
         let cellRightVirtualColInd = row.gridBefore;
         for (const cell of row.cells) {
             cellRightVirtualColInd += cell.columnSpan;
-            const cellRight = rowLeft + this.getCellWidth(cellRightVirtualColInd);
+            const cellWidth = this.getCellWidth(row.gridBefore, cellRightVirtualColInd);
+            const cellRight = UnitConverter.pixelsToTwips(rowLeft + cellWidth);
             this.exportCellProperties(cell, cellRight);
         }
     }
-    getCellWidth(virtualColumnIndex) {
-        if (virtualColumnIndex < 0)
+    getCellWidth(leftSideIndex, columnSpan) {
+        if (leftSideIndex < 0 || columnSpan < 0)
             throw new Error(Errors.InternalException);
-        const minVirtualColumnWidth = 10;
-        return virtualColumnIndex * minVirtualColumnWidth;
+        let result = 0;
+        for (let i = 0; i < columnSpan; i++)
+            result += Math.max(this.grid.columns.width[i + leftSideIndex], 1);
+        return result;
     }
     calculateRowLeft(row, indent) {
-        const widthBefore = row.gridBefore > 0 ? this.getCellWidth(row.gridBefore) : 0;
+        var _a;
+        const widthBefore = row.gridBefore > 0 ? this.getCellWidth(0, row.gridBefore) : 0;
         const offset = this.getActualWidth(indent) + widthBefore;
-        return offset - (this.rowLeftOffset != null ? this.rowLeftOffset : this.calculateRowLeftOffset(row));
+        const rowLeftOffset = (_a = this.rowLeftOffset) !== null && _a !== void 0 ? _a : this.calculateRowLeftOffset(row);
+        return offset - rowLeftOffset;
     }
     calculateRowLeftOffset(row) {
         const borderWidth = row.cells[0].properties.borders.left.width;

package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state.d.ts

@@ -1,9 +1,10 @@
+import { Grid } from '../../../../../../layout-formatter/table/grid-engine/grid';
 import { Table } from '../../../../../../model/tables/main-structures/table';
 import { TableRow } from '../../../../../../model/tables/main-structures/table-row';
 import { RtfContentExporter } from '../../rtf-content-exporter';
 import { RtfTableExporterStateBase } from './rtf-table-exporter-state-base';
 export declare class RtfTableExporterState extends RtfTableExporterStateBase {
-    constructor(rtfExporter: RtfContentExporter, table: Table);
+    constructor(rtfExporter: RtfContentExporter, table: Table, grid: Grid);
     export(): void;
     protected writeParagraphEndMark(): void;
     protected exportRow(row: TableRow, rowIndex: number): void;

package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state.js

@@ -1,8 +1,8 @@
 import { RtfExportSR } from '../../../../translation-table/rtf-export-sr';
 import { RtfTableExporterStateBase } from './rtf-table-exporter-state-base';
 export class RtfTableExporterState extends RtfTableExporterStateBase {
-    constructor(rtfExporter, table) {
-        super(rtfExporter, table, 1);
+    constructor(rtfExporter, table, grid) {
+        super(rtfExporter, table, grid, 1);
     }
     export() {
         super.exportBase();

package/lib/common/formats/rtf/import/table/normalization/apply-use-values.d.ts

@@ -0,0 +1,6 @@
+import { TableCellProperties } from '../../../../../model/tables/properties/table-cell-properties';
+import { TableProperties } from '../../../../../model/tables/properties/table-properties';
+import { TableRowProperties } from '../../../../../model/tables/properties/table-row-properties';
+export declare function applyTablePropertiesUseValues(props: TableProperties, styleProps: TableProperties): void;
+export declare function applyTableRowPropertiesUseValues(props: TableRowProperties, styleProps: TableRowProperties): void;
+export declare function applyTableCellPropertiesUseValues(props: TableCellProperties, styleProps: TableCellProperties): void;

package/lib/common/formats/rtf/import/table/normalization/apply-use-values.js

@@ -0,0 +1,90 @@
+import { TableCellPropertiesMask } from '../../../../../model/tables/properties/table-cell-properties';
+import { TablePropertiesMask } from '../../../../../model/tables/properties/table-properties';
+import { TableRowPropertiesMask } from '../../../../../model/tables/properties/table-row-properties';
+export function applyTablePropertiesUseValues(props, styleProps) {
+    props.mask = TablePropertiesMask.UseNone;
+    if (!props.borders.left.equals(styleProps.borders.left))
+        props.setUseValue(TablePropertiesMask.UseLeftBorder, true);
+    if (!props.borders.top.equals(styleProps.borders.top))
+        props.setUseValue(TablePropertiesMask.UseTopBorder, true);
+    if (!props.borders.right.equals(styleProps.borders.right))
+        props.setUseValue(TablePropertiesMask.UseRightBorder, true);
+    if (!props.borders.bottom.equals(styleProps.borders.bottom))
+        props.setUseValue(TablePropertiesMask.UseBottomBorder, true);
+    if (!props.borders.insideHorizontal.equals(styleProps.borders.insideHorizontal))
+        props.setUseValue(TablePropertiesMask.UseInsideHorizontalBorder, true);
+    if (!props.borders.insideVertical.equals(styleProps.borders.insideVertical))
+        props.setUseValue(TablePropertiesMask.UseInsideVerticalBorder, true);
+    if (!props.cellMargins.left.equals(styleProps.cellMargins.left))
+        props.setUseValue(TablePropertiesMask.UseLeftMargin, true);
+    if (!props.cellMargins.top.equals(styleProps.cellMargins.top))
+        props.setUseValue(TablePropertiesMask.UseTopMargin, true);
+    if (!props.cellMargins.right.equals(styleProps.cellMargins.right))
+        props.setUseValue(TablePropertiesMask.UseRightMargin, true);
+    if (!props.cellMargins.bottom.equals(styleProps.cellMargins.bottom))
+        props.setUseValue(TablePropertiesMask.UseBottomMargin, true);
+    if (!props.cellSpacing.equals(styleProps.cellSpacing))
+        props.setUseValue(TablePropertiesMask.UseCellSpacing, true);
+    if (!props.indent.equals(styleProps.indent))
+        props.setUseValue(TablePropertiesMask.UseTableIndent, true);
+    if (props.tableStyleColumnBandSize != styleProps.tableStyleColumnBandSize)
+        props.setUseValue(TablePropertiesMask.UseTableStyleColBandSize, true);
+    if (props.tableStyleRowBandSize != styleProps.tableStyleRowBandSize)
+        props.setUseValue(TablePropertiesMask.UseTableStyleRowBandSize, true);
+    if (props.avoidDoubleBorders != styleProps.avoidDoubleBorders)
+        props.setUseValue(TablePropertiesMask.UseAvoidDoubleBorders, true);
+    if (props.layoutType != styleProps.layoutType)
+        props.setUseValue(TablePropertiesMask.UseTableLayout, true);
+    if (!props.shadingInfo.equals(styleProps.shadingInfo))
+        props.setUseValue(TablePropertiesMask.UseShadingInfoIndex, true);
+    if (props.tableRowAlignment != styleProps.tableRowAlignment)
+        props.setUseValue(TablePropertiesMask.UseTableAlignment, true);
+    if (props.isTableOverlap != styleProps.isTableOverlap)
+        props.setUseValue(TablePropertiesMask.UseIsTableOverlap, true);
+}
+export function applyTableRowPropertiesUseValues(props, styleProps) {
+    props.mask = TableRowPropertiesMask.UseNone;
+    if (!props.cellSpacing.equals(styleProps.cellSpacing))
+        props.setUseValue(TableRowPropertiesMask.UseCellSpacing, true);
+    if (props.cantSplit != styleProps.cantSplit)
+        props.setUseValue(TableRowPropertiesMask.UseCantSplit, true);
+    if (props.hideCellMark != styleProps.hideCellMark)
+        props.setUseValue(TableRowPropertiesMask.UseHideCellMark, true);
+    if (props.tableRowAlignment != styleProps.tableRowAlignment)
+        props.setUseValue(TableRowPropertiesMask.UseTableRowAlignment, true);
+    if (props.header != styleProps.header)
+        props.setUseValue(TableRowPropertiesMask.UseHeader, true);
+    if (props.divId != styleProps.divId)
+        props.setUseValue(TableRowPropertiesMask.UseDivId, true);
+}
+export function applyTableCellPropertiesUseValues(props, styleProps) {
+    props.mask = TableCellPropertiesMask.UseNone;
+    if (!props.cellMargins.left.equals(styleProps.cellMargins.left))
+        props.setUseValue(TableCellPropertiesMask.UseLeftMargin, true);
+    if (!props.cellMargins.top.equals(styleProps.cellMargins.top))
+        props.setUseValue(TableCellPropertiesMask.UseTopMargin, true);
+    if (!props.cellMargins.bottom.equals(styleProps.cellMargins.bottom))
+        props.setUseValue(TableCellPropertiesMask.UseBottomMargin, true);
+    if (!props.cellMargins.right.equals(styleProps.cellMargins.right))
+        props.setUseValue(TableCellPropertiesMask.UseRightMargin, true);
+    if (!props.borders.left.equals(styleProps.borders.left))
+        props.setUseValue(TableCellPropertiesMask.UseLeftBorder, true);
+    if (!props.borders.top.equals(styleProps.borders.top))
+        props.setUseValue(TableCellPropertiesMask.UseTopBorder, true);
+    if (!props.borders.bottom.equals(styleProps.borders.bottom))
+        props.setUseValue(TableCellPropertiesMask.UseBottomBorder, true);
+    if (!props.borders.right.equals(styleProps.borders.right))
+        props.setUseValue(TableCellPropertiesMask.UseRightBorder, true);
+    if (props.hideCellMark != styleProps.hideCellMark)
+        props.setUseValue(TableCellPropertiesMask.UseHideCellMark, true);
+    if (props.noWrap != styleProps.noWrap)
+        props.setUseValue(TableCellPropertiesMask.UseNoWrap, true);
+    if (props.fitText != styleProps.fitText)
+        props.setUseValue(TableCellPropertiesMask.UseFitText, true);
+    if (props.textDirection != styleProps.textDirection)
+        props.setUseValue(TableCellPropertiesMask.UseTextDirection, true);
+    if (props.verticalAlignment != styleProps.verticalAlignment)
+        props.setUseValue(TableCellPropertiesMask.UseVerticalAlignment, true);
+    if (!props.shadingInfo.equals(styleProps.shadingInfo))
+        props.setUseValue(TableCellPropertiesMask.UseShadingInfoIndex, true);
+}

package/lib/common/formats/rtf/import/table/table-converter.js

@@ -7,6 +7,7 @@ import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { NumberMapUtils } from '@devexpress/utils/lib/utils/map/number';
 import { RtfTableColumnsCalculator } from './rtf-table-columns-calculator';
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
+import { applyTableCellPropertiesUseValues, applyTablePropertiesUseValues, applyTableRowPropertiesUseValues } from './normalization/apply-use-values';
 export class RtfTableConverter {
     constructor(tableReader) {
         this.rtfCellMap = {};
@@ -54,8 +55,9 @@ export class RtfTableConverter {
             tablePreferredWidth.type = TableWidthUnitType.Auto;
             tablePreferredWidth.value = 0;
         }
-        if (!table.properties.coreProperties.getUseValue(TablePropertiesMask.UseRightMargin) &&
-            !table.properties.coreProperties.getUseValue(TablePropertiesMask.UseLeftMargin) && table.properties.useHalfSpace) {
+        const useMargins = table.properties.coreProperties.getUseValue(TablePropertiesMask.UseLeftMargin) &&
+            table.properties.coreProperties.getUseValue(TablePropertiesMask.UseRightMargin);
+        if (!useMargins && table.properties.useHalfSpace) {
             const margin = table.properties.halfSpace;
             table.properties.coreProperties.cellMargins.left.type = TableWidthUnitType.ModelUnits;
             table.properties.coreProperties.cellMargins.left.value = margin;
@@ -99,6 +101,7 @@ export class RtfTableConverter {
         return 0;
     }
     convertTableCore(table, rtfTable) {
+        applyTablePropertiesUseValues(table.properties, table.style.baseConditionalStyle.tableProperties);
         const tableGrid = this.calculateTableGrid(rtfTable);
         const rows = table.rows;
         const tableLayoutType = table.properties.layoutType;
@@ -201,6 +204,7 @@ export class RtfTableConverter {
         return result;
     }
     convertRow(row, rtfRow) {
+        applyTableRowPropertiesUseValues(row.properties, row.parentTable.style.baseConditionalStyle.tableRowProperties);
         const rtfCells = rtfRow.cells;
         for (let i = 0; i < rtfCells.length; i++)
             this.convertCell(row, rtfCells[i]);
@@ -209,6 +213,7 @@ export class RtfTableConverter {
         if (rtfCell.properties.horizontalMerging == TableCellMergingState.Restart)
             this.mergeCells(rtfCell);
         const cell = rtfCell.createCell(row, this.subDocument);
+        applyTableCellPropertiesUseValues(cell.properties, cell.parentRow.parentTable.style.baseConditionalStyle.tableCellProperties);
         row.cells.push(cell);
         this.rtfCellMap[rtfCell.idForParentCellMap] = cell;
     }

package/lib/common/formats/rtf/importer-in-subdocument.d.ts

@@ -1,6 +1,5 @@
 import { FixedInterval } from "@devexpress/utils/lib/intervals/fixed";
-import { RichOptions } from "../../model/options/rich-options";
 import { SubDocument } from "../../model/sub-document";
 import { IProcessor } from "../../processor";
-export declare function getRtfFromSubDocumentPublic(richOptions: RichOptions, subDocument: SubDocument, coreInterval: FixedInterval): string;
+export declare function getRtfFromSubDocumentPublic(processor: IProcessor, subDocument: SubDocument, coreInterval: FixedInterval): string;
 export declare function insertRtfInSubDocumentPublic(processor: IProcessor, subDocument: SubDocument, position: number, rtf: string, callback: (interval: FixedInterval, isRtfValid: boolean) => void): void;

package/lib/common/formats/rtf/importer-in-subdocument.js

@@ -7,10 +7,11 @@ import { RtfDocumentExporterOptions } from "./export/rtf-document-exporter-optio
 import { RtfImporterOptions } from "./import/importer-options";
 import { RtfImporter } from "./import/rtf-importer";
 import { getAfterInsertCallback, getAfterInsertReject } from "../callback-helpers";
-export function getRtfFromSubDocumentPublic(richOptions, subDocument, coreInterval) {
+export function getRtfFromSubDocumentPublic(processor, subDocument, coreInterval) {
     const rangeCopy = RangeCopy.create(new SubDocumentIntervals(subDocument, [coreInterval]));
-    const newModelManager = new ClientModelManager(rangeCopy.model, richOptions, new EmptyBatchUpdatableObject());
-    return new RtfExporter(newModelManager.modelManipulator, new RtfDocumentExporterOptions()).exportAsString();
+    const newModelManager = new ClientModelManager(rangeCopy.model, processor.modelManager.richOptions, new EmptyBatchUpdatableObject());
+    const exportModelOptions = processor.getExportModelOptions({ modelManager: newModelManager });
+    return new RtfExporter(exportModelOptions, new RtfDocumentExporterOptions()).exportAsString();
 }
 export function insertRtfInSubDocumentPublic(processor, subDocument, position, rtf, callback) {
     const options = new RtfImporterOptions(() => { });

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();
         }
@@ -708,6 +708,7 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     startInputIME() {
         this.inputElement.style.position = "absolute";
+        this.inputElement.style.zoom = this.control.viewManager.zoomLevel;
         const lastSelectedIntervalStartPosition = this.control.selection.lastSelectedInterval.start;
         const subDocument = this.control.selection.activeSubDocument;
         const layoutPosition = subDocument.isMain() ?
@@ -721,6 +722,9 @@ export class IFrameInputEditor extends InputEditorBase {
         const propChar = HtmlConverter.getSizeSignificantRules(this.control.inputPosition.getMergedCharacterPropertiesRaw()).join(";");
         this.editableDocument.body.style.cssText = "padding: 0px; margin: 0px; overflow: hidden; color: transparent; " + propChar;
         this.editableDocument.body.style.textIndent = currentTextIndent;
+        if (Browser.Firefox && Browser.Version <= 137) {
+            this.editableDocument.body.style.zoom = this.control.viewManager.zoomLevel;
+        }
         let layoutX = layoutPosition.getLayoutX(this.control.measurer, DocumentLayoutDetailsLevel.Row);
         const layoutPoint = new LayoutPoint(layoutPosition.pageIndex, layoutX, layoutPosition.getLayoutY(DocumentLayoutDetailsLevel.Row));
         const pageElement = this.control.viewManager.cache[layoutPoint.pageIndex].page;

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

@@ -2,6 +2,9 @@ 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 { CanvasSizeInfo } from '../canvas/canvas-size-info';
+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,9 +28,11 @@ export declare class DocumentLayout {
     isFullyFormatted: boolean;
     anchorObjectsPositionInfo: AnchorObjectsPositionInfo;
     pageColor: number;
+    get grids(): Map<Table, Grid>;
     constructor(anchorObjectsPositionInfo: AnchorObjectsPositionInfo);
     setEmptyLayout(pageColor: number): void;
     getLastValidPage(): LayoutPage;
     isPageValid(pageIndex: number): boolean;
     getPageBySubDocumentId(subDocumentId: number): LayoutPage;
+    findPageIndexByOffsetY(offsetY: number, sizeInfo: CanvasSizeInfo): number;
 }

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

@@ -1,5 +1,7 @@
 import { NumberMapUtils } from '@devexpress/utils/lib/utils/map/number';
 import { ColorHelper } from '../model/color/color';
+import { SearchUtils } from '@devexpress/utils/lib/utils/search';
+import { MixedSize } from '../utils/mixed-size';
 export class ModelPositionHolder {
     constructor(pos, posManager) {
         this.pos = posManager.registerPosition(pos);
@@ -37,6 +39,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);
@@ -58,4 +66,9 @@ export class DocumentLayout {
     getPageBySubDocumentId(subDocumentId) {
         return this.pages.find((page) => !!page.mainSubDocumentPageAreas[subDocumentId] || !!page.otherPageAreas[subDocumentId]);
     }
+    findPageIndexByOffsetY(offsetY, sizeInfo) {
+        const getPageOffsetY = (p) => MixedSize.fromLayout(sizeInfo.getPageOffsetY(p)).useScale(sizeInfo.zoomLevel).UISize;
+        const normedInterpolationIndex = SearchUtils.normedInterpolationIndexOf(this.pages, getPageOffsetY, offsetY);
+        return Math.max(0, normedInterpolationIndex);
+    }
 }

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 = [];