el-text-editor 0.0.72 → 0.0.74

package/fesm2020/el-text-editor.mjs

@@ -640,7 +640,7 @@ class ElTextEditorComponent {
             }
             let editor = document.getElementById('editor');
             if (editor) {
-                this.setCaretToEnd(editor);
+                this.moveCaretToEnd(editor);
             }
             this.placeHolderRemove.emit();
         }
@@ -665,7 +665,7 @@ class ElTextEditorComponent {
                 // Set up a MutationObserver to handle content changes
                 this.setupMutationObserver(editor);
                 // Move the caret to the end after initial content setup
-                this.setCaretToEnd(editor);
+                this.moveCaretToEnd(editor);
                 //  Track caret position on mouse click
                 editor.addEventListener('click', () => {
                     if (editor) { // Ensure editor is not null
@@ -689,21 +689,29 @@ class ElTextEditorComponent {
     setupMutationObserver(editor) {
         const observer = new MutationObserver(() => {
             // Move the caret to the end after content changes
-            // this.moveCaretToEnd(editor);
+            this.moveCaretToEnd(editor);
             // Update model with the current content
             this.onModelChange(editor.innerHTML);
         });
         observer.observe(editor, { childList: true, subtree: true, characterData: true });
     }
     moveCaretToEnd(editor) {
+        // const selection = window.getSelection();
+        // const range = document.createRange();
+        // if (editor.lastChild) {
+        //   range.selectNodeContents(editor);
+        //   range.collapse(false); // Collapse to the end
+        //   selection?.removeAllRanges();
+        //   selection?.addRange(range);
+        // }
         const selection = window.getSelection();
-        const range = document.createRange();
-        if (editor.lastChild) {
-            range.selectNodeContents(editor);
-            range.collapse(false); // Collapse to the end
-            selection?.removeAllRanges();
-            selection?.addRange(range);
+        if (selection?.rangeCount) {
+            const range = selection.getRangeAt(0);
+            if (editor.contains(range.commonAncestorContainer)) {
+                return range.cloneRange(); // Return the current caret range
+            }
         }
+        return null;
     }
     //   init_Func(html: any) {
     //   if (html) {