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

package/lib/common/model/manipulators/tables/insert-table-row-operation.js

@@ -7,11 +7,11 @@ import { TableCellMergingState } from '../../tables/secondary-structures/table-b
 import { TableCellUtils } from '../../tables/table-utils';
 import { InsertParagraphManipulatorParams } from '../paragraph-manipulator/insert-paragraph-manipulator-params';
 export class InsertTableRowOperationBase {
+    get modelManipulator() { return this.modelManager.modelManipulator; }
     constructor(modelManager, subDocument) {
         this.modelManager = modelManager;
         this.subDocument = subDocument;
     }
-    get modelManipulator() { return this.modelManager.modelManipulator; }
     execute(table, patternRowIndex) {
         let patternRow = table.rows[patternRowIndex];
         let insertParagraphsPositionInfo = this.getInsertParagraphsPositionInfo(table, patternRowIndex);

package/lib/common/model/manipulators/tables/merge-table-cells-operation.js

@@ -9,12 +9,12 @@ import { TableWidthUnit } from '../../tables/secondary-structures/table-units';
 import { TableCellUtils } from '../../tables/table-utils';
 import { InsertParagraphManipulatorParams } from '../paragraph-manipulator/insert-paragraph-manipulator-params';
 export class MergeTableCellsOperationBase {
+    get modelManipulator() { return this.modelManager.modelManipulator; }
     constructor(modelManager, subDocument) {
         this.needDeleteNextTableCell = false;
         this.modelManager = modelManager;
         this.subDocument = subDocument;
     }
-    get modelManipulator() { return this.modelManager.modelManipulator; }
     execute(position, suppressNormalizeTableRows, inpPos) {
         let nextCellPosition = this.calculateNextCell(position);
         this.updateCellsProperties(position, nextCellPosition);

package/lib/common/model/manipulators/tables/table-normalizator.d.ts

@@ -1,8 +1,8 @@
 import { Table } from '../../tables/main-structures/table';
 import { TableCellMergingState } from '../../tables/secondary-structures/table-base-structures';
 import { TableWidthUnit } from '../../tables/secondary-structures/table-units';
-export declare type TableNormalizatorRowPropertySetter<T> = (table: Table, rowIndex: number, newValue: T) => void;
-export declare type TableNormalizatorCellPropertySetter<T> = (table: Table, rowIndex: number, cellIndex: number, newValue: T) => void;
+export type TableNormalizatorRowPropertySetter<T> = (table: Table, rowIndex: number, newValue: T) => void;
+export type TableNormalizatorCellPropertySetter<T> = (table: Table, rowIndex: number, cellIndex: number, newValue: T) => void;
 export declare class TableNormalizator {
     private table;
     private tableCellGridInfos;

package/lib/common/model/manipulators/text-box-manipulator.d.ts

@@ -17,6 +17,6 @@ export declare class BaseTextBoxInfo {
     constructor(innerSubDocument: SubDocument, size: AnchorTextBoxSize, shape: Shape, anchorInfo: AnchorInfo, textBoxProperties: TextBoxProperties, containerProperties: NonVisualDrawingObjectInfo);
 }
 export declare class TextBoxManipulator extends RunsBaseManipulator {
-    insertAnchoredTextBoxViaHistoty(subDocPos: SubDocumentPosition, charPropsBundle: MaskedCharacterPropertiesBundle, textBoxInfo: BaseTextBoxInfo): void;
+    insertAnchoredTextBoxViaHistory(subDocPos: SubDocumentPosition, charPropsBundle: MaskedCharacterPropertiesBundle, textBoxInfo: BaseTextBoxInfo): void;
     insertAnchoredTextBox(subDocPos: SubDocumentPosition, charPropsBundle: MaskedCharacterPropertiesBundle, textBoxInfo: BaseTextBoxInfo): AnchoredTextBoxRun;
 }

package/lib/common/model/manipulators/text-box-manipulator.js

@@ -16,7 +16,7 @@ export class BaseTextBoxInfo {
     }
 }
 export class TextBoxManipulator extends RunsBaseManipulator {
-    insertAnchoredTextBoxViaHistoty(subDocPos, charPropsBundle, textBoxInfo) {
+    insertAnchoredTextBoxViaHistory(subDocPos, charPropsBundle, textBoxInfo) {
         this.history.addAndRedo(new InsertAnchoredTextBoxHistoryItem(this.modelManipulator, subDocPos, charPropsBundle, textBoxInfo));
     }
     insertAnchoredTextBox(subDocPos, charPropsBundle, textBoxInfo) {
@@ -33,6 +33,7 @@ export class TextBoxManipulator extends RunsBaseManipulator {
         let textBoxSubDoc = textBoxInfo.innerSubDocument ?
             textBoxInfo.innerSubDocument :
             this.model.createSubDocument(SubDocumentInfoType.TextBox, subDocument.id);
+        textBoxInfo.innerSubDocument = textBoxSubDoc;
         textBoxRun.subDocId = textBoxSubDoc.id;
         subDocument.chunks[insertedRun.chunkIndex].textRuns[insertedRun.runIndex].paragraph.length++;
         this.modelManipulator.notifyModelChanged(new AnchoredTextBoxInsertedSubDocumentChange(subDocument.id, textBoxRun.anchoredObjectID, textBoxRun.subDocId, insertPositionAtStartDocument, textBoxInfo.anchorInfo, textBoxRun.containerProperties));

package/lib/common/model/options/fields.d.ts

@@ -6,6 +6,7 @@ export declare class FieldsSettings {
     defaultTimeFormat: string;
     defaultDateFormat: string;
     openHyperlinkOnClick: boolean;
+    allowedHyperlinkUriSchemes: string[];
     keepHyperlinkResultForInvalidReference: boolean;
     createHyperlinkTooltip: (hyperlinkTooltip: string, hint: string) => string;
     constructor();

package/lib/common/model/options/fields.js

@@ -1,6 +1,7 @@
 import { convertToFunction } from '../../utils/utils';
 import { isDefined, isNonNullString } from '@devexpress/utils/lib/utils/common';
 export class FieldsSettings {
+    ;
     constructor() {
         this.openHyperlinkOnClick = false;
         this.updateFieldsBeforePrint = true;
@@ -13,7 +14,6 @@ export class FieldsSettings {
             return `${hyperlinkTooltip}${hint}`;
         };
     }
-    ;
     copyFrom(obj) {
         if (isDefined(obj.updateFieldsBeforePrint))
             this.updateFieldsBeforePrint = obj.updateFieldsBeforePrint;
@@ -29,6 +29,8 @@ export class FieldsSettings {
             this.keepHyperlinkResultForInvalidReference = obj.keepHyperlinkResultForInvalidReference;
         if (isDefined(obj.createHyperlinkTooltip) && obj.createHyperlinkTooltip !== '')
             this.createHyperlinkTooltip = convertToFunction(obj.createHyperlinkTooltip);
+        if (isDefined(obj.allowedHyperlinkUriSchemes))
+            this.allowedHyperlinkUriSchemes = obj.allowedHyperlinkUriSchemes;
     }
     clone() {
         const result = new FieldsSettings();

package/lib/common/model/options/pdf.d.ts

@@ -1,8 +1,8 @@
-export declare type PdfKitContructor = new (options?: {
+export type PdfKitContructor = new (options?: {
     autoFirstPage: boolean;
     font: any;
 }) => any;
-export declare type BlobStreamContructor = new () => any;
+export type BlobStreamContructor = new () => any;
 export declare class PdfSettings {
     private _pdfDocument;
     private _blobStream;

package/lib/common/model/options/rich-options.js

@@ -10,6 +10,9 @@ import { DocumentProtectionSettings } from './protection';
 import { SearchSettings } from './search';
 import { SpellCheckerSettings } from './spell-checker';
 export class RichOptions {
+    get maxSpellRequestLength() {
+        return this.spellChecker.maxRequestLength;
+    }
     constructor(cultureOpts) {
         this.control = new ControlOptions();
         this.mailMerge = new MailMergeOptions();
@@ -24,9 +27,6 @@ export class RichOptions {
         this.fonts = new FontsSettings();
         this.cultureOpts = cultureOpts;
     }
-    get maxSpellRequestLength() {
-        return this.spellChecker.maxRequestLength;
-    }
     clone() {
         const result = new RichOptions(this.cultureOpts);
         result.control = this.control.clone();

package/lib/common/model/paragraph/paragraph-property-descriptors.d.ts

@@ -6,7 +6,7 @@ import { ModelManipulator } from '../manipulators/model-manipulator';
 import { ShadingInfo } from '../shadings/shading-info';
 import { SubDocumentInterval } from '../sub-document';
 import { ParagraphAlignment, ParagraphFirstLineIndent, ParagraphLineSpacingType, ParagraphProperties, ParagraphPropertiesMask } from './paragraph-properties';
-export declare type ParagraphPropertiesHistoryItemType<T> = new (modelManipulator: ModelManipulator, subDocInterval: SubDocumentInterval, newValue: T, newUse: boolean) => ParagraphPropertiesHistoryItemBase<T>;
+export type ParagraphPropertiesHistoryItemType<T> = new (modelManipulator: ModelManipulator, subDocInterval: SubDocumentInterval, newValue: T, newUse: boolean) => ParagraphPropertiesHistoryItemBase<T>;
 export interface IParagraphPropertyDescriptor<T> {
     setProp(props: ParagraphProperties, newValue: T): any;
     getProp(props: ParagraphProperties): T;

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

@@ -21,6 +21,7 @@ export var TabAlign;
     TabAlign[TabAlign["Numbering"] = 4] = "Numbering";
 })(TabAlign || (TabAlign = {}));
 export class Paragraph {
+    get isEmpty() { return this.length <= 1; }
     constructor(subDocument, startLogPosition, length, paragraphStyle, maskedParagraphProperties, indexInMaskedParagraphProperitesCache = undefined) {
         this.numberingListIndex = NumberingList.NumberingListNotSettedIndex;
         this.listLevelIndex = -1;
@@ -39,7 +40,6 @@ export class Paragraph {
         this.mergedParagraphFormatting = null;
         this.tabs = new TabProperties();
     }
-    get isEmpty() { return this.length <= 1; }
     getParagraphBundleFull(model) {
         return new MaskedParagraphPropertiesBundleFull(model.cache.maskedParagraphPropertiesCache.getItem(this.maskedParagraphProperties), model.stylesManager.addParagraphStyle(this.paragraphStyle), new ParagraphListInfo(this.numberingListIndex, this.listLevelIndex), this.tabs.clone());
     }

package/lib/common/model/position/linked-interval.js

@@ -2,15 +2,15 @@ import { BoundaryInterval } from '@devexpress/utils/lib/intervals/boundary';
 import { ConstInterval } from '@devexpress/utils/lib/intervals/const';
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 export class LinkedInterval extends ConstInterval {
+    get start() { return this._start.value; }
+    get length() { return this._end.value - this._start.value; }
+    get end() { return this._end.value; }
+    get center() { return (this.start + this.end) / 2; }
     constructor(manager, interval) {
         super();
         this._start = manager.registerPosition(interval.start);
         this._end = manager.registerPosition(interval.end);
     }
-    get start() { return this._start.value; }
-    get length() { return this._end.value - this._start.value; }
-    get end() { return this._end.value; }
-    get center() { return (this.start + this.end) / 2; }
     destructor(manager) {
         manager.unregisterPosition(this._start);
         manager.unregisterPosition(this._end);

package/lib/common/model/range-permissions.js

@@ -52,15 +52,15 @@ RangePermission.Owners_GROUP_NAME = "Owners".toLowerCase();
 RangePermission.Contributors_GROUP_NAME = "Contributors".toLowerCase();
 RangePermission.Administrators_GROUP_NAME = "Administrators".toLowerCase();
 export class ConstRangePermission extends ConstInterval {
+    get start() { return this.interval.start; }
+    get length() { return this.interval.length; }
+    get end() { return this.interval.end; }
     constructor(interval, userName, group) {
         super();
         this.interval = BoundaryInterval.makeByConstInterval(interval);
         this.userName = userName;
         this.group = group;
     }
-    get start() { return this.interval.start; }
-    get length() { return this.interval.length; }
-    get end() { return this.interval.end; }
     equals(obj) {
         return obj && this.userName == obj.userName && this.group == obj.group && this.interval.equals(obj.interval);
     }

package/lib/common/model/runs/anchored-picture-run.js

@@ -2,14 +2,14 @@ import { MaskedCharacterPropertiesBundle } from '../../rich-utils/properties-bun
 import { PictureRun, RunBase } from './run-base';
 import { RunType } from './run-type';
 export class AnchoredPictureRun extends PictureRun {
-    constructor(startOffset, paragraph, charPropsBundle, info, objectId) {
-        super(startOffset, paragraph, charPropsBundle, info);
-        this.anchoredObjectID = objectId < 0 ? RunBase.anchoredObjectIdCounter++ : objectId;
-    }
     get anchorInfo() { return this.info.anchorInfo; }
     ;
     set anchorInfo(val) { this.info.anchorInfo = val; }
     ;
+    constructor(startOffset, paragraph, charPropsBundle, info, objectId) {
+        super(startOffset, paragraph, charPropsBundle, info);
+        this.anchoredObjectID = objectId < 0 ? RunBase.anchoredObjectIdCounter++ : objectId;
+    }
     getType() {
         return RunType.AnchoredPictureRun;
     }

package/lib/common/model/runs/inline-picture-run.d.ts

@@ -6,7 +6,7 @@ import { SubDocument } from '../sub-document';
 import { AnchoredPictureRun } from './anchored-picture-run';
 import { PictureRun } from './run-base';
 import { RunType } from './run-type';
-export declare type PictureRunType = InlinePictureRun | AnchoredPictureRun;
+export type PictureRunType = InlinePictureRun | AnchoredPictureRun;
 export declare class InlinePictureRun extends PictureRun<InlinePictureInfo> implements ISupportCopyFrom<InlinePictureRun>, ICloneable<InlinePictureRun> {
     private static nextPublicAPIId;
     get publicAPIId(): number;

package/lib/common/model/runs/inline-picture-run.js

@@ -2,11 +2,11 @@ import { MaskedCharacterPropertiesBundle } from '../../rich-utils/properties-bun
 import { PictureRun } from './run-base';
 import { RunType } from './run-type';
 export class InlinePictureRun extends PictureRun {
+    get publicAPIId() { return this.info.publicAPIID; }
     constructor(startOffset, paragraph, charPropsBundle, info) {
         super(startOffset, paragraph, charPropsBundle, info);
         this.info.publicAPIID = this.info.publicAPIID >= 0 ? this.info.publicAPIID : this.getNextPublicAPIId();
     }
-    get publicAPIId() { return this.info.publicAPIID; }
     getType() {
         return RunType.InlinePictureRun;
     }

package/lib/common/model/runs/run-base.js

@@ -78,10 +78,6 @@ export class OneCharRun extends RunBase {
     }
 }
 export class PictureRun extends OneCharRun {
-    constructor(startOffset, paragraph, charPropsBundle, info) {
-        super(startOffset, paragraph, charPropsBundle);
-        this.info = info;
-    }
     get shape() { return this.info.shape; }
     ;
     set shape(val) { this.info.shape = val; }
@@ -92,6 +88,10 @@ export class PictureRun extends OneCharRun {
     ;
     get cacheInfo() { return this.info.cacheInfo; }
     ;
+    constructor(startOffset, paragraph, charPropsBundle, info) {
+        super(startOffset, paragraph, charPropsBundle);
+        this.info = info;
+    }
     getActualSize() {
         return this.info.size.actualSize;
     }

package/lib/common/model/section/section-property-descriptor.d.ts

@@ -7,7 +7,7 @@ import { SectionStartType } from './enums';
 import { PaperKind } from './paper-kind';
 import { SectionColumnProperties } from './section-column-properties';
 import { SectionProperties } from './section-properties';
-export declare type SectionPropertiesHistoryItemType<T> = new (modelManipulator: ModelManipulator, interval: FixedInterval, newValue: T) => SectionPropertiesHistoryItemBase<T>;
+export type SectionPropertiesHistoryItemType<T> = new (modelManipulator: ModelManipulator, interval: FixedInterval, newValue: T) => SectionPropertiesHistoryItemBase<T>;
 export interface ISectionPropertyDescriptor<T> {
     setProp(props: SectionProperties, newValue: T): any;
     getProp(props: SectionProperties): T;

package/lib/common/model/shadings/shading-info.js

@@ -4,14 +4,14 @@ import { JSONShadingInfoConverter } from '../json/importers/json-shading-info-co
 import { ShadingPattern } from './shading-pattern';
 import { ShadingHelper } from './shading-pattern-helper';
 export class ShadingInfo {
+    static get noColor() { return ShadingInfo.createByColor(ColorModelInfo.noColor); }
+    static get auto() { return ShadingInfo.createByColor(ColorModelInfo.auto); }
+    static get nullColor() { return ShadingInfo.createByColor(ColorModelInfo.makeByColor(0)); }
     constructor(shadingPattern, backColor, foreColor) {
         this.shadingPattern = shadingPattern;
         this.backColor = backColor;
         this.foreColor = foreColor;
     }
-    static get noColor() { return ShadingInfo.createByColor(ColorModelInfo.noColor); }
-    static get auto() { return ShadingInfo.createByColor(ColorModelInfo.auto); }
-    static get nullColor() { return ShadingInfo.createByColor(ColorModelInfo.makeByColor(0)); }
     static createByColor(backColor) {
         return new ShadingInfo(ShadingPattern.Clear, backColor, ColorModelInfo.nullColor);
     }

package/lib/common/model/styles-manager.d.ts

@@ -4,7 +4,7 @@ import { NumberingListStyle } from './numbering-lists/numbering-list-style';
 import { ParagraphStyle } from './paragraph/paragraph-style';
 import { TableCellStyle } from './tables/styles/table-cell-style';
 import { TableStyle } from './tables/styles/table-style';
-export declare type StyleGalleryItem = {
+export type StyleGalleryItem = {
     value: string;
     text: string;
     data: string;

package/lib/common/model/tables/main-structures/table-row.js

@@ -4,6 +4,7 @@ import { TableProperties } from '../properties/table-properties';
 import { ConditionalTableStyleFormatting } from '../secondary-structures/table-base-structures';
 import { TableHeightUnit, TableWidthUnit } from '../secondary-structures/table-units';
 export class TableRow {
+    get logicColumnCount() { return this.gridBefore + this.gridAfter + ListUtils.accumulate(this.cells, 0, (acc, c) => acc += c.columnSpan); }
     constructor(parentTable, properties) {
         this.cells = [];
         this.widthBefore = TableWidthUnit.createDefault();
@@ -16,7 +17,6 @@ export class TableRow {
         this.parentTable = parentTable;
         this.properties = properties;
     }
-    get logicColumnCount() { return this.gridBefore + this.gridAfter + ListUtils.accumulate(this.cells, 0, (acc, c) => acc += c.columnSpan); }
     get isLastRowInTable() {
         return ListUtils.last(this.parentTable.rows) === this;
     }

package/lib/common/mouse-handler/base/manipulator-handler-state-base.js

@@ -1,10 +1,10 @@
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 export class ManipulatorHandlerStateBase {
+    start() { }
+    finish() { }
     constructor(handler) {
         this.handler = handler;
     }
-    start() { }
-    finish() { }
     dispose() { }
     resizeRotationChecker(action) {
         const activeSubDocument = this.handler.control.selection.activeSubDocument;

package/lib/common/mouse-handler/mouse-handler/mouse-handler-drag-column-or-row-state.d.ts

@@ -3,7 +3,7 @@ import { IRichEditControl } from '../../interfaces/i-rich-edit-core';
 import { ResizeTableVisualizer } from '../../layout-engine/visualizers/resize-table-visualizer';
 import { ResizeTableHelperBase } from '../resize-table-helper';
 import { MouseHandlerStateBase } from './mouse-handler-state-base';
-export declare type MouseHandlerDragResizeTableBaseHelperConstructorType = new (control: IRichEditControl, resizeTableVisualizer: ResizeTableVisualizer, evt: RichMouseEvent) => ResizeTableHelperBase;
+export type MouseHandlerDragResizeTableBaseHelperConstructorType = new (control: IRichEditControl, resizeTableVisualizer: ResizeTableVisualizer, evt: RichMouseEvent) => ResizeTableHelperBase;
 export declare class MouseHandlerDragResizeTableBase extends MouseHandlerStateBase {
     private helper;
     onMouseDown(evt: RichMouseEvent): void;

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

@@ -45,6 +45,11 @@ import { HorizontalRulerControl } from './ui/ruler/ruler';
 import { SearchManager } from './ui/search-manager';
 import { isDefined } from '@devexpress/utils/lib/utils/common';
 export class RichEditCore {
+    get isReadOnlyPersistent() { return this.readOnly == ReadOnlyMode.Persistent; }
+    get model() { return this.modelManager.model; }
+    get isDisposed() {
+        return this._isDisposed;
+    }
     constructor(owner, name, element, clientGuid, readOnly, barHolder, unitsType, rulerSettings, richOptions, viewsSettings, stringResources) {
         this.isLoadingPictureFromClipboard = false;
         this.readOnly = ReadOnlyMode.None;
@@ -93,11 +98,6 @@ export class RichEditCore {
                 this.invalidateLayoutAfterFontsLoaded();
             });
     }
-    get isReadOnlyPersistent() { return this.readOnly == ReadOnlyMode.Persistent; }
-    get model() { return this.modelManager.model; }
-    get isDisposed() {
-        return this._isDisposed;
-    }
     beforeInitialization(_options) { }
     registerActiveContextTabManager() { }
     registerFontChangesListeners() { }
@@ -409,12 +409,6 @@ export class RichEditCore {
     }
 }
 export class DocumentInfo {
-    constructor(fileName, documentHasSource, documentFormat = DocumentInfo.defaultDocumentFormat, documentExtension = FileNameHelper.convertToString(documentFormat)) {
-        this._fileName = fileName;
-        this._documentFormat = documentFormat;
-        this._documentExtension = documentExtension;
-        this.documentHasSource = documentHasSource;
-    }
     get fileName() { return this._fileName; }
     set fileName(val) { this._fileName = val; }
     get documentFormat() { return this._documentFormat; }
@@ -426,6 +420,12 @@ export class DocumentInfo {
         this._documentExtension = FileNameHelper.convertToString(val);
     }
     get documentExtension() { return this._documentExtension; }
+    constructor(fileName, documentHasSource, documentFormat = DocumentInfo.defaultDocumentFormat, documentExtension = FileNameHelper.convertToString(documentFormat)) {
+        this._fileName = fileName;
+        this._documentFormat = documentFormat;
+        this._documentExtension = documentExtension;
+        this.documentHasSource = documentHasSource;
+    }
     getFileNameForDownload(fileName) {
         if (!StringUtils.isNullOrEmpty(fileName))
             return fileName;

package/lib/common/rich-utils/debug/runtime-template-model-creator.js

@@ -95,6 +95,12 @@ export class Options {
     }
 }
 export class Creator {
+    get documentModel() { ListUtils.addListOnTail(this.idMap.createdVariables, this.str); return this.idMap.createdVariables.join("\r\n"); }
+    get tables() { return this.subDocument.tables; }
+    get table() { return this.tables[this.tblIndex]; }
+    static create(model, layout = null, options = new Options()) {
+        return new Creator(model, layout, options).documentModel;
+    }
     constructor(model, layout = null, options = new Options()) {
         this.layout = layout;
         this.subDocument = model.mainSubDocument;
@@ -131,12 +137,6 @@ export class Creator {
             this.fillPage(p);
         this.str.push(`], model).getLayout();`);
     }
-    get documentModel() { ListUtils.addListOnTail(this.idMap.createdVariables, this.str); return this.idMap.createdVariables.join("\r\n"); }
-    get tables() { return this.subDocument.tables; }
-    get table() { return this.tables[this.tblIndex]; }
-    static create(model, layout = null, options = new Options()) {
-        return new Creator(model, layout, options).documentModel;
-    }
     static getSubDocumentVariableName(sd) {
         if (sd.isMain())
             return "subDocument";

package/lib/common/scroll/model-states.d.ts

@@ -4,7 +4,7 @@ import { ScrollTopInfo } from '../canvas/canvas-manager';
 import { CanvasSizeInfo } from '../canvas/canvas-size-info';
 import { Selection } from '../selection/selection';
 import { ICanvasState } from './canvas-states';
-export declare type GetVertivalOffset = (sizes: CanvasSizeInfo) => number;
+export type GetVertivalOffset = (sizes: CanvasSizeInfo) => number;
 export declare enum RelativePosition {
     Top = 0,
     Bottom = 1,

package/lib/common/scroll/model-states.js

@@ -21,15 +21,15 @@ export class ScrollState {
     get nothing() { return new ModelStateEmpty(); }
 }
 export class ModelStateByModelPosition {
+    get subDocument() {
+        var _a;
+        return this._subDocument = (_a = this._subDocument) === null || _a === void 0 ? void 0 : _a.getActualSubDocument();
+    }
     constructor(subDocument, endOfLine, pageIndex) {
         this._subDocument = subDocument;
         this.endOfLine = endOfLine;
         this.pageIndex = pageIndex;
     }
-    get subDocument() {
-        var _a;
-        return this._subDocument = (_a = this._subDocument) === null || _a === void 0 ? void 0 : _a.getActualSubDocument();
-    }
     getModelPosition() {
         return this.modelPosition;
     }

package/lib/common/selection/selected-cells-engine.js

@@ -8,11 +8,11 @@ import { CellGridInfoManager } from '../layout-formatter/table/grid-engine/cell-
 import { Table, TablePosition } from '../model/tables/main-structures/table';
 import { TableCellMergingState } from '../model/tables/secondary-structures/table-base-structures';
 export class SelectedTableRowInfo {
+    get row() { return this.cells[0].cell.parentRow; }
     constructor(rowIndex, cells) {
         this.rowIndex = rowIndex;
         this.cells = cells;
     }
-    get row() { return this.cells[0].cell.parentRow; }
     get isSeries() {
         return ListUtils.allOf(this.cells, (cellInfo, cellInd) => cellInfo.cellIndex == this.cells[cellInd - 1].cellIndex + 1, 1);
     }
@@ -27,16 +27,6 @@ export class SelectedTableCellInfo {
     }
 }
 export class TableSelectionData {
-    constructor(info, rows) {
-        this.info = info;
-        this.rows = rows;
-        if (!rows[0]) {
-            this._isSquare = false;
-            this._isSelectedEntireTable = false;
-            this._withoutGapByRows = false;
-            this._areCellsSelectedInSeries = false;
-        }
-    }
     get numRows() { return this.rows.length; }
     get startRowIndex() { return this.rows[0].rowIndex; }
     get isSquare() { return this._isSquare === undefined ? (this._isSquare = this.calculateIsSquare()) : this._isSquare; }
@@ -62,6 +52,16 @@ export class TableSelectionData {
             (this._areCellsSelectedInSeries = ListUtils.allOf(this.rows, (rowInfo, rowInd) => (rowInd == 0 || (rowInfo.rowIndex == this.rows[rowInd - 1].rowIndex + 1)) && rowInfo.isSeries)) :
             this._areCellsSelectedInSeries;
     }
+    constructor(info, rows) {
+        this.info = info;
+        this.rows = rows;
+        if (!rows[0]) {
+            this._isSquare = false;
+            this._isSelectedEntireTable = false;
+            this._withoutGapByRows = false;
+            this._areCellsSelectedInSeries = false;
+        }
+    }
     foreach(onEachRowCallback, onEachCellCallback) {
         for (let rowOffset = 0, rowInfo; rowInfo = this.rows[rowOffset]; rowOffset++) {
             onEachRowCallback(rowInfo);
@@ -99,13 +99,13 @@ export class TableSelectionData {
     }
 }
 export class SelectedTableInfo {
+    get isSelected() { return !!this.rawData.rows.length; }
     constructor(table, gridInfoManager, rawRowsData, extendedRowsData) {
         this.table = table;
         this.gridInfoManager = gridInfoManager;
         this.rawData = new TableSelectionData(this, rawRowsData);
         this.extendedData = new TableSelectionData(this, extendedRowsData);
     }
-    get isSelected() { return !!this.rawData.rows.length; }
 }
 export class SelectedCellsCalculator {
     constructor() {

package/lib/common/selection/selection-intervals-info.js

@@ -4,13 +4,6 @@ import { SubDocumentInterval, SubDocumentIntervals, SubDocumentPosition } from '
 import { SelectedCellsCalculator } from './selected-cells-engine';
 import { SelectedSpecialRunInfo } from './selected-special-run-info';
 export class SelectionIntervalsInfo {
-    constructor(subDocument, intervals, lastIntervalIndex = intervals.length - 1) {
-        this.specialRunInfo = new SelectedSpecialRunInfo();
-        this.subDocument = subDocument;
-        this._intervals = intervals;
-        this.lastIntervalIndex = lastIntervalIndex;
-        this._tableInfo = null;
-    }
     resetTableInfo() {
         this._tableInfo = null;
     }
@@ -37,6 +30,13 @@ export class SelectionIntervalsInfo {
     get subDocPosition() { return new SubDocumentPosition(this.subDocument, this.position); }
     get multiselection() { return this.intervals.length > 1; }
     get isCollapsed() { return !this._intervals[1] && this._intervals[0].isCollapsed(); }
+    constructor(subDocument, intervals, lastIntervalIndex = intervals.length - 1) {
+        this.specialRunInfo = new SelectedSpecialRunInfo();
+        this.subDocument = subDocument;
+        this._intervals = intervals;
+        this.lastIntervalIndex = lastIntervalIndex;
+        this._tableInfo = null;
+    }
     static fromPosition(subDocument, position) {
         return new SelectionIntervalsInfo(subDocument, [new FixedInterval(position, 0)], 0);
     }

package/lib/common/selection/selection-state.js

@@ -3,6 +3,11 @@ import { SelectionIntervalsInfo } from './selection-intervals-info';
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 export class SelectionState {
+    get interval() { return this.intervalsInfo.interval; }
+    ;
+    get anchorPostion() { return this.forwardDirection ? this.interval.start : this.interval.end; }
+    get activePostion() { return this.forwardDirection ? this.interval.end : this.interval.start; }
+    get reversedAnchorPostion() { return this.forwardDirection ? this.interval.end : this.interval.start; }
     constructor(intervalsInfo, forwardDirection, endOfLine, pageIndex) {
         this.forwardDirection = true;
         this.endOfLine = false;
@@ -13,11 +18,6 @@ export class SelectionState {
         this.endOfLine = endOfLine;
         this.pageIndex = pageIndex;
     }
-    get interval() { return this.intervalsInfo.interval; }
-    ;
-    get anchorPostion() { return this.forwardDirection ? this.interval.start : this.interval.end; }
-    get activePostion() { return this.forwardDirection ? this.interval.end : this.interval.start; }
-    get reversedAnchorPostion() { return this.forwardDirection ? this.interval.end : this.interval.start; }
     setEndOfLine(endOfLine) {
         this.endOfLine = endOfLine;
         return this;

package/lib/common/selection/selection.js

@@ -35,19 +35,6 @@ export class SetSelectionStateOptions {
     }
 }
 export class Selection extends BatchUpdatableObject {
-    constructor(model, layout, activeSubDocument) {
-        super();
-        this.searchIntervals = [];
-        this.misspelledIntervals = [];
-        this.onChanged = new EventDispatcher();
-        this.onSearchChanged = new EventDispatcher();
-        this.onMisspelledSelectionChanged = new EventDispatcher();
-        this.model = model;
-        this.layout = layout;
-        this.scrollManager = new ModelScrollManager();
-        this._prevState = SelectionState.getDefault(activeSubDocument);
-        this._state = SelectionState.getDefault(activeSubDocument);
-    }
     get currState() { return this._state; }
     get keepX() { return this._state.keepX; }
     set keepX(val) { this._state.keepX = val; }
@@ -73,6 +60,19 @@ export class Selection extends BatchUpdatableObject {
     get specialRunInfo() { return this._state.intervalsInfo.specialRunInfo; }
     ;
     get tableInfo() { return this._state.intervalsInfo.tableInfo; }
+    constructor(model, layout, activeSubDocument) {
+        super();
+        this.searchIntervals = [];
+        this.misspelledIntervals = [];
+        this.onChanged = new EventDispatcher();
+        this.onSearchChanged = new EventDispatcher();
+        this.onMisspelledSelectionChanged = new EventDispatcher();
+        this.model = model;
+        this.layout = layout;
+        this.scrollManager = new ModelScrollManager();
+        this._prevState = SelectionState.getDefault(activeSubDocument);
+        this._state = SelectionState.getDefault(activeSubDocument);
+    }
     dispose() {
         this.onChanged.dispose();
     }
@@ -205,8 +205,9 @@ export class Selection extends BatchUpdatableObject {
         this.resetInputPositionIfNeeded();
     }
     shouldResetInputPosition() {
+        var _a;
         const currentState = this.getState();
-        return currentState.intervalsInfo.subDocument.id != this.prevState.intervalsInfo.subDocument.id ||
+        return currentState.intervalsInfo.subDocument.id != ((_a = this.prevState.intervalsInfo.subDocument) === null || _a === void 0 ? void 0 : _a.id) ||
             !ListUtils.equals(currentState.intervalsInfo.intervals, this.prevState.intervalsInfo.intervals);
     }
     resetInputPositionIfNeeded() {

package/lib/common/ui/quick-search-panel.js

@@ -4,12 +4,12 @@ import { DomUtils } from '@devexpress/utils/lib/utils/dom';
 import { KeyCode, KeyUtils } from '@devexpress/utils/lib/utils/key';
 import { RichEditClientCommand } from '../commands/client-command';
 export class QuickSearchPanel {
+    get core() { return this.owner.core; }
     constructor(owner, searchManager) {
         this.owner = owner;
         this.searchManager = searchManager;
         this.initialize();
     }
-    get core() { return this.owner.core; }
     dispose() {
         if (this.isVisible())
             this.onClose(true);