dragon-editor 3.8.0 → 3.8.2

package/dist/module.json

@@ -4,7 +4,7 @@
     "nuxt": ">=3.0.0"
   },
   "configKey": "dragon-editor",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/DragonEditor.d.vue.ts

@@ -10,13 +10,14 @@ declare function setDecoration(style: DEDecoration): void;
 declare function setAlign(align: DETextalign): void;
 declare function changeEditorData(data: DEContentData): void;
 declare function updateLayout(): void;
+declare function checkDataEmpty(data?: DEContentData): boolean;
 declare const __VLS_export: import("vue").DefineComponent<DEOption, {
     addBlock: typeof addBlock;
     setDecoration: typeof setDecoration;
     setAlign: typeof setAlign;
     changeEditorData: typeof changeEditorData;
     updateLayout: typeof updateLayout;
-    checkDataEmpty: () => boolean;
+    checkDataEmpty: typeof checkDataEmpty;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     "update:modelValue": (data: DEContentData) => any;
     uploadImageEvent: (file: File) => any;

package/dist/runtime/components/DragonEditor.vue

@@ -181,6 +181,15 @@ function updateLayout() {
     _eidtorMountEvent(editorStore);
   }, 500);
 }
+function checkDataEmpty(data) {
+  let suitable = false;
+  if (data !== void 0) {
+    suitable = _checkDataEmpty(data);
+  } else {
+    suitable = _checkDataEmpty(props.modelValue);
+  }
+  return suitable;
+}
 onMounted(() => {
   _eidtorMountEvent(editorStore);
 });
@@ -193,7 +202,7 @@ defineExpose({
   setAlign,
   changeEditorData,
   updateLayout,
-  checkDataEmpty: () => _checkDataEmpty(props.modelValue)
+  checkDataEmpty
 });
 </script>
 

package/dist/runtime/components/DragonEditor.vue.d.ts

@@ -10,13 +10,14 @@ declare function setDecoration(style: DEDecoration): void;
 declare function setAlign(align: DETextalign): void;
 declare function changeEditorData(data: DEContentData): void;
 declare function updateLayout(): void;
