vue-editify 0.1.48 → 0.1.49

package/examples/App.vue

@@ -1,7 +1,7 @@
 <template>
 	<div style="padding: 10px; height: 100%; box-sizing: border-box">
 		<button @click="setStart">setStart</button>
-		<Editify color="#f30" ref="editify" border v-model="val" :menu="menuConfig" style="height: 100%" placeholder="Please Enter Text..." :toolbar="toolbarConfig" locale="zh_CN" allow-paste-html :plugins="plugins" @rangeupdate="rangeUpdate"></Editify>
+		<Editify color="#1098f3" ref="editify" border v-model="val" :menu="menuConfig" style="height: 100%" placeholder="Please Enter Text..." :toolbar="toolbarConfig" locale="zh_CN" allow-paste-html :plugins="plugins" @rangeupdate="rangeUpdate"></Editify>
 	</div>
 </template>
 <script setup lang="ts">

package/lib/editify.es.js

@@ -2782,13 +2782,12 @@ const doPaste = async function(html, text2, files) {
       if (typeof this.customHtmlPaste == "function") {
         await this.customHtmlPaste.apply(this, [elements, html]);
       } else {
-        for (let i = 0; i < elements.length; i++) {
-          if (i == 0) {
-            this.insertElement(elements[i]);
-          } else {
-            this.insertElement(elements[i], false);
-          }
+        this.insertElement(elements[0]);
+        for (let i = elements.length - 1; i >= 1; i--) {
+          this.addElementAfter(elements[i], elements[0]);
         }
+        this.range.anchor.moveToEnd(elements[elements.length - 1]);
+        this.range.focus.moveToEnd(elements[elements.length - 1]);
         this.emit("pasteHtml", elements, html);
       }
     } else if (text2) {
@@ -4260,6 +4259,9 @@ class AlexEditor {
         if (child.isEmpty()) {
           continue;
         }
+        if (!child.isText() && AlexElement.VOID_NODES.includes(child.parsedom)) {
+          continue;
+        }
         if (child.isText() || child.isClosed()) {
           el = child;
           break;
@@ -4277,6 +4279,9 @@ class AlexEditor {
         if (previousElement.isEmpty()) {
           return fn(previousElement);
         }
+        if (!previousElement.isText() && AlexElement.VOID_NODES.includes(previousElement.parsedom)) {
+          return fn(previousElement);
+        }
         if (previousElement.isText() || previousElement.isClosed()) {
           return previousElement;
         }
@@ -4358,6 +4363,18 @@ class AlexEditor {
         flatList: []
       };
     }
+    if (this.range.anchor.element.isEqual(this.range.focus.element)) {
+      const anchorInStart = this.range.anchor.offset == 0;
+      const focusInEnd = this.range.focus.offset == (this.range.focus.element.isText() ? this.range.focus.element.textContent.length : 1);
+      const result = {
+        element: this.range.anchor.element,
+        offset: anchorInStart && focusInEnd ? false : [this.range.anchor.offset, this.range.focus.offset]
+      };
+      return {
+        list: [result],
+        flatList: [result]
+      };
+    }
     const getFlatList = () => {
       let flatList = [];
       const anchorInStart = this.range.anchor.offset == 0;
@@ -4373,78 +4390,60 @@ class AlexEditor {
       if (startIndex > 0 || endIndex < elements.length - 1) {
         elements = elements.slice(startIndex, endIndex + 1);
       }
-      if (this.range.anchor.element.isEqual(this.range.focus.element)) {
-        if (anchorInStart && focusInEnd) {
-          flatList = elements.map((element2) => {
-            return {
-              element: element2,
+      const length = elements.length;
+      for (let i = 0; i < length; i++) {
+        if (this.range.anchor.element.isEqual(elements[i])) {
+          if (anchorInStart) {
+            flatList.push({
+              element: this.range.anchor.element,
               offset: false
-            };
-          });
-        } else {
-          flatList = [
-            {
+            });
+          } else if (this.range.anchor.element.isText() && this.range.anchor.offset < this.range.anchor.element.textContent.length) {
+            flatList.push({
               element: this.range.anchor.element,
-              offset: [this.range.anchor.offset, this.range.focus.offset]
-            }
-          ];
-        }
-      } else {
-        const length = elements.length;
-        for (let i = 0; i < length; i++) {
-          if (this.range.anchor.element.isEqual(elements[i])) {
-            if (anchorInStart) {
-              flatList.push({
-                element: this.range.anchor.element,
-                offset: false
-              });
-            } else if (this.range.anchor.element.isText() && this.range.anchor.offset < this.range.anchor.element.textContent.length) {
-              flatList.push({
-                element: this.range.anchor.element,
-                offset: [this.range.anchor.offset, this.range.anchor.element.textContent.length]
-              });
-            }
-          } else if (elements[i].isContains(this.range.anchor.element)) {
-            const isFirst = this.range.anchor.element.isFirst(elements[i]);
-            const hasFocus = elements[i].isContains(this.range.focus.element);
-            const isLast = this.range.focus.element.isLast(elements[i]);
-            if (anchorInStart && isFirst && hasFocus && isLast && focusInEnd) {
-              flatList.push({
-                element: elements[i],
-                offset: false
-              });
-            } else if (anchorInStart && isFirst && !hasFocus) {
-              flatList.push({
-                element: elements[i],
-                offset: false
-              });
-            }
-          } else if (this.range.focus.element.isEqual(elements[i])) {
-            if (focusInEnd) {
-              flatList.push({
-                element: this.range.focus.element,
-                offset: false
-              });
-            } else if (this.range.focus.offset > 0) {
-              flatList.push({
-                element: this.range.focus.element,
-                offset: [0, this.range.focus.offset]
-              });
-            }
-          } else if (elements[i].isContains(this.range.focus.element)) {
-            const isLast = this.range.focus.element.isLast(elements[i]);
-            if (isLast && focusInEnd) {
-              flatList.push({
-                element: elements[i],
-                offset: false
-              });
-            }
-          } else {
+              offset: [this.range.anchor.offset, this.range.anchor.element.textContent.length]
+            });
+          }
+        } else if (elements[i].isContains(this.range.anchor.element)) {
+          const isFirst = this.range.anchor.element.isFirst(elements[i]);
+          const hasFocus = elements[i].isContains(this.range.focus.element);
+          const isLast = this.range.focus.element.isLast(elements[i]);
+          if (anchorInStart && isFirst && hasFocus && isLast && focusInEnd) {
+            flatList.push({
+              element: elements[i],
+              offset: false
+            });
+          } else if (anchorInStart && isFirst && !hasFocus) {
             flatList.push({
               element: elements[i],
               offset: false
             });
           }
+        } else if (this.range.focus.element.isEqual(elements[i])) {
+          if (focusInEnd) {
+            flatList.push({
+              element: this.range.focus.element,
+              offset: false
+            });
+          } else if (this.range.focus.offset > 0) {
+            flatList.push({
+              element: this.range.focus.element,
+              offset: [0, this.range.focus.offset]
+            });
+          }
+        } else if (elements[i].isContains(this.range.focus.element)) {
+          const isLast = this.range.focus.element.isLast(elements[i]);
+          if (isLast && focusInEnd) {
+            flatList.push({
+              element: elements[i],
+              offset: false
+            });
+          }
+        } else {
+          flatList.push({
+            element: elements[i],
+            offset: false
+          });
         }
       }
       return flatList;
@@ -4681,7 +4680,7 @@ class AlexEditor {
     event$1.off(this.$el, "beforeinput.alex_editor compositionstart.alex_editor compositionupdate.alex_editor compositionend.alex_editor keydown.alex_editor cut.alex_editor paste.alex_editor copy.alex_editor dragstart.alex_editor drop.alex_editor focus.alex_editor blur.alex_editor");
   }
 }
-const version$2 = "1.4.11";
+const version$2 = "1.4.14";
 console.log(`%c alex-editor %c v${version$2} `, "padding: 2px 1px; border-radius: 3px 0 0 3px; color: #fff; background: #606060; font-weight: bold;", "padding: 2px 1px; border-radius: 0 3px 3px 0; color: #fff; background: #42c02e; font-weight: bold;");
 const number = {
   /**
@@ -42550,7 +42549,7 @@ const attachment = (options) => {
 const install = (app) => {
   app.component(Editify.name, Editify);
 };
-const version = "0.1.48";
+const version = "0.1.49";
 console.log(`%c vue-editify %c v${version} `, "padding: 2px 1px; border-radius: 3px 0 0 3px; color: #fff; background: #606060; font-weight: bold;", "padding: 2px 1px; border-radius: 0 3px 3px 0; color: #fff; background: #42c02e; font-weight: bold;");
 export {
   AlexElement,