devexpress-richedit 25.1.3 → 25.1.4-build-25191-0102

package/lib/common/layout-formatter/row/tab-info.d.ts

@@ -14,7 +14,8 @@ export declare class RowTabInfo {
     constructor(rowFormatter: RowFormatter, paragraphHorizontalBoundsStart: number);
     restart(): void;
     shiftBoxesAfterLastTab(): void;
-    addTabBox(): boolean;
+    tryAddTabBox(): boolean;
+    private addTabBox;
     private calculateActualTabWidth;
     private calcLastVisibleBoxRightBounds;
     private getFinalCustomTabWidth;

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

@@ -7,7 +7,6 @@ import { SearchUtils } from '@devexpress/utils/lib/utils/search';
 import { StringUtils } from '@devexpress/utils/lib/utils/string';
 import { LayoutBoxType } from '../../layout/main-structures/layout-boxes/layout-box';
 import { TabLeaderType } from '../../layout/main-structures/layout-boxes/layout-tab-space-box';
-import { LayoutRowStateFlags } from '../../layout/main-structures/layout-row';
 import { TabAlign } from '../../model/paragraph/paragraph';
 import { ParagraphFirstLineIndent } from '../../model/paragraph/paragraph-properties';
 import { TabInfo } from '../../model/paragraph/paragraph-style';
@@ -61,52 +60,46 @@ export class RowTabInfo {
         }
         this.restart();
     }