+declare function checkDataEmpty(data?: DEContentData): boolean;
 declare const __VLS_export: import("vue").DefineComponent<DEOption, {
     addBlock: typeof addBlock;
     setDecoration: typeof setDecoration;
     setAlign: typeof setAlign;
     changeEditorData: typeof changeEditorData;
     updateLayout: typeof updateLayout;
-    checkDataEmpty: () => boolean;
+    checkDataEmpty: typeof checkDataEmpty;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     "update:modelValue": (data: DEContentData) => any;
     uploadImageEvent: (file: File) => any;

package/dist/runtime/type.d.mts

@@ -115,7 +115,7 @@ interface DragonEditor {
     setTextAlign: (type: DETextalign) => void;
     changeEditorData: (data: DEContentData) => void;
     updateLayout: () => void;
-    checkDataEmpty: () => boolean;
+    checkDataEmpty: (data?: DEContentData) => boolean;
 }
 
 interface DETextBlock {

package/dist/runtime/utils/event/block.js

@@ -81,20 +81,29 @@ export function _checkNeedNewBlock(event, store) {
   if ($target !== null) {
     const $element = $target;
     if ($element.classList.contains("js-de-body") === true) {
+      const bodyRect = $element.getBoundingClientRect();
       const blockList = $element.querySelectorAll(".de-block");
       const $targetBlock = blockList[blockList.length - 1];
-      if ($targetBlock.classList.contains("de-text-block") === true) {
-        if ($targetBlock.textContent === "") {
-          $targetBlock.focus();
+      let isAllowed = true;
+      switch (true) {
+        case event.clientX > bodyRect.left + bodyRect.width - 20:
+        case event.clientX < bodyRect.left + 20:
+          isAllowed = false;
+      }
+      if (isAllowed === true) {
+        if ($targetBlock.classList.contains("de-text-block") === true) {
+          if ($targetBlock.textContent === "") {
+            $targetBlock.focus();
+          } else {
+            const $block = _createTextBlock(_getDefaultBlockData("text"));
+            $targetBlock.insertAdjacentElement("afterend", $block);
+            $block.focus();
+          }
         } else {
           const $block = _createTextBlock(_getDefaultBlockData("text"));
           $targetBlock.insertAdjacentElement("afterend", $block);
           $block.focus();
         }
-      } else {
-        const $block = _createTextBlock(_getDefaultBlockData("text"));
-        $targetBlock.insertAdjacentElement("afterend", $block);
-        $block.focus();
       }
     }
   }

package/dist/runtime/utils/event/keyboard.js

@@ -67,13 +67,18 @@ function __pasteToMarkDownFormat(value, store) {
   if (store.value.controlStatus.$currentBlock !== null) {
     const lineList = value.split("\n");
     const blockList = [];
-    const unorderListReg = new RegExp("^( +)?(\\*|-)(?= )( )");
+    const unorderListReg = new RegExp("^( +)?(\\+|\\*|-)(?= )( )");
     const orderListReg = new RegExp("^( +)?(\\d+.)(?= )( )");
     const codeBlockReg = new RegExp("^```");
     let tempData = null;
     let isCodeBlock = false;
     lineList.forEach((text, lineIndex) => {
       switch (true) {
+        case new RegExp("^(---|___|\\*\\*\\*)").test(text):
+          blockList.push({
+            type: "divider"
+          });
+          break;
         case (codeBlockReg.test(text) || isCodeBlock === true):
           if (isCodeBlock === false) {
             const startLineText = text.split("```");
@@ -106,7 +111,7 @@ function __pasteToMarkDownFormat(value, store) {
           break;
         case orderListReg.test(text):
           const olSplitText = text.split(new RegExp("\\d+.(?= )"));
-          const olDepth = olSplitText[0].length / 4;
+          const olDepth = Math.floor(olSplitText[0].length / 4);
           if (tempData === null) {
             tempData = {
               type: "list",
@@ -128,7 +133,7 @@ function __pasteToMarkDownFormat(value, store) {
               });
               if (nextLine !== void 0) {
                 const nextOlSplitText = nextLine.split(new RegExp("\\d+.(?= )"));
-                const nextOlDepth = nextOlSplitText[0].length / 4;
+                const nextOlDepth = Math.floor(nextOlSplitText[0].length / 4);
                 if (orderListReg.test(nextLine) === false) {
                   blockList.push(tempData);
                   tempData = null;
@@ -146,8 +151,8 @@ function __pasteToMarkDownFormat(value, store) {
           }
           break;
         case unorderListReg.test(text):
-          const ulSplitText = text.split(new RegExp("\\*|-"));
-          const ulDepth = ulSplitText[0].length / 4;
+          const ulSplitText = text.split(new RegExp("\\+|\\*|-"));
+          const ulDepth = Math.floor(ulSplitText[0].length / 4);
           if (tempData === null) {
             tempData = {
               type: "list",
@@ -168,8 +173,8 @@ function __pasteToMarkDownFormat(value, store) {
                 textContent: ___replaceTextData(ulSplitText[1].trim())
               });
               if (nextLine !== void 0) {
-                const nextUlSplitText = nextLine.split(new RegExp("\\*|-"));
-                const nextUlDepth = nextUlSplitText[0].length / 4;
+                const nextUlSplitText = nextLine.split(new RegExp("\\+|\\*|-"));
+                const nextUlDepth = Math.floor(nextUlSplitText[0].length / 4);
                 if (unorderListReg.test(nextLine) === false) {
                   blockList.push(tempData);
                   tempData = null;
@@ -192,7 +197,7 @@ function __pasteToMarkDownFormat(value, store) {
             level: 3,
             id: _generateId(),
             classList: [],
-            textContent: text.substring(4)
+            textContent: ___replaceTextData(text.substring(4))
           });
           break;
         case new RegExp("^##(?= )").test(text):
@@ -201,7 +206,7 @@ function __pasteToMarkDownFormat(value, store) {
             level: 2,
             id: _generateId(),
             classList: [],
-            textContent: text.substring(3)
+            textContent: ___replaceTextData(text.substring(3))
           });
           break;
         case new RegExp("^#(?= )").test(text):
@@ -210,7 +215,7 @@ function __pasteToMarkDownFormat(value, store) {
             level: 1,
             id: _generateId(),
             classList: [],
-            textContent: text.substring(2)
+            textContent: ___replaceTextData(text.substring(2))
           });
           break;
         default:
@@ -244,7 +249,7 @@ function __pasteToMarkDownFormat(value, store) {
   }
 }
 function ___replaceTextData(text) {
-  return text.replaceAll(new RegExp("(`)([^`]+)(`)", "g"), `<span class="de-code">$2</span>`).replaceAll(new RegExp("(\\[)([^\\[\\]]+)(\\])(?=\\()(\\()([^\\(\\)]+)(?=\\))(\\))", "g"), `<a class="de-link" href="$5" target="_blank">$2</a>`).replaceAll(new RegExp("(\\*\\*)([^\\*]+)(?=\\*\\*)(\\*\\*)", "g"), `<span class="de-bold">$2</span>`).replaceAll(new RegExp("(\\_\\_)([^\\_]+)(?=\\_\\_)(\\_\\_)", "g"), `<span class="de-bold">$2</span>`).replaceAll(new RegExp("(\\*)([^\\*]+)(?=\\*)(\\*)", "g"), `<span class="de-italic">$2</span>`).replaceAll(new RegExp("(\\_)([^\\_]+)(?=\\_)(\\_)", "g"), `<span class="de-italic">$2</span>`);
+  return text.replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll(new RegExp("(`)([^`]+)(`)", "g"), `<span class="de-code">$2</span>`).replaceAll(new RegExp("(\\*\\*)([^\\*]+)(?=\\*\\*)(\\*\\*)", "g"), `<span class="de-bold">$2</span>`).replaceAll(new RegExp("(\\_\\_)([^\\_]+)(?=\\_\\_)(\\_\\_)", "g"), `<span class="de-bold">$2</span>`).replaceAll(new RegExp("(\\~\\~)([^\\~]+)(?=\\~\\~)(\\~\\~)", "g"), `<span class="de-strikethrough">$2</span>`).replaceAll(new RegExp("(\\*)([^\\*]+)(?=\\*)(\\*)", "g"), `<span class="de-italic">$2</span>`).replaceAll(new RegExp("(\\_)([^\\_]+)(?=\\_)(\\_)", "g"), `<span class="de-italic">$2</span>`).replaceAll(new RegExp("(\\[)([^\\[\\]]+)(\\])(?=\\()(\\()([^\\(\\)]+)(?=\\))(\\))", "g"), `<a class="de-link" href="$5" target="_blank">$2</a>`);
 }
 function __enterEvent(event, store) {
   if (event.shiftKey === true) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dragon-editor",
-    "version": "3.8.0",
+    "version": "3.8.2",
     "description": "Javascript WYSIWYG editor in Nuxt!",
     "repository": {
         "type": "git",