@talrace/ngx-noder 19.0.59 → 19.0.61

package/fesm2022/talrace-ngx-noder.mjs

@@ -633,7 +633,13 @@ class EditorService {
         this._clipboardData$ = new BehaviorSubject('');
         this._hasSelection$ = new BehaviorSubject(false);
         this._historyInfo$ = new BehaviorSubject(new OperationsHistoryInfoModel(-1, -1));
-        this._toggleSidenav$ = new Subject();
+        this._toggleSidenav$ = new BehaviorSubject({
+            open: false,
+            component: null,
+            focus: false,
+            data: null
+        });
+        this._isSidenavLocked = false;
         this._displayGrammarError$ = new Subject();
         this._applyGrammarSuggestion$ = new Subject();
         this._ignoreGrammarError$ = new Subject();
@@ -763,6 +769,9 @@ class EditorService {
     get toggleSidenav$() {
         return this._toggleSidenav$.asObservable();
     }
+    get isSidenavLocked() {
+        return this._isSidenavLocked;
+    }
     get displayGrammarError$() {
         return this._displayGrammarError$.asObservable();
     }
@@ -1177,8 +1186,14 @@ class EditorService {
         this._toggleSidenav$.next({ open: true, component, focus });
     }
     closeSidenav() {
+        if (this.isSidenavLocked) {
+            return;
+        }
         this._toggleSidenav$.next({ open: false, component: null, focus: false });
     }
+    lockSidenav(value) {
+        this._isSidenavLocked = value;
+    }
     changedTableSize(insertIndex, sessionId) {
         this._changedTableSize$.next({ insertIndex, sessionId });
     }
@@ -8185,8 +8200,8 @@ class DisplayData extends EventEmitting {
             paragraphSettings.calculateDistanceFromTop(pageHeight, this.pagesSpace, pageVerticalData.marginTop, prevFormatsData);
         }
         this.pagesFormat.forEach((x, i) => {
-            const pagesHeight = this.getPageFormatParagraphs(i).reduce((sum, y) => sum + y.paragraphSettings.height, 0);
-            x.updateData(pagesHeight);
+            const paragraphs = this.getPageFormatParagraphs(i);
+            x.updateData(this.getPhysicalHeight(paragraphs));
         });
         this.allPagesHeight = 0;
         this.pagesFormat.forEach((x, i) => {
@@ -8207,7 +8222,7 @@ class DisplayData extends EventEmitting {
         });
     }
     getAllParagraphsHeight() {
-        return this.paragraphs.reduce((sum, x) => sum + x.paragraphSettings.height, 0);
+        return this.getPhysicalHeight(this.paragraphs);
     }
     destroy() {
         this.removeAllListeners('pagesCountChanged');
@@ -8646,6 +8661,15 @@ class DisplayData extends EventEmitting {
             paragraph.paragraphSettings.startInsertIndex = paragraph.startIndex;
         }
     }
+    getPhysicalHeight(paragraphs) {
+        const bounds = paragraphs
+            .flatMap(x => x.paragraphSettings?.textLinesInfo || [])
+            .reduce((acc, line) => ({
+            cursorY: acc.cursorY + line.offsetBefore + line.height + line.offsetAfter + (line.endPageOffset || 0),
+            maxBottom: Math.max(acc.maxBottom, acc.cursorY + line.offsetBefore + line.height)
+        }), { cursorY: 0, maxBottom: 0 });
+        return Math.max(bounds.cursorY, bounds.maxBottom);
+    }
 }
 
 class NoderEdgeComponent extends DestroyComponent {
@@ -10066,6 +10090,7 @@ class GrammarChecker {
             const filteredErrors = this.filterErrors(errors);
             this.paragraphErrorMap.set(key, filteredErrors);
             session.renderer.updateGrammarHighlights(+paragraphId, filteredErrors);
+            session.renderer.scheduleChanges({ grammar: true });
         }
     }
     destroy() {
@@ -10097,6 +10122,7 @@ class GrammarChecker {
             this.paragraphErrorMap.set(result.paragraphId, filteredErrors);
             const id = +result.paragraphId.split('-')[1];
             session.renderer.updateGrammarHighlights(id, filteredErrors);
+            session.renderer.scheduleChanges({ grammar: true });
         }
     }
     processParagraphChange(session, change) {
@@ -10113,6 +10139,7 @@ class GrammarChecker {
             return;
         }
         this.adjustHighlights(change, session);
+        session.renderer.scheduleChanges({ grammar: true });
         this.grammarService.updateParagraphContent(session.sessionId, change.paragraph);
     }
     adjustHighlights(changes, session) {
@@ -11049,7 +11076,6 @@ class Renderer extends EventEmitting {
     }
     updateGrammarHighlights(paragraphId, errors) {
         this.grammarHighlightLayer.setErrors(paragraphId, errors);
-        this.scheduleChanges({ grammar: true });
     }
     removeGrammarHighlights(paragraphId) {
         this.grammarHighlightLayer.removeParagraphHighlights(paragraphId);
@@ -14809,8 +14835,12 @@ class Selection {
         this.keepLinePositionX = null;
     }
     blur() {
-        this.focusedComponent?.instance.blur();
+        if (!this.focusedComponent) {
+            return;
+        }
+        const currentComponent = this.focusedComponent;
         this.focusedComponent = null;
+        currentComponent.instance.blur();
     }
     placeCursor(cursor) {
         this.anchor = null;
@@ -16685,6 +16715,7 @@ class Editor {
             links: [],
             comments: []
         });
+        this.editorService.lockSidenav(true);
         this.insertContent(insertIndex, nextElementContents);
         setTimeout(() => {
             // Need to skip micro tasks for a render element before focus
@@ -16695,6 +16726,7 @@ class Editor {
                 this.onSelectionChange();
                 this.scrollCursorIntoMainView();
             }
+            this.editorService.lockSidenav(false);
         });
     }
     insertContent(insertIndex, contents) {
@@ -16910,7 +16942,7 @@ class Editor {
         const beforeTable = ContentHelper.documentIndexToParagraphIndex(this.session.displayData.paragraphs, insertIndex);
         this.selection.placeCursor(beforeTable);
         this.history.pushRemoveTableRows(insertIndex, startIndex, endIndex);
-        this.commandsService.createCommand(SaveCommandsHelper.getRemoveTableRowsCommand(startIndex, endIndex, insertIndex, this.targets));
+        this.commandsService.createCommand(SaveCommandsHelper.getRemoveTableRowsCommand(insertIndex, startIndex, endIndex, this.targets));
         this.session.removeTableRows(insertIndex, startIndex, endIndex);
         this.changedTableSize(insertIndex, sessionId);
         this.onContentChange();
@@ -16920,7 +16952,7 @@ class Editor {
         const beforeTable = ContentHelper.documentIndexToParagraphIndex(this.session.displayData.paragraphs, insertIndex);
         this.selection.placeCursor(beforeTable);
         this.history.pushRemoveTableColumns(insertIndex, startIndex, endIndex);
-        this.commandsService.createCommand(SaveCommandsHelper.getRemoveTableColumnsCommand(startIndex, endIndex, insertIndex, this.targets));
+        this.commandsService.createCommand(SaveCommandsHelper.getRemoveTableColumnsCommand(insertIndex, startIndex, endIndex, this.targets));
         this.session.removeTableColumns(insertIndex, startIndex, endIndex);
         this.changedTableSize(insertIndex, sessionId);
         this.onContentChange();
@@ -17997,7 +18029,14 @@ class EditorComponent {
     }
     toggleSidenavSubscription() {
         return this.editorService.toggleSidenav$.subscribe(data => {
-            if (this.sidenavComponentRef?.componentType === data.component) {
+            const isSameComponent = this.sidenavComponentRef?.componentType === data.component;
+            if (data.open && (isSameComponent || this.editorService.isSidenavLocked)) {
+                const instance = this.sidenavComponentRef.instance;
+                for (const [key, value] of Object.entries(data.data || {})) {
+                    if (key in instance) {
+                        this.sidenavComponentRef.setInput(key, value);
+                    }
+                }
                 return;
             }
             this.removeSidenavComponent();
@@ -18015,6 +18054,9 @@ class EditorComponent {
                 this.sidenav.close().catch(() => {
                     // continue regardless of error
                 });
+                if (this.editor.selection.isFocused) {
+                    this.editor.selection.blur();
+                }
             }
             this.cdr.markForCheck();
         });