-    addTabBox() {
-        const box = this.rowFormatter.currBox;
+    tryAddTabBox() {
         this.shiftBoxesAfterLastTab();
         let tabPosition = this.getNextCustomTabPosition(this.currInterval.startOfFreeSpace);
-        const isCustomNonLeftTabPosition = tabPosition && !EnumUtils.isAnyOf(tabPosition.alignment, TabAlign.Left, TabAlign.Numbering);
+        const isCustomNonLeftTabPosition = tabPosition && !tabPosition.isLeftAlignment;
         let tabXPosRelativePage = tabPosition ? tabPosition.position : this.getNextDefaultTabPosition(this.currInterval.startOfFreeSpace);
         if (tabXPosRelativePage > this.currInterval.end) {
-            let ind = this.rowFormatter.rowSizesManager.rowFormattingInfo.indexOfIntervalContainsPositon(tabXPosRelativePage);
-            if (ind != this.rowFormatter.rowSizesManager.rowFormattingInfo.currIndex) {
-                if (isCustomNonLeftTabPosition)
-                    tabXPosRelativePage = this.currInterval.end;
-                else {
-                    this.rowFormatter.rowSizesManager.finishLogicalRow(ind, this.currInterval.end);
-                    tabPosition = this.getNextCustomTabPosition(this.currInterval.startOfFreeSpace);
-                    tabXPosRelativePage = tabPosition ? tabPosition.position : this.getNextDefaultTabPosition(this.currInterval.startOfFreeSpace);
-                }
+            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.isInfinityWidth = true;
+                this.rowFormatter.rowSizesManager.rowFormattingInfo.recalculate(interval);
+                this.row.width = Number.MAX_SAFE_INTEGER;
+                return this.tryAddTabBox();
             }
-        }
-        box.x = this.currInterval.startOfFreeSpace;
-        box.width = !isCustomNonLeftTabPosition ? tabXPosRelativePage - box.x : 0;
-        const tabBox = box.getLayoutTabBox(tabPosition ? tabPosition.leader : TabLeaderType.None);
-        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 && 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();
-                }
-                else if (tabBox.right < this.rowFormatter.paragraphHorizontalBounds.end) {
-                    const delta = this.rowFormatter.paragraphHorizontalBounds.end - lastInterval.end;
-                    let canIncrease = !isCustomNonLeftTabPosition;
-                    if (canIncrease && this.rowFormatter.rowSizesManager.rowFormattingInfo.isFloatingIntersectRow) {
-                        canIncrease = !IntervalAlgorithms.getIntersection(new FixedInterval(lastInterval.end, delta), ListUtils.last(this.rowFormatter.rowSizesManager.rowFormattingInfo.busyIntervals));
+            else {
+                let ind = this.rowFormatter.rowSizesManager.rowFormattingInfo.indexOfIntervalContainsPositon(tabXPosRelativePage);
+                if (ind != this.rowFormatter.rowSizesManager.rowFormattingInfo.currIndex) {
+                    if (isCustomNonLeftTabPosition) {
+                        this.addTabBox(tabPosition, this.currInterval.end);
+                        return true;
                     }
-                    if (canIncrease) {
-                        lastInterval.end = this.rowFormatter.paragraphHorizontalBounds.end;
-                        lastInterval.avaliableWidth += delta;
-                        this.row.width += delta;
-                        return this.addTabBox();
+                    else {
+                        this.rowFormatter.rowSizesManager.finishLogicalRow(ind, this.currInterval.end);
+                        tabPosition = this.getNextCustomTabPosition(this.currInterval.startOfFreeSpace);
+                        return this.tryAddTabBox();
                     }
                 }
             }
+            const extraSpace = this.rowFormatter.paragraphHorizontalBounds.end - this.currInterval.end;
+            if (extraSpace > 0) {
+                let canIncrease = !isCustomNonLeftTabPosition;
+                if (canIncrease && this.rowFormatter.rowSizesManager.rowFormattingInfo.isFloatingIntersectRow)
+                    canIncrease = !IntervalAlgorithms.getIntersection(new FixedInterval(this.currInterval.end, extraSpace), ListUtils.last(this.rowFormatter.rowSizesManager.rowFormattingInfo.busyIntervals));
+                if (canIncrease) {
+                    this.currInterval.end = this.rowFormatter.paragraphHorizontalBounds.end;
+                    this.currInterval.avaliableWidth += extraSpace;
+                    this.row.width += extraSpace;
+                    return this.tryAddTabBox();
+                }
+            }
             if (!this.row.isEmpty() && !isCustomNonLeftTabPosition)
                 return false;
             if (this.rowFormatter.rowSizesManager.rowFormattingInfo.isFloatingIntersectRow && !isCustomNonLeftTabPosition) {
@@ -114,13 +107,20 @@ export class RowTabInfo {
                 this.rowFormatter.rowSizesManager.restartAllRow(false);
                 while (EnumUtils.isAnyOf(this.rowFormatter.currBox.getType(), LayoutBoxType.AnchorPicture, LayoutBoxType.AnchorTextBox))
                     this.rowFormatter.setBoxInfo(true);
-                return this.addTabBox();
+                return this.tryAddTabBox();
             }
         }
+        this.addTabBox(tabPosition, tabXPosRelativePage);
+        return true;
+    }
+    addTabBox(tabPosition, tabXPosRelativePage) {
+        const box = this.rowFormatter.currBox;
+        box.x = this.currInterval.startOfFreeSpace;
+        box.width = (!tabPosition || tabPosition.isLeftAlignment) ? tabXPosRelativePage - box.x : 0;
+        const tabBox = box.getLayoutTabBox(tabPosition ? tabPosition.leader : TabLeaderType.None);
         this.rowFormatter.rowSizesManager.addTabBox(tabBox);
         this.lastTabPosition = tabPosition ? tabPosition : new TabInfo(tabXPosRelativePage, TabAlign.Left, TabLeaderType.None, false, false);
         this.lastTabBoxIndex = this.row.boxes.length - 1;
-        return true;
     }
     calculateActualTabWidth(prevTabBox) {
         const prevTabBoxXPos = prevTabBox.x;

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

@@ -9,6 +9,6 @@ export declare class FieldCodeParserDocVariable extends FieldCodeParser {
     protected insertDefaultText(): boolean;
     protected placeRequest(): boolean;
     protected getRequestData(): FieldRequestData;
-    protected getFormattedResult(value: string): string;
+    getFormattedResult(value: string): string;
     protected applyResponse(response: any): boolean;
 }

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

@@ -80,7 +80,7 @@ export declare abstract class FieldCodeParser {
     getMailMergeType(): FieldMailMergeType;
     handleSwitch(newSwitch: FieldSwitch): boolean;
     handleParameter(newParameter: FieldParameter): boolean;
-    protected getFormattedResult(value: number | string): string;
+    getFormattedResult(value: number | string): string;
     private capitalizesFirstLetterOfFirstWord;
     private capitalizesFirstLetterOfEachWord;
     private replaceCharacter;

package/lib/common/model/paragraph/paragraph-style.d.ts

@@ -48,6 +48,7 @@ export declare abstract class TabInfoBase<T extends TabInfoBase<T>> implements I
     deleted: boolean;
     isDefault: boolean;
     constructor(alignment: TabAlign, leader: TabLeaderType, deleted: boolean, isDefault: boolean);
+    get isLeftAlignment(): boolean;
     equals(obj: T): boolean;
     abstract clone(): T;
 }

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

@@ -2,6 +2,8 @@ import { SearchUtils } from '@devexpress/utils/lib/utils/search';
 import { NumberingList } from '../numbering-lists/numbering-list';
 import { ParagraphPropertiesMerger } from '../properties-merger/paragraph-properties-merger';
 import { StyleBase } from '../style-base';
+import { TabAlign } from './paragraph';
+import { EnumUtils } from '@devexpress/utils/lib/utils/enum';
 export class ParagraphStyle extends StyleBase {
     constructor(styleName, localizedName, deleted, hidden, semihidden, isDefault, maskedCharacterProperties, maskedParagraphProperties, tabs, autoUpdate, numberingListIndex, listLevelIndex, base64EncodedImage, id) {
         super(styleName, localizedName, deleted, hidden, semihidden, isDefault, base64EncodedImage, id);
@@ -113,6 +115,7 @@ export class TabInfoBase {
         this.deleted = deleted;
         this.isDefault = isDefault;
     }
+    get isLeftAlignment() { return EnumUtils.isAnyOf(this.alignment, TabAlign.Left, TabAlign.Numbering); }
     equals(obj) {
         if (!obj)
             return false;

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

@@ -1,13 +1,13 @@
 import { LayoutPosition } from '../layout/layout-position';
-import { GetVertivalOffset, RelativePosition } from './model-states';
+import { GetVerticalOffset, RelativePosition } from './model-states';
 export interface ICanvasState {
     lp: LayoutPosition;
-    getVerticalOffset: GetVertivalOffset;
+    getVerticalOffset: GetVerticalOffset;
     relativePosition: RelativePosition;
 }
 export declare class CanvasState implements ICanvasState {
     lp: LayoutPosition;
-    getVerticalOffset: GetVertivalOffset;
+    getVerticalOffset: GetVerticalOffset;
     relativePosition: RelativePosition;
-    constructor(lp: LayoutPosition, relativePosition: RelativePosition, getVerticalOffset: GetVertivalOffset);
+    constructor(lp: LayoutPosition, relativePosition: RelativePosition, getVerticalOffset: GetVerticalOffset);
 }

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

@@ -4,7 +4,7 @@ import { ScrollTopInfo } from '../canvas/canvas-manager';
 import { CanvasSizeInfo } from '../canvas/canvas-size-info';
 import { Selection } from '../selection/selection';
 import { ICanvasState } from './canvas-states';
-export type GetVertivalOffset = (sizes: CanvasSizeInfo) => number;
+export type GetVerticalOffset = (sizes: CanvasSizeInfo) => number;
 export declare enum RelativePosition {
     Top = 0,
     Bottom = 1,
@@ -25,7 +25,7 @@ export interface IModelStateByModelPosition_RelativePosition {
     useStdRelativePosition(): IModelStateByModelPosition_VerticalOffset;
 }
 export interface IModelStateByModelPosition_VerticalOffset {
-    setVerticalOffset(callback: GetVertivalOffset): IModelState;
+    setVerticalOffset(callback: GetVerticalOffset): IModelState;
     useStdOffset(): IModelState;
 }
 export interface IModelState {
@@ -33,7 +33,7 @@ export interface IModelState {
 }
 export declare class ModelStateByModelPosition implements IModelStateByModelPosition_ModelPosition, IModelStateByModelPosition_VerticalOffset, IModelStateByModelPosition_RelativePosition, IModelState {
     protected modelPosition: number;
-    protected getVerticalOffset: GetVertivalOffset;
+    protected getVerticalOffset: GetVerticalOffset;
     protected relativePosition: RelativePosition;
     private _subDocument;
     readonly endOfLine: boolean;
@@ -43,7 +43,7 @@ export declare class ModelStateByModelPosition implements IModelStateByModelPosi
     getModelPosition(): number;
     setModelPosition(modelPosition: number): IModelStateByModelPosition_RelativePosition;
     useCurrentPosition(selection: Selection): IModelStateByModelPosition_RelativePosition;
-    setVerticalOffset(getVerticalOffset: GetVertivalOffset): IModelState;
+    setVerticalOffset(getVerticalOffset: GetVerticalOffset): IModelState;
     useStdOffset(): IModelState;
     setRelativePosition(relativePosition: RelativePosition): IModelStateByModelPosition_VerticalOffset;
     useStdRelativePosition(): IModelStateByModelPosition_VerticalOffset;
@@ -54,7 +54,7 @@ export interface ModelStateByPageInfo_SetPageInfo {
 }
 export declare class ModelStateByPageInfo implements ModelStateByPageInfo_SetPageInfo, IModelState {
     protected pageIndex: number;
-    protected getVerticalOffset: GetVertivalOffset;
+    protected getVerticalOffset: GetVerticalOffset;
     protected relativePosition: RelativePosition;
     setPageInfo(scrollTopInfo: ScrollTopInfo): IModelState;
     getCanvasState(layout: DocumentLayout): ICanvasState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devexpress-richedit",
-  "version": "25.1.3",
+  "version": "25.1.4-build-25191-0102",
   "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": "25.1.3",
-    "devextreme-dist": "25.1.3"
+    "devextreme": "25.1.4-build-25189-0901",
+    "devextreme-dist": "25.1.4-build-25189-0901"
   },
   "dependencies": {
     "jszip": "~3.10.1",