@talrace/ngx-noder 19.0.47 → 19.0.49

package/fesm2022/talrace-ngx-noder.mjs

@@ -2486,7 +2486,7 @@ class LinkModel {
 
 class LinkHelper {
     static sliceSection(links, start, end) {
-        return links.map(link => LinkHelper.getPartialLink(link, start, end)).filter((link) => link !== null);
+        return links.map(link => LinkHelper.getPartialLink(link, start, end)).filter(x => x !== null);
     }
     static shiftIndexes(links, offset) {
         for (const link of links) {
@@ -2509,7 +2509,7 @@ class LinkHelper {
         }
         const newStart = Math.max(link.startIndex, selectionStart);
         const newEnd = Math.min(link.endIndex, selectionEnd);
-        const newFormats = link.formats
+        const formats = link.formats
             .map(format => {
             const formatStart = link.startIndex + format.startIndex;
             const formatEnd = link.startIndex + format.endIndex;
@@ -2518,10 +2518,11 @@ class LinkHelper {
             }
             const newFormatStart = Math.max(formatStart, newStart) - newStart;
             const newFormatEnd = Math.min(formatEnd, newEnd) - newStart;
-            return new FormatModel({ ...format, startIndex: newFormatStart, endIndex: newFormatEnd });
+            const textStyle = new TextStyleModel(format.textStyle);
+            return new FormatModel({ startIndex: newFormatStart, endIndex: newFormatEnd, textStyle });
         })
-            .filter((format) => format !== null);
-        return new LinkModel({ ...link, startIndex: newStart, endIndex: newEnd, formats: newFormats });
+            .filter(x => x !== null);
+        return new LinkModel({ ...link, startIndex: newStart, endIndex: newEnd, formats });
     }
 }
 
@@ -3224,22 +3225,21 @@ class FormatOperationsHelper {
         for (let i = formats.length - 1; i >= 0; i--) {
             if (formats[i].startIndex >= startIndex && formats[i].endIndex <= endIndex) {
                 formats.splice(i, 1);
+                continue;
             }
-        }
-        formats.forEach(x => {
-            if (x.startIndex >= startIndex && x.startIndex <= endIndex) {
-                x.startIndex = startIndex;
+            if (formats[i].startIndex > endIndex) {
+                formats[i].startIndex -= length;
             }
-            else if (x.startIndex > endIndex) {
-                x.startIndex -= length;
+            else if (formats[i].startIndex >= startIndex) {
+                formats[i].startIndex = startIndex;
             }
-            if (x.endIndex >= startIndex && x.endIndex <= endIndex) {
-                x.endIndex = startIndex - 1;
+            if (formats[i].endIndex > endIndex) {
+                formats[i].endIndex -= length;
             }
-            else if (x.endIndex > endIndex) {
-                x.endIndex -= length;
+            else if (formats[i].endIndex >= startIndex) {
+                formats[i].endIndex = startIndex - 1;
             }
-        });
+        }
         FormatStyleHelper.mergeFormats(formats, startIndex - 1, startIndex);
     }
     static insertContent(formats, index, textLength) {
@@ -3317,15 +3317,17 @@ class ImageOperationsHelper {
 }
 
 class LinkOperationsHelper {
-    static insert(links, link, startIndex, length, linkStyle) {
+    static insert(links, link, startIndex, length, style) {
         LinkOperationsHelper.insertContent(links, startIndex, length);
-        const linkModel = new LinkModel({
-            startIndex,
-            link,
-            endIndex: startIndex + length - 1,
-            formats: [new FormatModel({ startIndex: 0, endIndex: length - 1, textStyle: linkStyle })]
+        const textStyle = new TextStyleModel({
+            ...style,
+            fontColor: HYPERLINK_FONT_COLOR,
+            underline: true,
+            headingStyleId: HYPERLINK_HEADING_STYLE_ID
         });
-        const index = links.findIndex(x => x.startIndex > linkModel.startIndex);
+        const formats = [new FormatModel({ startIndex: 0, endIndex: length - 1, textStyle })];
+        const linkModel = new LinkModel({ startIndex, link, endIndex: startIndex + length - 1, formats });
+        const index = links.findIndex(x => x.startIndex > startIndex);
         if (index < 0) {
             links.push(linkModel);
         }
@@ -5527,7 +5529,7 @@ class TargetOperationsHelper {
     static getContents(document, targets) {
         let result = document;
         for (const target of targets) {
-            result = this.getTargetContents(document, target, document);
+            result = this.getTargetContents(result, target, document);
         }
         return result;
     }
@@ -5888,13 +5890,8 @@ class OperationsHelper {
         IndexedElementOperationsHelper.insertContent(document.tabs, index, text.length);
         RangeElementHelper.insertContent(document.comments, index, text.length);
         PageFormatOperationsHelper.insertContent(document, index, text.length);
-        const formatStyle = FormatStyleHelper.getFormatAtIndex(document.formats, index).textStyle;
-        LinkOperationsHelper.insert(document.links, link, index, text.length, {
-            ...formatStyle,
-            fontColor: HYPERLINK_FONT_COLOR,
-            underline: true,
-            headingStyleId: HYPERLINK_HEADING_STYLE_ID
-        });
+        const style = FormatStyleHelper.getFormatAtIndex(document.formats, index).textStyle;
+        LinkOperationsHelper.insert(document.links, link, index, text.length, style);
     }
     static addNumbering(target, numberings, startIndex, endIndex, levels, numberingId = null) {
         const newNumberingId = numberingId ?? NumberingOperationsHelper.generateNumberingId(numberings);
@@ -6879,17 +6876,11 @@ class DisplayTokenHelper {
         });
     }
     static getSymbolToken(symbol, fontString, index) {
-        const result = new DisplayToken({
+        return new DisplayToken({
             ...FontMetrics.measureCharSize(symbol, fontString),
             displayValue: this.getSymbolDisplayValue(symbol),
             index
         });
-        if (result.isSpace) {
-            result.ascent = 0;
-            result.descent = 0;
-            result.height = 0;
-        }
-        return result;
     }
     static getComponentTokens(component, fontString, index) {
         if (component.instance instanceof ExternalComponent && component.instance.isText) {
@@ -7086,6 +7077,7 @@ class LineInfoHelper {
         let maxAscent = 0;
         let maxDescent = 0;
         let i = 0;
+        const length = tokens[tokens.length - 1].isParagraph && tokens.length > 1 ? tokens.length - 1 : tokens.length;
         do {
             if (maxAscent < tokens[i].ascent) {
                 maxAscent = tokens[i].ascent;
@@ -7095,10 +7087,7 @@ class LineInfoHelper {
             }
             line.width += tokens[i].width;
             i++;
-        } while (i < tokens.length);
-        if (tokens.length > 1 && tokens[tokens.length - 1].isParagraph) {
-            line.width -= tokens[tokens.length - 1].width;
-        }
+        } while (i < length);
         line.height = maxAscent + maxDescent;
         line.ascent = maxAscent;
         if (line.height === 0) {
@@ -13354,7 +13343,7 @@ class RenderingHelper {
             this.renderText(fragment, textStyle, textBeforeElement, wordSpacing);
             renderedIndexes += textBeforeElement.length;
             if (component.instance instanceof ExternalComponent && component.instance.isText) {
-                const rendered = this.renderExternalText(fragment, textStyle, wordSpacing, component.instance, line, renderedTokensInLine, paragraphStartIndex);
+                const rendered = this.renderExternalText(fragment, textStyle, wordSpacing, component.instance, line, renderedTokensInLine + renderedIndexes + additionalTokens, paragraphStartIndex);
                 renderedIndexes += rendered.renderedIndexes;
                 additionalTokens += rendered.additionalTokens;
             }
@@ -13982,11 +13971,11 @@ class SaveCommandsHelper {
         const insertTableRows = new InsertTableRowsModel({ count: rowsCount, inheritIndex, insertIndex, targetIndex });
         return new CommandModel({ commandType: CommandType.InsertTableRows, insertTableRows, targets });
     }
-    static getRemoveTableColumnsCommand(startIndex, endIndex, insertIndex, targets) {
+    static getRemoveTableColumnsCommand(insertIndex, startIndex, endIndex, targets) {
         const removeTableColumns = new RemoveTableColumnsModel({ startIndex, endIndex, insertIndex });
         return new CommandModel({ commandType: CommandType.RemoveTableColumns, removeTableColumns, targets });
     }
-    static getRemoveTableRowsCommand(startIndex, endIndex, insertIndex, targets) {
+    static getRemoveTableRowsCommand(insertIndex, startIndex, endIndex, targets) {
         const removeTableRows = new RemoveTableRowsModel({ startIndex, endIndex, insertIndex });
         return new CommandModel({ commandType: CommandType.RemoveTableRows, removeTableRows, targets });
     }