devexpress-richedit 24.1.6-build-24232-0102 → 24.2.1-alpha-24260-0102

package/lib/common/formats/rtf/import/importers/paragraph-importer.js

@@ -15,15 +15,15 @@ class RtfParagraphImporterState {
     }
 }
 export class RtfParagraphImporter extends RtfBaseImporter {
+    get paragraph() { return this.data.positionStates.last.paragraph; }
+    set paragraph(value) { this.data.positionStates.last.paragraph = value; }
+    get paragraphFormatting() { return this.states.last.paragraphFormatting; }
+    set paragraphFormatting(value) { this.states.last.paragraphFormatting = value; }
     constructor(data) {
         super(data);
         this.states = new Stack();
         this.states.push(new RtfParagraphImporterState(new RtfParagraphProperties()));
     }
-    get paragraph() { return this.data.positionStates.last.paragraph; }
-    set paragraph(value) { this.data.positionStates.last.paragraph = value; }
-    get paragraphFormatting() { return this.states.last.paragraphFormatting; }
-    set paragraphFormatting(value) { this.states.last.paragraphFormatting = value; }
     static getOnlyOwnCharacterProperties(source, parentStyle) {
         const parentParagraphPropertiesMerger = new ParagraphPropertiesMerger();
         parentParagraphPropertiesMerger.mergeParagraphStyle(parentStyle);

package/lib/common/formats/rtf/import/importers/range-permission-importer.js

@@ -4,12 +4,12 @@ import { StringMapUtils } from '@devexpress/utils/lib/utils/map/string';
 import { RtfRevisionAuthors } from '../model/rtf-revision-authors';
 import { RtfBaseImporter } from './importer-base';
 export class RtfRangePermissionImporter extends RtfBaseImporter {
+    get rangePermissions() { return this.data.positionStates.last.rangePermissions; }
     constructor(data) {
         super(data);
         this.revisionAuthors = new RtfRevisionAuthors();
         this.userNames = [];
     }
-    get rangePermissions() { return this.data.positionStates.last.rangePermissions; }
     insertRangePermissions() {
         StringMapUtils.forEach(this.data.importers.rangePermission.rangePermissions, (rangePermission, _name) => {
             if (rangePermission.validate(this.subDocument))

package/lib/common/formats/rtf/import/importers/section-importer.js

@@ -9,16 +9,16 @@ import { SectionPageHeaderDestination } from '../destination/sub-document/sectio
 import { RtfSectionProperties } from '../model/section/rtf-section-properties';
 import { RtfBaseImporter } from './importer-base';
 export class RtfSectionImporter extends RtfBaseImporter {
-    constructor(data) {
-        super(data);
-        this.defaultSectionProperties = new RtfSectionProperties();
-    }
     get states() { return this.data.positionStates.last.sectionProperties; }
     get currentProperties() {
         if (!this.states.count)
             this.states.push(new RtfSectionProperties());
         return this.states.last;
     }
+    constructor(data) {
+        super(data);
+        this.defaultSectionProperties = new RtfSectionProperties();
+    }
     insertSection() {
         const paragraphFormatting = this.data.importers.paragraph.paragraphFormatting;
         paragraphFormatting.coreProperties.setValue(ParagraphPropertyDescriptor.lineSpacing, paragraphFormatting.calcLineSpacing());

package/lib/common/formats/rtf/import/importers/styles/paragraph-style-importer.js

@@ -5,10 +5,6 @@ import { ParagraphStyle, TabProperties } from '../../../../../model/paragraph/pa
 import { RtfBaseStyleImporter } from './base-style-importer';
 import { StylesManager } from '../../../../../model/styles-manager';
 export class RtfParagraphStyleImporter extends RtfBaseStyleImporter {
-    constructor(data) {
-        super(data, false);
-        this.paragraphTableStyles = {};
-    }
     addStyle(style) {
         const result = this.documentModel.stylesManager.addParagraphStyle(style);
         result.localizedName = StylesManager.getPresetParagraphStyleLocalizedName(style.styleName);
@@ -18,6 +14,10 @@ export class RtfParagraphStyleImporter extends RtfBaseStyleImporter {
         this.rtfStyleIndex = Math.max(0, this.rtfStyleIndex);
         this.rtfParentStyleIndex = Math.max(0, this.rtfParentStyleIndex);
     }
+    constructor(data) {
+        super(data, false);
+        this.paragraphTableStyles = {};
+    }
     get styleCollection() { return this.data.documentModel.paragraphStyles; }
     ;
     createEmpty() {

package/lib/common/formats/rtf/import/model/numbering-lists/rtf-old-list-level-info.js

@@ -2,16 +2,6 @@ import { MaskedCharacterProperties } from '../../../../../model/character/charac
 import { FontInfo } from '../../../../../model/fonts/font-info';
 import { ListLevelProperties } from '../../../../../model/numbering-lists/list-level-properties';
 export class RtfOldListLevelInfo {
-    constructor() {
-        this.characterProperties = new MaskedCharacterProperties();
-        this.characterProperties.fontInfo = new FontInfo();
-        this.characterProperties.fontSize = 12;
-        this.characterProperties.setAllUse();
-        this.listLevelProperties = new ListLevelProperties();
-        this.textBefore = "";
-        this.textAfter = "";
-        this.indent = 0;
-    }
     clone() {
         const result = new RtfOldListLevelInfo();
         result.copyFrom(this);
@@ -26,4 +16,14 @@ export class RtfOldListLevelInfo {
         this.textAfter = _obj.textAfter;
         this.indent = _obj.indent;
     }
+    constructor() {
+        this.characterProperties = new MaskedCharacterProperties();
+        this.characterProperties.fontInfo = new FontInfo();
+        this.characterProperties.fontSize = 12;
+        this.characterProperties.setAllUse();
+        this.listLevelProperties = new ListLevelProperties();
+        this.textBefore = "";
+        this.textAfter = "";
+        this.indent = 0;
+    }
 }

package/lib/common/formats/rtf/import/rtf-import-data.js

@@ -30,6 +30,19 @@ export class RtfPositionState {
     }
 }
 export class RtfImportData {
+    get destination() { return this._destination; }
+    set destination(newDestination) {
+        if (newDestination.subDocument !== this.destination.subDocument) {
+            this.beforeChangeSubDocument(newDestination.subDocument);
+            this.subDocument = newDestination.subDocument;
+            this.onChangeSubDocument();
+        }
+        this._destination = newDestination;
+    }
+    get savedStatesCount() { return this.savedDestinations.count; }
+    get formattingInfo() {
+        return this.importers.character.characterFormatting.rtfFormattingInfo;
+    }
     constructor(rtfText, importOptions, documentModel, richOptions) {
         this.intervalsToDelete = [];
         this.documentModel = documentModel;
@@ -52,19 +65,6 @@ export class RtfImportData {
         this.positionStates = new Stack();
         this.addEmptyPositionState();
     }
-    get destination() { return this._destination; }
-    set destination(newDestination) {
-        if (newDestination.subDocument !== this.destination.subDocument) {
-            this.beforeChangeSubDocument(newDestination.subDocument);
-            this.subDocument = newDestination.subDocument;
-            this.onChangeSubDocument();
-        }
-        this._destination = newDestination;
-    }
-    get savedStatesCount() { return this.savedDestinations.count; }
-    get formattingInfo() {
-        return this.importers.character.characterFormatting.rtfFormattingInfo;
-    }
     beforeChangeSubDocument(newSubDocument) {
         if (this.positionStates.count == 1)
             return;

package/lib/common/formats/txt/txt-exporter.js

@@ -2,11 +2,11 @@ import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 import { Base64Utils } from '@devexpress/utils/lib/utils/base64';
 import { PlainTextMimeType } from '@devexpress/utils/lib/utils/mime-type';
 export class TxtExporter {
+    get model() { return this.modelManipulator.model; }
     constructor(modelManipulator, options) {
         this.modelManipulator = modelManipulator;
         this.options = options;
     }
-    get model() { return this.modelManipulator.model; }
     exportToBlob(callback) {
         this.getBlob(callback);
     }

package/lib/common/global-event-dispatcher.d.ts

@@ -7,7 +7,7 @@ import { IRichEditControl } from './interfaces/i-rich-edit-core';
 import { ISelectionChangesListener } from './selection/i-selection-changes-listener';
 import { Selection } from './selection/selection';
 import { ContentInsertedSubDocumentChange } from './model/changes/change-base';
-declare type EventAction = () => void;
+type EventAction = () => void;
 declare enum PublicApiEventType {
     None = 0,
     DocumentLoaded = 1,

package/lib/common/interfaces/i-control-owner.d.ts

@@ -37,6 +37,7 @@ export interface IControlOwner {
     raiseSelectionChanged(): any;
     raiseCustomCommandExecuted(command: any, parameter: any): any;
     raiseFloatingObjectMovedObject(args: FloatingObjectMovedArgumentInner): any;
+    raiseHorizontalRulerVisibleChanged(horizontalRulerVisible: boolean): any;
     showPopupMenu(getPoint: (contextMenuBar: ContextMenuBarBase) => Point): any;
     hidePopupMenu(): any;
     isRibbon(element: HTMLElement): boolean;

package/lib/common/layout/main-structures/layout-boxes/layout-anchored-object-box.d.ts

@@ -15,7 +15,7 @@ export declare enum AnchoredObjectLevelType {
     InText = 1,
     BeforeText = 2
 }
-export declare type LayoutAnchoredObjectBoxTypes = LayoutAnchoredPictureBox | LayoutAnchoredTextBox;
+export type LayoutAnchoredObjectBoxTypes = LayoutAnchoredPictureBox | LayoutAnchoredTextBox;
 export declare abstract class LayoutAnchoredObjectBox extends LayoutBox {
     belongsToSubDocId: number;
     rotationInRadians: number;

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

@@ -1,11 +1,11 @@
 import { MeasureInfoNonText } from '../../../measurer/measure-info';
 import { LayoutBox, LayoutBoxType } from './layout-box';
 export class LayoutDashBox extends LayoutBox {
+    get isDashBox() { return true; }
     constructor(characterProperties, colorInfo, text) {
         super(characterProperties, colorInfo);
         this.text = text;
     }
-    get isDashBox() { return true; }
     equals(obj) {
         return super.equals(obj) &&
             this.text == obj.text;

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

@@ -3,6 +3,10 @@ import { CharacterProperties } from '../../../model/character/character-properti
 import { RichUtils } from '../../../model/rich-utils';
 import { LayoutBox, LayoutBoxType, LayoutRenderCharacterProperties } from './layout-box';
 export class LayoutLineBreakBox extends LayoutBox {
+    equals(obj) {
+        return super.equals(obj) &&
+            this.lineBreakSymbol == obj.lineBreakSymbol;
+    }
     constructor(characterProperties, colorInfo) {
         super(characterProperties, colorInfo);
         if (!LayoutLineBreakBox.renderCharacterProperties && characterProperties) {
@@ -15,10 +19,6 @@ export class LayoutLineBreakBox extends LayoutBox {
             LayoutLineBreakBox.renderCharacterProperties.fontInfo.scriptMultiplier = 0.65;
         }
     }
-    equals(obj) {
-        return super.equals(obj) &&
-            this.lineBreakSymbol == obj.lineBreakSymbol;
-    }
     clone() {
         const newObj = new LayoutLineBreakBox(this.characterProperties, this.colorInfo);
         newObj.copyFrom(this);

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

@@ -6,6 +6,16 @@ import { LayoutSpaceBox } from './layout-space-box';
 import { LayoutTabSpaceBoxJustForBoxIterator, TabLeaderType } from './layout-tab-space-box';
 import { LayoutTextBox } from './layout-text-box';
 export class LayoutNumberingListBox extends LayoutBox {
+    getFont(fontInfoCache) {
+        let fontInfo = fontInfoCache.getItemByName('Arial');
+        if (!fontInfo) {
+            fontInfo = fontInfoCache.getItemByName('Times New Roman');
+            if (!fontInfo) {
+                fontInfo = fontInfoCache.getItemByName('Calibri');
+            }
+        }
+        return fontInfo;
+    }
     constructor(characterProperties, colorInfo, text, separatorChar, mergedCharacterPropertiesCache, alignment = ListNumberAlignment.Left, fontInfoCache) {
         super(characterProperties, colorInfo);
         this.textBox = new LayoutTextBox(characterProperties, colorInfo, text);
@@ -38,16 +48,6 @@ export class LayoutNumberingListBox extends LayoutBox {
             }
         }
     }
-    getFont(fontInfoCache) {
-        let fontInfo = fontInfoCache.getItemByName('Arial');
-        if (!fontInfo) {
-            fontInfo = fontInfoCache.getItemByName('Times New Roman');
-            if (!fontInfo) {
-                fontInfo = fontInfoCache.getItemByName('Calibri');
-            }
-        }
-        return fontInfo;
-    }
     equals(obj) {
         return obj &&
             super.equals(obj) &&

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

@@ -2,6 +2,10 @@ import { MeasureInfoText } from '../../../measurer/measure-info';
 import { CharacterProperties } from '../../../model/character/character-properties';
 import { LayoutBox, LayoutBoxType, LayoutRenderCharacterProperties } from './layout-box';
 export class LayoutPageBreakBox extends LayoutBox {
+    equals(obj) {
+        return super.equals(obj) &&
+            this.text == obj.text;
+    }
     constructor(characterProperties, colorInfo) {
         super(characterProperties, colorInfo);
         if (!LayoutPageBreakBox.renderCharacterProperties && characterProperties) {
@@ -14,10 +18,6 @@ export class LayoutPageBreakBox extends LayoutBox {
             LayoutPageBreakBox.renderCharacterProperties.fontInfo.scriptMultiplier = 0.65;
         }
     }
-    equals(obj) {
-        return super.equals(obj) &&
-            this.text == obj.text;
-    }
     clone() {
         const newObj = new LayoutPageBreakBox(this.characterProperties, this.colorInfo);
         newObj.copyFrom(this);

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

@@ -14,6 +14,7 @@ export var LayoutRowStateFlags;
     LayoutRowStateFlags[LayoutRowStateFlags["PageBreakBefore"] = 128] = "PageBreakBefore";
 })(LayoutRowStateFlags || (LayoutRowStateFlags = {}));
 export class LayoutRow extends Rectangle {
+    get hasEffectToPageHeight() { return this.boxes.length != 1 || !this.boxes[0].isSectionBreakBox; }
     constructor(minY = Number.MAX_SAFE_INTEGER) {
         super(0, 0, 0, 0);
         this.boxes = [];
@@ -22,7 +23,6 @@ export class LayoutRow extends Rectangle {
         this.flags = new Flag(LayoutRowStateFlags.NormallyEnd);
         this.initialY = minY;
     }
-    get hasEffectToPageHeight() { return this.boxes.length != 1 || !this.boxes[0].isSectionBreakBox; }
     getEndPosition() {
         return this.columnOffset + this.getLastBoxEndPositionInRow();
     }

package/lib/common/layout/table/table-cell-iterator.js

@@ -19,6 +19,12 @@ export class ParentLinkTableCell {
     }
 }
 export class TableCellIterator {
+    get tableCellInfo() {
+        return this.tableCellInfoInternal;
+    }
+    get isInTable() {
+        return this.layoutRowIndexInCell > -1;
+    }
     constructor(position, layout, measurer) {
         this.tableIndex = -1;
         this.tableRowIndex = -1;
@@ -43,12 +49,6 @@ export class TableCellIterator {
                 }
         }
     }
-    get tableCellInfo() {
-        return this.tableCellInfoInternal;
-    }
-    get isInTable() {
-        return this.layoutRowIndexInCell > -1;
-    }
     readTables(tables, parentCell = null, layountIndex = -1) {
         for (let tableIndex = 0, table; table = tables[tableIndex]; tableIndex++) {
             for (let rowIndex = 0, row; row = table.tableRows[rowIndex]; rowIndex++) {

package/lib/common/layout-engine/hit-test-manager/hit-test-result.d.ts

@@ -3,7 +3,7 @@ import { LayoutPosition } from '../../layout/layout-position';
 import { LayoutAnchoredObjectBox } from '../../layout/main-structures/layout-boxes/layout-anchored-object-box';
 import { SubDocument } from '../../model/sub-document';
 import { HitTestDeviation } from '@devexpress/utils/lib/geometry/rectangle';
-export declare type HitTestResultDeviations = Record<number, HitTestDeviation>;
+export type HitTestResultDeviations = Record<number, HitTestDeviation>;
 export declare class HitTestResult extends LayoutPosition {
     subDocument: SubDocument;
     deviations: HitTestResultDeviations;

package/lib/common/layout-engine/selection/selection-formatter.js

@@ -33,6 +33,7 @@ export var SimpleSelectionLayoutType;
     SimpleSelectionLayoutType[SimpleSelectionLayoutType["RangePermission"] = 2] = "RangePermission";
 })(SimpleSelectionLayoutType || (SimpleSelectionLayoutType = {}));
 export class SelectionFormatter extends BatchUpdatableObject {
+    get highlightRanges() { return this.documentProtectionSettings.highlightRanges; }
     constructor(selection, measurer, layoutSelection, documentProtectionSettings) {
         super();
         this.onSelectionLayoutChanged = new EventDispatcher();
@@ -41,7 +42,6 @@ export class SelectionFormatter extends BatchUpdatableObject {
         this.layoutSelection = layoutSelection;
         this.documentProtectionSettings = documentProtectionSettings;
     }
-    get highlightRanges() { return this.documentProtectionSettings.highlightRanges; }
     modelChanged(change) {
         if (change.type == ModelChangeType.RangePermissionsPropertiesChanged)
             this.onRangePermissionPropertiesChanged();

package/lib/common/layout-formatter/box/generator/box-infos-generator.js

@@ -41,6 +41,9 @@ import { FieldIterator, TableIterator } from './recursive-objects-iterators';
 import { ColorModelInfo } from '../../../model/color/color-model-info';
 import { ColorUtils } from '@devexpress/utils/lib/utils/color';
 export class BoxGenerator {
+    static get MAX_NUM_NEW_BOXES() { return BoxWrapsHolder.AVERAGE_BOXES_ON_PAGE; }
+    ;
+    get colorProvider() { return this.manager.model.colorProvider; }
     constructor(manager, boxesHolder) {
         this.positionFromStartGenerate = -1;
         this.waitForMoreChunks = false;
@@ -61,9 +64,6 @@ export class BoxGenerator {
         this.manager = manager;
         this.boxWrapsHolder = boxesHolder;
     }
-    static get MAX_NUM_NEW_BOXES() { return BoxWrapsHolder.AVERAGE_BOXES_ON_PAGE; }
-    ;
-    get colorProvider() { return this.manager.model.colorProvider; }
     isNotEmptyParagraphOrSectionRunBeforeTable(box) {
         const hasNewWrappers = this.newWrappers && this.newWrappers.length;
         const lastWrapperNotInsideTable = hasNewWrappers && !ListUtils.last(this.newWrappers).info.tablePosition;

package/lib/common/layout-formatter/changes/changes/layout-change-base.js

@@ -6,14 +6,14 @@ export var LayoutChangeType;
     LayoutChangeType[LayoutChangeType["Inserted"] = 3] = "Inserted";
 })(LayoutChangeType || (LayoutChangeType = {}));
 export class LayoutChangeBase {
-    constructor(index, changeType = LayoutChangeType.Updated) {
-        this.index = index;
-        this.changeType = changeType;
-    }
     get layoutIndex() { return this.index; }
     ;
     get canvasIndex() { return this.index; }
     ;
+    constructor(index, changeType = LayoutChangeType.Updated) {
+        this.index = index;
+        this.changeType = changeType;
+    }
     summarizeChanges(_change) {
     }
 }
@@ -38,32 +38,32 @@ export class TableChange extends LayoutChangeBase {
     }
 }
 export class RowChangeSV extends RowChange {
-    constructor(layoutIndex, canvasIndex, changeType) {
-        super(canvasIndex, changeType);
-        this._layoutIndex = layoutIndex;
-    }
     get layoutIndex() { return this._layoutIndex; }
     ;
     get canvasIndex() { return this.index; }
     ;
-}
-export class TableChangeSV extends TableChange {
     constructor(layoutIndex, canvasIndex, changeType) {
         super(canvasIndex, changeType);
         this._layoutIndex = layoutIndex;
     }
+}
+export class TableChangeSV extends TableChange {
     get layoutIndex() { return this._layoutIndex; }
     ;
     get canvasIndex() { return this.index; }
     ;
-}
-export class ParagraphFrameChangeSV extends ParagraphFrameChange {
     constructor(layoutIndex, canvasIndex, changeType) {
         super(canvasIndex, changeType);
         this._layoutIndex = layoutIndex;
     }
+}
+export class ParagraphFrameChangeSV extends ParagraphFrameChange {
     get layoutIndex() { return this._layoutIndex; }
     ;
     get canvasIndex() { return this.index; }
     ;
+    constructor(layoutIndex, canvasIndex, changeType) {
+        super(canvasIndex, changeType);
+        this._layoutIndex = layoutIndex;
+    }
 }

package/lib/common/layout-formatter/invalidator/layout-invalidator.js

@@ -13,12 +13,12 @@ import { LogSource } from '../../rich-utils/debug/logger/base-logger/log-source'
 import { HeaderFooterInvalidatorHelper } from './header-footer-invalidator-helper';
 import { RemoveContentHelper } from './remove-content-helper';
 export class LayoutInvalidator {
-    constructor(manager) {
-        this.manager = manager;
-    }
     get model() { return this.manager.model; }
     get layout() { return this.manager.layout; }
     get mainSubDoc() { return this.model.mainSubDocument; }
+    constructor(manager) {
+        this.manager = manager;
+    }
     onContentInserted(subDocumentId, logPosition, length, restartFromParagraphStart) {
         const subDocument = this.model.subDocuments[subDocumentId];
         const pages = this.layout.pages;

package/lib/common/layout-formatter/managers/formatter-manager.d.ts

@@ -26,7 +26,7 @@ import { RestartManager } from './restart-manager';
 export interface ILayoutFormatterManagerHolder {
     layoutFormatterManager: FormatterManager;
 }
-export declare type BrowserUtils = {
+export type BrowserUtils = {
     MacOSPlatform: boolean;
 };
 export declare class FormatterManager extends BatchUpdatableObject {

package/lib/common/layout-formatter/managers/formatter-manager.js

@@ -18,6 +18,8 @@ import { LayoutInvalidator } from '../invalidator/layout-invalidator';
 import { RestartManager } from './restart-manager';
 import { Browser } from '@devexpress/utils/lib/browser';
 export class FormatterManager extends BatchUpdatableObject {
+    get activeSubDocument() { return this.activeSubDocumentHolder.activeSubDocument; }
+    get isDocumentOpened() { return this._isDocumentOpened; }
     constructor(measurer, innerClientProperties, model, layout, activeSubDocumentHolder, bookmarksSettings, documentProtectionSettings, controlHeightProvider, stringResources, layoutChangesListeners, browserUtils) {
         super();
         this.formatterProcessID = null;
@@ -49,8 +51,6 @@ export class FormatterManager extends BatchUpdatableObject {
         this.anchoredObjectsManager = new AnchoredObjectsManager(this);
         this.browserUtils = browserUtils !== null && browserUtils !== void 0 ? browserUtils : { MacOSPlatform: Browser.MacOSPlatform };
     }
-    get activeSubDocument() { return this.activeSubDocumentHolder.activeSubDocument; }
-    get isDocumentOpened() { return this._isDocumentOpened; }
     dispose() {
         clearTimeout(this.formatterProcessID);
         clearTimeout(this.unhideProcessID);

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

@@ -21,15 +21,15 @@ export var BoxBracketsType;
     BoxBracketsType[BoxBracketsType["Close"] = 2] = "Close";
 })(BoxBracketsType || (BoxBracketsType = {}));
 export class RowFormatterResult {
+    get rowStartPos() {
+        return this.rowFormatter.rowSizesManager.rowStartPos;
+    }
     constructor(rowFormatter, minY) {
         this.rowFormatter = rowFormatter;
         this.newAnchoredObjects = [];
         this.row = new LayoutRow(minY);
         this.startRowFormatting(true);
     }
-    get rowStartPos() {
-        return this.rowFormatter.rowSizesManager.rowStartPos;
-    }
     startRowFormatting(deleteAnchoredObjects) {
         this.flags = new Flag(RowFormatterResultFlag.None);
         this.row.boxes = [];

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

@@ -22,6 +22,8 @@ export class RowIntervalInfo extends FixedInterval {
     }
 }
 export class RowFormattingInfo {
+    get isFloatingIntersectRow() { return !!this.intersectsObjects.length; }
+    get lastNonEmptyInterval() { return this.intervals[this.lastNonEmptyIntervalIndex]; }
     constructor(minY, height, outerHorizontalRowContentBounds, boundsOfAnchoredOblectsOnThisColumn, tableCell) {
         this.intervals = [];
         this.busyIntervals = [];
@@ -33,8 +35,6 @@ export class RowFormattingInfo {
         this.tableCell = tableCell;
         this.lastNonEmptyIntervalIndex = 0;
     }
-    get isFloatingIntersectRow() { return !!this.intersectsObjects.length; }
-    get lastNonEmptyInterval() { return this.intervals[this.lastNonEmptyIntervalIndex]; }
     get currInterval() {
         return this.intervals[this.currIndex];
     }

package/lib/common/layout-formatter/row/size-engine/row-height-calculator.js

@@ -5,6 +5,9 @@ import { ParagraphLineSpacingType } from '../../../model/paragraph/paragraph-pro
 import { LineSpacingCalculator } from '../utils/line-spacing-calculator';
 import { RowHeightState } from './row-height-state';
 export class RowHeightCalculator {
+    get row() {
+        return this.rowFormatter.row;
+    }
     constructor(rowFormatter, rowSpacingBeforeApplier) {
         this.rowFormatter = rowFormatter;
         this.rowSpacingBeforeApplier = rowSpacingBeforeApplier;
@@ -15,9 +18,6 @@ export class RowHeightCalculator {
         this.currState.spacingBefore = 0;
         this.applyState(this.getState(this.rowFormatter.currBox));
     }
-    get row() {
-        return this.rowFormatter.row;
-    }
     getState(box) {
         let info;
         switch (box.getType()) {

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

@@ -16,6 +16,14 @@ import { CompatibilityMode } from '../../model/document-model';
 import { IntervalAlgorithms } from '@devexpress/utils/lib/intervals/algorithms';
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 export class RowTabInfo {
+    get row() {
+        return this.rowFormatter.row;
+    }
+    get currIntervalOrLastNonEmpty() {
+        const currInterval = this.rowFormatter.rowSizesManager.rowFormattingInfo.currInterval;
+        return currInterval ? currInterval : this.rowFormatter.rowSizesManager.rowFormattingInfo.lastNonEmptyInterval;
+    }
+    get currInterval() { return this.rowFormatter.rowSizesManager.rowFormattingInfo.currInterval; }
     constructor(rowFormatter, paragraphHorizontalBoundsStart) {
         this.rowFormatter = rowFormatter;
         this.paragraphHorizontalBoundsStart = paragraphHorizontalBoundsStart;
@@ -36,14 +44,6 @@ export class RowTabInfo {
             pos.position += this.paragraphHorizontalBoundsStart;
         this.restart();
     }
-    get row() {
-        return this.rowFormatter.row;
-    }
-    get currIntervalOrLastNonEmpty() {
-        const currInterval = this.rowFormatter.rowSizesManager.rowFormattingInfo.currInterval;
-        return currInterval ? currInterval : this.rowFormatter.rowSizesManager.rowFormattingInfo.lastNonEmptyInterval;
-    }
-    get currInterval() { return this.rowFormatter.rowSizesManager.rowFormattingInfo.currInterval; }
     restart() {
         this.lastTabPosition = null;
         this.lastTabBoxIndex = -1;

package/lib/common/layout-formatter/table/borders/border-helper.d.ts

@@ -22,7 +22,7 @@ export declare class TableBorderInfoProvider {
     constructor(model: DocumentModel, table: Table, converter: SimpleConverter<number>);
     static borderConvertToPixels(brdInfo: BorderInfo, converter: SimpleConverter<number>): BorderInfo;
 }
-export declare type CellBorderConstructor = new (tablePropertiesException: TableProperties, isOutsideBorder: boolean) => TableCellPropertiesMergerBorderBase;
+export type CellBorderConstructor = new (tablePropertiesException: TableProperties, isOutsideBorder: boolean) => TableCellPropertiesMergerBorderBase;
 export declare class BorderHelper {
     private colorProvider;
     private tableInfo;

package/lib/common/layout-formatter/table/borders/border-helper.js

@@ -35,11 +35,6 @@ export class TableBorderInfoProvider {
     }
 }
 export class BorderHelper {
-    constructor(tableInfo, model) {
-        this.colorProvider = model.colorProvider;
-        this.tableInfo = tableInfo;
-        this.tblbrdProvider = new TableBorderInfoProvider(model, tableInfo.table, UnitConverter.twipsToPixels);
-    }
     rowCellSpacing(rowIndex) {
         return this.tblbrdProvider.cellSpacings[rowIndex];
     }
@@ -48,6 +43,11 @@ export class BorderHelper {
     }
     get grid() { return this.tableInfo.grid; }
     get tblStyle() { return this.tableInfo.table.style; }
+    constructor(tableInfo, model) {
+        this.colorProvider = model.colorProvider;
+        this.tableInfo = tableInfo;
+        this.tblbrdProvider = new TableBorderInfoProvider(model, tableInfo.table, UnitConverter.twipsToPixels);
+    }
     getVerticalBorders() {
         const verticalBorders = [];
         const rows = this.grid.table.rows;

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

@@ -25,18 +25,6 @@ export var AddRowToTableResult;
     AddRowToTableResult[AddRowToTableResult["GoToNextColumn"] = 4] = "GoToNextColumn";
 })(AddRowToTableResult || (AddRowToTableResult = {}));
 export class Formatter {
-    constructor(rowFormatter, tablePositions, column, tableMaxWidth, offset, parentCell, index, avaliableHeight, parentFormatter, pageIndexFromWhichTableWasMoved = null) {
-        this._posToWaitingContinuedFormatterMap = [];
-        this.isFullyFormatted = false;
-        this.parentFormatter = parentFormatter;
-        const tblPos = tablePositions[index];
-        if (tblPos.rowIndex != 0 || tblPos.cellIndex != 0)
-            throw new Error(Errors.InternalException);
-        this.tableInfo = new TableInfo(rowFormatter, tblPos.table, tableMaxWidth, offset.x, offset.y, pageIndexFromWhichTableWasMoved);
-        this.initColumn(column, parentCell, avaliableHeight);
-        if (++index < tablePositions.length)
-            this.createInnerFormatter(tablePositions);
-    }
     get posToWaitingContinuedFormatterMap() {
         return this.nestedLevel == 0 ? this._posToWaitingContinuedFormatterMap : this.parentFormatter.posToWaitingContinuedFormatterMap;
     }
@@ -69,6 +57,18 @@ export class Formatter {
     }
     get position() { return this.tableInfo.position; }
     get grid() { return this.tableInfo.grid; }
+    constructor(rowFormatter, tablePositions, column, tableMaxWidth, offset, parentCell, index, avaliableHeight, parentFormatter, pageIndexFromWhichTableWasMoved = null) {
+        this._posToWaitingContinuedFormatterMap = [];
+        this.isFullyFormatted = false;
+        this.parentFormatter = parentFormatter;
+        const tblPos = tablePositions[index];
+        if (tblPos.rowIndex != 0 || tblPos.cellIndex != 0)
+            throw new Error(Errors.InternalException);
+        this.tableInfo = new TableInfo(rowFormatter, tblPos.table, tableMaxWidth, offset.x, offset.y, pageIndexFromWhichTableWasMoved);
+        this.initColumn(column, parentCell, avaliableHeight);
+        if (++index < tablePositions.length)
+            this.createInnerFormatter(tablePositions);
+    }
     getNestedTablePosition(tablePositions) {
         const index = this.nestedLevel + 1;
         return tablePositions && tablePositions.length > index ? tablePositions[index] : null;