@talrace/ngx-noder 19.0.30 → 19.0.31

package/fesm2022/talrace-ngx-noder.mjs

@@ -8346,6 +8346,13 @@ class Editor {
     insert(text) {
         const sanitizedText = text.replace(this.emojiRegex, ' ');
         if (this.selection.isEmpty) {
+            if (text === NEW_LINE_MARKUP && this.selection.range.start.column === 0) {
+                const paragraph = this.session.displayData.paragraphs[this.selection.range.start.row];
+                if (paragraph.paragraphSettings.numberingData.numberingId) {
+                    this.removeOrLowerNestingNumbering(paragraph);
+                    return;
+                }
+            }
             const textStyle = ContentStyleHelper.combineTextStyles(null, this.editorService.styles);
             this.insertText(sanitizedText, textStyle);
         }
@@ -8419,7 +8426,7 @@ class Editor {
         }
         if (this.selection.range.start.column === 0) {
             const paragraph = this.session.displayData.paragraphs[this.selection.range.start.row];
-            if (paragraph.paragraphSettings.numberingData.numberingId) {
+            if (paragraph.paragraphSettings.numberingData.numberingId && paragraph.paragraphSettings.numberingData.level <= 6) {
                 this.applyParagraphStyles(new ParagraphStyleModel({
                     numberingLevel: paragraph.paragraphSettings.numberingData.level + 1,
                     indentLeft: 0,
@@ -8445,6 +8452,9 @@ class Editor {
         if (this.selection.range.start.column === 0) {
             const paragraph = this.session.displayData.paragraphs[this.selection.range.start.row];
             if (paragraph.paragraphSettings.numberingData.numberingId) {
+                if (paragraph.paragraphSettings.numberingData.level === 0) {
+                    return;
+                }
                 this.applyParagraphStyles(new ParagraphStyleModel({
                     numberingLevel: paragraph.paragraphSettings.numberingData.level - 1,
                     indentLeft: 0,
@@ -9090,7 +9100,8 @@ class Editor {
         const indexes = ContentHelper.getSelectedPartDocumentIndexes(this.session.displayData.paragraphs, range);
         if (isNumbering && range.end.column === 0 && indexes.startIndex >= indexes.endIndex) {
             this.selection.placeCursor(range.end);
-            this.removeNumberingsFromParagraphs();
+            const paragraph = this.session.displayData.paragraphs[this.selection.range.end.row];
+            this.removeOrLowerNestingNumbering(paragraph);
             this.onSelectionChange();
             this.onContentChange();
             this.focus();
@@ -9135,6 +9146,14 @@ class Editor {
             this.editorService.removeCustomElementsData(elements);
         }
     }
+    removeOrLowerNestingNumbering(paragraph) {
+        if (paragraph.paragraphSettings.numberingData.level > 0) {
+            this.applyParagraphStyles(new ParagraphStyleModel({ numberingLevel: paragraph.paragraphSettings.numberingData.level - 1 }));
+        }
+        else {
+            this.removeNumberingsFromParagraphs();
+        }
+    }
     onInput() {
         const text = this.textInput.getInsertText();
         if (!text) {
@@ -11615,11 +11634,20 @@ class NumberingHelper {
                 numberingInfo[numberingId][level].markerIndex++;
                 return;
             }
-            this.updateNumberingInfo(numberingInfo, marker, numberingId);
+            this.updateNumberingInfo(numberingInfo, marker, numberingId, level);
         }
         else {
             numberingInfo[numberingId][level].markerIndex++;
-            numberingInfo[numberingId].splice(level + 1);
+            for (let i = 0; i < numberingInfo[numberingId].length; i++) {
+                if (i >= level + 1) {
+                    numberingInfo[numberingId][i].markerIndex = 0;
+                }
+                else {
+                    if (numberingInfo[numberingId][i].markerIndex === 0) {
+                        numberingInfo[numberingId][i].markerIndex++;
+                    }
+                }
+            }
         }
     }
     static getMarker(levelModel, numberingId, paragraphs, paragraphIndex, numberingInfo) {
@@ -11639,7 +11667,7 @@ class NumberingHelper {
             index = resultMarker.indexOf('%');
         }
         numberingInfo[numberingId] ??= [];
-        this.updateNumberingInfo(numberingInfo, resultMarker, numberingId);
+        this.updateNumberingInfo(numberingInfo, resultMarker, numberingId, levelModel.level);
         return resultMarker;
     }
     static createDataModel(numberings, paragraphs, paragraphIndex, numberingInfo) {
@@ -11650,6 +11678,12 @@ class NumberingHelper {
         }
         const level = paragraph.paragraphStyle.numberingLevel;
         const numberingLevelModel = this.find(numberings, numberingId, level);
+        for (let i = 0; i < level; i++) {
+            if (!numberingInfo[numberingId][i]) {
+                const numberingLevel = this.find(numberings, numberingId, i);
+                this.getMarker(numberingLevel, numberingId, paragraphs, paragraphIndex, numberingInfo);
+            }
+        }
         const marker = this.getMarker(numberingLevelModel, numberingId, paragraphs, paragraphIndex, numberingInfo);
         return new NumberingDataModel({ numberingId, level, marker });
     }
@@ -11683,14 +11717,17 @@ class NumberingHelper {
         }
         return { height, width };
     }
-    static updateNumberingInfo(numberingInfo, marker, numberingId) {
+    static updateNumberingInfo(numberingInfo, marker, numberingId, level) {
         if (!numberingInfo[numberingId]) {
             return;
         }
-        const levels = this.getLevelInfo(marker);
-        for (let i = 0; i < levels.length; i++) {
-            numberingInfo[numberingId][i] = { markerIndex: levels[i], visited: true };
-        }
+        const markerLevels = this.getLevelInfo(marker);
+        const lastMarkerLevel = markerLevels.length - 1;
+        numberingInfo[numberingId][level] = {
+            markerIndex: markerLevels[lastMarkerLevel],
+            markerLevel: Math.min(lastMarkerLevel, level),
+            visited: true
+        };
     }
     static getLevelIndex(paragraphs, paragraphIndex, numberingId, numberingLevel) {
         let index = 0;
@@ -11723,10 +11760,13 @@ class NumberingHelper {
         if (level === 0) {
             return numberingInfo[numberingId][level].markerIndex + '.';
         }
-        return numberingInfo[numberingId]
-            .slice(0, level + 1)
-            .map(marker => marker.markerIndex)
-            .join('.');
+        let marker = [];
+        let { markerLevel, markerIndex } = numberingInfo[numberingId][level];
+        for (let i = 0; i < markerLevel; i++) {
+            marker.push(numberingInfo[numberingId][i].markerIndex);
+        }
+        marker.push(markerIndex);
+        return marker.join('.');
     }
 }
 
@@ -12349,20 +12389,18 @@ class DisplayData extends EventEmitting {
     }
     resetAllNumberingInfo(paragraphIndex) {
         for (let i = paragraphIndex; i < this.model.paragraphs.length; i++) {
-            const { numberingId, numberingLevel } = this.model.paragraphs[i].paragraphStyle;
-            if (numberingId !== null &&
-                this.generalProperties.numberingInfo[numberingId] &&
-                this.generalProperties.numberingInfo[numberingId][numberingLevel]) {
-                this.generalProperties.numberingInfo[numberingId][numberingLevel].visited = false;
+            const { numberingId } = this.model.paragraphs[i].paragraphStyle;
+            if (numberingId !== null && this.generalProperties.numberingInfo[numberingId]) {
+                this.generalProperties.numberingInfo[numberingId] = [];
             }
         }
     }
     resetNumberingInfoByTableCell(table) {
         for (const element of table.instance.rowMatrix) {
             for (let cell of element.cells) {
-                const { marker, numberingId } = cell.componentRef.instance.session.displayData.paragraphs[0].paragraphSettings.numberingData;
+                const { marker, numberingId, level } = cell.componentRef.instance.session.displayData.paragraphs[0].paragraphSettings.numberingData;
                 if (marker && numberingId) {
-                    NumberingHelper.updateNumberingInfo(this.generalProperties.numberingInfo, marker, numberingId);
+                    NumberingHelper.updateNumberingInfo(this.generalProperties.numberingInfo, marker, numberingId, level);
                     this.resetAllNumberingInfo(0);
                     return;
                 }
@@ -12847,12 +12885,8 @@ class DisplayData extends EventEmitting {
         if (displayTokens[0].isTable || (displayTokens[0].breaksLine && displayTokens.length === 1)) {
             return 1;
         }
-        const indent = displayTokens[0].indentLeft +
-            displayTokens[0].indentRight +
-            displayTokens[0].indentFirstLine -
-            displayTokens[0].indentHanging || 0;
-        const maxRowWidth = contentWidth - indent;
-        let sum = 0;
+        const maxRowWidth = contentWidth - displayTokens[0].indentRight;
+        let sum = displayTokens[0].indentLeft + displayTokens[0].indentFirstLine - displayTokens[0].indentHanging || 0;
         let prevTabIndex = null;
         let tabCenter = null;
         let prevTabAlignment = TabAlignment.Left;
@@ -14008,11 +14042,10 @@ class EditSession {
         const startIndex = paragraphs[0].insertIndex;
         const endIndex = paragraphs[paragraphs.length - 1].insertIndex;
         const startParagraph = ContentHelper.documentIndexToParagraphIndex(this.displayData.paragraphs, startIndex).row;
-        const endPosition = ContentHelper.documentIndexToParagraphWithOffset(this.displayData.paragraphs, endIndex);
+        const endParagraph = ContentHelper.documentIndexToParagraphWithOffset(this.displayData.paragraphs, endIndex).row;
         OperationsHelper.applyParagraphs(this.model, paragraphs);
         this.displayData.resetAllNumberingInfo(startParagraph);
-        this.displayData.updateNextLineIndexes(startParagraph, endPosition.row);
-        this.displayData.updateNumberingsDataOnChange(startParagraph + 1);
+        this.displayData.updateNextLineIndexes(startParagraph, endParagraph);
         this.applyToolbarStyles();
     }
     setTextStyle(textStyle) {
@@ -18938,53 +18971,6 @@ class RevisionHelper {
         const actions = operations.map(x => x.command);
         OperationsHelper.applyOperations(content, actions);
     }
-    static fillTablesDefaultStyles(tables) {
-        for (const table of tables) {
-            for (const row of table.rows) {
-                for (const cell of row.cells) {
-                    this.fillDefaultStyles(cell);
-                }
-            }
-        }
-    }
-    static fillEdgesDefaultStyles(headers, footers) {
-        for (const header of headers) {
-            this.fillTablesDefaultStyles(header.tables);
-            this.fillDefaultStyles(header);
-        }
-        for (const footer of footers) {
-            this.fillTablesDefaultStyles(footer.tables);
-            this.fillDefaultStyles(footer);
-        }
-    }
-    static fillDefaultStyles(contents) {
-        for (const format of contents.formats) {
-            format.textStyle = ContentStyleHelper.combineTextStyles(format.textStyle, DEFAULT_TEXT_STYLE);
-        }
-        for (const paragraph of contents.paragraphs) {
-            paragraph.paragraphStyle = this.fillParagraphStyleModel(paragraph.paragraphStyle);
-        }
-    }
-    static fillParagraphStyleModel(paragraphStyle) {
-        return new ParagraphStyleModel({
-            alignment: paragraphStyle.alignment ?? DEFAULT_PARAGRAPH_STYLE.alignment,
-            backgroundColor: paragraphStyle.backgroundColor ?? DEFAULT_PARAGRAPH_STYLE.backgroundColor,
-            headingStyleId: paragraphStyle.headingStyleId,
-            indentFirstLine: paragraphStyle.indentFirstLine ?? DEFAULT_PARAGRAPH_STYLE.indentFirstLine,
-            indentHanging: paragraphStyle.indentHanging ?? DEFAULT_PARAGRAPH_STYLE.indentHanging,
-            indentLeft: paragraphStyle.indentLeft ?? DEFAULT_PARAGRAPH_STYLE.indentLeft,
-            indentRight: paragraphStyle.indentRight ?? DEFAULT_PARAGRAPH_STYLE.indentRight,
-            lineSpacing: paragraphStyle.lineSpacing ?? DEFAULT_PARAGRAPH_STYLE.lineSpacing,
-            spaceAfter: paragraphStyle.spaceAfter ?? DEFAULT_PARAGRAPH_STYLE.spaceAfter,
-            spaceBefore: paragraphStyle.spaceBefore ?? DEFAULT_PARAGRAPH_STYLE.spaceBefore,
-            contextualSpacing: paragraphStyle.contextualSpacing ?? DEFAULT_PARAGRAPH_STYLE.contextualSpacing,
-            beforeAutospacing: paragraphStyle.beforeAutospacing ?? DEFAULT_PARAGRAPH_STYLE.beforeAutospacing,
-            afterAutospacing: paragraphStyle.afterAutospacing ?? DEFAULT_PARAGRAPH_STYLE.afterAutospacing,
-            numberingId: paragraphStyle.numberingId ?? DEFAULT_PARAGRAPH_STYLE.numberingId,
-            numberingLevel: paragraphStyle.numberingLevel ?? DEFAULT_PARAGRAPH_STYLE.numberingLevel,
-            tabSettings: paragraphStyle.tabSettings ?? DEFAULT_PARAGRAPH_STYLE.tabSettings
-        });
-    }
     static getEmptyDocxModel() {
         const pageMargin = new MarginModel();
         return new DocxModel({