devexpress-richedit 24.1.12 → 24.1.13-build-25142-0103

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/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/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/paragraph/paragraph-style.d.ts

@@ -48,7 +48,8 @@ export declare class TabInfo implements IEquatable<TabInfo>, ICloneable<TabInfo>
     position: number;
     isDefault: boolean;
     deleted: boolean;
-    constructor(position: number, alignment: TabAlign, leader: TabLeaderType, deleted: boolean, isDefault: boolean);
+    readonly isParagraphIndent: boolean;
+    constructor(position: number, alignment: TabAlign, leader: TabLeaderType, deleted: boolean, isDefault: boolean, isParagraphIndent?: boolean);
     clone(): TabInfo;
     equals(obj: TabInfo): boolean;
 }

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

@@ -107,15 +107,16 @@ export class TabProperties {
     }
 }
 export class TabInfo {
-    constructor(position, alignment, leader, deleted, isDefault) {
+    constructor(position, alignment, leader, deleted, isDefault, isParagraphIndent = false) {
         this.position = position;
         this.alignment = alignment;
         this.leader = leader;
         this.isDefault = isDefault;
         this.deleted = deleted;
+        this.isParagraphIndent = isParagraphIndent;
     }
     clone() {
-        return new TabInfo(this.position, this.alignment, this.leader, this.deleted, this.isDefault);
+        return new TabInfo(this.position, this.alignment, this.leader, this.deleted, this.isDefault, this.isParagraphIndent);
     }
     equals(obj) {
         if (!obj)
@@ -124,6 +125,7 @@ export class TabInfo {
             this.leader == obj.leader &&
             this.position == obj.position &&
             this.deleted == obj.deleted &&
-            this.isDefault == obj.isDefault;
+            this.isDefault == obj.isDefault &&
+            this.isParagraphIndent == obj.isParagraphIndent;
     }
 }

package/lib/common/model/tables/secondary-structures/table-base-structures.d.ts

@@ -94,5 +94,6 @@ export declare enum ConditionalTableStyleFormatting {
     TopRightCell = 8,
     TopLeftCell = 4,
     BottomRightCell = 2,
-    BottomLeftCell = 1
+    BottomLeftCell = 1,
+    None = 0
 }

package/lib/common/model/tables/secondary-structures/table-base-structures.js

@@ -124,4 +124,5 @@ export var ConditionalTableStyleFormatting;
     ConditionalTableStyleFormatting[ConditionalTableStyleFormatting["TopLeftCell"] = 4] = "TopLeftCell";
     ConditionalTableStyleFormatting[ConditionalTableStyleFormatting["BottomRightCell"] = 2] = "BottomRightCell";
     ConditionalTableStyleFormatting[ConditionalTableStyleFormatting["BottomLeftCell"] = 1] = "BottomLeftCell";
+    ConditionalTableStyleFormatting[ConditionalTableStyleFormatting["None"] = 0] = "None";
 })(ConditionalTableStyleFormatting || (ConditionalTableStyleFormatting = {}));

package/lib/common/ui/ruler/controls/ruler.js

@@ -41,13 +41,9 @@ export class RulerControl extends RulerBase {
     }
     adjust() {
         const viewWidth = this.controls.canvas.clientWidth;
-        if (viewWidth > this.controls.ruler.pageWidth)
-            this.initialMarginLeftElement = (viewWidth - this.pageWidth - RULLER_NUMBER_CORRECTION * 2) / 2;
-        else {
-            const paddingLeft = DomUtils.pxToInt(DomUtils.getCurrentStyle(this.controls.canvas).paddingLeft);
-            const pageAreaBorderWidth = (this.controls.canvas.scrollWidth - paddingLeft - this.pageWidth) / 2;
-            this.initialMarginLeftElement = paddingLeft + pageAreaBorderWidth - RULLER_NUMBER_CORRECTION;
-        }
+        const paddingLeft = DomUtils.pxToInt(DomUtils.getCurrentStyle(this.controls.canvas).paddingLeft);
+        const minValue = paddingLeft - RULLER_NUMBER_CORRECTION;
+        this.initialMarginLeftElement = Math.max((viewWidth - this.pageWidth - RULLER_NUMBER_CORRECTION * 2) / 2, minValue);
         this.rootElement.style.left = this.calculateLeftOffset();
         this.setPaddings();
         this.canHandleScroll = this.controls.canvas.scrollWidth > this.controls.canvas.offsetWidth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "24.1.12",
+  "version": "24.1.13-build-25142-0103",
   "homepage": "https://www.devexpress.com/",
   "bugs": "https://www.devexpress.com/support/",
   "author": "Developer Express Inc.",
@@ -14,8 +14,8 @@
     "build-nspell": "webpack --mode production --config=bin/nspell.webpack.config.js"
   },
   "peerDependencies": {
-    "devextreme": "24.1.12",
-    "devextreme-dist": "24.1.12"
+    "devextreme": "24.1.13-build-25140-1937",
+    "devextreme-dist": "24.1.13-build-25140-1937"
   },
   "dependencies": {
     "jszip": "~3.10.1",