devexpress-richedit 25.1.1-alpha → 25.1.3

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

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

package/lib/common/layout-formatter/floating/position-calculators/horizontal.d.ts

@@ -11,6 +11,7 @@ export declare class AnchorObjectHorizontalPositionCalculator extends AnchorObje
     private alignment;
     private getAlignPosition;
     private absolute;
+    private getAnchorXPosition;
     private bookLayout;
     private relative;
 }

package/lib/common/layout-formatter/floating/position-calculators/horizontal.js

@@ -41,7 +41,7 @@ export class AnchorObjectHorizontalPositionCalculator extends AnchorObjectPositi
     alignment(type, alignment) {
         switch (type) {
             case AnchorObjectHorizontalPositionType.Character:
-                return this.getAlignPosition(alignment, 0);
+                return this.getAnchorXPosition() + this.getAlignPosition(alignment, 0);
             case AnchorObjectHorizontalPositionType.Column:
                 return this.isRelativeCell ?
                     this.relativeColumnPos() + this.lp.row.tableCellInfo.x +
@@ -90,17 +90,8 @@ export class AnchorObjectHorizontalPositionCalculator extends AnchorObjectPositi
                 return this.isRelativeCell ? this.relativeColumnPos() + this.lp.row.tableCellInfo.x : 0;
             case AnchorObjectHorizontalPositionType.Column:
                 return this.isRelativeCell ? this.relativeColumnPos() + this.lp.row.tableCellInfo.x + this.leftCellMargin : this.relativeColumnPos();
-            case AnchorObjectHorizontalPositionType.Character: {
-                const rowAbsPos = this.lp.getLogPosition(DocumentLayoutDetailsLevel.Row);
-                const ancBoxAbsPos = this.obj.rowOffset;
-                const boxIndex = SearchUtils.normedInterpolationIndexOf(this.lp.row.boxes, (box) => rowAbsPos + box.rowOffset, ancBoxAbsPos);
-                const box = this.lp.row.boxes[boxIndex];
-                if (!box)
-                    return this.lp.getLayoutX(null, DocumentLayoutDetailsLevel.Row);
-                const symbolCount = Math.max(0, ancBoxAbsPos - rowAbsPos - box.rowOffset);
-                return this.lp.getLayoutX(null, DocumentLayoutDetailsLevel.Row) + box.x +
-                    box.getCharOffsetXInPixels(this.manager.measurer, symbolCount);
-            }
+            case AnchorObjectHorizontalPositionType.Character:
+                return this.getAnchorXPosition();
             case AnchorObjectHorizontalPositionType.Margin:
                 return this.isRelativeCell ? this.relativeColumnPos() + this.lp.row.tableCellInfo.x + this.leftCellMargin :
                     this.manager.boundsCalculator.marginLeft;
@@ -117,6 +108,19 @@ export class AnchorObjectHorizontalPositionCalculator extends AnchorObjectPositi
                 throw new Error(Errors.InternalException);
         }
     }
+    getAnchorXPosition() {
+        const rowAbsPos = this.lp.getLogPosition(DocumentLayoutDetailsLevel.Row);
+        const ancBoxAbsPos = this.obj.rowOffset;
+        let boxIndex = SearchUtils.normedInterpolationIndexOf(this.lp.row.boxes, (box) => rowAbsPos + box.rowOffset, ancBoxAbsPos);
+        if (boxIndex < 0)
+            boxIndex = 0;
+        const box = this.lp.row.boxes[boxIndex];
+        if (!box)
+            return this.lp.getLayoutX(null, DocumentLayoutDetailsLevel.Row);
+        const symbolCount = Math.max(0, ancBoxAbsPos - rowAbsPos - box.rowOffset);
+        return this.lp.getLayoutX(null, DocumentLayoutDetailsLevel.Row) + box.x +
+            box.getCharOffsetXInPixels(this.manager.measurer, symbolCount);
+    }
     bookLayout() {
         return this.alignment(this.anchorInfo.horizontalPositionType, AnchorObjectHorizontalPositionCalculator.mapBookLayoutALignmentType[this.anchorInfo.horizontalPositionAlignment]);
     }

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

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

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

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

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

