@talrace/ngx-noder 19.0.62 → 19.0.63

package/fesm2022/talrace-ngx-noder.mjs

@@ -15521,43 +15521,73 @@ class Editor {
         this.onContentChange();
     }
     insertImage(imageData) {
-        const insertIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, this.selection.range.start);
-        const pageFormat = this.session.displayData.getPageFormatAtPosition(insertIndex);
-        const adjustedImage = ImageHelper.getImageWithAllowedSize(imageData, pageFormat.contentWidth);
-        const insertImage = new InsertImageModel({ insertIndex, imageData: adjustedImage });
-        if (!this.selection.isEmpty) {
+        if (!this.selection.isEmpty && !this.selection.isFocused) {
+            const startIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, this.selection.range.start);
+            const pageFormat = this.session.displayData.getPageFormatAtPosition(startIndex);
+            const adjustedImage = ImageHelper.getImageWithAllowedSize(imageData, pageFormat.contentWidth);
+            const insertImage = new InsertImageModel({ insertIndex: startIndex, imageData: adjustedImage });
             this.replaceBy(new ReplaceModel({ insertImage }));
             return;
         }
+        const startPoint = this.selection.isFocused
+            ? new CursorParagraph(this.selection.cursor.row, this.selection.cursor.column + 1)
+            : this.selection.cursor;
+        const insertIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, startPoint);
+        const pageFormat = this.session.displayData.getPageFormatAtPosition(insertIndex);
+        const adjustedImage = ImageHelper.getImageWithAllowedSize(imageData, pageFormat.contentWidth);
+        const insertImage = new InsertImageModel({ insertIndex, imageData: adjustedImage });
         this.saveInsertImageToHistory(insertImage);
-        const endPoint = this.session.insertImage(this.selection.cursor, adjustedImage);
-        let lastRow = this.selection.cursor.row === endPoint.row ? endPoint.row : Infinity;
-        this.renderer.updateLines(this.selection.cursor.row, lastRow);
+        const endPoint = this.session.insertImage(startPoint, adjustedImage);
+        let lastRow = startPoint.row === endPoint.row ? endPoint.row : Infinity;
+        this.renderer.updateLines(startPoint.row, lastRow);
         this.renderer.updateCursor();
         this.rerenderMarker();
         this.onContentChange();
     }
     insertLink(linkDataModel) {
-        const insertIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, this.selection.range.start);
-        const insertLink = new InsertLinkModel({ insertIndex, linkDataModel });
-        if (!this.selection.isEmpty) {
+        if (!this.selection.isEmpty && !this.selection.isFocused) {
+            const startIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, this.selection.range.start);
+            const insertLink = new InsertLinkModel({ insertIndex: startIndex, linkDataModel });
             this.replaceBy(new ReplaceModel({ insertLink }));
             return;
         }
+        const startPoint = this.selection.isFocused
+            ? new CursorParagraph(this.selection.cursor.row, this.selection.cursor.column + 1)
+            : this.selection.cursor;
+        const insertIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, startPoint);
+        const insertLink = new InsertLinkModel({ insertIndex, linkDataModel });
         this.saveInsertLinkToHistory(insertLink);
-        this.session.insertLink(this.selection.cursor, linkDataModel);
+        this.session.insertLink(startPoint, linkDataModel);
         this.renderer.updateCursor();
         this.rerenderMarker();
         this.onContentChange();
     }
     insertTable(tableData) {
-        const start = this.selection.range.start;
-        const end = this.selection.range.end;
-        const insertIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, start);
-        const endIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, end);
-        const isNumbering = !!this.session.displayData.paragraphs[start.row].paragraphSettings.numberingData.numberingId;
+        if (!this.selection.isEmpty && !this.selection.isFocused) {
+            const start = this.selection.range.start;
+            const end = this.selection.range.end;
+            const startIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, start);
+            const endIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, end);
+            const isNumbering = !!this.session.displayData.paragraphs[start.row].paragraphSettings.numberingData.numberingId;
+            const noParagraphLeft = startIndex !== 0 && !this.session.model.paragraphs.find(x => x.insertIndex === startIndex - 1);
+            const noParagraphRight = !this.session.model.paragraphs.find(x => x.insertIndex === endIndex);
+            const insertTable = new InsertTableModel({
+                insertIndex: startIndex,
+                rowsCount: tableData.rows,
+                columnsCount: tableData.columns,
+                insertParagraphBefore: isNumbering || noParagraphLeft,
+                insertParagraphAfter: isNumbering || noParagraphRight
+            });
+            this.replaceBy(new ReplaceModel({ insertTable }));
+            return;
+        }
+        const startPoint = this.selection.isFocused
+            ? new CursorParagraph(this.selection.cursor.row, this.selection.cursor.column + 1)
+            : this.selection.cursor;
+        const insertIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, startPoint);
+        const isNumbering = !!this.session.displayData.paragraphs[startPoint.row].paragraphSettings.numberingData.numberingId;
         const noParagraphLeft = insertIndex !== 0 && !this.session.model.paragraphs.find(x => x.insertIndex === insertIndex - 1);
