devexpress-richedit 24.1.8-build-24316-0102 → 24.2.2-beta

package/lib/common/input-controller.js

@@ -23,9 +23,16 @@ export const INPUT_CLASS_NAME = "dxreInputTarget";
 const EMPTY_KEYCODE = 229;
 const TAB_KEYCODE = 9;
 const IDEOGRAPHIC_SPACE_CHARCODE = 12288;
+var IMEState;
+(function (IMEState) {
+    IMEState[IMEState["None"] = 0] = "None";
+    IMEState[IMEState["Start"] = 1] = "Start";
+    IMEState[IMEState["Process"] = 2] = "Process";
+})(IMEState || (IMEState = {}));
 export class InputEditorBase {
     constructor(control, eventManager, parent) {
         this.newLineRegexp = /(\r\n|\n|\r)/gm;
+        this.IMEState = IMEState.None;
         this.processTextOnKeyPress = false;
         this.evtHandlersHolder = new DomEventHandlersHolder();
         this.control = control;
@@ -33,7 +40,6 @@ export class InputEditorBase {
         this.canInsertTextOnInputEvent = this.canUseInputEvent();
         this.createHierarchy(parent);
         this.initialize();
-        this.isIME = false;
         this.inputWithAlt = false;
     }
     dispose() {
@@ -106,7 +112,7 @@ export class InputEditorBase {
     }
     onKeyDown(evt) {
         if (!this.control.clientSideEvents.raiseKeyDown(evt)) {
-            if (!this.isIME) {
+            if (this.IMEState === IMEState.None) {
                 evt = this.getNormalizedEvent(evt);
                 const keyCode = KeyUtils.getEventKeyCode(evt);
                 this.needProcessShortcut = !keyCode || keyCode == EMPTY_KEYCODE;
@@ -271,6 +277,9 @@ export class DivInputEditor extends InputEditorBase {
     dispose() {
         super.dispose();
         clearTimeout(this.clearInputTimerId);
+        clearTimeout(this.composUpdateTimerId);
+        clearTimeout(this.composEndTimerId);
+        clearTimeout(this.onTextInputTimerId);
     }
     initializeIfNotReadOnlyCore() {
         this.inputElement.contentEditable = "true";
@@ -281,14 +290,21 @@ export class DivInputEditor extends InputEditorBase {
     }
     createInputElement() {
         const element = document.createElement("DIV");
-        if (Browser.Safari)
-            element.autocapitalize = "off";
+        element.autocapitalize = "off";
         if (Browser.MacOSMobilePlatform && (Number(Browser.PlaformMajorVersion) >= 16
             || Browser.Safari && Browser.MajorVersion >= 16)) {
             element.classList.add('dxreiOS16');
         }
         return element;
     }
+    initEvents() {
+        super.initEvents();
+        this.evtHandlersHolder.addListener(this.getEditableDocument(), "compositionstart", this.onCompositionStart.bind(this));
+        this.evtHandlersHolder.addListener(this.getEditableDocument(), "compositionupdate", (evt) => Browser.IE || Browser.Edge ?
+            this.onCompositionUpdate(evt) : this.composUpdateTimerId = setTimeout(() => this.onCompositionUpdate(evt), 0));
+        this.evtHandlersHolder.addListener(this.getEditableDocument(), "compositionend", (evt) => !Browser.Safari ?
+            this.onCompositionEnd(evt) : this.composEndTimerId = setTimeout(() => this.onCompositionEnd(evt), 0));
+    }
     onKeyDown(evt) {
         var _a;
         this.handled = false;
@@ -357,21 +373,15 @@ export class DivInputEditor extends InputEditorBase {
                     this.onTextReplace(text.substr(lastWordStartIndex), text);
                 else
                     super.onTextInput(data);
-                if (this.previousText && text.length < this.previousText.length || !text.length) {
-                    let deletedCharacterCount = this.previousText ? this.previousText.length - text.length : 1;
-                    for (let i = 0; i < deletedCharacterCount; i++)
-                        this.eventManager.onShortcut(KeyCode.Backspace);
-                    this.previousText = text;
-                }
                 this.cursorWasSetOnLastPosition = true;
             }
             this.handled = true;
-            if (Browser.MacOSMobilePlatform && text[text.length - 1] == " ")
+            if (text[text.length - 1] == " ")
                 this.clearInputElement();
         }
     }
     tryHandleShortcutByInputString(data) {
-        if (data && !this.isIME) {
+        if (data && this.IMEState === IMEState.None) {
             let enteredChar = data.charAt(data.length - 1);
             const keyCode = this.tryObtainCodeFromChar(enteredChar);
             if (keyCode != EMPTY_KEYCODE) {
@@ -462,6 +472,31 @@ export class DivInputEditor extends InputEditorBase {
         selection.selectAllChildren(this.inputElement);
         super.selectEditableDocumentContent();
     }
+    onCompositionStart(_evt) {
+        this.IMEState = IMEState.Start;
+        this.needProcessShortcut = false;
+        this.clearInputElement();
+    }
+    onCompositionUpdate(_evt) {
+        const text = this.getEditableDocumentText();
+        if (text.length && this.previousText != text) {
+            if (this.IMEState === IMEState.Start)
+                this.onText(text, text, this.previousText.length > 0);
+            else if (this.IMEState === IMEState.Process)
+                this.onTextReplace(text, text);
+        }
+        this.IMEState = IMEState.Process;
+    }
+    onCompositionEnd(_evt) {
+        const text = this.getEditableDocumentText();
+        if (this.previousText != text) {
+            if (text.length > 0)
+                this.onTextReplace(text, text);
+            else
+                this.onShortcutCore(_evt, KeyCode.Backspace);
+        }
+        this.IMEState = IMEState.None;
+    }
 }
 export class IFrameInputEditor extends InputEditorBase {
     constructor(control, eventManager, parent) {
@@ -565,7 +600,7 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     setEditableDocumentContent(content) {
         super.setEditableDocumentContent(content);
-        this.isIME = false;
+        this.IMEState = IMEState.None;
         this.editableDocument.body.innerHTML = "";
         if (typeof content === "string")
             this.editableDocument.body.innerHTML = content;
@@ -613,7 +648,7 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     onBlur(evt) {
         super.onBlur(evt);
-        this.isIME = false;
+        this.IMEState = IMEState.None;
         this.endInputIME();
     }
     onShortcutCore(evt, shortcutCode) {
@@ -642,7 +677,7 @@ export class IFrameInputEditor extends InputEditorBase {
         }
     }
     onCompositionStart(_evt) {
-        this.isIME = true;
+        this.IMEState = IMEState.Start;
         this.needProcessShortcut = false;
         if (!Browser.IE && !Browser.Edge)
             this.clearInputElement();
@@ -650,10 +685,11 @@ export class IFrameInputEditor extends InputEditorBase {
     }
     onCompositionUpdate(_evt) {
         const text = this.getEditableDocumentText();
-        if (this.isIME && text.length && this.previousText != text) {
+        if (this.IMEState !== IMEState.None && text.length && this.previousText != text) {
             this.onTextReplace(text, text);
             this.updateInputIME();
         }
+        this.IMEState = IMEState.Process;
     }
     onCompositionEnd(_evt) {
         const text = this.getEditableDocumentText();
@@ -663,7 +699,7 @@ export class IFrameInputEditor extends InputEditorBase {
             this.clearInputElement();
         if (text.charCodeAt(text.length - 1) == IDEOGRAPHIC_SPACE_CHARCODE)
             this.clearInputElement();
-        this.isIME = false;
+        this.IMEState = IMEState.None;
         this.endInputIME();
     }
     startInputIME() {
@@ -732,7 +768,10 @@ export class InputController {
         this.inputEditor = this.createInputEditor(parent, eventManager);
     }
     initExporter() {
-        this.exporter = new HtmlExporter(this.control.getExportModelOptions());
+        this.exporter = new HtmlExporter(this.control.getExportModelOptions(), {
+            sanitaizeHyperlinkURIs: true,
+            convertRelativeURIsToAbsolute: true
+        });
     }
     dispose() {
         this.inputEditor.dispose();
@@ -797,9 +836,8 @@ export class InputController {
             if (typeof html === 'string')
                 el.innerHTML = html;
         });
-        if (typeof html !== "string") {
+        if (typeof html !== "string")
             builder.assignFrom(html);
-        }
         builder.endChild('b');
         builder.endChild('span');
         builder.endChild('a');

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/document-layout.js

@@ -19,7 +19,7 @@ export class AnchorObjectsPositionInfo {
     }
     add(obj, modelPosition) {
         this.delete(obj.objectId);
-        this.cache[obj.objectId] = new ModelPositionHolder(modelPosition, this.model.subDocuments[obj.belongsToSubDocId].positionManager);
+        this.cache[obj.objectId] = new ModelPositionHolder(modelPosition, this.model.subDocumentsCollection.collection[obj.belongsToSubDocId].positionManager);
     }
     delete(id) {
         const info = this.cache[id];

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-boxes/layout-space-box.js

@@ -22,7 +22,7 @@ export class LayoutSpaceBox extends LayoutBox {
         return LayoutBoxType.Space;
     }
     pushInfoForMeasure(info, showHiddenSymbols) {
-        info.push(new MeasureInfoNonText(" ", this.characterProperties));
+        info.push(new MeasureInfoNonText(RichUtils.specialCharacters.Space, this.characterProperties));
         if (showHiddenSymbols)
             info.push(new MeasureInfoNonText(RichUtils.specialCharacters.HiddenSpace, this.characterProperties));
     }

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;