@@ -21,8 +21,6 @@ export class RowBaseFormatterState {
             this.rowFormatter.finishRow();
     }
     addAnchorObject() {
-        if (!this.rowFormatter.wordHolder.pushBoxes())
-            return;
         this.rowFormatter.addAnchorObject();
     }
     addTextBox() {

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

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

package/lib/common/layout-formatter/row/word-holder.js

@@ -25,7 +25,7 @@ export class WordHolderInfo {
         }
         if (res == null)
             return false;
-        if (this.rowFormatter.row.isEmpty()) {
+        if (this.rowFormatter.row.isEmpty() || this.rowFormatter.row.containsSpacesOnly()) {
             if (this.rowFormatter.rowSizesManager.rowFormattingInfo.isFloatingIntersectRow) {
                 this.rowFormatter.rowSizesManager.rowFormattingInfo.findNextYPosWhatHasNeededSpace(res.requiredWidth);
                 return this.pushBoxes();

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@ import { BorderLineStyle } from './enums';
 import { LayoutBorder } from './layout-border';
 export class BorderInfo {
     constructor() {
-        this.style = BorderLineStyle.None;
+        this.style = BorderLineStyle.Nil;
         this.color = ColorModelInfoCache.defaultItem;
         this.width = 0;
         this.offset = 0;

package/lib/common/model/caches/images.d.ts

@@ -8,12 +8,15 @@ export declare class CacheImageInfo {
     private _convertedBase64?;
     private _size?;
     private _isLoaded;
+    private _isSizeDefined;
     tmpId?: number;
     actualId?: number;
     imageUrl?: string;
     file?: File;
     get isLoaded(): boolean;
     set isLoaded(val: boolean);
+    get isSizeDefined(): boolean;
+    set isSizeDefined(val: boolean);
     get size(): Size;
     set size(val: Size);
     get currId(): number;
@@ -22,7 +25,7 @@ export declare class CacheImageInfo {
     get pdfCompatibleBase64(): string | undefined;
     get referenceInfo(): CacheImageInfo | undefined;
     set referenceInfo(val: CacheImageInfo | undefined);
-    constructor(base64?: string, actualId?: number, tmpId?: number, imageUrl?: string, file?: File, referenceInfo?: CacheImageInfo, size?: Size, isLoaded?: boolean);
+    constructor(base64?: string, actualId?: number, tmpId?: number, imageUrl?: string, file?: File, referenceInfo?: CacheImageInfo, size?: Size, isLoaded?: boolean, isActualSize?: boolean);
     equals(obj: CacheImageInfo): boolean;
     clone(): CacheImageInfo;
     shouldMakeImagePdfCompatible(): boolean;

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

@@ -7,6 +7,8 @@ export class CacheImageInfo {
     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; }
+    get isSizeDefined() { return this._referenceInfo ? this._referenceInfo._isSizeDefined : this._isSizeDefined; }
+    set isSizeDefined(val) { this._isSizeDefined = val; }
     get size() { return this._referenceInfo ? this._referenceInfo._size : this._size; }
     set size(val) { this._size = val; }
     get currId() { return this.actualId !== undefined ? this.actualId : this.tmpId; }
@@ -19,15 +21,17 @@ export class CacheImageInfo {
         this._base64 = undefined;
         this._size = undefined;
         this._isLoaded = undefined;
+        this._isSizeDefined = undefined;
         this.file = undefined;
     }
-    constructor(base64, actualId, tmpId, imageUrl, file, referenceInfo, size, isLoaded) {
+    constructor(base64, actualId, tmpId, imageUrl, file, referenceInfo, size, isLoaded, isActualSize) {
         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._isSizeDefined = isActualSize ? isActualSize : !!size;
         this.imageUrl = imageUrl;
         this.file = file;
     }
@@ -41,7 +45,7 @@ export class CacheImageInfo {
                 this.size.equals(obj.size);
     }
     clone() {
-        return new CacheImageInfo(this._base64, this.actualId, this.tmpId, this.imageUrl, this.file, this._referenceInfo, this._size, this._isLoaded);
+        return new CacheImageInfo(this._base64, this.actualId, this.tmpId, this.imageUrl, this.file, this._referenceInfo, this._size, this._isLoaded, this._isSizeDefined);
     }
     shouldMakeImagePdfCompatible() {
         if (isDefined(this._convertedBase64))

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

@@ -17,6 +17,7 @@ import { LoadFontInfoModelChange } from './model/load-font';
 import { PageColorModelChange } from './model/page-color';
 import { SectionsFormattingChangedModelChange } from './model/section-formatting-changed';
 import { SectionMergedSubDocumentChange } from './model/section-merged';
+import { ZoomLevelChange } from './model/zoom-level';
 import { AnchorInfoPropertyChangedSubDocumentChange } from './sub-document/anchor/anchor-info-property-changed';
 import { AnchoredTextBoxPropertiesChangedSubDocumentChange } from './sub-document/anchor/anchored-text-box-properties-changed';
 import { AnchoredTextBoxSizeChangedSubDocumentChange } from './sub-document/anchor/anchored-text-box-size-changed';
@@ -66,4 +67,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 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 | ZoomLevelChange;

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

@@ -67,5 +67,6 @@ export declare enum ModelChangeType {
     TableCellRemoved = 65,
     TableCellInserted = 66,
     RangePermissionsChanged = 67,
-    RangePermissionsPropertiesChanged = 68
+    RangePermissionsPropertiesChanged = 68,
+    ZoomLevelChanged = 69
 }

package/lib/common/model/changes/enums.js

@@ -69,4 +69,5 @@ export var ModelChangeType;
     ModelChangeType[ModelChangeType["TableCellInserted"] = 66] = "TableCellInserted";
     ModelChangeType[ModelChangeType["RangePermissionsChanged"] = 67] = "RangePermissionsChanged";
     ModelChangeType[ModelChangeType["RangePermissionsPropertiesChanged"] = 68] = "RangePermissionsPropertiesChanged";
+    ModelChangeType[ModelChangeType["ZoomLevelChanged"] = 69] = "ZoomLevelChanged";
 })(ModelChangeType || (ModelChangeType = {}));

package/lib/common/model/changes/model/zoom-level.d.ts

@@ -0,0 +1,8 @@
+import { ModelChangeBase } from '../change-base';
+import { ModelChangeType } from '../enums';
+export declare class ZoomLevelChange implements ModelChangeBase {
+    zoomLevel: number;
+    prevZoomLevel: number;
+    readonly type = ModelChangeType.ZoomLevelChanged;
+    constructor(zoomLevel: number, prevZoomLevel: number);
+}

package/lib/common/model/changes/model/zoom-level.js

@@ -0,0 +1,8 @@
+import { ModelChangeType } from '../enums';
+export class ZoomLevelChange {
+    constructor(zoomLevel, prevZoomLevel) {
+        this.zoomLevel = zoomLevel;
+        this.prevZoomLevel = prevZoomLevel;
+        this.type = ModelChangeType.ZoomLevelChanged;
+    }
+}

package/lib/common/model/character/character-properties.d.ts

@@ -54,7 +54,7 @@ export declare class MaskedCharacterProperties extends CharacterProperties imple
     protected calculateHash(): number;
     getUseValue(value: CharacterPropertiesMask): boolean;
     setUseValue(mask: CharacterPropertiesMask, value: boolean): void;
-    setUseValueFull(value: number): void;
+    setUseValueFull(value: number, onlyForDefault?: boolean): void;
     getLowPartUseValue(value: number): number;
     getHighPartUseValue(value: number): number;
     getUseValueFull(): number;

package/lib/common/model/character/character-properties.js

@@ -5,6 +5,7 @@ import { ColorHelper } from '../color/color';
 import { ColorModelInfo } from '../color/color-model-info';
 import { ShadingInfo } from '../shadings/shading-info';
 import { ShadingPattern } from '../shadings/shading-pattern';
+import { CharacterPropertyDescriptor } from './character-property-descriptor';
 import { CompositeFontInfo } from './composite-font-info';
 import { CharacterFormattingScript, CharacterPropertiesMask, StrikeoutType, UnderlineType } from './enums';
 import { LangInfo } from './lang-info';
@@ -143,8 +144,19 @@ export class MaskedCharacterProperties extends CharacterProperties {
             this.useValueExt &= ~this.getHighPartUseValue(mask);
         }
     }
-    setUseValueFull(value) {
-        this.useValue = this.getLowPartUseValue(value);
+    setUseValueFull(value, onlyForDefault = false) {
+        const lowPartUseValue = this.getLowPartUseValue(value);
+        if (onlyForDefault) {
+            CharacterPropertyDescriptor.ALL_FIELDS.forEach((desc) => {
+                const prop = desc.getProp(this);
+                const mask = desc.maskValue();
+                if (desc.binaryEquals(prop, desc.defaultValue))
+                    this.setUseValue(mask, !!(mask & lowPartUseValue));
+            });
+        }
+        else {
+            this.useValue = lowPartUseValue;
+        }
         this.useValueExt = this.getHighPartUseValue(value);
     }
     getLowPartUseValue(value) {

package/lib/common/model/creator/creator.js

@@ -27,6 +27,7 @@ import { TableRowProperties, TableRowPropertiesMask } from '../tables/properties
 import { TableConditionalStyle } from '../tables/styles/table-conditional-style';
 import { TableStyle } from '../tables/styles/table-style';
 import { SystemColorValues } from '../themes/enums';
+import { TableWidthUnitType } from '../tables/secondary-structures/table-units';
 export class ModelCreator {
     constructor(options) {
         this.options = options;
@@ -122,6 +123,11 @@ export class ModelCreator {
         }
         if (this.options.fillTableStyles) {
             const tableConditionalStyle = new TableConditionalStyle(templateTableProp, templateTableRowProp, templateTableCellProp, templateParProp, templateCharProps, templateTabProp);
+            tableConditionalStyle.tableProperties.cellMargins.left.type = TableWidthUnitType.ModelUnits;
+            tableConditionalStyle.tableProperties.cellMargins.left.value = 108;
+            tableConditionalStyle.tableProperties.cellMargins.right.type = TableWidthUnitType.ModelUnits;
+            tableConditionalStyle.tableProperties.cellMargins.right.value = 108;
+            tableConditionalStyle.tableProperties.mask = TablePropertiesMask.UseLeftMargin | TablePropertiesMask.UseRightMargin;
             model.stylesManager.addTableStyle(new TableStyle(TableStyle.DEFAULT_STYLENAME, TableStyle.DEFAULT_STYLENAME, false, false, false, true, {}, tableConditionalStyle, null));
         }
         if (this.options.initOfficeTheme)

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

@@ -99,7 +99,7 @@ export declare class Field {
     static correctIntervalDueToFieldsWithoutUiChecks(subDocument: SubDocument, newInterval: FixedInterval): FixedInterval;
     private static correctIntervalDueToFieldsCaseSelectionCollapsed;
     static correctIntervalDueToFields(subDocument: SubDocument, newInterval: FixedInterval): number;
-    private static isFloatingObjectSelected;
+    private static isResizableObjectSelected;
     static correctWhenPositionInStartCode(fields: Field[], position: number): number;
     clone(subDocument: SubDocument): Field;
 }

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

@@ -287,15 +287,16 @@ export class Field {
             return newInterval.start = Field.correctIntervalDueToFieldsCaseSelectionCollapsed(subDocument.fields, newInterval.start);
         const indexesInterval = Field.correctIntervalDueToFieldsWithoutUiChecks(subDocument, newInterval);
         ListUtils.forEach(fields, (field) => {
-            if (field.getResultInterval().equals(newInterval) && !this.isFloatingObjectSelected(subDocument, newInterval))
+            if (field.getResultInterval().equals(newInterval) && !this.isResizableObjectSelected(subDocument, newInterval))
                 newInterval.expand(field.getAllFieldInterval());
         }, indexesInterval.start, indexesInterval.end);
     }
-    static isFloatingObjectSelected(subDocument, interval) {
+    static isResizableObjectSelected(subDocument, interval) {
         if (interval.length !== 1)
             return false;
         const run = subDocument.getRunByPosition(interval.start);
-        return run && (run.getType() == RunType.AnchoredPictureRun || run.getType() == RunType.AnchoredTextBoxRun);
+        const runType = run && run.getType();
+        return runType == RunType.AnchoredPictureRun || runType == RunType.AnchoredTextBoxRun || runType == RunType.InlinePictureRun;
     }
     static correctWhenPositionInStartCode(fields, position) {
         if (fields.length < 1)

package/lib/common/model/fields/tree-creator.js

@@ -104,7 +104,7 @@ export class FieldsWaitingForUpdate {
                     }
                     if (!fieldParser.update(response)) {
                         someFieldInCurrentInfoNotUpdated = true;
-                        info.parsers.push(fieldParser);
+                        info.parsers.unshift(fieldParser);
                     }
                     else
                         fieldParser.destructor();

package/lib/common/model/history/items/character-properties-history-items.d.ts

@@ -14,7 +14,8 @@ import { HistoryItemIntervalStateObject, HistoryItemIntervalUseStateObject } fro
 export declare class FontUseValueHistoryItem extends IntervalBasedHistoryItem {
     oldState: HistoryItemIntervalState<HistoryItemIntervalStateObject>;
     newValue: number;
-    constructor(modelManipulator: ModelManipulator, subDocInterval: SubDocumentInterval, newValue: number);
+    keepCustomFormatting: boolean;
+    constructor(modelManipulator: ModelManipulator, subDocInterval: SubDocumentInterval, newValue: number, keepCustomFormatting?: boolean);
     redo(): void;
     undo(): void;
 }

package/lib/common/model/history/items/character-properties-history-items.js

@@ -1,12 +1,13 @@
 import { Errors } from '@devexpress/utils/lib/errors';
 import { IntervalBasedHistoryItem } from '../base/interval-based-history-item';
 export class FontUseValueHistoryItem extends IntervalBasedHistoryItem {
-    constructor(modelManipulator, subDocInterval, newValue) {
+    constructor(modelManipulator, subDocInterval, newValue, keepCustomFormatting = false) {
         super(modelManipulator, subDocInterval);
         this.newValue = newValue;
+        this.keepCustomFormatting = keepCustomFormatting;
     }
     redo() {
-        this.oldState = this.modelManipulator.characterProperties.useValue.setValue(this.boundSubDocument, this.interval, this.newValue);
+        this.oldState = this.modelManipulator.characterProperties.useValue.setValue(this.boundSubDocument, this.interval, this.newValue, this.keepCustomFormatting);
     }
     undo() {
         this.modelManipulator.characterProperties.useValue.restoreValue(this.boundSubDocument, this.oldState);

package/lib/common/model/manipulators/character-properties-manipulator.js

@@ -74,7 +74,7 @@ class CharacterPropertiesUseValueManipulator {
     constructor(manipulator) {
         this.manipulator = manipulator;
     }
-    setValue(subDocument, interval, newValue) {
+    setValue(subDocument, interval, newValue, keepCustomFormatting = false) {
         var oldState = new HistoryItemIntervalState();
         if (!ControlOptions.isEnabled(subDocument.documentModel.options.characterFormatting))
             return oldState;
@@ -84,7 +84,7 @@ class CharacterPropertiesUseValueManipulator {
             var run = iterator.currentRun;
             oldState.register(new HistoryItemIntervalStateObject(iterator.currentInterval(), run.maskedCharacterProperties.getUseValueFull()));
             var properties = run.maskedCharacterProperties.clone();
-            properties.setUseValueFull(newValue);
+            properties.setUseValueFull(newValue, keepCustomFormatting);
             run.setCharacterProperties(properties);
             run.onCharacterPropertiesChanged();
         }

package/lib/common/model/manipulators/i-properties-manipulator.d.ts

@@ -8,7 +8,7 @@ export interface IIntervalPropertyWithUseValueManipulator<T> {
     restoreValue(subDocument: SubDocument, state: HistoryItemIntervalState<HistoryItemIntervalUseStateObject>): any;
 }
 export interface IIntervalPropertyManipulator<T> {
-    setValue(subDocument: SubDocument, interval: FixedInterval, newValue: T): HistoryItemIntervalState<HistoryItemIntervalStateObject>;
+    setValue(subDocument: SubDocument, interval: FixedInterval, newValue: T, keepCustomFormatting?: boolean): HistoryItemIntervalState<HistoryItemIntervalStateObject>;
     restoreValue(subDocument: SubDocument, state: HistoryItemIntervalState<HistoryItemIntervalStateObject>): any;
 }
 export interface IListLevelPropertyManipulator<T> {

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

@@ -62,10 +62,11 @@ export declare class ModelManipulator {
     textBox: TextBoxManipulator;
     paragraph: ParagraphManipulator;
     documentMerger: DocumentMerger;
-    modelListeners: IModelChangesListener[];
+    private modelListeners;
     onFontsChanged: EventDispatcher<IFontsChangesListener>;
     constructor(modelManager: IModelManager, batchUpdatableObject: IBatchUpdatableObject);
     notifyModelChanged(change: ModelChange): void;
+    addModelListener(listener: IModelChangesListener): void;
     removeModelListener(listener: IModelChangesListener): void;
     raiseFontAdded(newFontInfo: FontInfo | null): void;
     raiseFontRemoved(font: FontInfo | null): void;

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

@@ -61,6 +61,10 @@ export class ModelManipulator {
     notifyModelChanged(change) {
         this.modelListeners.forEach(listener => listener.modelChanged(change));
     }
+    addModelListener(listener) {
+        if (this.modelListeners.indexOf(listener) < 0)
+            this.modelListeners.push(listener);
+    }
     removeModelListener(listener) {
         const index = this.modelListeners.indexOf(listener);
         if (index >= 0)

package/lib/common/model/manipulators/picture-manipulator/picture-manipulator.js

@@ -88,7 +88,7 @@ export class PictureManipulator extends RunsBaseManipulator {
             this.history.addTransaction(() => {
                 this.modelManipulator.range.removeInterval(new SubDocumentInterval(subDocument, interval), true, false);
                 const newInfo = new InlinePictureInfo(pictureRun.size.clone(), new Shape(), -1, pictureRun.info.containerProperties, pictureRun.info.nonVisualDrawingProperties);
-                this.modelManipulator.picture.insertInlinePictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo);
+                this.modelManipulator.picture.insertInlinePictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo, new ImageLoadingOptions(!pictureRun.cacheInfo.isSizeDefined));
             });
         }
     }
@@ -103,7 +103,7 @@ export class PictureManipulator extends RunsBaseManipulator {
             anchorInfo.zOrder = this.modelManipulator.floatingObject.zOrder.getNewZOrder(subDocument);
             this.modelManipulator.range.removeInterval(new SubDocumentInterval(subDocument, interval), true, false);
             const newInfo = new AnchorPictureInfo(pictureRun.size.clone(), new Shape(), anchorInfo, pictureRun.info.containerProperties, pictureRun.info.nonVisualDrawingProperties);
-            this.modelManipulator.picture.insertAnchoredPictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo, new ImageLoadingOptions(false));
+            this.modelManipulator.picture.insertAnchoredPictureViaHistory(new SubDocumentPosition(subDocument, interval.start), charPropsBundle, newInfo, new ImageLoadingOptions(!pictureRun.cacheInfo.isSizeDefined));
             run = subDocument.getRunByPosition(interval.start);
         }
         let anchoredRun = run.getType() == RunType.AnchoredPictureRun ? run : run;

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

@@ -9,7 +9,7 @@ export interface IFontSettings {
     name: string;
     fontFamily: string;
     googleFontsResponse?: string;
-    useGoogleFonts?: string;
+    useGoogleFonts?: boolean;
     italicFontUri?: string;
     boldFontUri?: string;
     boldItalicFontUri?: string;