@talrace/ngx-noder 19.0.36 → 19.0.38

package/lib/apart-components/editor-toolbar/components/base-toolbar.component.d.ts

@@ -35,6 +35,9 @@ export declare abstract class BaseToolbarComponent extends DestroyComponent {
     updateTableBorderStyle: EventEmitter<LineStyles>;
     updateTableBorderWidth: EventEmitter<number>;
     updateTableBorders: EventEmitter<Borders>;
+    selectSpacing: EventEmitter<number>;
+    selectBefore: EventEmitter<number>;
+    selectAfter: EventEmitter<number>;
     styles: IToolbarStyles;
     canUndo: boolean;
     canRedo: boolean;
@@ -50,5 +53,5 @@ export declare abstract class BaseToolbarComponent extends DestroyComponent {
     private historyInfoSubscription;
     private stylesSubscription;
     static ɵfac: i0.ɵɵFactoryDeclaration<BaseToolbarComponent, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<BaseToolbarComponent, never, never, {}, { "print": "print"; "redo": "redo"; "undo": "undo"; "createElement": "createElement"; "changeTextStyle": "changeTextStyle"; "changeParagraphStyle": "changeParagraphStyle"; "setNumberingTemplateType": "setNumberingTemplateType"; "removeNumberings": "removeNumberings"; "insertImage": "insertImage"; "insertLink": "insertLink"; "insertTable": "insertTable"; "updateTableBorderStyle": "updateTableBorderStyle"; "updateTableBorderWidth": "updateTableBorderWidth"; "updateTableBorders": "updateTableBorders"; }, never, never, true, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<BaseToolbarComponent, never, never, {}, { "print": "print"; "redo": "redo"; "undo": "undo"; "createElement": "createElement"; "changeTextStyle": "changeTextStyle"; "changeParagraphStyle": "changeParagraphStyle"; "setNumberingTemplateType": "setNumberingTemplateType"; "removeNumberings": "removeNumberings"; "insertImage": "insertImage"; "insertLink": "insertLink"; "insertTable": "insertTable"; "updateTableBorderStyle": "updateTableBorderStyle"; "updateTableBorderWidth": "updateTableBorderWidth"; "updateTableBorders": "updateTableBorders"; "selectSpacing": "selectSpacing"; "selectBefore": "selectBefore"; "selectAfter": "selectAfter"; }, never, never, true, never>;
 }

package/lib/apart-components/editor-toolbar/components/buttons/spacing/spacing.component.d.ts

@@ -0,0 +1,16 @@
+import * as i0 from "@angular/core";
+export declare class SpacingComponent {
+    isDisabled: import("@angular/core").InputSignal<boolean>;
+    spacing: import("@angular/core").InputSignal<number>;
+    before: import("@angular/core").InputSignal<number>;
+    after: import("@angular/core").InputSignal<number>;
+    selectSpacing: import("@angular/core").OutputEmitterRef<number>;
+    selectBefore: import("@angular/core").OutputEmitterRef<number>;
+    selectAfter: import("@angular/core").OutputEmitterRef<number>;
+    readonly spacings: string[];
+    onSelectSpacing(value: number): void;
+    onSelectBefore(value: number): void;
+    onSelectAfter(value: number): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SpacingComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SpacingComponent, "app-nod-spacing", never, { "isDisabled": { "alias": "isDisabled"; "required": false; "isSignal": true; }; "spacing": { "alias": "spacing"; "required": false; "isSignal": true; }; "before": { "alias": "before"; "required": false; "isSignal": true; }; "after": { "alias": "after"; "required": false; "isSignal": true; }; }, { "selectSpacing": "selectSpacing"; "selectBefore": "selectBefore"; "selectAfter": "selectAfter"; }, never, never, false, never>;
+}

package/lib/apart-components/editor-toolbar/components/toolbar-actions/toolbar-actions.component.d.ts

@@ -16,6 +16,9 @@ export declare class ToolbarActionsComponent extends BaseToolbarComponent {
     onApplyFontColor(color: string): void;
     onApplyHighlightColor(color: string): void;
     onApplyAlignment(alignment: Alignment): void;
+    onApplySpacing(value: number): void;
+    onApplyBefore(value: number): void;
+    onApplyAfter(value: number): void;
     onSetNumberingTemplateType(templateType: NumberingTemplateType): void;
     onTableInsertMenuClosed(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ToolbarActionsComponent, never>;

package/lib/apart-components/editor-toolbar/editor-toolbar.module.d.ts

@@ -7,30 +7,31 @@ import * as i5 from "./components/menu-dropdowns/menu-dropdowns.component";
 import * as i6 from "./components/menu-dropdowns-mobile/menu-dropdowns-mobile.component";
 import * as i7 from "./components/buttons/numbering/numbering.component";
 import * as i8 from "./components/buttons/print/print.component";
-import * as i9 from "./components/toolbar-actions/toolbar-actions.component";
-import * as i10 from "./components/buttons/undo-redo/undo-redo.component";
-import * as i11 from "./components/buttons/zoom/zoom.component";
-import * as i12 from "./components/buttons/color-picker/color-picker.component";
-import * as i13 from "@angular/common";
-import * as i14 from "./components/buttons/font/font.component";
-import * as i15 from "./components/buttons/font-size/font-size.component";
-import * as i16 from "../insert-table/insert-table.component";
-import * as i17 from "../insert-table-mobile/insert-table-mobile.component";
-import * as i18 from "@angular/material/autocomplete";
-import * as i19 from "@angular/material/button";
-import * as i20 from "@angular/material/button-toggle";
-import * as i21 from "@angular/material/expansion";
-import * as i22 from "@angular/material/icon";
-import * as i23 from "@angular/material/menu";
-import * as i24 from "@angular/material/tooltip";
-import * as i25 from "@angular/forms";
-import * as i26 from "./components/buttons/table-borders/table-borders.component";
-import * as i27 from "./components/buttons/table-border-style/table-border-style.component";
-import * as i28 from "./components/buttons/table-border-width/table-border-width.component";
-import * as i29 from "../text-format-mobile/text-format-mobile.component";
-import * as i30 from "@ngx-translate/core";
+import * as i9 from "./components/buttons/spacing/spacing.component";
+import * as i10 from "./components/toolbar-actions/toolbar-actions.component";
+import * as i11 from "./components/buttons/undo-redo/undo-redo.component";
+import * as i12 from "./components/buttons/zoom/zoom.component";
+import * as i13 from "./components/buttons/color-picker/color-picker.component";
+import * as i14 from "@angular/common";
+import * as i15 from "./components/buttons/font/font.component";
+import * as i16 from "./components/buttons/font-size/font-size.component";
+import * as i17 from "../insert-table/insert-table.component";
+import * as i18 from "../insert-table-mobile/insert-table-mobile.component";
+import * as i19 from "@angular/material/autocomplete";
+import * as i20 from "@angular/material/button";
+import * as i21 from "@angular/material/button-toggle";
+import * as i22 from "@angular/material/expansion";
+import * as i23 from "@angular/material/icon";
+import * as i24 from "@angular/material/menu";
+import * as i25 from "@angular/material/tooltip";
+import * as i26 from "@angular/forms";
+import * as i27 from "./components/buttons/table-borders/table-borders.component";
+import * as i28 from "./components/buttons/table-border-style/table-border-style.component";
+import * as i29 from "./components/buttons/table-border-width/table-border-width.component";
+import * as i30 from "../text-format-mobile/text-format-mobile.component";
+import * as i31 from "@ngx-translate/core";
 export declare class EditorToolbarModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<EditorToolbarModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<EditorToolbarModule, [typeof i1.EditorMobileToolbarComponent, typeof i2.EditorToolbarComponent, typeof i3.FontStyleComponent, typeof i4.FormatComponent, typeof i5.MenuDropdownsComponent, typeof i6.MenuDropdownsMobileComponent, typeof i7.NumberingComponent, typeof i8.PrintComponent, typeof i9.ToolbarActionsComponent, typeof i10.UndoRedoComponent, typeof i11.ZoomComponent], [typeof i12.ColorPickerComponent, typeof i13.CommonModule, typeof i14.FontComponent, typeof i15.FontSizeComponent, typeof i16.InsertTableComponent, typeof i17.InsertTableMobileComponent, typeof i18.MatAutocompleteModule, typeof i19.MatButtonModule, typeof i20.MatButtonToggleModule, typeof i21.MatExpansionModule, typeof i22.MatIconModule, typeof i23.MatMenuModule, typeof i24.MatTooltipModule, typeof i25.ReactiveFormsModule, typeof i26.TableBordersComponent, typeof i27.TableBorderStyleComponent, typeof i28.TableBorderWidthComponent, typeof i29.TextFormatMobileComponent, typeof i30.TranslateModule], [typeof i1.EditorMobileToolbarComponent, typeof i2.EditorToolbarComponent, typeof i5.MenuDropdownsComponent, typeof i6.MenuDropdownsMobileComponent, typeof i9.ToolbarActionsComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<EditorToolbarModule, [typeof i1.EditorMobileToolbarComponent, typeof i2.EditorToolbarComponent, typeof i3.FontStyleComponent, typeof i4.FormatComponent, typeof i5.MenuDropdownsComponent, typeof i6.MenuDropdownsMobileComponent, typeof i7.NumberingComponent, typeof i8.PrintComponent, typeof i9.SpacingComponent, typeof i10.ToolbarActionsComponent, typeof i11.UndoRedoComponent, typeof i12.ZoomComponent], [typeof i13.ColorPickerComponent, typeof i14.CommonModule, typeof i15.FontComponent, typeof i16.FontSizeComponent, typeof i17.InsertTableComponent, typeof i18.InsertTableMobileComponent, typeof i19.MatAutocompleteModule, typeof i20.MatButtonModule, typeof i21.MatButtonToggleModule, typeof i22.MatExpansionModule, typeof i23.MatIconModule, typeof i24.MatMenuModule, typeof i25.MatTooltipModule, typeof i26.ReactiveFormsModule, typeof i27.TableBordersComponent, typeof i28.TableBorderStyleComponent, typeof i29.TableBorderWidthComponent, typeof i30.TextFormatMobileComponent, typeof i31.TranslateModule], [typeof i1.EditorMobileToolbarComponent, typeof i2.EditorToolbarComponent, typeof i5.MenuDropdownsComponent, typeof i6.MenuDropdownsMobileComponent, typeof i10.ToolbarActionsComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<EditorToolbarModule>;
 }

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/display-data/toolbar-styles.interface.d.ts

@@ -9,6 +9,7 @@ export interface IToolbarStyles {
     bold?: boolean;
     strikethrough?: boolean;
     underline?: boolean;
+    lineSpacing?: number;
     spaceAfter?: number;
     spaceBefore?: number;
     indentLeft?: number;

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/editor.module.d.ts

@@ -1,13 +1,14 @@
 import { ComponentType } from '@angular/cdk/portal';
 import { ModuleWithProviders, Type } from '@angular/core';
 import { BaseCommentComponent } from './gadgets/comment/base-comment.component';
+import { CommentTypeModel } from './gadgets/comment/comment-popup/comment-type.model';
 import { ImageApiService } from './components/image/image-api.service';
 import { ExternalElementInterface } from '../editor/components/external-element/external-element.service';
 import { ExternalSidenavModel } from './components/external-element/models/external-sidenav.model';
 import { InsertOverlayComponentInterface } from './gadgets/insert-overlays/insert-overlay-component.interface';
 import * as i0 from "@angular/core";
 import * as i1 from "./components/editor.component";
-import * as i2 from "./components/comment-popup/comment-popup.component";
+import * as i2 from "./gadgets/comment/comment-popup/comment-popup.component";
 import * as i3 from "./components/edges/edge.component";
 import * as i4 from "./components/image/components/image.component";
 import * as i5 from "./components/tab/tab.component";
@@ -36,6 +37,7 @@ export interface INoderOptions {
     }[];
     elementService: Type<ExternalElementInterface>;
     commentComponent?: Type<BaseCommentComponent>;
+    commentTypes?: CommentTypeModel[];
 }
 export declare class EditorModule {
     static forRoot(options?: INoderOptions): ModuleWithProviders<EditorModule>;

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

@@ -6,6 +6,7 @@ import { BaseNoderComponent } from '../components/shared/abstract/base.component
 import { BreakTypes } from '../gadgets/page-break/break-types.enum';
 import { CommandsService } from '../operations/commands.service';
 import { CommentModel } from '../../models/generated/comment.model';
+import { CommentTypeModel } from '../gadgets/comment/comment-popup/comment-type.model';
 import { CreateEdgesModel } from '../../models/generated/create-edges.model';
 import { DocumentHandler } from '../interaction/document.handler';
 import { DocxModel } from '../../models/generated/docx.model';
@@ -180,9 +181,11 @@ export declare class Editor {
     onCut(event: ClipboardEvent): void;
     onCopy(event: ClipboardEvent): void;
     onPaste(event: ClipboardEvent): void;
-    onCreateComment(): void;
+    onCreateComment(commentType: CommentTypeModel): void;
     onCommentCreated(reqId: number, commentId: number): void;
     onCommentRemoved(id: number): void;
+    onCommentTextReplace(commentId: number, newText: string): void;
+    onGetCommentText(commentId: number, continueWith: (text: string) => void): void;
     onSetCommentsVisibility(value: boolean): void;
     private initResizeListener;
     private destroyResizeListener;
@@ -280,6 +283,9 @@ export declare class Editor {
     updateTableBorderStyleSubscription(): Subscription;
     updateTableBorderWidthSubscription(): Subscription;
     updateTableBordersSubscription(): Subscription;
+    selectSpacingSubscription(): Subscription;
+    selectBeforeSubscription(): Subscription;
+    selectAfterSubscription(): Subscription;
     insertTextSubscription(): Subscription;
     undoSubscription(): Subscription;
     redoSubscription(): Subscription;
@@ -302,6 +308,8 @@ export declare class Editor {
     private selectCommentSubscription;
     private removeCommentSubscription;
     private setComentsVisibilitySubscription;
+    private getCommentTextSubscription;
+    private replaceCommentTextSubscription;
     private recreateMainSession;
     private changeColumnsWidth;
     private changeCellsWidth;

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

@@ -1,4 +1,5 @@
 import { ElementRef } from '@angular/core';
+import { CommentModel } from '../../models/generated/comment.model';
 import { CommentRenderService } from '../gadgets/comment/comment-render.service';
 import { ComponentService } from '../components/shared/services/component.service';
 import { CustomContentService } from '../components/shared/services/custom-content.service';
@@ -50,6 +51,10 @@ export declare class RegulatorService {
         session: SessionModel;
         target: TargetModel;
     } | null;
+    getComment(commentId: number): {
+        session: SessionModel;
+        comment: CommentModel;
+    } | null;
     setCommentsVisibility(value: boolean): void;
     isWithinEdge(sessionId: number): boolean;
     arrangeEdgeChange(sessionId: number): void;

package/lib/editor/{components → gadgets/comment}/comment-popup/comment-popup.component.d.ts

@@ -1,11 +1,13 @@
-import { EditorService } from '../../../editor/interaction/editor.service';
-import { OverlayService } from '../shared/services/overlay.service';
+import { CommentTypeModel } from './comment-type.model';
+import { EditorService } from '../../../interaction/editor.service';
+import { OverlayService } from '../../../components/shared/services/overlay.service';
 import * as i0 from "@angular/core";
 export declare class CommentPopupComponent {
     private editorService;
     private overlayService;
-    constructor(editorService: EditorService, overlayService: OverlayService);
-    addComment(): void;
+    commentTypes: CommentTypeModel[];
+    constructor(editorService: EditorService, overlayService: OverlayService, commentTypes: CommentTypeModel[]);
+    addComment(type: CommentTypeModel): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<CommentPopupComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<CommentPopupComponent, "app-nod-comment-popup", never, {}, {}, never, never, false, never>;
 }

package/lib/editor/gadgets/comment/comment-popup/comment-type.model.d.ts

@@ -0,0 +1,6 @@
+export declare class CommentTypeModel {
+    typeId: number;
+    nameTranslated: string;
+    icon: string;
+    constructor(typeId: number, nameTranslated: string, icon: string);
+}

package/lib/editor/gadgets/comment/comment-types.const.d.ts

@@ -0,0 +1,3 @@
+import { InjectionToken } from '@angular/core';
+import { CommentTypeModel } from './comment-popup/comment-type.model';
+export declare const COMMENT_TYPES: InjectionToken<CommentTypeModel[]>;

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;
 }