@talrace/ngx-noder 19.0.41 → 19.0.42

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

@@ -67,18 +67,14 @@ export declare class DisplayData extends EventEmitting {
     isSameNumberingId(paragraphIndex: number, numberingId: number): boolean;
     private updateNumberingsDataOnChange;
     private splitParagraphByLines;
-    private getParagraphTokens;
     getParagraphLineTokens(paragraphIndex: number, paragraphLine: number): DisplayToken[];
-    getTokens(contentIndex: number, content: string, paragraphSymbolIndex: number): {
-        tokens: DisplayToken[];
-        paragraphToken: DisplayToken;
-    };
+    getTokens(contentIndex: number, content: string, paragraphSymbolIndex: number): DisplayToken[];
     private getOrGenerateComponent;
     private getPageFormatParagraphs;
     getPageFormatByPageNumber(pageNumber: number): PageFormat;
     getPageFormatAtPosition(startParagraphIndex: number): PageFormat | undefined;
     getPageFormatIndexAtPosition(startParagraphIndex: number): number;
-    private computeWrapIndex;
+    private computeWrapToken;
     private adjustLastTab;
     private getPreviousParagraphInfo;
     private getVisiblePages;

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

@@ -7,6 +7,8 @@ export declare class DisplayToken implements IFontMetricSize {
     ascent: number;
     descent: number;
     displayValue: number;
+    index: number;
+    customIndex?: number;
     get isSpace(): boolean;
     get isParagraph(): boolean;
     get isPageBreak(): boolean;
@@ -14,7 +16,7 @@ export declare class DisplayToken implements IFontMetricSize {
     get isTab(): boolean;
     get isTable(): boolean;
     get isWhiteSpace(): boolean;
-    get breaksLine(): boolean;
+    get isBreak(): boolean;
     get breakable(): boolean;
     constructor(fields?: Partial<DisplayToken>);
 }

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

@@ -1,3 +1,4 @@
+import { CustomTextModel } from './models/custom-text.model';
 import { IndentModel } from './indent.model';
 export declare class LineInfoModel {
     height: number;
@@ -8,13 +9,18 @@ export declare class LineInfoModel {
     offsetBefore: number;
     offsetAfter: number;
     lineSpacing: number;
+    startIndex: number;
+    endIndex: number;
     isAfterPageBreak: boolean;
     isEndedByPageBreak: boolean;
     backgroundColor: string;
     hasTable: boolean;
     isNumbering: boolean;
     wordSpacing?: number;
-    wordSpacingStart?: number;
-    wordSpacingEnd?: number;
+    wordSpacingStartToken?: number;
+    wordSpacingEndToken?: number;
+    wordSpacingStartIndex?: number;
+    wordSpacingEndIndex?: number;
+    customTexts?: CustomTextModel[];
     constructor(fields?: Partial<LineInfoModel>);
 }

package/lib/editor/content/display-data/models/custom-text.model.d.ts

@@ -0,0 +1,8 @@
+export declare class CustomTextModel {
+    index: number;
+    start: number;
+    end: number;
+    constructor(index: number, // content index in paragraph of the custom component
+    start: number, // start index within text of the custom component
+    end: number);
+}

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

@@ -1,7 +1,6 @@
 import { Paragraph } from '../paragraph';
 export declare class ParagraphInfoModel {
     content: string;
-    nextLineIndexes: number[];
     paragraphSettings: Paragraph;
     startIndex: number;
     lineNumber: number;

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

@@ -2,11 +2,13 @@ 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 { 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, 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;
+    static getParagraphToken(paragraphSymbolStyle: TextStyleModel, index: number): DisplayToken;
+    static getBreakToken(symbol: string, fontString: string, breakType: BreakTypes, index: number): DisplayToken;
+    static getSymbolToken(symbol: string, fontString: string, index: number): DisplayToken;
+    static getComponentTokens(component: ComponentRef<BaseNoderComponent>, fontString: string, index: number): DisplayToken[];
+    private static getBreakDisplayValue;
+    private static getSymbolDisplayValue;
+    private static getComponentDisplayValue;
 }

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

@@ -5,6 +5,13 @@ 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 get(tokens: DisplayToken[], style: ParagraphStyleModel, indent: IndentModel, width: number, paragraphStartIndex: number, position: {
+        isAfterPageBreak: boolean;
+        isLastLine: boolean;
+        isNumbering: boolean;
+    }): LineInfoModel;
     static getFirstLineIndent(model: ContentType, paragraphIndex: number, generalProperties: GeneralPropertiesModel): IndentModel;
+    private static applySizeToLine;
+    private static applyWordSpacingToLine;
+    private static applyCustomTextsToLine;
 }

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

@@ -14,5 +14,6 @@ export declare class RenderingHelper {
     static renderNumberingMarker(paragraph: Paragraph, layerElement: HTMLElement, scalingRatio: number): HTMLElement;
     static createDivContainer(className: string): HTMLDivElement;
     private static renderFormatContent;
+    private static renderExternalText;
     private static renderText;
 }

package/lib/editor/execution/constants/editor-tags.const.d.ts

@@ -0,0 +1,5 @@
+export declare const PARENT_TAG = "APP-NOD-EDITOR";
+export declare const TABLE_CELL_TAG = "APP-NOD-TABLE-CELL";
+export declare const EDGE_TAG = "APP-NOD-EDGE";
+export declare const IMAGE_TAG = "APP-NOD-IMAGE";
+export declare const CUSTOM_TAG = "APP-NOD-CUSTOM-ELEMENT";

package/lib/editor/execution/editor.d.ts

@@ -64,15 +64,10 @@ export declare class Editor {
     private regulatorService;
     private commandsService;
     private clipboard;
-    private externalElementTagNames;
+    private externalElementTags;
     private insertOverlays;
     private customPageWidth?;
-    readonly MAX_COUNT = 999;
-    readonly parentTagName = "APP-NOD-EDITOR";
-    readonly tableCellTagName = "APP-NOD-TABLE-CELL";
-    readonly edgeElementTagName = "APP-NOD-EDGE";
-    readonly imageTagName = "APP-NOD-IMAGE";
-    readonly customElementTagNames: string[];
+    readonly customElementTags: string[];
     readonly history: OperationHistory;
     get mainSession(): EditSession;
     get mainRenderer(): VirtualRenderer;
@@ -100,7 +95,7 @@ export declare class Editor {
     private clipboardData;
     private isRerenderSubscriptionOpen;
     private commentsVisible;
-    constructor(model: DocxModel, container: ElementRef<HTMLElement>, editorService: EditorService, overlayService: OverlayService, regulatorService: RegulatorService, commandsService: CommandsService, clipboard: Clipboard, externalElementTagNames: string[], insertOverlays: InsertOverlays, customPageWidth?: number);
+    constructor(model: DocxModel, container: ElementRef<HTMLElement>, editorService: EditorService, overlayService: OverlayService, regulatorService: RegulatorService, commandsService: CommandsService, clipboard: Clipboard, externalElementTags: string[], insertOverlays: InsertOverlays, customPageWidth?: number);
     destroy(): void;
     selectPageDown(): void;
     selectPageUp(): void;

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

@@ -2,5 +2,4 @@ import { BreakModel } from '../../../models/generated/break.model';
 import { BreakTypes } from './break-types.enum';
 export declare class BreakHelper {
     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,7 +1,6 @@
 export interface CursorPosition {
     pageX: number;
     pageY: number;
-    width: number;
     height: number;
     ascent: number;
 }

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

@@ -9,11 +9,11 @@ export declare class PositionHelper {
         paragraph: number;
         paragraphLine: number;
     };
-    static paragraphToParagraphLine(nextLineIndexes: number[], indexInParagraph: number): {
+    static paragraphToParagraphLine(paragraph: ParagraphInfoModel, indexInParagraph: number): {
         paragraphLine: number;
         indexInLine: number;
     };
-    static paragraphToDocumentLine(session: EditSession, paragraph: number, indexInParagraph: number): CursorParagraph;
+    static paragraphToDocumentLine(paragraph: ParagraphInfoModel, indexInParagraph: number): CursorParagraph;
     static documentLineToParagraph(session: EditSession, documentLine: number, indexInLine: number): CursorParagraph;
     static paragraphToPixel(session: EditSession, paragraph: number, indexInParagraph: number): CursorPosition;
     static documentLineToPixel(session: EditSession, documentLine: number, indexInLine: number): CursorPosition;
@@ -22,10 +22,7 @@ export declare class PositionHelper {
         paragraph: number;
         paragraphLine: number;
     };
-    static pixelToParagraph(session: EditSession, pageX: number, pageY: number, tokenDivider: number): {
-        paragraph: number;
-        indexInParagraph: number;
-    };
-    static pixelToIndexInLine(session: EditSession, documentLine: number, pageX: number, tokenDivider: number): number;
+    static pixelToIndexInParagraph(session: EditSession, pageX: number, paragraph: number, paragraphLine: number, tokenDivider: number): number;
     private static getIndexInLine;
+    private static mergeCustomTokens;
 }

package/lib/editor/positioning/range.d.ts

@@ -1,5 +1,5 @@
 import { CursorParagraph } from './cursor-paragraph';
-import { EditSession } from '../execution/edit.session';
+import { ParagraphInfoModel } from '../content/display-data/models/paragraph-info.model';
 export declare class Range {
     start: CursorParagraph;
     end: CursorParagraph;
@@ -13,7 +13,7 @@ export declare class Range {
     }): boolean;
     contains(position: CursorParagraph): boolean;
     comparePosition(position: CursorParagraph): number;
-    paragraphToDocumentLine(session: EditSession): Range;
+    paragraphToDocumentLine(paragraphs: ParagraphInfoModel[]): Range;
     /**
      * Returns the part of the current `Range` that occurs within the boundaries of `firstRow` and `lastRow` as a new `Range` object.
      * @param {Number} firstRow The starting row

package/lib/editor/positioning/selection.d.ts

@@ -51,8 +51,8 @@ export declare class Selection {
     private moveCursorUp;
     private moveCursorDown;
     private moveToLine;
-    private getCursorLeft;
-    private getCursorRight;
+    private getLeft;
+    private getRight;
     private getLineStart;
     private getLineEnd;
     private getWordRight;

package/package.json

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

package/src/scss/base-editor.scss

@@ -34,7 +34,7 @@ div.ngx-colors-overlay.noder-color-picker-overlay .opened .colors {
     }
 
     .mat-mdc-menu-item:not(:last-child) {
-        border-bottom: 1px dashed #E5EBF0;
+        border-bottom: 1px dashed #e5ebf0;
     }
 }
 
@@ -155,6 +155,10 @@ div.ngx-colors-overlay.noder-color-picker-overlay .opened .colors {
         position: absolute;
         contain: style size layout;
         pointer-events: auto;
+
+        .noder-pointing {
+            cursor: pointer;
+        }
     }
 
     .noder-edges-layer {
@@ -180,10 +184,6 @@ div.ngx-colors-overlay.noder-color-picker-overlay .opened .colors {
         > * {
             display: inline-block;
             font-kerning: none;
-
-            &.paragraph-symbol {
-                align-self: flex-end;
-            }
         }
     }
 
@@ -325,14 +325,14 @@ div.ngx-colors-overlay.noder-color-picker-overlay .opened .colors {
                 background-color: rgb(255, 150, 50, 0.4);
             }
         }
-        
+
         &.comments-highlight {
             > .noder-highlight {
-                background: #E0A74A66;
+                background: #e0a74a66;
             }
 
             > .noder-selected-highlight {
-                background-color: #E69A1DB2
+                background-color: #e69a1db2;
             }
         }
     }