-        const noParagraphRight = !this.session.model.paragraphs.find(x => x.insertIndex === endIndex);
+        const noParagraphRight = !this.session.model.paragraphs.find(x => x.insertIndex === insertIndex);
         const insertTable = new InsertTableModel({
             insertIndex,
             rowsCount: tableData.rows,
@@ -15565,14 +15595,10 @@ class Editor {
             insertParagraphBefore: isNumbering || noParagraphLeft,
             insertParagraphAfter: isNumbering || noParagraphRight
         });
-        if (!this.selection.isEmpty) {
-            this.replaceBy(new ReplaceModel({ insertTable }));
-            return;
-        }
         this.saveInsertTableToHistory(insertTable);
-        const endPoint = this.session.insertTable(this.selection.cursor, insertTable);
-        let lastRow = this.selection.cursor.row === endPoint.row ? endPoint.row : Infinity;
-        this.renderer.updateLines(this.selection.cursor.row, lastRow);
+        const endPoint = this.session.insertTable(startPoint, insertTable);
+        let lastRow = startPoint.row === endPoint.row ? endPoint.row : Infinity;
+        this.renderer.updateLines(startPoint.row, lastRow);
         this.renderer.updateCursor();
         this.onContentChange();
         this.rerenderMarker();
@@ -16237,17 +16263,28 @@ class Editor {
         this.commandsService.createCommand(SaveCommandsHelper.getApplyDocumentPageFormatCommand(redo, this.targets));
     }
     createCustomElement(data) {
-        const insertIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, this.selection.range.start);
-        const insertElement = new InsertElementModel({ element: new ElementModel({ ...data, insertIndex }) });
-        if (!this.selection.isEmpty) {
+        if (!this.selection.isEmpty && !this.selection.isFocused) {
+            const startIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, this.selection.range.start);
+            const insertElement = new InsertElementModel({ element: new ElementModel({ ...data, insertIndex: startIndex }) });
             this.replaceBy(new ReplaceModel({ insertElement }));
+            this.focusCustomElement(startIndex).catch(() => {
+                // continue regardless error
+            });
             return;
         }
+        const startPoint = this.selection.isFocused
+            ? new CursorParagraph(this.selection.cursor.row, this.selection.cursor.column + 1)
+            : this.selection.cursor;
+        const insertIndex = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, startPoint);
+        const insertElement = new InsertElementModel({ element: new ElementModel({ ...data, insertIndex }) });
         this.saveInsertElementToHistory(insertElement);
-        const endPoint = this.session.insertElement(this.selection.cursor, data);
-        this.onDocumentChange(new Range(this.selection.cursor, endPoint));
+        const endPoint = this.session.insertElement(startPoint, data);
+        this.onDocumentChange(new Range(startPoint, endPoint));
         this.onSelectionChange();
         this.onContentChange();
+        this.focusCustomElement(insertIndex).catch(() => {
+            // continue regardless error
+        });
     }
     replaceByCustomElement(textKey, model) {
         const index = ContentHelper.paragraphPositionToDocumentIndex(this.session.displayData.paragraphs, this.selection.cursor);
@@ -16717,16 +16754,10 @@ class Editor {
         });
         this.editorService.lockSidenav(true);
         this.insertContent(insertIndex, nextElementContents);
-        setTimeout(() => {
-            // Need to skip micro tasks for a render element before focus
-            const component = this.session.customComponents.customElements.find(x => x.instance.content.insertIndex === insertIndex + 1);
-            if (component) {
-                const position = this.session.displayData.indexToPosition(component.instance.insertIndex, 0);
-                this.selection.focus(component, position);
-                this.onSelectionChange();
-                this.scrollCursorIntoMainView();
-            }
-            this.editorService.lockSidenav(false);
+        this.focusCustomElement(insertIndex + 1)
+            .then(() => this.editorService.lockSidenav(false))
+            .catch(() => {
+            // continue regardless error
         });
     }
     insertContent(insertIndex, contents) {
@@ -17495,6 +17526,21 @@ class Editor {
         this.overlayService.open(CommentPopupComponent, {}, hintX, hintY);
         event?.stopPropagation();
     }
+    focusCustomElement(insertIndex) {
+        return new Promise(resolve => {
+            setTimeout(() => {
+                // Need to skip micro tasks for a render element before focus
+                const component = this.session.customComponents.customElements.find(x => x.instance.content.insertIndex === insertIndex);
+                if (component) {
+                    const position = this.session.displayData.indexToPosition(component.instance.insertIndex, 0);
+                    this.selection.focus(component, position);
+                    this.onSelectionChange();
+                    this.scrollCursorIntoMainView();
+                }
+                resolve();
+            });
+        });
+    }
 }
 
 const EDITOR_VERSION = '2';