@talrace/ngx-noder 19.0.48 → 19.0.50

package/fesm2022/talrace-ngx-noder.mjs

@@ -5529,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;
     }
@@ -6876,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) {
@@ -6896,41 +6890,33 @@ class DisplayTokenHelper {
             for (let i = 0; i < text.length; i++) {
                 result.push(this.getSymbolToken(text[i], fontString, index));
                 result[i].customIndex = i;
+                result[i].customText = text;
             }
-            return result.length ? result : [this.getSymbolToken(' ', fontString, index)];
+            return result;
         }
-        const ascent = component.instance.ascent() ?? 0;
-        const descent = component.instance.descent() ?? 0;
-        return [
-            new DisplayToken({
-                width: component.instance.width(),
-                height: ascent + descent,
-                font: FontMetrics.measureCharSize('0', fontString).font,
-                ascent,
-                descent,
-                displayValue: this.getComponentDisplayValue(component.instance),
-                index
-            })
-        ];
+        return [this.getComponentToken(component, fontString, index)];
     }
-    static getTableTokens(component, fontString, index, withNumbering) {
-        if (!withNumbering) {
-            return this.getComponentTokens(component, fontString, index);
-        }
-        const spaceToken = this.getSymbolToken(' ', fontString, index);
-        spaceToken.customIndex = 0;
+    static getComponentToken(component, fontString, index) {
         const ascent = component.instance.ascent() ?? 0;
         const descent = component.instance.descent() ?? 0;
-        const tableToken = new DisplayToken({
+        return new DisplayToken({
             width: component.instance.width(),
             height: ascent + descent,
             font: FontMetrics.measureCharSize('0', fontString).font,
             ascent,
             descent,
-            displayValue: DisplayValue.table,
-            index,
-            customIndex: 1
+            displayValue: this.getComponentDisplayValue(component.instance),
+            index
         });
+    }
+    static getTableTokens(component, fontString, index, withNumbering) {
+        const tableToken = this.getComponentToken(component, fontString, index);
+        if (!withNumbering) {
+            return [tableToken];
+        }
+        const spaceToken = this.getSymbolToken(' ', fontString, index);
+        spaceToken.customIndex = 0;
+        tableToken.customIndex = 1;
         return [spaceToken, tableToken];
     }
     static getBreakDisplayValue(breakType) {
@@ -7083,6 +7069,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;
@@ -7092,10 +7079,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) {
@@ -7154,7 +7138,8 @@ class LineInfoHelper {
                     line.customTexts.push({
                         index: indexInParagraph,
                         start: token.customIndex,
-                        end: token.customIndex + 1
+                        end: token.customIndex + 1,
+                        text: token.customText
                     });
                 }
             }
@@ -13351,7 +13336,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;
             }
@@ -13385,10 +13370,8 @@ class RenderingHelper {
             { name: 'data-session-id', value: `${instance.sessionId}` },
             { name: 'data-insert-index', value: `${instance.insertIndex}` }
         ];
-        let text = instance.getText();
-        text = !text.length ? ' ' : text;
         const customText = line.customTexts.find(x => x.index === instance.insertIndex - paragraphStartIndex);
-        const customTextFragment = text.substring(customText.start, customText.end);
+        const customTextFragment = customText.text.substring(customText.start, customText.end);
         if (!line.wordSpacing) {
             this.renderText(fragment, textStyle, customTextFragment, wordSpacing, classes, attributes, style);
             additionalTokens += customTextFragment.length;
@@ -13410,7 +13393,7 @@ class RenderingHelper {
                 additionalTokens += rightText.length;
             }
         }
-        if (text.length === customText.end) {
+        if (customText.text.length === customText.end) {
             renderedIndexes++;
             additionalTokens--;
         }