@talrace/ngx-noder 19.0.36 → 19.0.37

package/lib/editor/components/external-element/external.component.d.ts

@@ -7,6 +7,8 @@ export declare abstract class ExternalComponent extends BaseNoderComponent {
     content: ElementModel;
     protected abstract sidenavComponent: Type<ExternalSidenavInterface>;
     protected focusSidenav: boolean;
+    isText: boolean;
+    getText(): string;
     protected skipSidenav(): boolean;
     focus(): void;
     blur(): void;

package/lib/editor/components/shared/services/custom-content.service.d.ts

@@ -2,13 +2,9 @@ import { ComponentRef, Injector, Type } from '@angular/core';
 import { BaseNoderComponent } from '../abstract/base.component';
 import { ComponentService } from './component.service';
 import { ContentType } from '../../../content/contents.interface';
-import { DisplayToken } from '../../../content/display-data/display-token.model';
-import { DistanceModel } from '../../../execution/distance.model';
 import { ExternalElementModel } from '../../external-element/models/external-element.model';
 import { GeneralPropertiesModel } from '../../../content/display-data/general-properties.model';
 import { ICustomComponents } from '../custom-components.interface';
-import { IFontMetricSize } from '../../../gadgets/font-metrics/font-metric-size.interface';
-import { LineInfoModel } from '../../../content/display-data/line-info.model';
 import * as i0 from "@angular/core";
 export declare class CustomContentService {
     componentService: ComponentService;
@@ -16,13 +12,10 @@ export declare class CustomContentService {
     elements: ExternalElementModel[];
     constructor(componentService: ComponentService, injector: Injector);
     generateComponent(model: ContentType, components: ICustomComponents, sessionId: number, generalProperties: GeneralPropertiesModel, contentWidth: number, charIndex: number): ComponentRef<BaseNoderComponent> | null;
-    isFragmentContainComponent(components: ICustomComponents, textFragment: string, fragmentDistance: DistanceModel): boolean;
-    getComponents(components: ICustomComponents, distance: DistanceModel): ComponentRef<BaseNoderComponent>[];
+    getComponents(components: ICustomComponents, start: number, end: number): ComponentRef<BaseNoderComponent>[];
     getComponent(components: ICustomComponents, char: string, charIndex: number): ComponentRef<BaseNoderComponent>;
-    getTokenFromComponent(component: ComponentRef<BaseNoderComponent>, lineInfo: LineInfoModel, displayValue: number, isFirst: boolean, size: IFontMetricSize): DisplayToken;
     findComponentType(type: number): Type<BaseNoderComponent>;
     findComponent<T>(components: ComponentRef<T>[], insertIndex: number): ComponentRef<T>;
-    private isFragmentContainComponents;
     isSpecialMarker(char: string): boolean;
     static ɵfac: i0.ɵɵFactoryDeclaration<CustomContentService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<CustomContentService>;

package/lib/editor/content/constants/display-values.const.d.ts

@@ -1,8 +1,12 @@
 export declare const DisplayValue: {
     char: number;
     customContent: number;
+    table: number;
+    pageBreak: number;
+    lineBreak: number;
     punctuation: number;
     space: number;
-    trailingSpace: number;
-    emptyLine: number;
+    tab: number;
+    paragraph: number;
+    hyphen: number;
 };

package/lib/editor/content/display-data/display-data.d.ts

@@ -1,4 +1,3 @@
-import { ComponentRef } from '@angular/core';
 import { BreakTypes } from '../../gadgets/page-break/break-types.enum';
 import { ContentType } from '../contents.interface';
 import { CursorParagraph } from '../../positioning/cursor-paragraph';
@@ -9,7 +8,6 @@ import { EventEmitting } from '../../core/event-emitting';
 import { GeneralPropertiesModel } from './general-properties.model';
 import { ICustomComponents } from '../../components/shared/custom-components.interface';
 import { LineInfoModel } from './line-info.model';
-import { NoderTableComponent } from '../../components/table/components/table.component';
 import { NumberingDataModel } from '../../gadgets/numbering/numbering-data.model';
 import { PageFormat } from './page-format';
 import { PageFormatModel } from '../../../models/generated/page-format.model';
@@ -33,7 +31,6 @@ export declare class DisplayData extends EventEmitting {
     paragraphs: ParagraphInfoModel[];
     pagesFormat: PageFormat[];
     allPagesHeight: number;
-    tabTokens: DisplayToken[];
     get maxPageWidth(): number;
     private readonly ParagraphInfoChanges;
     get ParagraphInfoChanges$(): import("rxjs").Observable<ParagraphInfoAdded | ParagraphInfoContentChanged | ParagraphInfoContentInserted | ParagraphInfosRemoved>;
@@ -67,38 +64,22 @@ export declare class DisplayData extends EventEmitting {
     updateParagraphStartIndex(first: number): void;
     updateParagraphSettingsNumberingData(index: number): void;
     updateNextLineIndexes(firstParagraph: number, lastParagraph: number): void;
-    updateNumberingsDataOnChange(index: number): void;
-    resetAllNumberingInfo(paragraphIndex: number): void;
-    resetNumberingInfoByTableCell(table: ComponentRef<NoderTableComponent>): void;
-    private updateParagraphTabs;
-    private getSplits;
-    /**
-     * Given a string, returns an array of the display characters, including tabs and spaces and custom components.
-     */
-    getDisplayTokens(model: ContentType, str: string, startIndex: number): DisplayToken[];
-    private fillLineTokens;
+    isSameNumberingId(paragraphIndex: number, numberingId: number): boolean;
+    private updateNumberingsDataOnChange;
+    private splitParagraphByLines;
+    private getParagraphTokens;
+    getParagraphLineTokens(paragraphIndex: number, lineIndex: number): DisplayToken[];
+    getTokens(contentIndex: number, content: string, paragraphSymbolIndex: number): {
+        tokens: DisplayToken[];
+        paragraphToken: DisplayToken;
+    };
     private getOrGenerateComponent;
-    private processCharSizes;
     private getPageFormatParagraphs;
     getPageFormatByPageNumber(pageNumber: number): PageFormat;
     getPageFormatAtPosition(startParagraphIndex: number): PageFormat | undefined;
     getPageFormatIndexAtPosition(startParagraphIndex: number): number;
-    getLineTokens(model: ContentType, line: string, startIndex: number): DisplayToken[];
-    private findSameNumberingIndex;
-    private getEmptyDisplayTokens;
-    private getEmptyLineTokens;
-    private getLineInfoByBreakModifier;
-    private getParagraphIndentLeft;
-    private getLineInfoFromTextLine;
-    private getLineInfoModel;
-    private getIndentLeftFromTextLine;
-    private computeWrapSplit;
-    private calculateSplit;
-    private isWhiteSpace;
-    /**
-     * Computes wrap index based on max row width
-     */
     private computeWrapIndex;
+    private adjustLastTab;
     private getPreviousParagraphInfo;
     private getVisiblePages;
     private calculateVisiblePageCount;

package/lib/editor/content/display-data/display-token.model.d.ts

@@ -2,28 +2,19 @@ import { IFontMetricSize } from '../../gadgets/font-metrics/font-metric-size.int
 export declare class DisplayToken implements IFontMetricSize {
     width: number;
     height: number;
-    baseline: number;
-    content: number;
     font: number;
-    line: number;
     lineSpacing: number;
-    multiplier: number;
     ascent: number;
     descent: number;
     displayValue: number;
-    align: number;
-    indentFirstLine: number;
-    indentHanging: number;
-    indentLeft: number;
-    indentRight: number;
-    indentBefore: number;
-    indentAfter: number;
-    markerWidth: number;
-    isPageBreak: boolean;
-    isLineBreak: boolean;
-    isTab: boolean;
-    isTable: boolean;
-    isNumbering: boolean;
+    get isSpace(): boolean;
+    get isParagraph(): boolean;
+    get isPageBreak(): boolean;
+    get isLineBreak(): boolean;
+    get isTab(): boolean;
+    get isTable(): boolean;
+    get isWhiteSpace(): boolean;
     get breaksLine(): boolean;
+    get breakable(): boolean;
     constructor(fields?: Partial<DisplayToken>);
 }

package/lib/editor/content/display-data/general-properties.model.d.ts

@@ -1,8 +1,9 @@
 import { NumberingModel } from '../../../models/generated/numbering.model';
 export type NumberingInfo = Record<string, {
     markerIndex: number;
-    markerLevel: number;
-    visited: boolean;
+    start: number;
+    needToRecalculate: boolean;
+    needToCalculateFirstMarker: boolean;
 }[]>;
 export declare class GeneralPropertiesModel {
     defaultTabWidth: number;

package/lib/editor/content/display-data/indent.model.d.ts

@@ -3,5 +3,6 @@ export declare class IndentModel {
     hanging: number;
     left: number;
     right: number;
-    constructor(firstLine: number, hanging: number, left: number, right: number);
+    markerWidth: number;
+    constructor(firstLine: number, hanging: number, left: number, right: number, markerWidth: number);
 }

package/lib/editor/content/display-data/line-info.model.d.ts

@@ -2,7 +2,7 @@ import { IndentModel } from './indent.model';
 export declare class LineInfoModel {
     height: number;
     width: number;
-    maxAscent: number;
+    ascent: number;
     align: number;
     indent: IndentModel;
     offsetBefore: number;
@@ -13,8 +13,8 @@ export declare class LineInfoModel {
     backgroundColor: string;
     hasTable: boolean;
     isNumbering: boolean;
-    markerWidth?: number;
     wordSpacing?: number;
-    wordSpacingWidth?: number;
+    wordSpacingStart?: number;
+    wordSpacingEnd?: number;
     constructor(fields?: Partial<LineInfoModel>);
 }

package/lib/editor/content/display-data/paragraph-info.interface.d.ts

@@ -2,6 +2,6 @@ export interface ParagraphInfo {
     paragraphIndex: number;
     lineIndex: number;
     lineTopOffset: number;
-    indentBefore: number;
     lineHeight: number;
+    lineAscent: number;
 }

package/lib/editor/content/display-data/text-line-info.d.ts

@@ -1,27 +1,14 @@
 import { IndentModel } from './indent.model';
 import { LineInfoModel } from './line-info.model';
-export declare class TextLineInfo {
-    width: number;
-    height: number;
-    maxAscent: number;
+export declare class TextLineInfo extends LineInfoModel {
     page?: number;
     paddingLeft: number;
     offsetMargin: number;
-    offsetBefore: number;
-    offsetAfter: number;
     firstLinePageOffset: number;
     endPageOffset: number;
     screenLine: number;
-    isAfterPageBreak: boolean;
-    isEndedByPageBreak: boolean;
-    backgroundColor: string;
-    hasTable: boolean;
     splitOffset: number;
     indentLeft: number;
     indentFirstLine: number;
-    wordSpacing?: number;
-    wordSpacingWidth?: number;
-    isNumbering: boolean;
-    markerWidth?: number;
     constructor(offsetMargin: number, contentWidth: number, align: number, indent: IndentModel, fields?: Partial<LineInfoModel>);
 }

package/lib/editor/content/helpers/display-token.helper.d.ts

@@ -1,6 +1,12 @@
+import { ComponentRef } from '@angular/core';
+import { BaseNoderComponent } from '../../components/shared/abstract/base.component';
+import { BreakTypes } from '../../gadgets/page-break/break-types.enum';
 import { DisplayToken } from '../display-data/display-token.model';
-import { LineInfoModel } from '../display-data/line-info.model';
+import { IFontMetricSize } from '../../gadgets/font-metrics/font-metric-size.interface';
+import { TextStyleModel } from '../../../models/generated/text-style.model';
 export declare class DisplayTokenHelper {
-    static getDisplayValue(charCode: number): number;
-    static getLineInfoFromToken(prevToken: DisplayToken, firstWrapToken: DisplayToken, wrapTokens: DisplayToken[], isAfterPageBreak: boolean): LineInfoModel;
+    static getDisplayValue(charCode: number, breakType: BreakTypes | null): number;
+    static getParagraphToken(paragraphSymbolStyle: TextStyleModel): DisplayToken;
+    static getSymbolToken(code: number, size: IFontMetricSize, breakType: BreakTypes | null): DisplayToken;
+    static getComponentToken(component: ComponentRef<BaseNoderComponent>, size: IFontMetricSize): DisplayToken;
 }

package/lib/editor/content/helpers/line-info.helper.d.ts

@@ -0,0 +1,10 @@
+import { ContentType } from '../contents.interface';
+import { DisplayToken } from '../display-data/display-token.model';
+import { GeneralPropertiesModel } from '../display-data/general-properties.model';
+import { IndentModel } from '../display-data/indent.model';
+import { LineInfoModel } from '../display-data/line-info.model';
+import { ParagraphStyleModel } from '../../../models/generated/paragraph-style.model';
+export declare class LineInfoHelper {
+    static get(tokens: DisplayToken[], isAfterPageBreak: boolean, isLastLine: boolean, style: ParagraphStyleModel, indent: IndentModel, isNumbering: boolean, width: number, defaultHeight: number, defaultAscent: number): LineInfoModel;
+    static getFirstLineIndent(model: ContentType, paragraphIndex: number, generalProperties: GeneralPropertiesModel): IndentModel;
+}

package/lib/editor/display/layers/text.layer.d.ts

@@ -1,20 +1,18 @@
 import { EditSession } from '../../execution/edit.session';
 import { ILayerConfig } from './layer.config';
 import { Lines } from '../../content/display-data/lines';
-import { RenderingHelper } from '../rendering.helper';
 export declare class TextLayer {
     private parentElement;
     protected session: EditSession;
-    private renderingHelper;
     element: HTMLElement;
     lines: Lines;
     config: ILayerConfig;
-    constructor(parentElement: HTMLElement, session: EditSession, renderingHelper?: typeof RenderingHelper);
+    constructor(parentElement: HTMLElement, session: EditSession);
     destroy(): void;
     updateLines(config: ILayerConfig): void;
     scrollLines(config: ILayerConfig): void;
     protected getParagraphTop(row: number): number;
     private renderTextParagraph;
-    private renderTextLines;
+    private renderParagraph;
     private readonly pagesCountChangedHandler;
 }

package/lib/editor/display/rendering.helper.d.ts

@@ -1,27 +1,18 @@
-import { ComponentRef } from '@angular/core';
 import { BreakModel } from '../../models/generated/break.model';
 import { CustomContentService } from '../components/shared/services/custom-content.service';
-import { DistanceModel } from '../execution/distance.model';
-import { FormatExtModel } from '../content/display-data/format-ext.model';
+import { FormatModel } from '../../models/generated/format.model';
 import { ICustomComponents } from '../components/shared/custom-components.interface';
 import { Paragraph } from '../content/display-data/paragraph';
+import { ParagraphInfoModel } from '../content/display-data/models/paragraph-info.model';
 import { TextLineInfo } from '../content/display-data/text-line-info';
 export declare class RenderingHelper {
     static createLineElement(lineInfo: TextLineInfo, numberingOffsetLeft: number, scalingRatio: number): HTMLElement;
-    static renderContentSimpleLine(domContent: {
+    static renderParagraph(domContent: {
         currentElement: HTMLElement;
         parentNode: Node;
-    }, formatsExt: FormatExtModel[], rowDistance: DistanceModel, customContentService: CustomContentService, customComponents: ICustomComponents, lineInfo: TextLineInfo, breaks?: BreakModel[]): void;
-    static renderContentWrappedLine(domContent: {
-        currentElement: HTMLElement;
-        parentNode: Node;
-    }, splits: number[], currentParagraph: Paragraph, formatsExt: FormatExtModel[], distance: DistanceModel, customContentService: CustomContentService, customComponents: ICustomComponents, scalingRatio: number, breaks?: BreakModel[]): void;
+    }, paragraph: ParagraphInfoModel, formats: FormatModel[], customContentService: CustomContentService, customComponents: ICustomComponents, scalingRatio: number, breaks?: BreakModel[]): void;
     static renderNumberingMarker(paragraph: Paragraph, layerElement: HTMLElement, scalingRatio: number): HTMLElement;
     static createDivContainer(className: string): HTMLDivElement;
     private static renderFormatContent;
-    private static renderTextWithCustomContent;
-    private static renderTextWithSpacingHandling;
     private static renderText;
-    private static getTextIndexLengthForInsert;
-    protected static attachComponent(fragment: DocumentFragment, component: ComponentRef<unknown>, customContentService: CustomContentService): void;
 }

package/lib/editor/gadgets/font-metrics/font-metric-size.interface.d.ts

@@ -1,11 +1,7 @@
 export interface IFontMetricSize {
     width: number;
     height: number;
-    baseline: number;
-    content: number;
     font: number;
-    line: number;
-    multiplier: number;
     ascent: number;
     descent: number;
 }

package/lib/editor/gadgets/numbering/numbering.helper.d.ts

@@ -1,26 +1,35 @@
-import { GeneralPropertiesModel, NumberingInfo } from '../../content/display-data/general-properties.model';
 import { NumberingDataModel } from './numbering-data.model';
+import { NumberingInfo } from '../../content/display-data/general-properties.model';
 import { NumberingLevelModel } from '../../../models/generated/numbering-level.model';
 import { NumberingModel } from '../../../models/generated/numbering.model';
 import { NumberingParagraphStyleModel } from './numbering-paragraph-style.model';
 import { Paragraph } from '../../content/display-data/paragraph';
 import { ParagraphModel } from '../../../models/generated/paragraph.model';
 import { ParagraphStyleModel } from '../../../models/generated/paragraph-style.model';
+import { TextLineInfo } from '../../content/display-data/text-line-info';
 import { TextStyleModel } from '../../../models/generated/text-style.model';
 export declare class NumberingHelper {
+    static addValueToNumberingInfo(numberingId: number, numberingInfo: NumberingInfo, numberingLevels: NumberingLevelModel[]): void;
+    static setNumberingNeedToRecalculate(numberingInfo: NumberingInfo, numberingId: number): void;
+    static setAllNumberingIsCalculated(numberingInfo: NumberingInfo): void;
     static getStyles(paragraphStyle: ParagraphStyleModel, numberings: NumberingModel[]): NumberingParagraphStyleModel;
-    static find(numberings: NumberingModel[], id: number, level: number): NumberingLevelModel;
-    static calculateNumberingInfo(numberingId: number | null, level: number | null, marker: string, numberingInfo: NumberingInfo, numberings: NumberingModel[]): void;
+    static findNumberingLevel(numberings: NumberingModel[], id: number, level: number): NumberingLevelModel;
+    static findNumberingLevels(numberings: NumberingModel[], id: number): NumberingLevelModel[];
+    static calculateNumberingInfo(numberingId: number | null, level: number | null, numberingInfo: NumberingInfo, numberings: NumberingModel[]): void;
     private static calculateMarkerIndexes;
-    static getMarker(levelModel: NumberingLevelModel, numberingId: number, paragraphs: ParagraphModel[], paragraphIndex: number, numberingInfo: NumberingInfo): string;
+    static getMarker(levelModels: NumberingLevelModel[], level: number, numberingId: number, numberingInfo: NumberingInfo): string;
     static createDataModel(numberings: NumberingModel[], paragraphs: ParagraphModel[], paragraphIndex: number, numberingInfo: NumberingInfo): NumberingDataModel;
-    static updateMarkerData(properties: GeneralPropertiesModel, paragraph: Paragraph, paragraphTextStyle: TextStyleModel, paragraphStyle: ParagraphStyleModel): void;
+    static updateMarkerData(numberings: NumberingModel[], paragraph: Paragraph, paragraphTextStyle: TextStyleModel, paragraphStyle: ParagraphStyleModel): void;
     static getMarkerSizes(marker: string, markerStyle: TextStyleModel): {
         height: number;
         width: number;
     };
     static updateNumberingInfo(numberingInfo: NumberingInfo, marker: string, numberingId: number, level: number): void;
-    private static getLevelIndex;
     private static getLevelInfo;
-    static createMarkerString(numberingInfo: NumberingInfo, numberingId: number, level: number): string;
+    static createMarkerString(numberingInfo: NumberingInfo, numberingId: number, splittedMarker: string[]): string;
+    static getMarkerOffset(paragraphSettings: Paragraph): {
+        offset: number;
+        markerWidth: number;
+    };
+    static getOffsetCausedByMarker(numberingData: NumberingDataModel, info: TextLineInfo): number;
 }

package/lib/editor/gadgets/page-break/break.helper.d.ts

@@ -1,7 +1,6 @@
 import { BreakModel } from '../../../models/generated/break.model';
 import { BreakTypes } from './break-types.enum';
-import { ContentType } from '../../content/contents.interface';
 export declare class BreakHelper {
-    static getBreakType(model: ContentType, char: string, insertIndex: number): BreakTypes | null;
+    static getBreakType(breaks: BreakModel[], char: string, insertIndex: number): BreakTypes | null;
     static removeBreakMarker(breaks: BreakModel[], text: string, fragmentStartIndex: number): string;
 }

package/lib/editor/positioning/cursor-position.interface.d.ts

@@ -1,11 +1,7 @@
-import { IFontMetricSize } from '../gadgets/font-metrics/font-metric-size.interface';
 export interface CursorPosition {
     pageX: number;
     pageY: number;
-    lineHeight?: number;
-    sizeCurrent?: IFontMetricSize;
-    sizeMax?: IFontMetricSize;
-    sizeNext?: IFontMetricSize;
-    firstChar?: boolean;
-    lastChar?: boolean;
+    width: number;
+    height: number;
+    ascent: number;
 }

package/lib/editor/positioning/position.helper.d.ts

@@ -1,10 +1,8 @@
 import { CursorParagraph } from './cursor-paragraph';
 import { CursorPosition } from './cursor-position.interface';
 import { EditSession } from '../execution/edit.session';
-import { Paragraph } from '../content/display-data/paragraph';
 import { ParagraphInfo } from '../content/display-data/paragraph-info.interface';
 import { ParagraphInfoModel } from '../content/display-data/models/paragraph-info.model';
-import { TextLineInfo } from '../content/display-data/text-line-info';
 export declare class PositionHelper {
     /**
      * Returns an object containing the `pageX` and `pageY` coordinates of the document position.
@@ -46,5 +44,4 @@ export declare class PositionHelper {
         lineIndex: number;
     };
     static getApproximatePosition(session: EditSession, documentLine: number, positionWidth: number): number;
-    static getMarkerWidth(paragraphSettings: Paragraph, textLineInfo: TextLineInfo, lineIndex: number): number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talrace/ngx-noder",
-  "version": "19.0.36",
+  "version": "19.0.37",
   "license": "MIT",
   "peerDependencies": {
     "@angular/common": "^19.0.5",

package/lib/editor/components/tab/tab.helper.d.ts

@@ -1,4 +0,0 @@
-import { TabSettingModel } from '../../../models/generated/tab-setting.model';
-export declare class TabHelper {
-    static calculateTabWidth(rowWidth: number, defaultTabWidth: number, tabSettings: TabSettingModel[] | null): number;
-}

package/lib/editor/content/display-data/format-ext.model.d.ts

@@ -1,5 +0,0 @@
-import { FormatModel } from '../../../models/generated/format.model';
-export declare class FormatExtModel extends FormatModel {
-    content: string;
-    constructor(fields?: Partial<FormatExtModel>);
-}

package/lib/editor/display/print/print.rendering.helper.d.ts

@@ -1,6 +0,0 @@
-import { ComponentRef } from '@angular/core';
-import { CustomContentService } from '../../components/shared/services/custom-content.service';
-import { RenderingHelper } from '../rendering.helper';
-export declare class PrintRenderingHelper extends RenderingHelper {
-    static attachComponent(fragment: DocumentFragment, component: ComponentRef<unknown>, customContentService: CustomContentService): void;
-}

package/lib/editor/positioning/line-width.helper.d.ts

@@ -1,5 +0,0 @@
-import { DisplayToken } from '../content/display-data/display-token.model';
-import { EditSession } from '../execution/edit.session';
-export declare class LineWidthHelper {
-    static getParagraphLineDisplayTokens(session: EditSession, paragraphIndex: number, lineIndex: number): DisplayToken[];
-}