@talrace/ngx-noder 19.0.31 → 19.0.32

package/fesm2022/talrace-ngx-noder.mjs

@@ -177,6 +177,7 @@ const DEFAULT_HEADINGS = [
 ];
 const NEW_LINE_MARKUP = '\n';
 const DEFAULT_TAB_WIDTH = 48;
+const DEFAULT_OFFSET_AFTER_NUMBERING_MARKER = 20;
 const DEFAULT_EDGE_MAX_HEIGHT_MULTIPLIER = 0.4;
 
 var PageType;
@@ -1171,7 +1172,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.5", ngImpor
 class BaseNoderComponent extends DestroyComponent {
     constructor() {
         super(...arguments);
-        this.height = signal(0);
+        this.ascent = signal(0);
+        this.descent = signal(0);
         this.width = signal(0);
         this._isFocused = false;
         this.cdr = inject(ChangeDetectorRef);
@@ -5912,7 +5914,7 @@ class PositionHelper {
             (textLineInfo.indentFirstLine ||
                 (numberingOffsetLeft - textLineInfo.indentLeft > 0 &&
                     numberingOffsetLeft - textLineInfo.indentLeft < textLineInfo.markerWidth))) {
-            return textLineInfo.markerWidth;
+            return DEFAULT_OFFSET_AFTER_NUMBERING_MARKER;
         }
         return 0;
     }
@@ -6022,7 +6024,7 @@ class RenderingHelper {
         if (currentParagraph.textLinesInfo[0].indentFirstLine ||
             (numberingOffsetLeft - currentParagraph.textLinesInfo[0].indentLeft > 0 &&
                 numberingOffsetLeft - currentParagraph.textLinesInfo[0].indentLeft < currentParagraph.textLinesInfo[0].markerWidth)) {
-            markerWidth = currentParagraph.textLinesInfo[0].markerWidth;
+            markerWidth = DEFAULT_OFFSET_AFTER_NUMBERING_MARKER;
         }
         let lineEl = RenderingHelper.createLineElement(currentParagraph.textLinesInfo[splitIndex], numberingOffsetLeft - markerWidth, scalingRatio);
         domContent.parentNode.appendChild(lineEl);
@@ -6896,7 +6898,7 @@ class TextLayer {
             let offset = 0;
             if (numberingOffsetLeft - paragraphSettings.textLinesInfo[0].indentLeft > 0 &&
                 numberingOffsetLeft - paragraphSettings.textLinesInfo[0].indentLeft < paragraphSettings.textLinesInfo[0].markerWidth) {
-                offset = paragraphSettings.textLinesInfo[0].markerWidth;
+                offset = DEFAULT_OFFSET_AFTER_NUMBERING_MARKER;
             }
             const lineInfo = paragraphSettings.textLinesInfo[0];
             const lastLineEl = this.renderingHelper.createLineElement(lineInfo, numberingOffsetLeft - offset, this.session.generalProperties.scalingRatio);
@@ -10306,28 +10308,20 @@ class DisplayTokenHelper {
             info.isNumbering = firstWrapToken.isNumbering;
             info.markerWidth = firstWrapToken.markerWidth;
         }
-        let fontSize = 0;
-        let ascent = 0;
-        let descent = 0;
+        let maxAscent = 0;
+        let maxDescent = 0;
         const tokens = isAfterPageBreak && !wrapTokens.length ? [prevToken] : wrapTokens;
         for (const wrapToken of tokens) {
-            if (info.height < wrapToken.height) {
-                info.height = wrapToken.height;
+            if (maxAscent < wrapToken.ascent) {
+                maxAscent = wrapToken.ascent;
             }
-            if (fontSize < wrapToken.font && wrapToken.displayValue !== DisplayValue.customContent) {
-                fontSize = wrapToken.font;
-                ascent = wrapToken.ascent;
-                descent = wrapToken.descent;
+            if (maxDescent < wrapToken.descent) {
+                maxDescent = wrapToken.descent;
             }
             info.width += wrapToken.width;
         }
-        info.height = info.height || 18;
-        if (info.lineSpacing > 1) {
-            info.offsetAfter = (ascent + descent) * (info.lineSpacing - 1);
-        }
-        else if (ascent + descent === info.height) {
-            info.height = info.height * info.lineSpacing;
-        }
+        info.height = maxAscent + maxDescent;
+        info.offsetAfter = info.height * (info.lineSpacing - 1);
         return info;
     }
 }
@@ -11461,20 +11455,20 @@ class NoderTableComponent extends BaseNoderComponent {
                 bordersHeight += this.borderSize;
             }
         }
-        this.height.set(rowsHeight + bordersHeight);
+        this.ascent.set(rowsHeight + bordersHeight);
     }
     processSplit(leftSpaceOnPage, spaceBetweenPagesContent, contentHeight) {
         this.removeSplits();
-        if (leftSpaceOnPage >= this.height()) {
-            return { splitsCount: 0, tableHeight: this.height(), leftHeight: 0 };
+        if (leftSpaceOnPage >= this.ascent()) {
+            return { splitsCount: 0, tableHeight: this.ascent(), leftHeight: 0 };
         }
         if (leftSpaceOnPage < this.rowMatrix[0].height) {
-            return { splitsCount: 1, tableHeight: this.height(), leftHeight: this.height() };
+            return { splitsCount: 1, tableHeight: this.ascent(), leftHeight: this.ascent() };
         }
         return this.splitTable(leftSpaceOnPage, spaceBetweenPagesContent, contentHeight);
     }
     splitTable(leftSpaceOnPage, spaceBetweenPagesContent, contentHeight) {
-        let leftHeight = 0, tableHeightWithSplits = this.height(), rowIndex = 0;
+        let leftHeight = 0, tableHeightWithSplits = this.ascent(), rowIndex = 0;
         while (rowIndex < this.rowMatrix.length) {
             let { index, rowsHeight } = this.getRowIndexByHeight(rowIndex, leftSpaceOnPage);
             rowIndex = index;
@@ -11668,6 +11662,10 @@ class NumberingHelper {
         }
         numberingInfo[numberingId] ??= [];
         this.updateNumberingInfo(numberingInfo, resultMarker, numberingId, levelModel.level);
+        const markerLevels = resultMarker.split('.');
+        if (levelModel.level !== 0 && markerLevels[markerLevels.length - 1] === '') {
+            return resultMarker.slice(0, -1);
+        }
         return resultMarker;
     }
     static createDataModel(numberings, paragraphs, paragraphIndex, numberingInfo) {
@@ -12417,7 +12415,7 @@ class DisplayData extends EventEmitting {
         }
         const startIndex = tabIndex;
         while (this.customComponents.tabs[tabIndex] && this.customComponents.tabs[tabIndex].instance.insertIndex <= paragraphLastIndex) {
-            this.customComponents.tabs[tabIndex].instance.applySize(this.tabTokens[tabIndex - startIndex].width, this.tabTokens[tabIndex - startIndex].font);
+            this.customComponents.tabs[tabIndex].instance.applySize(this.tabTokens[tabIndex - startIndex].width);
             tabIndex++;
         }
         return tabIndex;
@@ -13652,7 +13650,7 @@ class NoderImageComponent extends BaseNoderComponent {
         this.content = val;
     }
     get size() {
-        return { width: this.width(), height: this.height() };
+        return { width: this.width(), height: this.ascent() };
     }
     constructor(elementRef, apiService) {
         super();
@@ -13662,7 +13660,7 @@ class NoderImageComponent extends BaseNoderComponent {
     }
     initialize() {
         const url = this.image.content?.replace('/api/', '') ?? '';
-        this.height.set(ScalingHelper.scale(this.image.height, this.generalProperties.scalingRatio));
+        this.ascent.set(ScalingHelper.scale(this.image.height, this.generalProperties.scalingRatio));
         this.width.set(ScalingHelper.scale(this.image.width, this.generalProperties.scalingRatio));
         this.apiService.getFile(url).subscribe(x => {
             const fileSource = URL.createObjectURL(x);
@@ -13678,7 +13676,7 @@ class NoderImageComponent extends BaseNoderComponent {
     }
     resize(size) {
         this.width.set(size.width);
-        this.height.set(size.height);
+        this.ascent.set(size.height);
         this.isCanvas ? this.resizeCanvas(size) : this.resizeImage(size);
         this.cdr.markForCheck();
     }
@@ -13697,7 +13695,7 @@ class NoderImageComponent extends BaseNoderComponent {
     createImage(fileSource) {
         const imageEl = document.createElement('img');
         imageEl.width = this.width();
-        imageEl.height = this.height();
+        imageEl.height = this.ascent();
         imageEl.draggable = false;
         imageEl.src = fileSource;
         return imageEl;
@@ -13728,20 +13726,18 @@ class NoderTabComponent extends BaseNoderComponent {
         this.content = val;
     }
     initialize() {
-        this.applySize(this.tab.width, this.tab.fontSize);
+        this.applySize(this.tab.width);
     }
-    applySize(width, font) {
-        this.height.set(font);
+    applySize(width) {
         this.width.set(ScalingHelper.scale(width, this.generalProperties.scalingRatio));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.5", ngImport: i0, type: NoderTabComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.0.5", type: NoderTabComponent, isStandalone: false, selector: "app-nod-tab", host: { properties: { "style.width.px": "width()", "style.fontSize.pt": "height()" } }, usesInheritance: true, ngImport: i0, template: "&emsp;\n", styles: [":host{position:relative;outline:none}\n"], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.0.5", type: NoderTabComponent, isStandalone: false, selector: "app-nod-tab", host: { properties: { "style.width.px": "width()" } }, usesInheritance: true, ngImport: i0, template: "&emsp;\n", styles: [":host{position:relative;outline:none}\n"], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.5", ngImport: i0, type: NoderTabComponent, decorators: [{
             type: Component,
             args: [{ selector: 'app-nod-tab', changeDetection: ChangeDetectionStrategy.OnPush, standalone: false, host: {
-                        '[style.width.px]': 'width()',
-                        '[style.fontSize.pt]': 'height()'
+                        '[style.width.px]': 'width()'
                     }, template: "&emsp;\n", styles: [":host{position:relative;outline:none}\n"] }]
         }] });
 
@@ -14034,6 +14030,7 @@ class EditSession {
         const startParagraph = ContentHelper.documentIndexToParagraphIndex(this.displayData.paragraphs, startIndex).row;
         const endPosition = ContentHelper.documentIndexToParagraphWithOffset(this.displayData.paragraphs, endIndex);
         OperationsHelper.restoreParagraphStyles(this.model, paragraphs);
+        this.displayData.resetAllNumberingInfo(0);
         this.displayData.updateNextLineIndexes(startParagraph, endPosition.row);
         this.selection.placeCursor(endPosition);
         this.applyToolbarStyles();
@@ -15921,21 +15918,16 @@ class CustomContentService {
         return this.findComponent(components.tables, charIndex);
     }
     getTokenFromComponent(component, lineInfo, displayValue, isFirst, size) {
-        let height = size.height;
-        if (component.instance.height() > size.height) {
-            height =
-                component.instance instanceof NoderImageComponent
-                    ? component.instance.height() + size.descent
-                    : component.instance.height();
-        }
+        const ascent = component.instance.ascent() ?? 0;
+        const descent = component.instance.descent() ?? 0;
         return new DisplayToken({
             width: component.instance.width(),
-            height,
+            height: ascent + descent,
             baseline: 0,
             content: 0,
             font: size.font,
-            ascent: component.instance.height() ?? size.height,
-            descent: 0,
+            ascent,
+            descent,
             line: 0,
             lineSpacing: lineInfo.lineSpacing,
             multiplier: 0,
@@ -19198,5 +19190,5 @@ class OperationModel {
  * Generated bundle index. Do not edit.
  */
 
-export { AddLinkDialogComponent, AddLinkMobileComponent, Alignment, BaseNoderComponent, Borders, BreakTypes, CommandModel, CommandType, CommandsService, ConfirmDialogComponent, DEFAULT_BACKGROUND_COLOR, DEFAULT_EDGE_MAX_HEIGHT_MULTIPLIER, DEFAULT_FONT_COLOR, DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, DEFAULT_HEADINGS, DEFAULT_HEADING_STYLE_ID, DEFAULT_PARAGRAPH_STYLE, DEFAULT_TAB_WIDTH, DEFAULT_TEXT_STYLE, DEFAULT_TOOLBAR_STYLES, DefaultImageApiService, DestroyComponent, DocumentInfo, DocumentModel, DocumentNameModel, DocxModel, DomHelper, EditorComponent, EditorMobileToolbarComponent, EditorModule, EditorService, EditorTitleComponent, EditorTitleMobileComponent, EditorToolbarComponent, EditorToolbarMode, EditorToolbarModule, EditorToolbarService, ElementDataModel, ElementModel, ExternalComponent, ExternalElementModel, ExternalElementService, FileSourceModel, FontMetrics, FormatStyleHelper, GrammarService, HYPERLINK_FONT_COLOR, HYPERLINK_HEADING_STYLE_ID, ImageApiService, ImageDataModel, LastDocumentRevisionModel, LineStyles, MenuDropdownsComponent, MenuDropdownsMobileComponent, Mode, NEW_LINE_MARKUP, NoderTranslateLoader, NumberingLevelModel, OperationModel, OperationsHistoryInfoModel, PageSetupComponent, PageType, ParagraphStyleModel, RevisionHelper, RevisionModel, SearchResultLocation, TextFormatMobileComponent, TextStyleModel, ToolbarActionsComponent };
+export { AddLinkDialogComponent, AddLinkMobileComponent, Alignment, BaseNoderComponent, Borders, BreakTypes, CommandModel, CommandType, CommandsService, ConfirmDialogComponent, DEFAULT_BACKGROUND_COLOR, DEFAULT_EDGE_MAX_HEIGHT_MULTIPLIER, DEFAULT_FONT_COLOR, DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, DEFAULT_HEADINGS, DEFAULT_HEADING_STYLE_ID, DEFAULT_OFFSET_AFTER_NUMBERING_MARKER, DEFAULT_PARAGRAPH_STYLE, DEFAULT_TAB_WIDTH, DEFAULT_TEXT_STYLE, DEFAULT_TOOLBAR_STYLES, DefaultImageApiService, DestroyComponent, DocumentInfo, DocumentModel, DocumentNameModel, DocxModel, DomHelper, EditorComponent, EditorMobileToolbarComponent, EditorModule, EditorService, EditorTitleComponent, EditorTitleMobileComponent, EditorToolbarComponent, EditorToolbarMode, EditorToolbarModule, EditorToolbarService, ElementDataModel, ElementModel, ExternalComponent, ExternalElementModel, ExternalElementService, FileSourceModel, FontMetrics, FormatStyleHelper, GrammarService, HYPERLINK_FONT_COLOR, HYPERLINK_HEADING_STYLE_ID, ImageApiService, ImageDataModel, LastDocumentRevisionModel, LineStyles, MenuDropdownsComponent, MenuDropdownsMobileComponent, Mode, NEW_LINE_MARKUP, NoderTranslateLoader, NumberingLevelModel, OperationModel, OperationsHistoryInfoModel, PageSetupComponent, PageType, ParagraphStyleModel, RevisionHelper, RevisionModel, SearchResultLocation, TextFormatMobileComponent, TextStyleModel, ToolbarActionsComponent };
 //# sourceMappingURL=talrace-ngx-noder.mjs.map