devexpress-richedit 25.1.2-beta → 25.1.4-build-25191-0102

package/lib/common/commands/floating-objects/floating-object-drag-drop-change-position-command.js

@@ -11,7 +11,6 @@ import { Point } from '@devexpress/utils/lib/geometry/point';
 import { HitTestDeviation, RectangleDeviation, Rectangle as Rect } from '@devexpress/utils/lib/geometry/rectangle';
 import { FixedInterval } from '@devexpress/utils/lib/intervals/fixed';
 import { SelectionHistoryItem } from '../../model/history/selection/selection-history-item';
-import { ScrollState } from '../../scroll/model-states';
 import { RichEditClientCommand } from '../client-command';
 import { CommandBase, CommandOptions } from '../command-base';
 import { SimpleCommandState } from '../command-states';
@@ -45,7 +44,6 @@ export class FloatingObjectDragDropChangePositionCommand extends CommandBase {
             this.getFloatingObjectParentSubDocument().isEditable([new FixedInterval(specialRunInfo.getPosition(), 1)]);
     }
     executeCore(_state, options) {
-        const topInfo = this.control.viewManager.canvasManager.getScrollTopInfo();
         const runInfo = this.activeSubDocument.getRunAndIndexesByPosition(this.selection.specialRunInfo.getPosition());
         const oldRun = runInfo.run.clone();
         const oldRunPos = runInfo.getAbsoluteRunPosition();
@@ -60,7 +58,6 @@ export class FloatingObjectDragDropChangePositionCommand extends CommandBase {
             this.changeActiveSubDocument(initialHtr, finalClickPoint);
         this.move(oldRun, oldRunPos, initialHtr, options.endPageIndex, options.finalPoint);
         this.history.endTransaction();
-        this.selection.scrollManager.setScroll(new ScrollState().byScrollInfo.setPageInfo(topInfo));
         return true;
     }
     changeActiveSubDocument(htr, point) {

package/lib/common/commands/layout/apply-style-command.d.ts

@@ -6,7 +6,7 @@ import { CommandBase, CommandSimpleOptions } from '../command-base';
 import { ApplyStyleCommandState } from '../command-states';
 export interface IApplyStyleCommandParams {
     styleName: string;
-    keepDirectFormatting?: boolean;
+    keepCustomFormatting?: boolean;
 }
 export declare class ApplyStyleCommand extends CommandBase<ApplyStyleCommandState> {
     getState(): ApplyStyleCommandState;
@@ -14,7 +14,7 @@ export declare class ApplyStyleCommand extends CommandBase<ApplyStyleCommandStat
     DEPRECATEDConvertOptionsParameter(parameter: string | IApplyStyleCommandParams): IApplyStyleCommandParams;
     executeCore(state: ApplyStyleCommandState, options: CommandSimpleOptions<IApplyStyleCommandParams>): boolean;
     applyCharacterStyle(subDocumentInterval: SubDocumentInterval, style: CharacterStyle, isPresetStyle: boolean): void;
-    applyParagraphStyle(subDocumentInterval: SubDocumentInterval, style: ParagraphStyle, isPresetStyle: boolean, keepDirectFormatting?: boolean): void;
+    applyParagraphStyle(subDocumentInterval: SubDocumentInterval, style: ParagraphStyle, isPresetStyle: boolean, keepCustomFormatting?: boolean): void;
     applyParagraphLinkedStyle(subDocumentInterval: SubDocumentInterval, style: ParagraphStyle, isPresetStyle: boolean): void;
     private addLinkedCharacterStyle;
     calculateAffectedParagraphCount(subDocumentInterval: SubDocumentInterval): number;

package/lib/common/commands/layout/apply-style-command.js

@@ -70,7 +70,7 @@ export class ApplyStyleCommand extends CommandBase {
                 paragraphStyle = StylesManager.getPresetParagraphStyleByName(styleName).clone();
                 isPresetStyle = true;
             }
-            this.applyParagraphStyle(subDocumentInterval, paragraphStyle, isPresetStyle, parameter.keepDirectFormatting);
+            this.applyParagraphStyle(subDocumentInterval, paragraphStyle, isPresetStyle, parameter.keepCustomFormatting);
         }
         else if (!StylesManager.isParagraphStyle(parameter.styleName) && state.characterStyleChangeEnabled) {
             const styleName = StylesManager.getStyleNameWithoutPrefix(parameter.styleName);
@@ -105,7 +105,7 @@ export class ApplyStyleCommand extends CommandBase {
             this.modelManipulator.style.applyCharacterStyle(subDocumentInterval, characterStyle, false);
         }
     }
-    applyParagraphStyle(subDocumentInterval, style, isPresetStyle, keepDirectFormatting = false) {
+    applyParagraphStyle(subDocumentInterval, style, isPresetStyle, keepCustomFormatting = false) {
         const count = this.calculateAffectedParagraphCount(subDocumentInterval);
         if (count > 0 && ControlOptions.isEnabled(this.control.modelManager.richOptions.control.paragraphStyle)) {
             const { interval, subDocument } = subDocumentInterval;
@@ -118,8 +118,7 @@ export class ApplyStyleCommand extends CommandBase {
                 style = isPresetStyle ? modelManipulator.model.stylesManager.addParagraphStyle(style) : style;
                 this.history.addAndRedo(new ApplyParagraphStyleHistoryItem(modelManipulator, paragraphSubDocumentInterval, style));
                 this.history.addAndRedo(new ParagraphUseValueHistoryItem(modelManipulator, paragraphSubDocumentInterval, 0));
-                if (!keepDirectFormatting)
-                    this.history.addAndRedo(new FontUseValueHistoryItem(modelManipulator, paragraphSubDocumentInterval, 0));
+                this.history.addAndRedo(new FontUseValueHistoryItem(modelManipulator, paragraphSubDocumentInterval, 0, keepCustomFormatting));
                 this.history.addAndRedo(new AddParagraphToListHistoryItem(modelManipulator, subDocument, paragraphIndex, NumberingList.NumberingListNotSettedIndex, -1));
             }
         }

package/lib/common/commands/layout/toggle-show-hidden-symbols-command.js

@@ -1,4 +1,3 @@
-import { ScrollState } from '../../scroll/model-states';
 import { CommandBase } from '../command-base';
 import { SimpleCommandState } from '../command-states';
 export class ToggleShowHiddenSymbolsCommand extends CommandBase {
@@ -12,9 +11,7 @@ export class ToggleShowHiddenSymbolsCommand extends CommandBase {
         let newValue = options.param;
         if (newValue !== this.control.innerClientProperties.showHiddenSymbols) {
             this.control.innerClientProperties.showHiddenSymbols = newValue;
-            const topInfo = this.control.viewManager.canvasManager.getScrollTopInfo();
             this.control.layoutFormatterManager.invalidator.onChangedAllLayout();
-            this.selection.scrollManager.setScroll(new ScrollState().byScrollInfo.setPageInfo(topInfo));
             return true;
         }
         return false;

package/lib/common/commands/toc/set-paragraph-level-command.js

@@ -22,7 +22,7 @@ export class SetParagraphLevelCommandBase extends CommandBase {
         if (!paragraphStyle)
             paragraphStyle = StylesManager.getPresetParagraphStyleByName(styleName);
         if (paragraphStyle) {
-            const commandOptions = new CommandSimpleOptions(this.control, { styleName: StylesManager.paragraphPrefix + styleName, keepDirectFormatting: true });
+            const commandOptions = new CommandSimpleOptions(this.control, { styleName: StylesManager.paragraphPrefix + styleName, keepCustomFormatting: true });
             this.commandManager.getCommand(RichEditClientCommand.ChangeStyle).execute(this.commandManager.isPublicApiCall, commandOptions);
         }
         else {

package/lib/common/formats/html/export/html-export.d.ts

@@ -5,12 +5,19 @@ import { Paragraph } from '../../../model/paragraph/paragraph';
 import { SubDocument } from '../../../model/sub-document';
 import { HtmlBuilder } from './html-builder';
 import { IExportModelOptions } from '../../i-document-exporter';
+interface ListInterval {
+    listStartValue: number;
+    start: number;
+    end: number;
+}
 interface List {
     parentList?: List;
     numberingListIndex: number;
     listLevelIndex: number;
     start: number;
     end: number;
+    intervals: ListInterval[];
+    paragraphsCount: number;
 }
 interface IHtmlExporterOptions {
     sanitaizeHyperlinkURIs?: boolean;
@@ -30,6 +37,7 @@ export declare class HtmlExporter {
     getHtmlElementsByInterval(model: DocumentModel, subDocument: SubDocument, interval: FixedInterval, guidLabel: string): HtmlBuilder;
     getParagraphsByInterval(subDocument: SubDocument, interval: FixedInterval): Paragraph[];
     getListsByParagraphs(paragraphs: Paragraph[]): List[];
+    updateListIntervals(list: List, start: number, end: number): void;
     private addParentTableRecursively;
     startList(model: DocumentModel, subDocument: SubDocument, interval: FixedInterval, builder: HtmlBuilder, lists: List[], position: number): void;
     private endList;

package/lib/common/formats/html/export/html-export.js

@@ -287,7 +287,7 @@ export class HtmlExporter {
                         .configure((el) => {
                         el.setAttribute('border', '1');
                         el.style.cssText = 'border-width: 0px; border-collapse: collapse; border-spacing: 0px;';
-                        el.setAttribute('id', guidLabel.replace("id=\"", "").replace("\"", ""));
+                        el.setAttribute('id', guidLabel.replace(/id="/g, "").replace(/"/g, ""));
                     })
                         .startChild('tbody')
                         .startChild('tr')
@@ -484,17 +484,26 @@ export class HtmlExporter {
                 });
                 if (!list) {
                     const parentList = (previousList === null || previousList === void 0 ? void 0 : previousList.numberingListIndex) === numberingListIndex ? previousList : null;
-                    list = { parentList, numberingListIndex, listLevelIndex, start, end };
+                    list = { parentList, numberingListIndex, listLevelIndex, start, end, intervals: [], paragraphsCount: 0 };
                     listsInInterval.push(list);
                 }
+                list.paragraphsCount++;
                 previousList = list;
-                do {
-                    list.end = end;
-                } while (list = list.parentList);
+                this.updateListIntervals(list, start, end);
             }
         }
         return listsInInterval;
     }
+    updateListIntervals(list, start, end) {
+        list.end = end;
+        const lastInterval = list.intervals.at(-1);
+        if (lastInterval && lastInterval.end === start)
+            lastInterval.end = end;
+        else
+            list.intervals.push({ start, end, listStartValue: list.paragraphsCount });
+        if (list.parentList)
+            this.updateListIntervals(list.parentList, start, end);
+    }
     addParentTableRecursively(model, builder, parentCell, paragraphStartPosition) {
         const parentRow = parentCell.parentRow;
         const parentTable = parentRow.parentTable;
@@ -532,51 +541,65 @@ export class HtmlExporter {
     startList(model, subDocument, interval, builder, lists, position) {
         if (!lists.length)
             return;
-        let listIndex = lists.findIndex((list) => list.start === position);
-        if (listIndex < 0 && position === interval.start) {
+        const listsToStart = lists.filter(list => list.intervals.some(interval => interval.start === position));
+        if (!listsToStart.length && position === interval.start) {
             const firstParagraph = subDocument.getParagraphByPosition(position);
             if (firstParagraph.getNumberingListIndex() === lists[0].numberingListIndex)
-                listIndex = 0;
+                listsToStart.push(lists[0]);
         }
-        if (listIndex > -1) {
-            const numberingList = model.numberingLists[lists[listIndex].numberingListIndex];
-            const numberingListFormat = numberingList.levels[lists[listIndex].listLevelIndex].getListLevelProperties().format;
-            const numberingListType = numberingList.getListType();
-            let listFormatType = "";
-            switch (numberingListFormat) {
+        for (const list of listsToStart) {
+            const numberingList = model.numberingLists[list.numberingListIndex];
+            const level = numberingList.levels[list.listLevelIndex];
+            const format = level.getListLevelProperties().format;
+            const listType = numberingList.getListType();
+            const levelStart = level.getNewStart();
+            const intervalStart = list.intervals.find(interval => interval.start === position).listStartValue;
+            const listStart = Math.max(levelStart, intervalStart);
+            let listStyleType = "";
+            switch (format) {
                 case NumberingFormat.Bullet:
-                    listFormatType = "disc";
+                    listStyleType = "disc";
                     break;
                 case NumberingFormat.Decimal:
-                    listFormatType = "decimal";
+                    listStyleType = "decimal";
                     break;
                 case NumberingFormat.LowerLetter:
-                    listFormatType = "lower-alpha";
+                    listStyleType = "lower-alpha";
                     break;
                 case NumberingFormat.UpperLetter:
-                    listFormatType = "upper-alpha";
+                    listStyleType = "upper-alpha";
                     break;
                 case NumberingFormat.LowerRoman:
-                    listFormatType = "lower-roman";
+                    listStyleType = "lower-roman";
                     break;
                 case NumberingFormat.UpperRoman:
-                    listFormatType = "upper-roman";
+                    listStyleType = "upper-roman";
                     break;
                 default:
                     break;
             }
             builder
-                .startChild(numberingListType !== NumberingType.Bullet ? "ol" : "ul")
-                .configure((e) => e.style.cssText = "list-style-type:" + listFormatType);
+                .startChild(listType !== NumberingType.Bullet ? "ol" : "ul")
+                .configure((e) => {
+                e.style.cssText = "list-style-type:" + listStyleType;
+                if (listStart > 1)
+                    e.setAttribute("start", listStart.toString());
+            });
         }
     }
     endList(model, builder, lists, endPosition) {
         for (let i = lists.length - 1; i >= 0; i--) {
-            if (lists[i].end === endPosition) {
-                const listType = model.numberingLists[lists[i].numberingListIndex].getListType();
-                lists.splice(i, 1);
-                builder.endChild(listType != NumberingType.Bullet ? "ol" : "ul");
+            const list = lists[i];
+            for (let j = list.intervals.length - 1; j >= 0; j--) {
+                const interval = list.intervals[j];
+                if (interval.end === endPosition) {
+                    const listType = model.numberingLists[list.numberingListIndex].getListType();
+                    builder.endChild(listType !== NumberingType.Bullet ? "ol" : "ul");
+                    list.intervals.splice(j, 1);
+                }
             }
+            if (list.intervals.length === 0)
+                lists.splice(i, 1);
         }
     }
     getHtmlText(text) {

package/lib/common/formats/html/import/containers/runs.d.ts

@@ -31,7 +31,8 @@ export declare class ImportedParagraphListInfo {
     listType: NumberingType;
     displayFormatString: string;
     maskedCharacterProperties: MaskedCharacterProperties;
-    constructor(listIndex: number, listLevel: number, listFormat: NumberingFormat, listType: NumberingType, displayFormatString: string, maskedCharacterProperties: MaskedCharacterProperties);
+    newStart: number;
+    constructor(listIndex: number, listLevel: number, listFormat: NumberingFormat, listType: NumberingType, displayFormatString: string, maskedCharacterProperties: MaskedCharacterProperties, newStart?: number);
 }
 export declare class ImportedParagraphRunInfo extends RunInfo {
     listInfo: ImportedParagraphListInfo;

package/lib/common/formats/html/import/containers/runs.js

@@ -40,13 +40,14 @@ export class ImportedTextRunInfo extends RunInfo {
 }
 ImportedTextRunInfo.tabRegex = new RegExp(RichUtils.specialCharacters.NonBreakingSpace + "{1,}", "gi");
 export class ImportedParagraphListInfo {
-    constructor(listIndex, listLevel, listFormat, listType, displayFormatString, maskedCharacterProperties) {
+    constructor(listIndex, listLevel, listFormat, listType, displayFormatString, maskedCharacterProperties, newStart = 1) {
         this.listIndex = listIndex;
         this.listLevel = listLevel;
         this.listFormat = listFormat;
         this.listType = listType;
         this.displayFormatString = displayFormatString;
         this.maskedCharacterProperties = maskedCharacterProperties;
+        this.newStart = newStart;
     }
 }
 export class ImportedParagraphRunInfo extends RunInfo {

package/lib/common/formats/html/import/html-importer.d.ts

@@ -38,7 +38,6 @@ export declare class HtmlImporter {
     get currElement(): HTMLElement;
     get currElementChildren(): HTMLElement[];
     levelInfo: LevelInfo[];
-    get prevLevelInfo(): LevelInfo;
     get currLevelInfo(): LevelInfo;
     get currListItemLevelInfo(): LevelInfo | null;
     fieldsId: number;

package/lib/common/formats/html/import/html-importer.js

@@ -72,7 +72,6 @@ export class HtmlImporter {
     ;
     get currElementChildren() { return ListUtils.last(this.levelInfo).childElements; }
     ;
-    get prevLevelInfo() { return this.levelInfo[this.levelInfo.length - 2]; }
     get currLevelInfo() { return ListUtils.last(this.levelInfo); }
     get currListItemLevelInfo() { return ListUtils.reverseElementBy(this.levelInfo, (levelInfo) => { var _a; return ((_a = levelInfo.tagImporter) === null || _a === void 0 ? void 0 : _a.elementTag()) === 'LI'; }); }
     get currListInfo() {
@@ -305,7 +304,7 @@ export class HtmlImporter {
         html = html.replace(/<o:[pP][^>]*>\s*<\/o:[pP]>/gi, '');
         html = html.replace(/<o:[pP][^>]*>.*?<\/o:[pP]>/gi, '&nbsp;');
         html = html.replace(/<st1:.*?>/gi, '');
-        html = html.replace(/<\!--[\s\S]*?-->/g, '');
+        html = html.replace(/<!--[\s\S]*?(-->|$)/g, '');
         html = html.replace(/\s*style="\s*"/gi, '');
         html = html.replace(/style=""/ig, "");
         html = html.replace(/style=''/ig, "");
@@ -346,7 +345,7 @@ export class HtmlImporter {
         html = html.replace(/\n/gi, RichUtils.specialCharacters.LineBreak);
         html = html.replace(/(<\/(?!(p)+)(\s*[^>]*)?>)<\/td>/gi, '$1<p>&nbsp;</p></td>');
         html = html.replace(/(<\/(?!(p)+)(\s*[^>]*)?>)<\/th>/gi, '$1<p>&nbsp;</p></th>');
-        html = html.replace(/<script(\s[^>]*)?>[\s\S]*?<\/script>/gi, '');
+        html = html.replace(/<script\b[^>]*>[\s\S]*?(<\/script\b[^>]*>|$)/gi, '');
         html = html.replace(/<u>([\s\S]*?)<\/u>/gi, '<span style="text-decoration: underline">$1</span>');
         html = html.replace(/<s>([\s\S]*?)<\/s>/gi, '<span style="text-decoration: line-through">$1</span>');
         html = html.replace(/<\/([^\s>]+)(\s[^>]*)?><br><\/([^\s>]+)(\s[^>]*)?>/gi, '');

package/lib/common/formats/html/import/html-model-inserter.js

@@ -144,6 +144,10 @@ export class HtmlModelInserter {
         if (listInfo.displayFormatString) {
             modelManipulator.numberingList.listLevelProperties.displayFormatString.setValue(model, false, targetListIndex, listLevelIndex, listInfo.displayFormatString);
         }
+        if (listInfo.newStart) {
+            modelManipulator.numberingList.setIOverrideListLevelNewStart(numberingListIndex, listLevelIndex, listInfo.newStart);
+            modelManipulator.numberingList.setIOverrideListLevelOverrideStart(numberingListIndex, listLevelIndex, true);
+        }
         if (listInfo.maskedCharacterProperties) {
             listLevel.setCharacterProperties(listInfo.maskedCharacterProperties);
             listLevel.onCharacterPropertiesChanged();

package/lib/common/formats/html/import/importers/list-base.js

@@ -20,7 +20,8 @@ export class HtmlListTagImporterBase extends HtmlTagImporterBase {
         }
         const listFormat = ParagraphListPropertiesUtils.getListType(this.element);
         const displayFormat = ParagraphListPropertiesUtils.importDisplayFormatStringByParentListFormat(listFormat, parentList === null || parentList === void 0 ? void 0 : parentList.listFormat, listLevel);
-        this.importer.listInfos.push(new ImportedParagraphListInfo(listIndex, listLevel, listFormat, listFormat == NumberingFormat.Bullet ? NumberingType.Bullet : NumberingType.MultiLevel, displayFormat, null));
+        const startIndex = parseInt(this.element.getAttribute('start'));
+        this.importer.listInfos.push(new ImportedParagraphListInfo(listIndex, listLevel, listFormat, listFormat == NumberingFormat.Bullet ? NumberingType.Bullet : NumberingType.MultiLevel, displayFormat, null, startIndex));
     }
     isImportChildren() {
         return true;

package/lib/common/formats/rtf/utils/list-level-display-text-helper.js

@@ -18,8 +18,8 @@ export class ListLevelDisplayTextHelper {
     static getTextRange(placeholderIndices, startPlaceHolderIndex, text) {
         var index = placeholderIndices[startPlaceHolderIndex] + 1;
         var result = text.substr(index, placeholderIndices[startPlaceHolderIndex + 1] - index);
-        result = result.replace("{", "{{");
-        result = result.replace("}", "}}");
+        result = result.replace(/{/g, "{{");
+        result = result.replace(/}/g, "}}");
         return result;
     }
 }

package/lib/common/input-controller.js

@@ -722,7 +722,7 @@ export class IFrameInputEditor extends InputEditorBase {
         const propChar = HtmlConverter.getSizeSignificantRules(this.control.inputPosition.getMergedCharacterPropertiesRaw()).join(";");
         this.editableDocument.body.style.cssText = "padding: 0px; margin: 0px; overflow: hidden; color: transparent; " + propChar;
         this.editableDocument.body.style.textIndent = currentTextIndent;
-        if (Browser.Firefox) {
+        if (Browser.Firefox && Browser.Version <= 137) {
             this.editableDocument.body.style.zoom = this.control.viewManager.zoomLevel;
         }
         let layoutX = layoutPosition.getLayoutX(this.control.measurer, DocumentLayoutDetailsLevel.Row);
@@ -828,7 +828,7 @@ export class InputController {
     }
     static getCopyPasteHtmlContentForEditable(html, guidLabel) {
         const builder = new HtmlBuilder();
-        const id = guidLabel.replace("id=\"", "").replace("\"", "");
+        const id = guidLabel.replace(/id="/g, "").replace(/"/g, "");
         builder
             .startChild('a')
             .configure((el) => {

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

@@ -1,6 +1,7 @@
 import { NumberMapUtils } from '@devexpress/utils/lib/utils/map/number';
 import { ColorHelper } from '../model/color/color';
 import { SearchUtils } from '@devexpress/utils/lib/utils/search';
+import { MixedSize } from '../utils/mixed-size';
 export class ModelPositionHolder {
     constructor(pos, posManager) {
         this.pos = posManager.registerPosition(pos);
@@ -66,6 +67,8 @@ export class DocumentLayout {
         return this.pages.find((page) => !!page.mainSubDocumentPageAreas[subDocumentId] || !!page.otherPageAreas[subDocumentId]);
     }
     findPageIndexByOffsetY(offsetY, sizeInfo) {
-        return Math.max(0, SearchUtils.normedInterpolationIndexOf(this.pages, (p) => sizeInfo.getPageOffsetY(p), offsetY));
+        const getPageOffsetY = (p) => MixedSize.fromLayout(sizeInfo.getPageOffsetY(p)).useScale(sizeInfo.zoomLevel).UISize;
+        const normedInterpolationIndex = SearchUtils.normedInterpolationIndexOf(this.pages, getPageOffsetY, offsetY);
+        return Math.max(0, normedInterpolationIndex);
     }
 }

package/lib/common/layout/main-structures/layout-row.d.ts

@@ -13,8 +13,7 @@ export declare enum LayoutRowStateFlags {
     SectionEnd = 8,
     DocumentEnd = 16,
     CellTableEnd = 64,
-    PageBreakBefore = 128,
-    InfinityWidth = 256
+    PageBreakBefore = 128
 }
 export declare class LayoutRow extends Rectangle {
     boxes: LayoutBox[];

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

@@ -12,7 +12,6 @@ export var LayoutRowStateFlags;
     LayoutRowStateFlags[LayoutRowStateFlags["DocumentEnd"] = 16] = "DocumentEnd";
     LayoutRowStateFlags[LayoutRowStateFlags["CellTableEnd"] = 64] = "CellTableEnd";
     LayoutRowStateFlags[LayoutRowStateFlags["PageBreakBefore"] = 128] = "PageBreakBefore";
-    LayoutRowStateFlags[LayoutRowStateFlags["InfinityWidth"] = 256] = "InfinityWidth";
 })(LayoutRowStateFlags || (LayoutRowStateFlags = {}));
 export class LayoutRow extends Rectangle {
     get hasEffectToPageHeight() { return this.boxes.length != 1 || !this.boxes[0].isSectionBreakBox; }

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

@@ -42,7 +42,7 @@ export class RowFormatterResult {
             return;
         this.rowFormatter.tabInfo.shiftBoxesAfterLastTab();
         const dontJustifyLinesEndingInSoftLineBreak = this.rowFormatter.manager.model.compatibilitySettings.dontJustifyLinesEndingInSoftLineBreak;
-        if (!this.row.flags.get(LayoutRowStateFlags.InfinityWidth))
+        if (!this.rowFormatter.rowSizesManager.isInfinityWidth)
             BoxAligner.align(this.row, this.rowFormatter.paragraphProps.alignment, currLogicRowEndPos, this.rowBoxIndexStart, dontJustifyLinesEndingInSoftLineBreak);
         this.rowBoxIndexStart = this.row.boxes.length;
     }

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

@@ -19,6 +19,7 @@ export declare class RowFormattingInfo {
     lastNonEmptyIntervalIndex: number;
     tableCell: TableCell;
     private intersectsObjects;
+    isInfinityWidth: boolean;
     get isFloatingIntersectRow(): boolean;
     get lastNonEmptyInterval(): RowIntervalInfo;
     constructor(minY: number, height: number, outerHorizontalRowContentBounds: FixedInterval, boundsOfAnchoredOblectsOnThisColumn: AnchorObjectBoundsInfo[], tableCell: TableCell | null);

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

@@ -84,7 +84,7 @@ export class RowFormattingInfo {
         let index = 0;
         while (index < this.intervals.length) {
             const interval = this.intervals[index];
-            if (interval.start <= position && position < interval.end || position < interval.start)
+            if (position < interval.start || interval.start <= position && position < interval.end)
                 break;
             index++;
         }
@@ -109,7 +109,7 @@ export class RowFormattingInfo {
     calcIntersectObjects(height) {
         const initRect = new Rectangle(this.outerHorizontalRowContentBounds.start, this.minY, this.outerHorizontalRowContentBounds.length, height);
         return ListUtils.reducedMap(this.boundsOfAnchoredOblectsOnThisColumn, (objInfo) => {
-            if (this.tableCell !== objInfo.cell)
+            if (this.tableCell !== objInfo.cell || this.isInfinityWidth)
                 return null;
             const rect = Rectangle.getNonCollapsedIntersection(initRect, objInfo.bounds);
             if (!rect)

package/lib/common/layout-formatter/row/size-engine/row-sizes-manager.d.ts

@@ -13,6 +13,8 @@ export declare class RowSizesManager {
     private row;
     rowStartPos: number;
     constructor(rowFormatter: RowFormatter, outerHorizontalRowContentBounds: FixedInterval, minY: number, rowSpacingBeforeApplier: IRowSpacingBeforeApplier, boundsOfAnchoredOblectsOnThisColumn: AnchorObjectBoundsInfo[], isFirstRowInParagraph: boolean);
+    get isInfinityWidth(): boolean;
+    set isInfinityWidth(value: boolean);
     private addNumberingListBoxes;
     addFullWord(boxes: LayoutBox[]): AddFullWordResult;
     addWordByChars(boxes: LayoutBox[]): number;

package/lib/common/layout-formatter/row/size-engine/row-sizes-manager.js

@@ -26,6 +26,8 @@ export class RowSizesManager {
         this.rowFormattingInfo = new RowFormattingInfo(minY, this.heightCalculator.currState.getFullRowHeight(), outerHorizontalRowContentBounds, boundsOfAnchoredOblectsOnThisColumn, tableCell);
         this.rowFormattingInfo.calculate();
     }
+    get isInfinityWidth() { return this.rowFormattingInfo.isInfinityWidth; }
+    set isInfinityWidth(value) { this.rowFormattingInfo.isInfinityWidth = value; }
     addNumberingListBoxes() {
         const { paragraph, result: { paragraphIndex }, numberingListCountersManager, manager: formatterManager } = this.rowFormatter;
         const counters = numberingListCountersManager.calculateCounters(paragraphIndex);

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

@@ -45,7 +45,7 @@ export class RowBaseFormatterState {
             return;
         if (!this.rowFormatter.rowSizesManager.addNumberingBoxes())
             return;
-        if (this.rowFormatter.tabInfo.addTabBox())
+        if (this.rowFormatter.tabInfo.tryAddTabBox())
             this.rowFormatter.setState(TextRowFormatterState.Base);
         else
             this.rowFormatter.finishRow();

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/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();