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

package/index.d.ts

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.d.ts)
-* Version: 25.1.3
+* Version: 25.1.4
 * Copyright (c) 2012 - 2025 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

package/index.js

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.js)
-* Version: 25.1.3
+* Version: 25.1.4
 * Copyright (c) 2012 - 2025 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

package/lib/client/commands/mail-merge-command.js

@@ -8,7 +8,6 @@ import { InsertParagraphManipulatorParams } from '../../common/model/manipulator
 import { RangeCopy } from '../../common/model/manipulators/range/create-range-copy-operation';
 import { InsertTextManipulatorParams } from '../../common/model/manipulators/text-manipulator/insert-text-manipulator-params';
 import { ControlOptions, DocumentCapability } from '../../common/model/options/control';
-import { RichUtils } from '../../common/model/rich-utils';
 import { RunType } from '../../common/model/runs/run-type';
 import { SectionStartType } from '../../common/model/section/enums';
 import { SubDocumentIntervals, SubDocumentPosition } from '../../common/model/sub-document';
@@ -125,8 +124,10 @@ export class MailMergeCommand extends CommandBase {
     replaceMergeFieldsInSubDocument(modelManager, record, lastProcessedPositionInMainSubDocument, subDoc) {
         const processField = (parser) => {
             if (parser instanceof FieldCodeParserMailMerge) {
+                parser.update(null);
                 const fieldName = parser.getMergeFieldName();
-                return RichUtils.replaceParagraphEndCharsWithLineBreak(this.getResultByFieldName(record, fieldName));
+                const simpleText = this.getResultByFieldName(record, fieldName);
+                return parser.getFormattedResult(simpleText);
             }
             return null;
         };

package/lib/client/commands/open-document-command.js

@@ -71,6 +71,8 @@ export class OpenDocumentCommand extends CommandBase {
             return false;
         this.beforeOpen();
         core.activeDocumentImporter.importFromFile(file, this.control.modelManager.richOptions, (documentModel, formatImagesImporter) => {
+            if (core.isDisposed)
+                return;
             core.activeDocumentImporter = null;
             this.openCore(fileName, format, documentModel, formatImagesImporter, extension);
             if (!this.suppressUpdateFields)
@@ -78,6 +80,8 @@ export class OpenDocumentCommand extends CommandBase {
             if (callback)
                 callback(true, null);
         }, (reason) => {
+            if (core.isDisposed)
+                return;
             core.activeDocumentImporter = null;
             this.control.loadingPanelManager.loadingPanel.setVisible(false);
             NewDocumentCommand.newDocumentInner.call(this);

package/lib/client/formats/docx/export/exporters/relations/base.js

@@ -21,9 +21,9 @@ export class RelationsBaseExporter extends ExporterBaseWithRootElement {
     urlEncodeAsciiSpecialSymbols(url) {
         if (url) {
             if (url.indexOf(' ') >= 0)
-                url = url.replace(' ', '%20');
+                url = url.replace(/ /g, '%20');
             if (url.indexOf('\'') >= 0)
-                url = url.replace("\'", '%27');
+                url = url.replace(/'/g, '%27');
         }
         return url;
     }

package/lib/client/formats/docx/import/destination/numbering/numberings-destination.js

@@ -438,7 +438,7 @@ export class ListLevelFormatStringDestination extends ListLevelElementDestinatio
     }
     convertFormatString(value) {
         const regex = new RegExp(/%\d/);
-        let result = value.replace('{', '{{').replace('}', '}}');
+        let result = value.replace(/{/g, '{{').replace(/}/g, '}}');
         let match = result.match(regex);
         if (match) {
             do {

package/lib/client/formats/docx/import/destination/runs/text-destination.js

@@ -16,6 +16,6 @@ export class TextDestination extends ElementDestination {
         return true;
     }
     replaceLineBreakOnSpace(text) {
-        return text.replace('\n', ' ');
+        return text.replace(/\n/g, ' ');
     }
 }

package/lib/client/model-api/images/image-enums.js

@@ -1,3 +1,4 @@
+import { AnchorObjectVerticalPositionAlignment } from '../../../common/model/floating-objects/enums';
 export var FloatingObjectHorizontalPositionTypeApi;
 (function (FloatingObjectHorizontalPositionTypeApi) {
     FloatingObjectHorizontalPositionTypeApi[FloatingObjectHorizontalPositionTypeApi["Aligned"] = 0] = "Aligned";

package/lib/client/model-api/table/enums.js

@@ -1,3 +1,7 @@
+import { ParagraphAlignment } from '../../../common/model/paragraph/paragraph-properties';
+import { BorderLineStyle } from '../../../common/model/borders/enums';
+import { TableCellVerticalAlignment } from '../../../common/model/tables/secondary-structures/table-base-structures';
+import { TableHeightUnitType, TableWidthUnitType } from '../../../common/model/tables/secondary-structures/table-units';
 export var BorderLineStyleApi;
 (function (BorderLineStyleApi) {
     BorderLineStyleApi[BorderLineStyleApi["Nil"] = -1] = "Nil";

package/lib/client/public/commands/enum.js

@@ -1,3 +1,4 @@
+import { RichEditClientCommand as Command } from '../../../common/commands/client-command';
 export var FileTabCommandId;
 (function (FileTabCommandId) {
     FileTabCommandId[FileTabCommandId["CreateDocument"] = 412] = "CreateDocument";

package/lib/client/public/ribbon/item-ids.js

@@ -1,3 +1,4 @@
+import { RichEditClientCommand as Command } from '../../../common/commands/client-command';
 export var FileTabItemId;
 (function (FileTabItemId) {
     FileTabItemId[FileTabItemId["CreateNewDocument"] = 412] = "CreateNewDocument";

package/lib/client/public/rich-edit.d.ts

@@ -118,20 +118,20 @@ declare enum PrintModeApi {
     Html = 1,
     Pdf = 2
 }
-export { CharacterPropertiesApi as CharacterProperties, CharacterPropertiesScriptApi as CharacterPropertiesScript, ICharacterProperties } from '../model-api/character-properties';
+export { CharacterPropertiesApi as CharacterProperties, CharacterPropertiesScriptApi as CharacterPropertiesScript, type ICharacterProperties } from '../model-api/character-properties';
 export { HyperlinkInfoApi as HyperlinkInfo } from '../model-api/field';
 export { IntervalApi as Interval } from '../model-api/interval';
 export { ListTypeApi as ListType, ListLevelNumberAlignmentApi as ListLevelNumberAlignment, ListLevelFormatApi as ListLevelFormat } from '../model-api/lists/enums';
 export { ListLevelSettingsApi as ListLevelSettings } from '../model-api/lists/list-level-settings';
 export { ListApi as List } from '../model-api/lists/lists';
-export { ParagraphAlignmentApi as ParagraphAlignment, ParagraphLineSpacingTypeApi as ParagraphLineSpacingType, ParagraphFirstLineIndentApi as ParagraphFirstLineIndent, ParagraphPropertiesApi as ParagraphProperties, ParagraphApi as Paragraph, IParagraphProperties } from '../model-api/paragraph';
-export { MarginsApi as Margins, SizeApi as Size, IMargins, } from '../model-api/size';
+export { ParagraphAlignmentApi as ParagraphAlignment, ParagraphLineSpacingTypeApi as ParagraphLineSpacingType, ParagraphFirstLineIndentApi as ParagraphFirstLineIndent, ParagraphPropertiesApi as ParagraphProperties, ParagraphApi as Paragraph, type IParagraphProperties } from '../model-api/paragraph';
+export { MarginsApi as Margins, SizeApi as Size, type IMargins, } from '../model-api/size';
 export { SubDocumentTypeApi as SubDocumentType, HeaderFooterTypeApi as HeaderFooterType, SectionBreakTypeApi as SectionBreakType, SubDocumentApi as SubDocument } from '../model-api/sub-document';
 export { BookmarkApi as Bookmark } from '../model-api/bookmark';
 export { BookmarkClientApi as BookmarkBase } from '../api/bookmark';
 export { PaperSizeApi as PaperSize } from '../model-api/section';
 export { TableApi as Table } from '../model-api/table/table';
-export { TableBordersBaseApi as TableBordersBase, TableBordersApi as TableBorders, TableCellBordersApi as TableCellBorders, TableBorderApi as TableBorder, ITableBorders, ITableCellBorders, } from '../model-api/table/table-borders';
+export { TableBordersBaseApi as TableBordersBase, TableBordersApi as TableBorders, TableCellBordersApi as TableCellBorders, TableBorderApi as TableBorder, type ITableBorders, type ITableCellBorders, } from '../model-api/table/table-borders';
 export { TableStyleOptionsApi as TableStyleOptions } from '../model-api/table/table-style-options';
 export { TableWidthTypeApi as TableWidthType, TableContentVerticalAlignmentApi as TableContentVerticalAlignment, TableContentHorizontalAlignmentApi as TableContentHorizontalAlignment, TableRowHeightTypeApi as TableRowHeightType, BorderLineStyleApi as BorderLineStyle, } from '../model-api/table/enums';
 export { SectionApi as Section } from '../model-api/section';
@@ -175,7 +175,7 @@ export { TableLayoutTabCommandId };
 export { FloatingObjectsFormatTabCommandId };
 export { ContextMenuCommandId };
 export { WrapTypeApi as WrapType, WrapSideApi as WrapSide, FloatingObjectHorizontalAlignmentApi as FloatingObjectHorizontalAlignment, FloatingObjectHorizontalAnchorElementApi as FloatingObjectHorizontalAnchorElement, FloatingObjectHorizontalPositionTypeApi as FloatingObjectHorizontalPositionType, FloatingObjectVerticalAnchorElementApi as FloatingObjectVerticalAnchorElement, FloatingObjectVerticalAlignmentApi as FloatingObjectVerticalAlignment, FloatingObjectVerticalPositionTypeApi as FloatingObjectVerticalPositionType } from '../model-api/images/image-enums';
-export { HorizontalAbsolutePositionApi as HorizontalAbsolutePosition, HorizontalAlignedPositionApi as HorizontalAlignedPosition, HorizontalRelativePositionApi as HorizontalRelativePosition, VerticalAbsolutePositionApi as VerticalAbsolutePosition, VerticalAlignedPositionApi as VerticalAlignedPosition, VerticalRelativePositionApi as VerticalRelativePosition, IFloatingObjectDistanceApi as IFloatingObjectDistance, IHorizontalAlignedPositionApi as IHorizontalAlignedPosition, IHorizontalAbsolutePositionApi as IHorizontalAbsolutePosition, IHorizontalRelativePositionApi as IHorizontalRelativePosition, IVerticalAlignedPositionApi as IVerticalAlignedPosition, IVerticalAbsolutePositionApi as IVerticalAbsolutePosition, IVerticalRelativePositionApi as IVerticalRelativePosition, IInsertedFloatingImageOptionsApi as IInsertedFloatingImageOptions, IInsertedInlineImageOptionsApi as IInsertedInlineImageOptions, } from '../model-api/images/image-interfaces';
+export { HorizontalAbsolutePositionApi as HorizontalAbsolutePosition, HorizontalAlignedPositionApi as HorizontalAlignedPosition, HorizontalRelativePositionApi as HorizontalRelativePosition, VerticalAbsolutePositionApi as VerticalAbsolutePosition, VerticalAlignedPositionApi as VerticalAlignedPosition, VerticalRelativePositionApi as VerticalRelativePosition, type IFloatingObjectDistanceApi as IFloatingObjectDistance, type IHorizontalAlignedPositionApi as IHorizontalAlignedPosition, type IHorizontalAbsolutePositionApi as IHorizontalAbsolutePosition, type IHorizontalRelativePositionApi as IHorizontalRelativePosition, type IVerticalAlignedPositionApi as IVerticalAlignedPosition, type IVerticalAbsolutePositionApi as IVerticalAbsolutePosition, type IVerticalRelativePositionApi as IVerticalRelativePosition, type IInsertedFloatingImageOptionsApi as IInsertedFloatingImageOptions, type IInsertedInlineImageOptionsApi as IInsertedInlineImageOptions, } from '../model-api/images/image-interfaces';
 export { FloatingImageApi as FloatingImage } from '../model-api/images/floating-image';
 export { InlineImageApi as InlineImage } from '../model-api/images/inline-image';
 export { ImageApi as Image } from '../model-api/images/image';

package/lib/client/ribbon/toolbar-items/index.d.ts

@@ -4,7 +4,7 @@ export { ToolbarMenuItem } from './toolbar-menu-item';
 export { ToolbarSelectBoxItem } from './toolbar-select-box-item';
 export { ToolbarSeparatorItem } from './toolbar-separator-item';
 export { ToolbarItemBase } from './toolbar-item-base';
-export { InteractiveItemOptions, ToolbarInteractiveItem } from './toolbar-interactive-item';
+export { type InteractiveItemOptions, ToolbarInteractiveItem } from './toolbar-interactive-item';
 export { ToolbarSubMenuItem } from './toolbar-sub-menu-item';
 export { ToolbarColorBoxItem } from './toolbar-color-box-item';
 export { ToolbarNumberBoxItem } from './toolbar-number-box-item';

package/lib/client/ribbon/toolbar-items/toolbar-item-template-creators/index.d.ts

@@ -1,8 +1,8 @@
-export { ButtonToolbarItemTemplateCreator, IButtonToolbarItemTemplateCreatorOptions } from './button-toolbar-item-template-creator';
-export { ButtonGroupToolbarItemTemplateCreator, IButtonGroupToolbarItemTemplateCreatorOptions } from './button-group-toolbar-item-template-creator';
-export { MenuToolbarItemTemplateCreator, IMenuToolbarItemTemplateCreatorOptions } from './menu-toolbar-item-template-creator';
-export { SelectBoxToolbarItemTemplateCreator, ISelectBoxToolbarItemTemplateCreatorOptions } from './select-box-toolbar-item-template-creator';
+export { ButtonToolbarItemTemplateCreator, type IButtonToolbarItemTemplateCreatorOptions } from './button-toolbar-item-template-creator';
+export { ButtonGroupToolbarItemTemplateCreator, type IButtonGroupToolbarItemTemplateCreatorOptions } from './button-group-toolbar-item-template-creator';
+export { MenuToolbarItemTemplateCreator, type IMenuToolbarItemTemplateCreatorOptions } from './menu-toolbar-item-template-creator';
+export { SelectBoxToolbarItemTemplateCreator, type ISelectBoxToolbarItemTemplateCreatorOptions } from './select-box-toolbar-item-template-creator';
 export { SeparatorToolbarItemTemplateCreator } from './separator-toolbar-item-template-creator';
-export { NumberBoxToolbarItemTemplateCreator, INumberBoxToolbarItemTemplateCreatorOptions } from './number-box-toolbar-item-template-creator';
-export { ColorBoxToolbarItemTemplateCreator, IColorBoxToolbarItemTemplateCreatorOptions } from './color-box-toolbar-item-template-creator';
-export { IToolbarItemTemplateCreator } from './base-types';
+export { NumberBoxToolbarItemTemplateCreator, type INumberBoxToolbarItemTemplateCreatorOptions } from './number-box-toolbar-item-template-creator';
+export { ColorBoxToolbarItemTemplateCreator, type IColorBoxToolbarItemTemplateCreatorOptions } from './color-box-toolbar-item-template-creator';
+export { type IToolbarItemTemplateCreator } from './base-types';

package/lib/common/canvas/canvas-scroll-manager.js

@@ -69,7 +69,7 @@ export class CanvasScrollManager {
             height.clear().addLayoutSize(position.page.height);
         if (relativePosition === RelativePosition.Bottom)
             y.subtractUISize(this.sizes.getVisibleAreaHeight(false));
-        y.addUISize(canvasState.getVerticalOffset(this.sizes));
+        y.addLayoutSize(canvasState.getVerticalOffset(this.sizes));
         if (relativePosition === RelativePosition.Inside) {
             let scrollTop = this.canvas.scrollTop;
             const scrollVisibleAreaHeight = this.sizes.getVisibleAreaHeight(false);

package/lib/common/commands/dialogs/dialog-layout-options-command.js

@@ -58,7 +58,6 @@ export class DialogLayoutOptionsCommand extends ShowDialogCommandBase {
         let run = subDocument.getRunByPosition(position);
         let modelManipulator = this.modelManipulator;
         let anchorInfoManipulator = modelManipulator.floatingObject.anchorInfo;
-        const topInfo = this.control.viewManager.canvasManager.getScrollTopInfo();
         let history = this.history;
         history.beginTransaction();
         let changed = false;
@@ -224,8 +223,6 @@ export class DialogLayoutOptionsCommand extends ShowDialogCommandBase {
             changed = true;
         }
         history.endTransaction();
-        if (topInfo)
-            this.selection.scrollManager.setScroll(new ScrollState().byScrollInfo.setPageInfo(topInfo));
         return changed;
     }
     getDialogName() {

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/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/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

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