devexpress-richedit 24.2.7 → 24.2.8-build-25135-0103

package/index.d.ts

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

package/index.js

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

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

@@ -11,7 +11,6 @@ export declare class SectionExporter extends BaseExporter {
     private exportSectionHeadersFootersCore;
     private exportSectionPropertiesCore;
     private exportSectionPage;
-    private shouldExportSectionPage;
     private exportSectionMargins;
     private exportSectionLineNumbering;
     private exportSectionPageNumbering;

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

@@ -75,21 +75,13 @@ export class SectionExporter extends BaseExporter {
         this.exportSectionGeneralSettings(props);
     }
     exportSectionPage(props) {
-        if (!this.shouldExportSectionPage(props))
-            return;
         this.writer.writeWpStartElement('pgSz');
-        if (props.pageSize.width != SectionExporter.defaultProps.pageSize.width)
-            this.writer.writeWpIntAttr('w', props.pageSize.width);
-        if (props.pageSize.height != SectionExporter.defaultProps.pageSize.height)
-            this.writer.writeWpIntAttr('h', props.pageSize.height);
+        this.writer.writeWpIntAttr('w', props.pageSize.width);
+        this.writer.writeWpIntAttr('h', props.pageSize.height);
         if (props.landscape)
             this.writer.writeWpStringAttr('orient', props.landscape ? 'landscape' : 'portrait');
         this.writer.endElement();
     }
-    shouldExportSectionPage(props) {
-        return !props.pageSize.equals(SectionExporter.defaultProps.pageSize) ||
-            props.landscape != SectionExporter.defaultProps.landscape;
-    }
     exportSectionMargins(props) {
         this.writer.writeWpStartElement('pgMar');
         this.writer.writeWpIntAttr('left', props.marginLeft);

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

@@ -16,7 +16,7 @@ function getExporter(exportModelOptions) {
     const { modelManipulator } = exportModelOptions.modelManager;
     switch (exportModelOptions.documentFormat) {
         case DocumentFormat.OpenXml: return new DocxExporter(exportModelOptions, new DocxExportOptions());
-        case DocumentFormat.Rtf: return new RtfExporter(modelManipulator, new RtfDocumentExporterOptions());
+        case DocumentFormat.Rtf: return new RtfExporter(exportModelOptions, new RtfDocumentExporterOptions());
         case DocumentFormat.PlainText: return new TxtExporter(modelManipulator, new DocumentExporterOptions());
         case DocumentFormat.Html: return new HtmlDocumentExporter(exportModelOptions, new DocumentExporterOptions());
         default:

package/lib/client/model-api/sub-document.js

@@ -211,7 +211,7 @@ export class SubDocumentApi {
     }
     getRtf(interval) {
         const coreInterval = this._checkInterval(interval);
-        return getRtfFromSubDocumentPublic(this._processor.modelManager.richOptions, this._subDocument, coreInterval);
+        return getRtfFromSubDocumentPublic(this._processor, this._subDocument, coreInterval);
     }
     insertContent(position, content, documentFormat, callback) {
         position = ApiParametersChecker.check(position, 1, false, [

package/lib/common/formats/rtf/export/exporter.d.ts

@@ -1,7 +1,6 @@
-import { IDocumentExporter } from '../../i-document-exporter';
+import { IDocumentExporter, IExportModelOptions } from '../../i-document-exporter';
 import { ColorModelInfo } from '../../../model/color/color-model-info';
 import { DocumentModel } from '../../../model/document-model';
-import { ModelManipulator } from '../../../model/manipulators/model-manipulator';
 import { RtfContentExporter } from './exporters/rtf-content-exporter';
 import { RtfExportHelper } from './helpers/rtf-export-helper';
 import { RtfBuilder } from './rtf-builder';
@@ -13,7 +12,7 @@ export declare class RtfExporter implements IDocumentExporter {
     contentExporter: RtfContentExporter;
     private modelManipulator;
     get documentModel(): DocumentModel;
-    constructor(modelManipulator: ModelManipulator, options: RtfDocumentExporterOptions);
+    constructor(exportModelOptions: IExportModelOptions, options: RtfDocumentExporterOptions);
     exportToBlob(callback: (blob: Blob) => void): void;
     exportToBase64(callback: (base64: string) => void): void;
     exportAsString(): string;

package/lib/common/formats/rtf/export/exporter.js

@@ -11,11 +11,11 @@ import { RtfContentExporter } from './exporters/rtf-content-exporter';
 import { RtfExportHelper } from './helpers/rtf-export-helper';
 export class RtfExporter {
     get documentModel() { return this.modelManipulator.model; }
-    constructor(modelManipulator, options) {
-        this.modelManipulator = modelManipulator;
+    constructor(exportModelOptions, options) {
+        this.modelManipulator = exportModelOptions.modelManager.modelManipulator;
         this.options = options;
         this.rtfExportHelper = new RtfExportHelper();
-        this.contentExporter = new RtfContentExporter(this.documentModel, options, this.rtfExportHelper);
+        this.contentExporter = new RtfContentExporter(exportModelOptions, options, this.rtfExportHelper);
         this.rtfBuilder = this.contentExporter.createRtfBuilder();
     }
     exportToBlob(callback) {

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

@@ -8,6 +8,7 @@ import { Section } from '../../../../model/section/section';
 import { SubDocument } from '../../../../model/sub-document';
 import { FooterSubDocumentInfo, HeaderSubDocumentInfo } from '../../../../model/sub-document-infos';
 import { ConditionalTableStyleFormatting } from '../../../../model/tables/secondary-structures/table-base-structures';
+import { IExportModelOptions } from '../../../../formats/i-document-exporter';
 import { RtfExportHelper } from '../helpers/rtf-export-helper';
 import { PieceTableNumberingListCountersManager } from '../piece-table-numbering-list-counters-manager';
 import { RtfBuilder } from '../rtf-builder';
@@ -17,7 +18,7 @@ import { RtfParagraphPropertiesExporter } from './rtf-paragraph-properties-expor
 import { RtfSectionPropertiesExporter } from './rtf-section-properties-exporter';
 export type RunHandler = (run: RunBase, runText: string, absolutePosition: number) => void;
 export declare class RtfContentExporter {
-    documentModel: DocumentModel;
+    exportModelOptions: IExportModelOptions;
     subDocument: SubDocument;
     currentSection: Section;
     static readonly verticalAlignmentTypes: Record<number, string>;
@@ -44,9 +45,10 @@ export declare class RtfContentExporter {
     private bookmarksIterator;
     private permissionsIterator;
     tableIterator: TableIterator;
+    get documentModel(): DocumentModel;
     private startSectionParagraphIndex;
     private shouldFourceUpdateIterators;
-    constructor(documentModel: DocumentModel, options: RtfDocumentExporterOptions, rtfExportHelper: RtfExportHelper);
+    constructor(exportModelOptions: IExportModelOptions, options: RtfDocumentExporterOptions, rtfExportHelper: RtfExportHelper);
     createRtfBuilder(): RtfBuilder;
     export(): void;
     shouldSplitRuns(): boolean;

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/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/layout/main-structures/layout-row.js

@@ -2,7 +2,6 @@ import { Flag } from '@devexpress/utils/lib/class/flag';
 import { UnitConverter } from '@devexpress/utils/lib/class/unit-converter';
 import { Rectangle } from '@devexpress/utils/lib/geometry/rectangle';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
-import { LayoutBoxType } from './layout-boxes/layout-box';
 export var LayoutRowStateFlags;
 (function (LayoutRowStateFlags) {
     LayoutRowStateFlags[LayoutRowStateFlags["NormallyEnd"] = 0] = "NormallyEnd";
@@ -129,7 +128,7 @@ export class LayoutRow extends Rectangle {
         return lastBoxIndexWhatCanStrikeoutAndUnderline;
     }
     containsSpacesOnly() {
-        return this.boxes.length > 0 && ListUtils.allOf(this.boxes, val => val.isWhitespace() || val.getType() === LayoutBoxType.ParagraphMark);
+        return this.boxes.length > 0 && ListUtils.allOf(this.boxes, val => val.isWhitespace());
     }
 }
 export class LayoutRowWithIndex extends LayoutRow {

package/lib/common/layout-formatter/row/size-engine/row-formatting-info.d.ts

@@ -25,7 +25,10 @@ export declare class RowFormattingInfo {
     get currInterval(): RowIntervalInfo;
     indexOfFreeInterval(width: number): number;
     indexOfIntervalContainsPositon(pos: number): number;
-    calculate(): void;
+    calculate(outerHorizontalRowContentBounds?: FixedInterval): void;
+    private calculateFreeIntervals;
+    recalculate(outerHorizontalRowContentBounds?: FixedInterval): void;
+    private findIntervalIndexByPosition;
     canIncrementHeightTo(newHeight: number): boolean;
     findNextYPos(): void;
     findNextYPosWhatHasNeededSpace(requiredWidth: number): void;

package/lib/common/layout-formatter/row/size-engine/row-formatting-info.js

@@ -45,10 +45,10 @@ export class RowFormattingInfo {
         const ind = ListUtils.indexBy(this.intervals, (curr) => curr.start > pos || pos < curr.end, this.currIndex + 1);
         return ind < 0 ? this.intervals.length - 1 : ind;
     }
-    calculate() {
+    calculate(outerHorizontalRowContentBounds) {
         this.setIntersectObjects();
         this.busyIntervals = IntervalAlgorithms.getMergedIntervals(ListUtils.map(this.intersectsObjects, (objBnds) => new FixedInterval(objBnds.x, objBnds.width)), true);
-        const freeIntervals = IntervalAlgorithms.reflectIntervals(this.busyIntervals, this.outerHorizontalRowContentBounds);
+        const freeIntervals = this.calculateFreeIntervals(this.busyIntervals, outerHorizontalRowContentBounds !== null && outerHorizontalRowContentBounds !== void 0 ? outerHorizontalRowContentBounds : this.outerHorizontalRowContentBounds);
         if (freeIntervals.length) {
             this.intervals = ListUtils.map(freeIntervals, (curr) => new RowIntervalInfo(curr.start, curr.length));
             return;
@@ -56,6 +56,40 @@ export class RowFormattingInfo {
         this.resetMinY(ListUtils.min);
         Log.print(LogSource.RowFormatter, "RowFormattingInfo.calculate ", `minY:${this.minY}, height:${this.height}, currIndex: ${this.currIndex} intervals:\n${Log.join("\n", ListUtils.map(this.intervals, (curr) => LogObjToStr.fixedInterval(curr)))}`);
     }
+    calculateFreeIntervals(busyIntervals, outerHorizontalRowContentBounds) {
+        const intervals = ListUtils.reducedMap(busyIntervals, val => IntervalAlgorithms.getIntersectionNonNullLength(val, outerHorizontalRowContentBounds));
+        if (!intervals.length)
+            return [outerHorizontalRowContentBounds.clone()];
+        const lastIntervalEnd = ListUtils.last(intervals).end;
+        const result = ListUtils.reducedMap(intervals, (curr, i) => FixedInterval.fromPositions(busyIntervals[i - 1].end, curr.start), 1);
+        if (outerHorizontalRowContentBounds.start < busyIntervals[0].start)
+            result.unshift(FixedInterval.fromPositions(outerHorizontalRowContentBounds.start, busyIntervals[0].start));
+        if (outerHorizontalRowContentBounds.end > lastIntervalEnd)
+            result.push(FixedInterval.fromPositions(lastIntervalEnd, outerHorizontalRowContentBounds.end));
+        return result;
+    }
+    recalculate(outerHorizontalRowContentBounds) {
+        const currInterval = this.currInterval;
+        this.calculate(outerHorizontalRowContentBounds);
+        const pos = currInterval.start + currInterval.busyWidth;
+        const index = this.findIntervalIndexByPosition(pos);
+        const interval = this.intervals[index];
+        if (interval && interval.start < pos) {
+            const avaliableWidth = interval.length - (pos - interval.start);
+            interval.avaliableWidth = avaliableWidth;
+        }
+        this.currIndex = index;
+    }
+    findIntervalIndexByPosition(position) {
+        let index = 0;
+        while (index < this.intervals.length) {
+            const interval = this.intervals[index];
+            if (interval.start <= position && position < interval.end || position < interval.start)
+                break;
+            index++;
+        }
+        return index;
+    }
     canIncrementHeightTo(newHeight) {
         const contentBounds = ListUtils.map(this.intervals, (c) => new Rectangle(c.start, this.minY, c.busyWidth, newHeight));
         const intersectedObjects = this.calcIntersectObjects(newHeight);

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

@@ -39,7 +39,7 @@ export class RowTabInfo {
             const tab = this.tabPositions[ind];
             const oldTabPos = tab ? tab.position : Number.MAX_VALUE;
             if (oldTabPos != pos)
-                this.tabPositions.splice(pos > oldTabPos ? ind + 1 : ind, 0, new TabInfo(pos, TabAlign.Left, TabLeaderType.None, false, false));
+                this.tabPositions.splice(pos > oldTabPos ? ind + 1 : ind, 0, new TabInfo(pos, TabAlign.Left, TabLeaderType.None, false, false, true));
         }
         for (let pos of this.tabPositions)
             pos.position += this.paragraphHorizontalBoundsStart;
@@ -85,9 +85,10 @@ 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 && tabPosition !== null) {
-                    this.currInterval.avaliableWidth = Number.MAX_SAFE_INTEGER - this.currInterval.busyWidth;
-                    this.currInterval.length = Number.MAX_SAFE_INTEGER;
+                if (this.rowFormatter.manager.model.compatibilitySettings.compatibilityMode < CompatibilityMode.Word2013 && tabPosition && !tabPosition.isParagraphIndent) {
+                    const interval = this.rowFormatter.rowSizesManager.rowFormattingInfo.outerHorizontalRowContentBounds;
+                    interval.length = Number.MAX_SAFE_INTEGER - interval.start;
+                    this.rowFormatter.rowSizesManager.rowFormattingInfo.recalculate(interval);
                     this.row.width = Number.MAX_SAFE_INTEGER;
                     this.row.flags.set(LayoutRowStateFlags.InfinityWidth, true);
                     return this.addTabBox();

package/lib/common/layout-formatter/table/info/table-info.d.ts

@@ -53,7 +53,6 @@ export declare class TableInfo {
     constructor(rowFormatter: RowFormatter, table: Table, tableMaxWidth: number, xPosition: number, yOffset: number, pageIndexFromWhichTableWasMoved: number | null);
     static checkIsTableCannotBePlacedOnCurrentPage(rowFormatter: RowFormatter, table: Table, yOffset: number, maxWidth: number): boolean;
     private init;
-    private getShiftHorizontalPosition;
     private static getEstimatedTableWidth;
     private static getRelationByColumnY;
     private static getRelationByColumnX;

package/lib/common/layout-formatter/table/info/table-info.js

@@ -8,7 +8,7 @@ import { LayoutTableColumnInfo, LayoutTableInfo } from '../../../layout/table/la
 import { TablePosition, TablePositionIndexes } from '../../../model/tables/main-structures/table';
 import { TableCellPropertiesMergerMarginLeft, TableCellPropertiesMergerMarginRight } from '../../../model/tables/properties-mergers/table-cell-properties-merger';
 import { TablePropertiesMergerShadingInfo } from '../../../model/tables/properties-mergers/table-properties-merger';
-import { ConditionalTableStyleFormatting, TableLayoutType, TableRowAlignment } from '../../../model/tables/secondary-structures/table-base-structures';
+import { ConditionalTableStyleFormatting, TableLayoutType } from '../../../model/tables/secondary-structures/table-base-structures';
 import { TableWidthUnitType } from '../../../model/tables/secondary-structures/table-units';
 import { BorderHelper } from '../borders/border-helper';
 import { createGrid } from '../grid-engine/creator';
@@ -79,25 +79,9 @@ export class TableInfo {
             tableIndent.value = 0;
         }
         const tableIndentInPixels = tableIndent.asNumberNoPercentType(UnitConverter.twipsToPixels);
-        this.xPositionStart = xPosition + tableIndentInPixels + (diff.xDiff ? diff.xDiff : -firstCellLeftMargin) +
-            this.getShiftHorizontalPosition(xPosition);
+        this.xPositionStart = xPosition + tableIndentInPixels + (diff.xDiff ? diff.xDiff : -firstCellLeftMargin);
         this.yPositionStart = yOffset + diff.yDiff;
     }
-    getShiftHorizontalPosition(xPosition) {
-        const freeSpaceFromTable = this.columnWidth - this.grid.commonWidth;
-        if (freeSpaceFromTable >= 0)
-            return 0;
-        const tableAlignment = this.table.getActualTableAlignment();
-        if (tableAlignment == TableRowAlignment.Center) {
-            let result = freeSpaceFromTable / 2 - xPosition;
-            if (result < 0 && this.isSimpleView)
-                result = 0;
-            return result;
-        }
-        else if (tableAlignment == TableRowAlignment.Right)
-            return freeSpaceFromTable - xPosition;
-        return 0;
-    }
     static getEstimatedTableWidth(table, maxWidth) {
         const preferredWidth = table.preferredWidth;
         const minWidth = 3 * table.rows[0].getTotalCellsInRowConsiderGrid();

package/lib/common/layout-formatter/table/size-compressor.js

@@ -11,6 +11,12 @@ export class LayoutTableSizeCompressor {
             LayoutTableSizeCompressor.cellCompress(cell, cell.createRectangle());
     }
     static tableCompress(tableInfo, boundsRelativeColumn) {
+        const intersection = Rectangle.getIntersection(tableInfo, boundsRelativeColumn);
+        const headOffset = intersection.x - tableInfo.x;
+        if (headOffset > 0) {
+            tableInfo.verticalBorders.forEach(b => b.xPos -= headOffset);
+            tableInfo.verticalCursorBorders.forEach(b => b.xPos -= headOffset);
+        }
         LayoutTableSizeCompressor.compress(tableInfo, boundsRelativeColumn, true, false);
         const boundsRelativeTable = tableInfo.clone().moveRectangle(-tableInfo.x, -tableInfo.y);
         for (let row of tableInfo.tableRows)
@@ -79,8 +85,9 @@ export class LayoutTableSizeCompressor {
         }
         border.length = Math.min(border.yPos + border.length, bounds.bottom) - border.yPos;
         if (border.xPos < bounds.x)
-            return true;
-        border.xPos = bounds.right;
+            border.xPos = bounds.x;
+        else
+            border.xPos = bounds.right;
         border.borderInfo.width = 0;
         return false;
     }

package/lib/common/layout-formatter/table/table-alignment-applier.js

@@ -33,8 +33,6 @@ export class TableAlignmentApplier {
                 offset = 0;
                 break;
         }
-        if (offset <= 0)
-            return;
         TableAlignmentApplier.moveAllTable(currTableColumnInfo, (rect) => rect.x += offset);
     }
     static applyCellsVerticalAlignment(defaultTableCellProps, grid, currTableColumnInfo, rowInfo) {

package/lib/common/model/paragraph/paragraph-style.d.ts

@@ -48,7 +48,8 @@ export declare class TabInfo implements IEquatable<TabInfo>, ICloneable<TabInfo>
     position: number;
     isDefault: boolean;
     deleted: boolean;
-    constructor(position: number, alignment: TabAlign, leader: TabLeaderType, deleted: boolean, isDefault: boolean);
+    readonly isParagraphIndent: boolean;
+    constructor(position: number, alignment: TabAlign, leader: TabLeaderType, deleted: boolean, isDefault: boolean, isParagraphIndent?: boolean);
     clone(): TabInfo;
     equals(obj: TabInfo): boolean;
 }

package/lib/common/model/paragraph/paragraph-style.js

@@ -107,15 +107,16 @@ export class TabProperties {
     }
 }
 export class TabInfo {
-    constructor(position, alignment, leader, deleted, isDefault) {
+    constructor(position, alignment, leader, deleted, isDefault, isParagraphIndent = false) {
         this.position = position;
         this.alignment = alignment;
         this.leader = leader;
         this.isDefault = isDefault;
         this.deleted = deleted;
+        this.isParagraphIndent = isParagraphIndent;
     }
     clone() {
-        return new TabInfo(this.position, this.alignment, this.leader, this.deleted, this.isDefault);
+        return new TabInfo(this.position, this.alignment, this.leader, this.deleted, this.isDefault, this.isParagraphIndent);
     }
     equals(obj) {
         if (!obj)
@@ -124,6 +125,7 @@ export class TabInfo {
             this.leader == obj.leader &&
             this.position == obj.position &&
             this.deleted == obj.deleted &&
-            this.isDefault == obj.isDefault;
+            this.isDefault == obj.isDefault &&
+            this.isParagraphIndent == obj.isParagraphIndent;
     }
 }