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

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;

package/lib/common/layout-formatter/table/grid-engine/calculators/column-interval.js

@@ -2,6 +2,9 @@ import { MinMaxNumber } from '@devexpress/utils/lib/class/min-max';
 import { UnitConverter } from '@devexpress/utils/lib/class/unit-converter';
 import { TableWidthUnitType } from '../../../../model/tables/secondary-structures/table-units';
 export class GridColumnBase {
+    get isPercentBased() {
+        return this.type == TableWidthUnitType.FiftiethsOfPercent;
+    }
     constructor(interval) {
         this.width = interval.type == TableWidthUnitType.ModelUnits ? UnitConverter.twipsToPixelsF(interval.width) : interval.width;
         this.type = interval.type;
@@ -9,9 +12,6 @@ export class GridColumnBase {
         this.preferredWidth = 0;
         this.bounds = new MinMaxNumber(0, 0);
     }
-    get isPercentBased() {
-        return this.type == TableWidthUnitType.FiftiethsOfPercent;
-    }
     updateMinBound(val) {
         if (val > this.bounds.minElement)
             this.bounds.minElement = val;

package/lib/common/layout-formatter/table/grid-engine/calculators/grid-calculator.js

@@ -6,6 +6,9 @@ import { Columns } from '../columns';
 import { GridColumnBase } from './column-interval';
 import { Calculator } from './column-width-engine/calculator';
 export class GridCalculator {
+    get table() { return this.grid.table; }
+    get currCache() { return this.cache[this.table.index]; }
+    get subDocument() { return this.boxIterator.subDocument; }
     constructor(grid, cache, boxIterator, avaliableSpacing) {
         this.accuracy = 8;
         this.maxPercentWidth = 5000;
@@ -21,9 +24,6 @@ export class GridCalculator {
         this.applyCellsWidth(intervals);
         this.autofitTable();
     }
-    get table() { return this.grid.table; }
-    get currCache() { return this.cache[this.table.index]; }
-    get subDocument() { return this.boxIterator.subDocument; }
     convertTableWidthUnitToTwips(value) {
         if (value.type == TableWidthUnitType.ModelUnits)
             return value.value;

package/lib/common/layout-formatter/table/grid-engine/calculators/table-properties-cache.js

@@ -6,6 +6,13 @@ import { TableWidthUnit, TableWidthUnitType } from '../../../../model/tables/sec
 import { BorderHelper, TableBorderInfoProvider } from '../../borders/border-helper';
 import { Formatter } from '../../formatter';
 export class TablePropertiesCache {
+    get isFixedTableWidth() {
+        const type = this.preferredWidth.type;
+        return type == TableWidthUnitType.FiftiethsOfPercent || type == TableWidthUnitType.ModelUnits;
+    }
+    get isFixedAlgoritm() {
+        return this.layoutType == TableLayoutType.Fixed && this.isFixedTableWidth;
+    }
     constructor(model, table, grid, innerClientProperties) {
         this.borderProvider = new TableBorderInfoProvider(model, table, UnitConverter.twipsToPixels);
         this.indent = table.getActualTableIndent(model.defaultTableProperties);
@@ -20,13 +27,6 @@ export class TablePropertiesCache {
         while (pos.moveToNextRow())
             this.rows.push(new TableRowPropertiesCache(model, this.borderProvider, pos, this.rows, grid));
     }
-    get isFixedTableWidth() {
-        const type = this.preferredWidth.type;
-        return type == TableWidthUnitType.FiftiethsOfPercent || type == TableWidthUnitType.ModelUnits;
-    }
-    get isFixedAlgoritm() {
-        return this.layoutType == TableLayoutType.Fixed && this.isFixedTableWidth;
-    }
     getActualPreferredWidth(table) {
         let result = table.preferredWidth;
         if (result.type == TableWidthUnitType.ModelUnits && result.value == 0)

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

@@ -7,14 +7,6 @@ import { TablePositionIndexes } from '../../../model/tables/main-structures/tabl
 import { TableCellMergingState } from '../../../model/tables/secondary-structures/table-base-structures';
 import { Formatter } from '../formatter';
 export class CellInfo {
-    constructor(cellIndex, rowInfo) {
-        this._isStartOnThisColumn = false;
-        this._formattingSuspended = false;
-        this.cellIndex = cellIndex;
-        this.rowInfo = rowInfo;
-        this.actualCellInfo = this.getActuallCellInfo();
-        this.init();
-    }
     getContentModelPosition(maxNestedLevel) {
         const formatter = this.innerFormatter;
         return formatter && formatter.tableInfo.table.nestedLevel <= maxNestedLevel ?
@@ -58,6 +50,14 @@ export class CellInfo {
     set minBottomPosition(val) { this.actualCellInfo._minBottomPosition = Math.max(val, this.actualCellInfo._minBottomPosition); }
     get marginLeft() { return this.actualCellInfo._marginLeft; }
     get marginRight() { return this.actualCellInfo._marginRight; }
+    constructor(cellIndex, rowInfo) {
+        this._isStartOnThisColumn = false;
+        this._formattingSuspended = false;
+        this.cellIndex = cellIndex;
+        this.rowInfo = rowInfo;
+        this.actualCellInfo = this.getActuallCellInfo();
+        this.init();
+    }
     getActuallCellInfo() {
         if (this.cell.verticalMerging != TableCellMergingState.Continue)
             return this;

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

@@ -7,6 +7,7 @@ import { TableCellMergingState } from '../../../model/tables/secondary-structure
 import { Formatter } from '../formatter';
 import { TableRowHeightInfo, TopAndBottomMarginsForRow } from '../other';
 export class RowInfo {
+    get row() { return this.tableInfo.table.rows[this.rowIndex]; }
     constructor(tableInfo, rowIndex) {
         this.cells = [];
         this.tableInfo = tableInfo;
@@ -14,7 +15,6 @@ export class RowInfo {
         this.howManyColumnsConsiderTableRow = 0;
         this.init();
     }
-    get row() { return this.tableInfo.table.rows[this.rowIndex]; }
     init() {
         const row = this.row;
         const cantSplit = new TableRowPropertiesMergerCantSplit().getProperty(row.properties, this.tableInfo.tableStyle, row.conditionalFormatting, this.tableInfo.defaultTblRowProps);

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

@@ -16,6 +16,23 @@ import { CellInfo } from './cell-info';
 import { CellOrderHelper } from './cell-order-helper';
 import { RowInfo } from './row-info';
 export class TableInfo {
+    get table() { return this.position.table; }
+    get tableStyle() { return this.table.style; }
+    get tblProps() { return this.table.properties; }
+    get defaultTblProps() { return this.model.defaultTableProperties; }
+    get defaultTblRowProps() { return this.model.defaultTableRowProperties; }
+    get defaultTblCellProps() { return this.model.defaultTableCellProperties; }
+    get currRowInfo() { return this.rows[this.position.rowIndex]; }
+    get currCellInfo() { return this.currRowInfo.cells[this.position.cellIndex]; }
+    get isThisTableRowFirstInColumn() { return this.currLayoutTableColumnInfo.tableRows.length == 0; }
+    get isCurrRowLastInTable() { return this.position.rowIndex == this.grid.table.rows.length - 1; }
+    get currTablePositionIndexes() {
+        const actCellInfo = this.currCellInfo;
+        return new TablePositionIndexes(actCellInfo.rowInfo.rowIndex, actCellInfo.cellIndex);
+    }
+    get isSimpleView() {
+        return this.rowFormatter.manager.innerClientProperties.viewsSettings.isSimpleView;
+    }
     constructor(rowFormatter, table, tableMaxWidth, xPosition, yOffset, pageIndexFromWhichTableWasMoved) {
         this.minRowIndex = 0;
         this.verticalBorders = [];
@@ -37,23 +54,6 @@ export class TableInfo {
             rowInfo.cells = ListUtils.map(rowInfo.row.cells, (_cell, cellIndex) => new CellInfo(cellIndex, rowInfo));
         this.cellOrderHelper = new CellOrderHelper(this);
     }
-    get table() { return this.position.table; }
-    get tableStyle() { return this.table.style; }
-    get tblProps() { return this.table.properties; }
-    get defaultTblProps() { return this.model.defaultTableProperties; }
-    get defaultTblRowProps() { return this.model.defaultTableRowProperties; }
-    get defaultTblCellProps() { return this.model.defaultTableCellProperties; }
-    get currRowInfo() { return this.rows[this.position.rowIndex]; }
-    get currCellInfo() { return this.currRowInfo.cells[this.position.cellIndex]; }
-    get isThisTableRowFirstInColumn() { return this.currLayoutTableColumnInfo.tableRows.length == 0; }
-    get isCurrRowLastInTable() { return this.position.rowIndex == this.grid.table.rows.length - 1; }
-    get currTablePositionIndexes() {
-        const actCellInfo = this.currCellInfo;
-        return new TablePositionIndexes(actCellInfo.rowInfo.rowIndex, actCellInfo.cellIndex);
-    }
-    get isSimpleView() {
-        return this.rowFormatter.manager.innerClientProperties.viewsSettings.isSimpleView;
-    }
     static checkIsTableCannotBePlacedOnCurrentPage(rowFormatter, table, yOffset, maxWidth) {
         return this.moveRowDownToFitTable(rowFormatter, table, yOffset, TableInfo.getEstimatedTableWidth(table, maxWidth), maxWidth).needNextPage;
     }

package/lib/common/model/bookmarks.js

@@ -3,14 +3,14 @@ import { ConstInterval } from '@devexpress/utils/lib/intervals/const';
 import { Comparers } from '@devexpress/utils/lib/utils/comparers';
 import { LinkedInterval } from './position/linked-interval';
 export class BookmarkBase extends ConstInterval {
-    constructor(positionManager, interval) {
-        super();
-        this._interval = new LinkedInterval(positionManager, interval);
-    }
     get start() { return this._interval.start; }
     get length() { return this._interval.length; }
     get end() { return this._interval.end; }
     get interval() { return this._interval.getFixedInterval(); }
+    constructor(positionManager, interval) {
+        super();
+        this._interval = new LinkedInterval(positionManager, interval);
+    }
     equals(obj) {
         return obj && this._interval.equals(obj._interval);
     }
@@ -51,14 +51,14 @@ export class Bookmark extends BookmarkBase {
     }
 }
 export class ConstBookmark extends ConstInterval {
+    get start() { return this.interval.start; }
+    get length() { return this.interval.length; }
+    get end() { return this.interval.end; }
     constructor(interval, name) {
         super();
         this.interval = new BoundaryInterval(interval.start, interval.end);
         this.name = name;
     }
-    get start() { return this.interval.start; }
-    get length() { return this.interval.length; }
-    get end() { return this.interval.end; }
     equals(obj) {
         return obj && this.name == obj.name && this.interval.equals(obj.interval);
     }

package/lib/common/model/borders/border-base.js

@@ -1,14 +1,14 @@
 import { ColorHelper } from '../color/color';
 import { BorderLineStyle } from './enums';
 export class BorderBase {
+    static getEmpty() {
+        return BorderBase.empty.clone();
+    }
     constructor(style, width, color) {
         this.style = style;
         this.width = width;
         this.color = color;
     }
-    static getEmpty() {
-        return BorderBase.empty.clone();
-    }
     clone() {
         return new BorderBase(this.style, this.width, this.color);
     }

package/lib/common/model/caches/hash-based-cache.d.ts

@@ -4,7 +4,7 @@ export interface IHashBasedCacheTypeCore<T> extends IEquatable<T> {
 }
 export interface IHashBasedCacheType<T> extends IHashBasedCacheTypeCore<T>, ICloneable<T> {
 }
-export declare type FromJsonConverterType<T> = (obj: any) => T;
+export type FromJsonConverterType<T> = (obj: any) => T;
 export declare class HashBasedCacheCore<T extends IHashBasedCacheTypeCore<T>> {
     protected hashtable: Record<number, T[]>;
     protected numElements: number;

package/lib/common/model/caches/hash-based-cache.js

@@ -2,11 +2,11 @@ import { Errors } from '@devexpress/utils/lib/errors';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { NumberMapUtils } from '@devexpress/utils/lib/utils/map/number';
 export class HashBasedCacheCore {
+    get count() { return this.numElements; }
+    ;
     constructor() {
         this.clear();
     }
-    get count() { return this.numElements; }
-    ;
     clear() {
         this.hashtable = {};
         this.numElements = 0;

package/lib/common/model/caches/images.js

@@ -4,16 +4,6 @@ import { Base64Utils } from '@devexpress/utils/lib/utils/base64';
 import { NumberMapUtils } from '@devexpress/utils/lib/utils/map/number';
 import { isDefined } from '@devexpress/utils/lib/utils/common';
 export class CacheImageInfo {
-    constructor(base64, actualId, tmpId, imageUrl, file, referenceInfo, size, isLoaded) {
-        this._base64 = base64 !== undefined ? Base64Utils.normalizeToDataUrl(base64, "image/png") : undefined;
-        this.actualId = actualId;
-        this.tmpId = tmpId;
-        this._referenceInfo = referenceInfo;
-        this._size = size ? size : CacheImageInfo.emptyPictureSize;
-        this._isLoaded = isLoaded !== undefined ? isLoaded : false;
-        this.imageUrl = imageUrl;
-        this.file = file;
-    }
     static get emptyPictureSize() { return new Size(CacheImageInfo.emptyPicDimension, CacheImageInfo.emptyPicDimension); }
     get isLoaded() { return this._referenceInfo ? this._referenceInfo._isLoaded : this._isLoaded; }
     set isLoaded(val) { this._isLoaded = val; }
@@ -31,6 +21,16 @@ export class CacheImageInfo {
         this._isLoaded = undefined;
         this.file = undefined;
     }
+    constructor(base64, actualId, tmpId, imageUrl, file, referenceInfo, size, isLoaded) {
+        this._base64 = base64 !== undefined ? Base64Utils.normalizeToDataUrl(base64, "image/png") : undefined;
+        this.actualId = actualId;
+        this.tmpId = tmpId;
+        this._referenceInfo = referenceInfo;
+        this._size = size ? size : CacheImageInfo.emptyPictureSize;
+        this._isLoaded = isLoaded !== undefined ? isLoaded : false;
+        this.imageUrl = imageUrl;
+        this.file = file;
+    }
     equals(obj) {
         return (isDefined(this._referenceInfo) && this._referenceInfo === obj._referenceInfo) ||
             this.actualId == obj.actualId &&
@@ -71,6 +71,7 @@ export class CacheImageInfo {
 }
 CacheImageInfo.emptyPicDimension = UnitConverter.pixelsToTwips(32);
 export class ImageCache {
+    get emptyImage() { return this.cache[this.emptyImageId]; }
     constructor() {
         this.emptyImageId = 0;
         this.lastTmpId = 0;
@@ -80,7 +81,6 @@ export class ImageCache {
         const emptyImage = this.createUnloadedInfoByBase64(ImageCache.transparentWhiteImage1_1, new Size(onePixelSize, onePixelSize));
         emptyImage.isLoaded = false;
     }
-    get emptyImage() { return this.cache[this.emptyImageId]; }
     getPictureData(id) {
         return this.cache[id];
     }

package/lib/common/model/changes/change.d.ts

@@ -66,4 +66,4 @@ import { ParagraphMergedSubDocumentChange } from './sub-document/text/paragraph-
 import { SectionInsertedSubDocumentChange } from './sub-document/text/section-inserted';
 import { SimpleRunInsertedSubDocumentChange } from './sub-document/text/simple-run-inserted';
 import { TextBufferChangedSubDocumentChange } from './sub-document/text/text-buffer-changed';
-export declare type ModelChange = PageColorModelChange | DefaultTabWidthModelChange | DifferentOddAndEvenPagesModelChange | HeaderFooterCreatedModelChange | HeaderFooterIndexChangedModelChange | LoadFontInfoModelChange | SectionsFormattingChangedModelChange | CreateStyleLinkModelChange | DeleteStyleLinkModelChange | DocumentProtectionChangedModelChange | AbstractNumberingListAddedModelChange | AbstractNumberingListDeletedModelChange | NumberingListAddedModelChange | NumberingListDeletedModelChange | ListLevelPropertyChangedModelChange | ListLevelParagraphPropertyChangedModelChange | ListLevelCharacterPropertyChangedModelChange | IOverrideListLevelChangedModelChange | BookmarkCreatedSubDocumentChange | BookmarkDeletedSubDocumentChange | TabInsertedSubDocumentChange | TabDeletedSubDocumentChange | LoadPicturesInfoSubDocumentChange | InlinePictureInsertedSubDocumentChange | InlinePicturesUpdatedSubDocumentChange | AnchoredPictureInsertedSubDocumentChange | AnchoredPictureSizeChangedSubDocumentChange | InlineObjectRunPropertyChangedSubDocumentChange | FieldInsertedSubDocumentChange | FieldDeletedSubDocumentChange | HyperlinkInfoChangedSubDocumentChange | FieldsShowCodeChangedSubDocumentChange | SimpleRunInsertedSubDocumentChange | TextBufferChangedSubDocumentChange | ParagraphInsertedSubDocumentChange | SectionInsertedSubDocumentChange | AnchoredTextBoxInsertedSubDocumentChange | AnchorObjectRemovedSubDocumentChange | IntervalRemovedSubDocumentChange | ParagraphMergedSubDocumentChange | SectionMergedSubDocumentChange | CharacterFormattingChangedSubDocumentChange | CharacterPropertiesChangedSubDocumentChange | ParagraphFormattingChangedSubDocumentChange | ParagraphPropertiesChangedSubDocumentChange | ParagraphAndCharacterMergedPropertiesResetSubDocumentChange | AnchoredTextBoxSizeChangedSubDocumentChange | AnchoredTextBoxPropertiesChangedSubDocumentChange | AnchorInfoPropertyChangedSubDocumentChange | ShapeChangedSubDocumentChange | ShapePropertyChangedSubDocumentChange | CharacterStyleAppliedSubDocumentChange | ParagraphStyleAppliedSubDocumentChange | TableStyleChangedSubDocumentChange | ParagraphNumberingListChangedSubDocumentChange | TableCreatedSubDocumentChange | TableRemovedSubDocumentChange | TableStartPositionShiftedSubDocumentChange | TableCellPropertyChangedSubDocumentChange | TablePropertyChangedSubDocumentChange | TableRowPropertyChangedSubDocumentChange | TableCellSplittedHorizontallySubDocumentChange | TableCellMergedHorizontallySubDocumentChange | TableRowInsertedSubDocumentChange | TableRowRemovedSubDocumentChange | TableCellRemovedSubDocumentChange | TableCellInsertedSubDocumentChange | RangePermissionsChangedSubDocumentChange | RangePermissionsPropertiesChange;
+export type ModelChange = PageColorModelChange | DefaultTabWidthModelChange | DifferentOddAndEvenPagesModelChange | HeaderFooterCreatedModelChange | HeaderFooterIndexChangedModelChange | LoadFontInfoModelChange | SectionsFormattingChangedModelChange | CreateStyleLinkModelChange | DeleteStyleLinkModelChange | DocumentProtectionChangedModelChange | AbstractNumberingListAddedModelChange | AbstractNumberingListDeletedModelChange | NumberingListAddedModelChange | NumberingListDeletedModelChange | ListLevelPropertyChangedModelChange | ListLevelParagraphPropertyChangedModelChange | ListLevelCharacterPropertyChangedModelChange | IOverrideListLevelChangedModelChange | BookmarkCreatedSubDocumentChange | BookmarkDeletedSubDocumentChange | TabInsertedSubDocumentChange | TabDeletedSubDocumentChange | LoadPicturesInfoSubDocumentChange | InlinePictureInsertedSubDocumentChange | InlinePicturesUpdatedSubDocumentChange | AnchoredPictureInsertedSubDocumentChange | AnchoredPictureSizeChangedSubDocumentChange | InlineObjectRunPropertyChangedSubDocumentChange | FieldInsertedSubDocumentChange | FieldDeletedSubDocumentChange | HyperlinkInfoChangedSubDocumentChange | FieldsShowCodeChangedSubDocumentChange | SimpleRunInsertedSubDocumentChange | TextBufferChangedSubDocumentChange | ParagraphInsertedSubDocumentChange | SectionInsertedSubDocumentChange | AnchoredTextBoxInsertedSubDocumentChange | AnchorObjectRemovedSubDocumentChange | IntervalRemovedSubDocumentChange | ParagraphMergedSubDocumentChange | SectionMergedSubDocumentChange | CharacterFormattingChangedSubDocumentChange | CharacterPropertiesChangedSubDocumentChange | ParagraphFormattingChangedSubDocumentChange | ParagraphPropertiesChangedSubDocumentChange | ParagraphAndCharacterMergedPropertiesResetSubDocumentChange | AnchoredTextBoxSizeChangedSubDocumentChange | AnchoredTextBoxPropertiesChangedSubDocumentChange | AnchorInfoPropertyChangedSubDocumentChange | ShapeChangedSubDocumentChange | ShapePropertyChangedSubDocumentChange | CharacterStyleAppliedSubDocumentChange | ParagraphStyleAppliedSubDocumentChange | TableStyleChangedSubDocumentChange | ParagraphNumberingListChangedSubDocumentChange | TableCreatedSubDocumentChange | TableRemovedSubDocumentChange | TableStartPositionShiftedSubDocumentChange | TableCellPropertyChangedSubDocumentChange | TablePropertyChangedSubDocumentChange | TableRowPropertyChangedSubDocumentChange | TableCellSplittedHorizontallySubDocumentChange | TableCellMergedHorizontallySubDocumentChange | TableRowInsertedSubDocumentChange | TableRowRemovedSubDocumentChange | TableCellRemovedSubDocumentChange | TableCellInsertedSubDocumentChange | RangePermissionsChangedSubDocumentChange | RangePermissionsPropertiesChange;

package/lib/common/model/changes/sub-document/list/paragraph-numbering-list-changed.js

@@ -1,10 +1,10 @@
 import { ModelChangeType } from '../../enums';
 export class ParagraphNumberingListChangedSubDocumentChange {
+    get subDocumentId() { return this.subDocument.id; }
     constructor(subDocument, newState, oldAbstractNumberingListIndex) {
         this.subDocument = subDocument;
         this.newState = newState;
         this.oldAbstractNumberingListIndex = oldAbstractNumberingListIndex;
         this.type = ModelChangeType.ParagraphNumberingListChanged;
     }
-    get subDocumentId() { return this.subDocument.id; }
 }

package/lib/common/model/changes/sub-document/table/cell-property-changed.js

@@ -1,10 +1,10 @@
 import { ModelChangeType } from '../../enums';
 export class TableCellPropertyChangedSubDocumentChange {
+    get subDocumentId() { return this.subDocument.id; }
     constructor(subDocument, property, newState) {
         this.subDocument = subDocument;
         this.property = property;
         this.newState = newState;
         this.type = ModelChangeType.TableCellPropertyChanged;
     }
-    get subDocumentId() { return this.subDocument.id; }
 }

package/lib/common/model/changes/sub-document/table/property-changed.js

@@ -1,10 +1,10 @@
 import { ModelChangeType } from '../../enums';
 export class TablePropertyChangedSubDocumentChange {
+    get subDocumentId() { return this.subDocument.id; }
     constructor(subDocument, property, newState) {
         this.subDocument = subDocument;
         this.property = property;
         this.newState = newState;
         this.type = ModelChangeType.TablePropertyChanged;
     }
-    get subDocumentId() { return this.subDocument.id; }
 }

package/lib/common/model/changes/sub-document/table/row-property-changed.js

@@ -1,10 +1,10 @@
 import { ModelChangeType } from '../../enums';
 export class TableRowPropertyChangedSubDocumentChange {
+    get subDocumentId() { return this.subDocument.id; }
     constructor(subDocument, property, newState) {
         this.subDocument = subDocument;
         this.property = property;
         this.newState = newState;
         this.type = ModelChangeType.TableRowPropertyChanged;
     }
-    get subDocumentId() { return this.subDocument.id; }
 }

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

@@ -10,7 +10,7 @@ import { CharacterProperties } from './character-properties';
 import { CompositeFontInfo } from './composite-font-info';
 import { CharacterFormattingScript, CharacterPropertiesMask, StrikeoutType, UnderlineType } from './enums';
 import { LangInfo } from './lang-info';
-export declare type CharacterPropertiesHistoryItemType<T> = new (modelManipulator: ModelManipulator, subDocInterval: SubDocumentInterval, newValue: T, newUse: boolean) => CharacterPropertiesHistoryItemBase<T>;
+export type CharacterPropertiesHistoryItemType<T> = new (modelManipulator: ModelManipulator, subDocInterval: SubDocumentInterval, newValue: T, newUse: boolean) => CharacterPropertiesHistoryItemBase<T>;
 export interface ICharacterPropertyDescriptor<T> {
     setProp(props: CharacterProperties, newValue: T): any;
     getProp(props: CharacterProperties): T;

package/lib/common/model/color/color-model-info.js

@@ -7,12 +7,6 @@ import { ColorHSL } from './color-hsl';
 import { DXColor } from './dx-color';
 import { ColorType, ThemeColorIndexConstants, ThemeColorValues } from './enums';
 export class ColorModelInfo {
-    constructor() {
-        this._themeColorIndex = ThemeColorIndexConstants.None;
-        this._themeValue = ThemeColorValues.None;
-        this._colorIndex = ColorModelInfo.defaultColorIndex;
-        this.restoreDefaultValues();
-    }
     static get nullColor() { return ColorModelInfo.makeByColor(ColorHelper.AUTOMATIC_COLOR); }
     ;
     static makeByThemeColorIndex(themeColorIndex, tint = 0, themeValue = ThemeColorValues.None) {
@@ -72,6 +66,12 @@ export class ColorModelInfo {
         this._tint = value;
     }
     get isEmpty() { return this.colorType == ColorType.Rgb && DXColor.isTransparentOrEmpty(this.rgb); }
+    constructor() {
+        this._themeColorIndex = ThemeColorIndexConstants.None;
+        this._themeValue = ThemeColorValues.None;
+        this._colorIndex = ColorModelInfo.defaultColorIndex;
+        this.restoreDefaultValues();
+    }
     restoreDefaultValues() {
         this._themeColorIndex = ThemeColorIndexConstants.None;
         this._themeValue = ThemeColorValues.None;

package/lib/common/model/creator/font-corrector.js

@@ -6,17 +6,17 @@ import { ControlFontType } from '../fonts/font-info';
 import { GoogleFontsApi } from '../fonts/google-fonts';
 import { ModelCacheFiller } from './cache';
 export class FontCorrector {
-    constructor(modelManipulator, model, fonts) {
-        this.modelManipulator = modelManipulator;
-        this.model = model;
-        this.fonts = fonts;
-    }
     get fontInfoCache() {
         return this.model.cache.fontInfoCache;
     }
     get controlFontsCache() {
         return this.model.cache.controlFontsCache;
     }
+    constructor(modelManipulator, model, fonts) {
+        this.modelManipulator = modelManipulator;
+        this.model = model;
+        this.fonts = fonts;
+    }
     correct() {
         this.addAndLoad();
         new ModelCacheFiller(this.model, this.fonts).fillCache();

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

@@ -36,6 +36,16 @@ import { InlinePictureRun } from './runs/inline-picture-run';
 import { SubDocumentCollection } from './sub-document-collection';
 import { NotePosition, NoteSeparators } from './footnotes/footnote';
 export class DocumentModel {
+    get subDocuments() {
+        return this.subDocumentsCollection.filteredCollection;
+    }
+    get options() { return this.modelOptions.control; }
+    ;
+    get isDocumentProtectionEnabled() {
+        const properties = this.documentProtectionProperties;
+        return this.aspxIsDocumentProtectionEnabled ||
+            (properties.enforceProtection && properties.protectionType != DocumentProtectionType.None);
+    }
     constructor(modelOptions, subDocumentsIdCounter = 1) {
         this.mirrorMargins = false;
         this.aspxIsDocumentProtectionEnabled = false;
@@ -73,16 +83,6 @@ export class DocumentModel {
         this.compatibilitySettings = new CompatibilitySettings();
         this.docVariables = new DocumentVariables();
     }
-    get subDocuments() {
-        return this.subDocumentsCollection.filteredCollection;
-    }
-    get options() { return this.modelOptions.control; }
-    ;
-    get isDocumentProtectionEnabled() {
-        const properties = this.documentProtectionProperties;
-        return this.aspxIsDocumentProtectionEnabled ||
-            (properties.enforceProtection && properties.protectionType != DocumentProtectionType.None);
-    }
     setPageColor(value) {
         this.displayBackgroundShape = true;
         this.pageBackColor = value;

package/lib/common/model/fields/field-request-manager.d.ts

@@ -1,7 +1,7 @@
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 import { SubDocument } from '../sub-document';
 import { FieldParameter } from './parsers/field-code-parser';
-export declare type FieldRequestHandler = (fieldRequestManager: FieldRequestManager) => void;
+export type FieldRequestHandler = (fieldRequestManager: FieldRequestManager) => void;
 export declare abstract class FieldRequestManager {
     private static fieldId;
     protected activeRecord: number;

package/lib/common/model/fields/field-request-manager.js

@@ -45,13 +45,13 @@ export class TocFieldRequestManager extends FieldRequestManager {
 export class FieldRequestData {
 }
 export class FieldDocVariableRequestData extends FieldRequestData {
+    get serverUpdateFieldType() { return ServerUpdateFieldType.DocVariable; }
     constructor(fieldInterval, fieldName, parameters) {
         super();
         this.fieldInterval = fieldInterval;
         this.fieldName = fieldName;
         this.parameters = parameters;
     }
-    get serverUpdateFieldType() { return ServerUpdateFieldType.DocVariable; }
     asJson() {
         return {
             [JSONUpdateFieldCommandInfo.ServerUpdateFieldType]: this.serverUpdateFieldType,
@@ -69,11 +69,11 @@ export class FieldDocVariableRequestData extends FieldRequestData {
     }
 }
 export class FieldMailMergeRequestData extends FieldRequestData {
+    get serverUpdateFieldType() { return ServerUpdateFieldType.MergeField; }
     constructor(fieldName) {
         super();
         this.fieldName = fieldName;
     }
-    get serverUpdateFieldType() { return ServerUpdateFieldType.MergeField; }
     asJson() {
         return {
             [JSONUpdateFieldCommandInfo.ServerUpdateFieldType]: this.serverUpdateFieldType,

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

@@ -11,5 +11,6 @@ export declare enum FieldName {
     Tc = 9,
     PageRef = 10,
     Toc = 11,
-    FillIn = 12
+    FillIn = 12,
+    If = 13
 }

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

@@ -13,4 +13,5 @@ export var FieldName;
     FieldName[FieldName["PageRef"] = 10] = "PageRef";
     FieldName[FieldName["Toc"] = 11] = "Toc";
     FieldName[FieldName["FillIn"] = 12] = "FillIn";
+    FieldName[FieldName["If"] = 13] = "If";
 })(FieldName || (FieldName = {}));

package/lib/common/model/fields/parsers/field-code-parser-client-updating-base.js

@@ -10,7 +10,7 @@ export class FieldCodeParserClientUpdatingBase extends FieldCodeParser {
     }
     parseCodeCurrentFieldInternal(_responce) {
         this.removeInterval(this.getTopField().getResultInterval());
-        if (this.parseSwitchesAndArgs(true))
+        if (this.parseSwitchesAndArgs())
             this.fillResult();
         this.parserState = FieldCodeParserState.end;
         return true;

package/lib/common/model/fields/parsers/field-code-parser-doc-variable.js

@@ -19,7 +19,7 @@ export class FieldCodeParserDocVariable extends FieldCodeParser {
                 this.parserState = FieldCodeParserState.end;
             return true;
         }
-        if (!this.parseSwitchesAndArgs(true)) {
+        if (!this.parseSwitchesAndArgs()) {
             this.parserState = FieldCodeParserState.end;
             return true;
         }

package/lib/common/model/fields/parsers/field-code-parser-hyperlink.js

@@ -10,7 +10,7 @@ import { UrlUtils } from '../../../utils/utils';
 export class FieldCodeParserHyperlink extends FieldCodeParserClientUpdatingBase {
     get name() { return FieldName.Hyperlink; }
     parseCodeCurrentFieldInternal(_responce) {
-        if (this.parseSwitchesAndArgs(true))
+        if (this.parseSwitchesAndArgs())
             this.fillResult();
         else
             this.removeInterval(this.getTopField().getResultInterval());

package/lib/common/model/fields/parsers/field-code-parser-if.d.ts

@@ -0,0 +1,39 @@
+import { FieldName } from '../names';
+import { FieldCodeParserClientUpdatingBase } from './field-code-parser-client-updating-base';
+export declare class FieldCodeParserIf extends FieldCodeParserClientUpdatingBase {
+    get name(): FieldName;
+    protected fillResult(): boolean;
+    private parseParameters;
+}
+export declare class IfExpression {
+    operator: string;
+    leftExpression: IfExpressionParameter;
+    rightExpression: IfExpressionParameter;
+    trueText: string;
+    falseText: string;
+    static operators: string[];
+    constructor(operator: string, leftExpression: IfExpressionParameter, rightExpression: IfExpressionParameter, trueText?: string, falseText?: string);
+    static isOperator(operator: string): boolean;
+    evaluate(): string;
+    private evaluateComparison;
+    static compareStrings(leftValue: string, rightValue: string): number;
+    static compareStringsWithWildcards(leftValue: string, rightValue: string): 0 | 1;
+}
+export declare class IfExpressionParameter {
+    text: string;
+    number: number;
+    isNumber: boolean;
+    constructor(text: string, isQuoted?: boolean);
+}
+export declare class IfExpressionError extends Error {
+    constructor(message: string);
+}
+export declare class IfExpressionInvalidOperatorError extends IfExpressionError {
+    constructor(message?: string);
+}
+export declare class IfExpressionTooManyParametersError extends IfExpressionError {
+    constructor(message?: string);
+}
+export declare class IfExpressionMissingParametersError extends IfExpressionError {
+    constructor(message?: string);
+}