vue-editify 0.2.13 → 0.2.14

package/lib/components/button/button.vue.d.ts

@@ -267,7 +267,7 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<{
         };
         $forceUpdate: () => void;
         $nextTick: typeof import('vue').nextTick;
-        $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (args_0: R, args_1: R) => any : (...args: any) => any, options?: import('vue').WatchOptions<boolean> | undefined): import('vue').WatchStopHandle;
+        $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (args_0: R, args_1: R, args_2: (cleanupFn: () => void) => void) => any : (args_0: any, args_1: any, args_2: (cleanupFn: () => void) => void) => any, options?: import('vue').WatchOptions<boolean> | undefined): import('vue').WatchStopHandle;
     } & Omit<Readonly<import('vue').ExtractPropTypes<{
         modelValue: {
             type: BooleanConstructor;

package/lib/components/toolbar/toolbar.vue.d.ts

@@ -241,7 +241,7 @@ declare const _default: import('vue').DefineComponent<{
         };
         $forceUpdate: () => void;
         $nextTick: typeof import('vue').nextTick;
-        $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (args_0: R, args_1: R) => any : (...args: any) => any, options?: import('vue').WatchOptions<boolean> | undefined): import('vue').WatchStopHandle;
+        $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (args_0: R, args_1: R, args_2: (cleanupFn: () => void) => void) => any : (args_0: any, args_1: any, args_2: (cleanupFn: () => void) => void) => any, options?: import('vue').WatchOptions<boolean> | undefined): import('vue').WatchStopHandle;
     } & Omit<Readonly<import('vue').ExtractPropTypes<{
         modelValue: {
             type: BooleanConstructor;

package/lib/editify/editify.vue.d.ts

@@ -151,8 +151,8 @@ declare const _default: import('vue').DefineComponent<{
                     key: number;
                     type: import('alex-editor').AlexElementType;
                     parsedom: string | null;
-                    marks: import('alex-editor/lib/core/tool').ObjectType | null;
-                    styles: import('alex-editor/lib/core/tool').ObjectType | null;
+                    marks: import('alex-editor').ObjectType | null;
+                    styles: import('alex-editor').ObjectType | null;
                     textContent: string | null;
                     children: any[] | null;
                     parent: any | null;
@@ -171,7 +171,7 @@ declare const _default: import('vue').DefineComponent<{
                     getUneditableElement: () => AlexElement | null;
                     isEqual: (element: AlexElement) => boolean;
                     isContains: (element: AlexElement) => boolean;
-                    isOnlyHasBreak: () => boolean;
+                    isOnlyHasBreak: () => boolean | 0;
                     isPreStyle: () => boolean;
                     hasMarks: () => boolean;
                     hasStyles: () => boolean;
@@ -196,8 +196,8 @@ declare const _default: import('vue').DefineComponent<{
                             key: number;
                             type: import('alex-editor').AlexElementType;
                             parsedom: string | null;
-                            marks: import('alex-editor/lib/core/tool').ObjectType | null;
-                            styles: import('alex-editor/lib/core/tool').ObjectType | null;
+                            marks: import('alex-editor').ObjectType | null;
+                            styles: import('alex-editor').ObjectType | null;
                             textContent: string | null;
                             children: any[] | null;
                             parent: any | null;
@@ -216,7 +216,7 @@ declare const _default: import('vue').DefineComponent<{
                             getUneditableElement: () => AlexElement | null;
                             isEqual: (element: AlexElement) => boolean;
                             isContains: (element: AlexElement) => boolean;
-                            isOnlyHasBreak: () => boolean;
+                            isOnlyHasBreak: () => boolean | 0;
                             isPreStyle: () => boolean;
                             hasMarks: () => boolean;
                             hasStyles: () => boolean;
@@ -245,8 +245,8 @@ declare const _default: import('vue').DefineComponent<{
                             key: number;
                             type: import('alex-editor').AlexElementType;
                             parsedom: string | null;
-                            marks: import('alex-editor/lib/core/tool').ObjectType | null;
-                            styles: import('alex-editor/lib/core/tool').ObjectType | null;
+                            marks: import('alex-editor').ObjectType | null;
+                            styles: import('alex-editor').ObjectType | null;
                             textContent: string | null;
                             children: any[] | null;
                             parent: any | null;
@@ -265,7 +265,7 @@ declare const _default: import('vue').DefineComponent<{
                             getUneditableElement: () => AlexElement | null;
                             isEqual: (element: AlexElement) => boolean;
                             isContains: (element: AlexElement) => boolean;
-                            isOnlyHasBreak: () => boolean;
+                            isOnlyHasBreak: () => boolean | 0;
                             isPreStyle: () => boolean;
                             hasMarks: () => boolean;
                             hasStyles: () => boolean;
@@ -301,8 +301,8 @@ declare const _default: import('vue').DefineComponent<{
             key: number;
             type: import('alex-editor').AlexElementType;
             parsedom: string | null;
-            marks: import('alex-editor/lib/core/tool').ObjectType | null;
-            styles: import('alex-editor/lib/core/tool').ObjectType | null;
+            marks: import('alex-editor').ObjectType | null;
+            styles: import('alex-editor').ObjectType | null;
             textContent: string | null;
             children: any[] | null;
             parent: any | null;
@@ -321,7 +321,7 @@ declare const _default: import('vue').DefineComponent<{
             getUneditableElement: () => AlexElement | null;
             isEqual: (element: AlexElement) => boolean;
             isContains: (element: AlexElement) => boolean;
-            isOnlyHasBreak: () => boolean;
+            isOnlyHasBreak: () => boolean | 0;
             isPreStyle: () => boolean;
             hasMarks: () => boolean;
             hasStyles: () => boolean;
@@ -346,8 +346,8 @@ declare const _default: import('vue').DefineComponent<{
                     key: number;
                     type: import('alex-editor').AlexElementType;
                     parsedom: string | null;
-                    marks: import('alex-editor/lib/core/tool').ObjectType | null;
-                    styles: import('alex-editor/lib/core/tool').ObjectType | null;
+                    marks: import('alex-editor').ObjectType | null;
+                    styles: import('alex-editor').ObjectType | null;
                     textContent: string | null;
                     children: any[] | null;
                     parent: any | null;
@@ -366,7 +366,7 @@ declare const _default: import('vue').DefineComponent<{
                     getUneditableElement: () => AlexElement | null;
                     isEqual: (element: AlexElement) => boolean;
                     isContains: (element: AlexElement) => boolean;
-                    isOnlyHasBreak: () => boolean;
+                    isOnlyHasBreak: () => boolean | 0;
                     isPreStyle: () => boolean;
                     hasMarks: () => boolean;
                     hasStyles: () => boolean;
@@ -395,8 +395,8 @@ declare const _default: import('vue').DefineComponent<{
                     key: number;
                     type: import('alex-editor').AlexElementType;
                     parsedom: string | null;
-                    marks: import('alex-editor/lib/core/tool').ObjectType | null;
-                    styles: import('alex-editor/lib/core/tool').ObjectType | null;
+                    marks: import('alex-editor').ObjectType | null;
+                    styles: import('alex-editor').ObjectType | null;
                     textContent: string | null;
                     children: any[] | null;
                     parent: any | null;
@@ -415,7 +415,7 @@ declare const _default: import('vue').DefineComponent<{
                     getUneditableElement: () => AlexElement | null;
                     isEqual: (element: AlexElement) => boolean;
                     isContains: (element: AlexElement) => boolean;
-                    isOnlyHasBreak: () => boolean;
+                    isOnlyHasBreak: () => boolean | 0;
                     isPreStyle: () => boolean;
                     hasMarks: () => boolean;
                     hasStyles: () => boolean;
@@ -441,8 +441,50 @@ declare const _default: import('vue').DefineComponent<{
             };
         } | null;
         __guid: number;
-        __events: import('alex-editor/lib/core/tool').ObjectType;
-        __firstRender: boolean;
+        __events: import('alex-editor').ObjectType;
+        __oldStack: {
+            key: number;
+            type: import('alex-editor').AlexElementType;
+            parsedom: string | null;
+            marks: import('alex-editor').ObjectType | null;
+            styles: import('alex-editor').ObjectType | null;
+            textContent: string | null;
+            children: any[] | null;
+            parent: any | null;
+            behavior: "default" | "block";
+            namespace: string | null;
+            locked: boolean;
+            elm: HTMLElement | null;
+            isBlock: () => boolean;
+            isInblock: () => boolean;
+            isInline: () => boolean;
+            isClosed: () => boolean;
+            isText: () => boolean;
+            isBreak: () => boolean;
+            isEmpty: () => boolean;
+            isSpaceText: () => boolean;
+            getUneditableElement: () => AlexElement | null;
+            isEqual: (element: AlexElement) => boolean;
+            isContains: (element: AlexElement) => boolean;
+            isOnlyHasBreak: () => boolean | 0;
+            isPreStyle: () => boolean;
+            hasMarks: () => boolean;
+            hasStyles: () => boolean;
+            hasChildren: () => boolean;
+            hasContains: (element: AlexElement) => boolean;
+            clone: (deep?: boolean | undefined) => AlexElement;
+            convertToBlock: () => void;
+            toEmpty: () => void;
+            getBlock: () => AlexElement;
+            getInblock: () => AlexElement | null;
+            getInline: () => AlexElement | null;
+            isEqualStyles: (element: AlexElement) => boolean;
+            isEqualMarks: (element: AlexElement) => boolean;
+            isFirst: (element: AlexElement) => boolean;
+            isLast: (element: AlexElement) => boolean;
+            __render: () => void;
+            __fullClone: () => AlexElement;
+        }[];
         __isInputChinese: boolean;
         __innerSelectionChange: boolean;
         __chineseInputTimer: any;
@@ -483,8 +525,8 @@ declare const _default: import('vue').DefineComponent<{
                 key: number;
                 type: import('alex-editor').AlexElementType;
                 parsedom: string | null;
-                marks: import('alex-editor/lib/core/tool').ObjectType | null;
-                styles: import('alex-editor/lib/core/tool').ObjectType | null;
+                marks: import('alex-editor').ObjectType | null;
+                styles: import('alex-editor').ObjectType | null;
                 textContent: string | null;
                 children: any[] | null;
                 parent: any | null;
@@ -503,7 +545,7 @@ declare const _default: import('vue').DefineComponent<{
                 getUneditableElement: () => AlexElement | null;
                 isEqual: (element: AlexElement) => boolean;
                 isContains: (element: AlexElement) => boolean;
-                isOnlyHasBreak: () => boolean;
+                isOnlyHasBreak: () => boolean | 0;
                 isPreStyle: () => boolean;
                 hasMarks: () => boolean;
                 hasStyles: () => boolean;
@@ -529,8 +571,8 @@ declare const _default: import('vue').DefineComponent<{
                 key: number;
                 type: import('alex-editor').AlexElementType;
                 parsedom: string | null;
-                marks: import('alex-editor/lib/core/tool').ObjectType | null;
-                styles: import('alex-editor/lib/core/tool').ObjectType | null;
+                marks: import('alex-editor').ObjectType | null;
+                styles: import('alex-editor').ObjectType | null;
                 textContent: string | null;
                 children: any[] | null;
                 parent: any | null;
@@ -549,7 +591,7 @@ declare const _default: import('vue').DefineComponent<{
                 getUneditableElement: () => AlexElement | null;
                 isEqual: (element: AlexElement) => boolean;
                 isContains: (element: AlexElement) => boolean;
-                isOnlyHasBreak: () => boolean;
+                isOnlyHasBreak: () => boolean | 0;
                 isPreStyle: () => boolean;
                 hasMarks: () => boolean;
                 hasStyles: () => boolean;

package/lib/editify.es.js

@@ -736,18 +736,18 @@ const element$1 = {
   },
   /**
    * 字符串转dom
-   * @param {Object} str
+   * @param {Object} html
    */
-  string2dom(str, parentTag) {
-    if (!str || typeof str != "string") {
+  string2dom(html) {
+    if (!html || typeof html != "string") {
       throw new TypeError("The argument must be an HTML string");
     }
-    let parentEle = document.createElement(parentTag || "div");
-    parentEle.innerHTML = str;
-    if (parentEle.children.length == 1) {
-      return parentEle.children[0];
+    const template = document.createElement("template");
+    template.innerHTML = html;
+    if (template.content.children.length == 1) {
+      return template.content.children[0];
     } else {
-      return Array.from(parentEle.children);
+      return Array.from(template.content.children);
     }
   }
 };
@@ -14973,18 +14973,18 @@ const element = {
   },
   /**
    * 字符串转dom
-   * @param {Object} str
+   * @param {Object} html
    */
-  string2dom(str, parentTag) {
-    if (!str || typeof str != "string") {
+  string2dom(html) {
+    if (!html || typeof html != "string") {
       throw new TypeError("The argument must be an HTML string");
     }
-    let parentEle = document.createElement(parentTag || "div");
-    parentEle.innerHTML = str;
-    if (parentEle.children.length == 1) {
-      return parentEle.children[0];
+    const template = document.createElement("template");
+    template.innerHTML = html;
+    if (template.content.children.length == 1) {
+      return template.content.children[0];
     } else {
-      return Array.from(parentEle.children);
+      return Array.from(template.content.children);
     }
   }
 };
@@ -15891,10 +15891,7 @@ const _AlexElement = class _AlexElement2 {
       if (!this.hasChildren()) {
         return true;
       }
-      const allEmpty = this.children.every((el) => {
-        return el.isEmpty();
-      });
-      return allEmpty;
+      return this.children.every((el) => el.isEmpty());
     }
     return false;
   }
@@ -15903,7 +15900,7 @@ const _AlexElement = class _AlexElement2 {
    * @returns
    */
   isSpaceText() {
-    return this.isText() && !this.isEmpty() && isSpaceText(this.textContent);
+    return !this.isEmpty() && this.isText() && isSpaceText(this.textContent);
   }
   /**
    * 获取不可编辑的元素，如果是null，说明元素是可编辑的
@@ -15949,13 +15946,8 @@ const _AlexElement = class _AlexElement2 {
    */
   isOnlyHasBreak() {
     if (this.hasChildren()) {
-      const hasBreak = this.children.some((item) => {
-        return item.isBreak();
-      });
-      const isAll = this.children.every((item) => {
-        return item.isBreak() || item.isEmpty();
-      });
-      return hasBreak && isAll;
+      const elements = this.children.filter((el) => !el.isEmpty());
+      return elements.length && elements.every((el) => el.isBreak());
     }
     return false;
   }
@@ -15964,25 +15956,14 @@ const _AlexElement = class _AlexElement2 {
    * @returns
    */
   isPreStyle() {
-    const block = this.getBlock();
-    const inblock = this.getInblock();
-    if (inblock) {
-      if (inblock.parsedom == "pre") {
-        return true;
-      }
-      if (inblock.hasStyles() && (inblock.styles["white-space"] == "pre" || inblock.styles["white-space"] == "pre-wrap")) {
-        return true;
-      }
-      return inblock.parent.isPreStyle();
-    } else {
-      if (block.parsedom == "pre") {
-        return true;
-      }
-      if (block.hasStyles() && (block.styles["white-space"] == "pre" || block.styles["white-space"] == "pre-wrap")) {
-        return true;
-      }
-      return false;
+    const block = this.getInblock() || this.getBlock();
+    if (block.parsedom == "pre") {
+      return true;
+    }
+    if (block.hasStyles() && ["pre", "pre-wrap"].includes(block.styles["white-space"])) {
+      return true;
     }
+    return block.parent ? block.parent.isPreStyle() : false;
   }
   /**
    * 是否含有标记
@@ -16185,9 +16166,7 @@ const _AlexElement = class _AlexElement2 {
       return false;
     }
     if (element2.isContains(this)) {
-      const elements = _AlexElement2.flatElements(element2.children).filter((el) => {
-        return el.isText() || el.isClosed();
-      });
+      const elements = _AlexElement2.flatElements(element2.children).filter((el) => el.isText() || el.isClosed());
       return this.isEqual(elements[0]);
     }
     return false;
@@ -16205,11 +16184,8 @@ const _AlexElement = class _AlexElement2 {
       return false;
     }
     if (element2.isContains(this)) {
-      const elements = _AlexElement2.flatElements(element2.children).filter((el) => {
-        return el.isText() || el.isClosed();
-      });
-      const length = elements.length;
-      return this.isEqual(elements[length - 1]);
+      const elements = _AlexElement2.flatElements(element2.children).filter((el) => el.isText() || el.isClosed());
+      return this.isEqual(elements[elements.length - 1]);
     }
     return false;
   }
@@ -17496,7 +17472,7 @@ class AlexEditor {
     __publicField(this, "range", null);
     __publicField(this, "__guid", createGuid());
     __publicField(this, "__events", {});
-    __publicField(this, "__firstRender", true);
+    __publicField(this, "__oldStack", []);
     __publicField(this, "__isInputChinese", false);
     __publicField(this, "__innerSelectionChange", false);
     __publicField(this, "__chineseInputTimer", null);
@@ -18169,26 +18145,25 @@ class AlexEditor {
    */
   domRender(unPushHistory = false) {
     this.emit("beforeRender");
+    const firstRender = !this.__oldStack.length;
+    const oldValue = this.value;
+    this.$el.innerHTML = "";
     const fragment = document.createDocumentFragment();
     this.stack.forEach((element2) => {
       element2.__render();
       fragment.appendChild(element2.elm);
     });
-    this.$el.innerHTML = "";
     this.$el.appendChild(fragment);
-    const oldValue = this.value;
     this.value = this.$el.innerHTML;
-    if (this.__firstRender || oldValue != this.value) {
-      if (!this.__firstRender) {
+    this.__oldStack = this.stack.map((ele) => ele.__fullClone());
+    if (firstRender || oldValue != this.value) {
+      if (!firstRender) {
         this.emit("change", this.value, oldValue);
       }
       if (!unPushHistory) {
         this.history.push(this.stack, this.range);
       }
     }
-    if (this.__firstRender) {
-      this.__firstRender = false;
-    }
     this.emit("afterRender");
   }
   /**
@@ -18198,8 +18173,7 @@ class AlexEditor {
   rangeRender() {
     return new Promise((resolve) => {
       if (this.disabled) {
-        resolve();
-        return;
+        return resolve();
       }
       if (this.range) {
         const handler = (point) => {
@@ -18250,10 +18224,10 @@ class AlexEditor {
     if (!html) {
       throw new Error("You need to give an html content to convert");
     }
-    const node = document.createElement("div");
-    node.innerHTML = html;
+    const template = document.createElement("template");
+    template.innerHTML = html;
     let elements = [];
-    Array.from(node.childNodes).forEach((el) => {
+    template.content.childNodes.forEach((el) => {
       if (el.nodeType == 1 || el.nodeType == 3) {
         const element2 = this.parseNode(el);
         elements.push(element2);
@@ -18911,7 +18885,7 @@ class AlexEditor {
     event.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$1 = "1.4.14";
+const version$1 = "1.4.20";
 console.log(`%c alex-editor %c v${version$1} `, "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 setTableCellMerged = (cell) => {
   const breakEl = AlexElement.create({
@@ -42737,7 +42711,7 @@ const Editify = withInstall(editify);
 const install = (app) => {
   app.component(Editify.name, Editify);
 };
-const version = "0.2.13";
+const version = "0.2.14";
 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,