@kaitify/core 0.0.2 → 0.0.3-beta.2

package/lib/extensions/Extension.d.ts

@@ -60,7 +60,7 @@ export type ExtensionCreateOptionType = {
      */
     onPasteKeepStyles?: (this: Editor, node: KNode) => KNodeStylesType;
     /**
-     * 视频更新前回调
+     * 视图更新前回调
      */
     onBeforeUpdateView?: (this: Editor) => void;
     /**
@@ -68,7 +68,7 @@ export type ExtensionCreateOptionType = {
      */
     onAfterUpdateView?: (this: Editor) => void;
     /**
-     * 在删除和换行操作中块节点节点从其父节点中抽离出去成为与父节点同级的节点后触发，如果返回true则表示继续使用默认逻辑，会将该节点转为段落，返回false则不走默认逻辑，需要自定义处理
+     * 在删除和换行操作中块节点从其父节点中抽离出去成为与父节点同级的节点后触发，如果返回true则表示继续使用默认逻辑，会将该节点转为段落，返回false则不走默认逻辑，需要自定义处理
      */
     onDetachMentBlockFromParent?: (this: Editor, node: KNode) => boolean;
     /**
@@ -149,7 +149,7 @@ export declare class Extension {
      */
     onPasteKeepStyles?: (this: Editor, node: KNode) => KNodeStylesType;
     /**
-     * 视频更新前回调
+     * 视图更新前回调
      */
     onBeforeUpdateView?: (this: Editor) => void;
     /**
@@ -157,7 +157,7 @@ export declare class Extension {
      */
     onAfterUpdateView?: (this: Editor) => void;
     /**
-     * 在删除和换行操作中块节点节点从其父节点中抽离出去成为与父节点同级的节点后触发，如果返回true则表示继续使用默认逻辑，会将该节点转为段落，返回false则不走默认逻辑，需要自定义处理
+     * 在删除和换行操作中块节点从其父节点中抽离出去成为与父节点同级的节点后触发，如果返回true则表示继续使用默认逻辑，会将该节点转为段落，返回false则不走默认逻辑，需要自定义处理
      */
     onDetachMentBlockFromParent?: (this: Editor, node: KNode) => boolean;
     /**

package/lib/extensions/code-block/index.d.ts

@@ -26,7 +26,7 @@ declare module '../../model' {
         /**
          * 更新光标所在代码块的语言类型
          */
-        updateCodeBlockLanguage?: (language: HljsLanguageType) => Promise<void>;
+        updateCodeBlockLanguage?: (language?: HljsLanguageType) => Promise<void>;
     }
 }
 export type CodeBlockExtensionPropsType = {

package/lib/extensions/link/index.d.ts

@@ -26,7 +26,7 @@ declare module '../../model' {
          */
         hasLink?: () => boolean;
         /**
-         * 设置连接
+         * 设置链接
          */
         setLink?: (options: SetLinkOptionType) => Promise<void>;
         /**

package/lib/kaitify-core.es.js

@@ -1399,7 +1399,7 @@ const kebabToCamel = (val) => {
 const getDomAttributes = (dom) => {
   const attributes = Array.from(dom.attributes);
   const length = attributes.length;
-  const regExp = new RegExp(`(^on)|(^style$)|(^${NODE_MARK}$)`, "g");
+  const regExp = new RegExp(`(^on)|(^style$)|(^${NODE_MARK}$)`);
   const result = {};
   for (let i = 0; i < length; i++) {
     const { nodeName, nodeValue } = attributes[i];
@@ -1564,22 +1564,6 @@ class KNode {
       }
       return newNode2;
     });
-    /**
-     * 【API】如果当前节点是文本节点或者闭合节点，则判断是不是指定节点后代中所有文本节点和闭合节点中的第一个
-     */
-    __publicField(this, "firstInTargetNode", (node) => {
-      if (!this.isText() && !this.isClosed()) {
-        return false;
-      }
-      if (this.isEqual(node)) {
-        return true;
-      }
-      if (node.isContains(this) && node.hasChildren()) {
-        const firstChild = node.children[0];
-        return this.firstInTargetNode(firstChild);
-      }
-      return false;
-    });
     /**
      * 【API】获取当前节点下的所有可聚焦的节点，如果自身符合也会包括在内
      * 1. type 是 all 获取闭合节点和文本节点；
@@ -1835,6 +1819,22 @@ class KNode {
     }
     return newNode2;
   }
+  /**
+   * 【API】如果当前节点是文本节点或者闭合节点，则判断是不是指定节点后代中所有文本节点和闭合节点中的第一个
+   */
+  firstInTargetNode(node) {
+    if (!this.isText() && !this.isClosed()) {
+      return false;
+    }
+    if (this.isEqual(node)) {
+      return true;
+    }
+    if (node.isContains(this) && node.hasChildren()) {
+      const firstChild = node.children[0];
+      return this.firstInTargetNode(firstChild);
+    }
+    return false;
+  }
   /**
    * 【API】如果当前节点是文本节点或者闭合节点，则判断是不是指定节点后代中所有文本节点和闭合节点中的最后一个
    */
@@ -2607,6 +2607,16 @@ const updateSelection$1 = function() {
     const range = realSelection.getRangeAt(0);
     if (isContains(this.$el, range.startContainer) && isContains(this.$el, range.endContainer)) {
       const resolvePoint = (container, rangeOffset, type) => {
+        if (container === this.$el) {
+          const childDoms = Array.from(container.childNodes);
+          if (childDoms.length) {
+            const dom = childDoms[rangeOffset] ? childDoms[rangeOffset] : childDoms[rangeOffset - 1];
+            if (dom.nodeType == 1) {
+              childDoms[rangeOffset] ? this.setSelectionBefore(this.findNode(dom), type) : this.setSelectionAfter(this.findNode(dom), type);
+            }
+          }
+          return;
+        }
         const containerNode = container.nodeType == 3 ? this.findNode(container.parentNode) : this.findNode(container);
         if (containerNode.isClosed()) {
           this.selection[type] = { node: containerNode, offset: type == "start" ? 0 : 1 };
@@ -2760,7 +2770,7 @@ const handlerForPasteDrop = async function(dataTransfer) {
     fillPlaceholderToEmptyBlock.apply(this, [nodes]);
     handlerForPasteKeepMarksAndStyles.apply(this, [nodes]);
     const useDefault = typeof this.onPasteHtml == "function" ? await this.onPasteHtml.apply(this, [nodes, html]) : true;
-    if (useDefault) {
+    if (useDefault && nodes.length > 0) {
       this.insertNode(nodes[0]);
       for (let i = nodes.length - 1; i >= 1; i--) {
         this.addNodeAfter(nodes[i], nodes[0]);
@@ -2940,12 +2950,12 @@ const formatLineBreakSpaceText = ({ editor, node }) => {
         endPrevNumber = (preText.match(regExp) || []).length;
       }
     }
-    node.textContent = node.textContent.replace(/\n/g, (chart, index) => {
-      const nextChart = node.textContent[index + 1];
-      if (!nextChart || !isZeroWidthText(nextChart)) {
-        chart = chart + getZeroWidthText();
+    node.textContent = node.textContent.replace(/\n/g, (char, index) => {
+      const nextChar = node.textContent[index + 1];
+      if (!nextChar || !isZeroWidthText(nextChar)) {
+        char = char + getZeroWidthText();
       }
-      return chart;
+      return char;
     });
     if (startPrevNumber > 0) {
       editor.selection.start.offset += startPrevNumber;
@@ -2960,8 +2970,8 @@ const formatZeroWidthTextMerge = ({ editor, node }) => {
     let val = node.textContent;
     let i = 0;
     while (i < val.length) {
-      const chart = val.charAt(i);
-      if (i > 0 && isZeroWidthText(chart) && isZeroWidthText(val.charAt(i - 1))) {
+      const char = val.charAt(i);
+      if (i > 0 && isZeroWidthText(char) && isZeroWidthText(val.charAt(i - 1))) {
         if (editor.isSelectionInTargetNode(node, "start") && editor.selection.start.offset >= i + 1) {
           editor.selection.start.offset -= 1;
         }
@@ -3010,7 +3020,7 @@ const patchNodes$1 = (newNodes, oldNodes) => {
     return [];
   }
   if (newNodes.length === 0) {
-    return oldNodes.filter((node) => !node).map((oldNode) => ({
+    return oldNodes.filter((node) => !!node).map((oldNode) => ({
       oldNode,
       newNode: null
     }));
@@ -3351,7 +3361,7 @@ class Extension {
      */
     __publicField(this, "onPasteKeepStyles");
     /**
-     * 视频更新前回调
+     * 视图更新前回调
      */
     __publicField(this, "onBeforeUpdateView");
     /**
@@ -3359,7 +3369,7 @@ class Extension {
      */
     __publicField(this, "onAfterUpdateView");
     /**
-     * 在删除和换行操作中块节点节点从其父节点中抽离出去成为与父节点同级的节点后触发，如果返回true则表示继续使用默认逻辑，会将该节点转为段落，返回false则不走默认逻辑，需要自定义处理
+     * 在删除和换行操作中块节点从其父节点中抽离出去成为与父节点同级的节点后触发，如果返回true则表示继续使用默认逻辑，会将该节点转为段落，返回false则不走默认逻辑，需要自定义处理
      */
     __publicField(this, "onDetachMentBlockFromParent");
     /**
@@ -7000,10 +7010,10 @@ const CodeExtension = () => Extension.create({
         const length = focusNodes.length;
         for (let i = 0; i < length; i++) {
           const node = focusNodes[i];
-          const isExsitInCode = !!node.getMatchNode({
+          const isExistInCode = !!node.getMatchNode({
             tag: "code"
           });
-          if (isExsitInCode) {
+          if (isExistInCode) {
             continue;
           }
           const newNode2 = node.clone(true);
@@ -36039,7 +36049,7 @@ const AttachmentExtension = (props) => Extension.create({
     if (node.isMatch({ tag: "span", marks: { [ATTACHMENT_NODE_TAG]: true } })) {
       const url = node.marks[ATTACHMENT_NODE_TAG];
       const text2 = KNode.flat(node.children ?? []).filter((n) => n.isText()).map((n) => n.textContent).join("");
-      const icon = (_c = (_b = (_a = node.styles) == null ? void 0 : _a.backgroundImage) == null ? void 0 : _b.match(/url\(["']?(.*?)["']?\)/)) == null ? void 0 : _c[1];
+      const icon = ((_c = (_b = (_a = node.styles) == null ? void 0 : _a.backgroundImage) == null ? void 0 : _b.match(/url\(["']?(.*?)["']?\)/)) == null ? void 0 : _c[1]) ?? "";
       node.type = "closed";
       node.tag = ATTACHMENT_NODE_TAG;
       node.children = void 0;
@@ -36639,16 +36649,16 @@ const TableExtension = () => Extension.create({
     //td内无段落则加入段落
     ({ node, editor }) => {
       if (node.isMatch({ tag: "td" }) && !node.children.some((item) => item.isBlock())) {
-        const pararaph = KNode.create({
+        const paragraph = KNode.create({
           type: "block",
           tag: editor.blockRenderTag
         });
-        pararaph.children = node.children.map((item) => {
-          item.parent = pararaph;
+        paragraph.children = node.children.map((item) => {
+          item.parent = paragraph;
           return item;
         });
-        node.children = [pararaph];
-        pararaph.parent = node;
+        node.children = [paragraph];
+        paragraph.parent = node;
       }
     },
     //针对跨行跨列的单元格，增加隐藏单元格
@@ -36675,7 +36685,7 @@ const TableExtension = () => Extension.create({
       if (this.isParagraph(blockNode) && blockNode.allIsPlaceholder() && pBlock && this.isParagraph(pBlock) && pBlock.allIsPlaceholder() && ppBlock) {
         blockNode.toEmpty();
         pBlock.toEmpty();
-        const pararaph = KNode.create({
+        const paragraph = KNode.create({
           type: "block",
           tag: this.blockRenderTag,
           children: [
@@ -36685,8 +36695,8 @@ const TableExtension = () => Extension.create({
             }
           ]
         });
-        this.addNodeAfter(pararaph, tableNode);
-        this.setSelectionBefore(pararaph);
+        this.addNodeAfter(paragraph, tableNode);
+        this.setSelectionBefore(paragraph);
       }
     }
   },
@@ -37136,7 +37146,7 @@ const patchNodes = (newNodes, oldNodes) => {
     return [];
   }
   if (newNodes.length === 0) {
-    return oldNodes.filter((node) => !node).map((oldNode) => ({
+    return oldNodes.filter((node) => !!node).map((oldNode) => ({
       type: "remove",
       oldNode,
       newNode: null
@@ -37334,9 +37344,9 @@ const insertDom = (editor, newNode2) => {
   const previousDom = previousNode ? findDom(editor, previousNode) : null;
   const nextNode = newNode2.getNext(parentNode ? parentNode.children : editor.stackNodes);
   const nextDom = nextNode ? findDom(editor, nextNode) : null;
-  if (previousDom && Array.from(parentDom.childNodes).some((item) => item === previousDom)) {
+  if (previousDom && isContains(parentDom, previousDom)) {
     previousDom.nextElementSibling ? parentDom.insertBefore(newDom, previousDom.nextElementSibling) : parentDom.appendChild(newDom);
-  } else if (nextDom && Array.from(parentDom.childNodes).some((item) => item === nextDom)) {
+  } else if (nextDom && isContains(parentDom, nextDom)) {
     parentDom.insertBefore(newDom, nextDom);
   } else {
     const idx = (parentNode ? parentNode.children : editor.stackNodes).findIndex((item) => item.isEqual(newNode2));
@@ -37452,7 +37462,7 @@ class Editor {
      */
     __publicField(this, "textRenderTag", "span");
     /**
-     * 编辑内渲染默认块级节点的真实标签，即段落标签【初始化后不建议修改】【open】
+     * 编辑器内渲染默认块级节点的真实标签，即段落标签【初始化后不建议修改】【open】
      */
     __publicField(this, "blockRenderTag", "p");
     /**
@@ -37548,7 +37558,7 @@ class Editor {
      */
     __publicField(this, "onAfterUpdateView");
     /**
-     * 在删除和换行操作中块节点节点从其父节点中抽离出去成为与父节点同级的节点后触发，如果返回true则表示继续使用默认逻辑，会将该节点转为段落，返回false则不走默认逻辑，需要自定义处理【初始化后不可修改】
+     * 在删除和换行操作中块节点从其父节点中抽离出去成为与父节点同级的节点后触发，如果返回true则表示继续使用默认逻辑，会将该节点转为段落，返回false则不走默认逻辑，需要自定义处理【初始化后不可修改】
      */
     __publicField(this, "onDetachMentBlockFromParent");
     /**
@@ -37593,7 +37603,7 @@ class Editor {
       newHtml: void 0
     });
     /**
-     * 是否编辑器内部渲染真实光标引起selctionChange事件【不可修改】
+     * 是否编辑器内部渲染真实光标引起selectionChange事件【不可修改】
      */
     __publicField(this, "internalCauseSelectionChange", false);
     /**
@@ -37611,12 +37621,11 @@ class Editor {
         const scrollHeight = element.getScrollHeight(scrollEl);
         const scrollWidth = element.getScrollWidth(scrollEl);
         if (scrollEl.clientHeight < scrollHeight || scrollEl.clientWidth < scrollWidth) {
-          const selection = window.getSelection();
-          const range = selection.getRangeAt(0);
-          const rects = range.getClientRects();
-          let target = range;
-          if (rects.length == 0) {
-            target = focusDom;
+          let target = focusDom;
+          const sel = window.getSelection();
+          const range = sel && sel.rangeCount ? sel.getRangeAt(0) : null;
+          if (range && range.getClientRects().length > 0) {
+            target = range;
           }
           const childRect = target.getBoundingClientRect();
           const parentRect = scrollEl.getBoundingClientRect();
@@ -38420,8 +38429,7 @@ class Editor {
   }
   /**
    * 向选区进行换行
-   * 1. 所在块节点只有占位符并且块节点不是段落则会转为段落
-   * 2. 非代码块样式内换行是插入换行符\n
+   * 1. 在代码块样式内换行是插入换行符\n
    * 2. 光标所在块节点是固定块节点，则无法换行
    * 3. 光标所在块节点只有占位符，并且其存在父节点，且父节点不是固定块节点，会从父节点抽离到与父节点同级
    * 4. 光标所在块节点只有占位符，并且不存在父节点，且不是段落，则会转为段落
@@ -38856,12 +38864,11 @@ class Editor {
         const scrollHeight = element.getScrollHeight(scrollElement);
         const scrollWidth = element.getScrollWidth(scrollElement);
         if (scrollElement.clientHeight < scrollHeight || scrollElement.clientWidth < scrollWidth) {
-          const selection = window.getSelection();
-          const range = selection.getRangeAt(0);
-          const rects = range.getClientRects();
-          let target = range;
-          if (rects.length == 0) {
-            target = focusDom;
+          let target = focusDom;
+          const sel = window.getSelection();
+          const range = sel && sel.rangeCount ? sel.getRangeAt(0) : null;
+          if (range && range.getClientRects().length > 0) {
+            target = range;
           }
           const childRect = target.getBoundingClientRect();
           const parentRect = scrollElement.getBoundingClientRect();