dragon-editor 3.7.2 → 3.7.3

package/dist/module.json

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

package/dist/runtime/utils/layout/controlbar.js

@@ -1,5 +1,5 @@
 import { h } from "vue";
-import { _setCodeBlockTheme, _setCodeBlockLanguage, _setListBlockStyle } from "../node/index.js";
+import { _setCodeBlockStatus, _setListBlockStyle } from "../node/index.js";
 import { CODEBLOCKLANG } from "../event/index.js";
 export function _getControlbarVNodeStructure(store) {
   const childList = [];
@@ -16,7 +16,7 @@ export function _getControlbarVNodeStructure(store) {
               onChange: (event) => {
                 const $target = event.currentTarget;
                 if ($target !== null) {
-                  _setCodeBlockTheme($target.value, store);
+                  _setCodeBlockStatus($target.value, store.value.controlStatus.codeBlockLang, store);
                 }
               }
             },
@@ -37,7 +37,7 @@ export function _getControlbarVNodeStructure(store) {
               onChange: (event) => {
                 const $target = event.currentTarget;
                 if ($target !== null) {
-                  _setCodeBlockLanguage($target.value, store);
+                  _setCodeBlockStatus(store.value.controlStatus.codeBlockTheme, $target.value, store);
                 }
               }
             },

package/dist/runtime/utils/layout/menuBar.js

@@ -14,6 +14,7 @@ export function _getMenuBarVNodeStructure(store) {
           "button",
           {
             class: ["de-btn", { "--active": store.value.controlStatus.anchorTabType === "url" }],
+            type: "button",
             onClick: () => {
               store.value.controlStatus.anchorTabType = "url";
             }
@@ -24,6 +25,7 @@ export function _getMenuBarVNodeStructure(store) {
           "button",
           {
             class: ["de-btn", { "--active": store.value.controlStatus.anchorTabType === "heading" }],
+            type: "button",
             onClick: () => {
               store.value.controlStatus.anchorTabType = "heading";
             }
@@ -43,6 +45,7 @@ export function _getMenuBarVNodeStructure(store) {
           "button",
           {
             class: ["de-btn"],
+            type: "button",
             onClick: () => {
               _setAnchorTag(store.value.controlStatus.anchorHref, true, store);
             }
@@ -57,6 +60,7 @@ export function _getMenuBarVNodeStructure(store) {
             "button",
             {
               class: ["de-btn", { "--active": store.value.controlStatus.anchorHref === `#${item.id}` }],
+              type: "button",
               onClick: () => {
                 store.value.activeStatus.anchorInputArea = false;
                 _setAnchorTag(item.id, false, store);
@@ -78,6 +82,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu", "de-menu-add", "js-de-menu-add"],
+          type: "button",
           onClick: () => {
             store.value.activeStatus.addBlockMenu = !store.value.activeStatus.addBlockMenu;
           }
@@ -92,6 +97,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setDecoration("de-bold", store);
           }
@@ -102,6 +108,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setDecoration("de-italic", store);
           }
@@ -112,6 +119,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setDecoration("de-underline", store);
           }
@@ -122,6 +130,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setDecoration("de-strikethrough", store);
           }
@@ -132,6 +141,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setDecoration("de-code", store);
           }
@@ -146,6 +156,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu", "js-de-link-btn"],
+          type: "button",
           onClick: (event) => {
             _openAnchorArea(event, store);
           }
@@ -156,6 +167,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu", { "--disabled": store.value.controlStatus.anchorHref === "" }],
+          type: "button",
           onClick: () => {
             _unsetAnchorTag(store);
           }
@@ -190,6 +202,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setTextAlign("left", store);
           }
@@ -200,6 +213,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setTextAlign("center", store);
           }
@@ -210,6 +224,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setTextAlign("right", store);
           }
@@ -220,6 +235,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setTextAlign("justify", store);
           }
@@ -234,6 +250,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setIndent(store, "minus");
           }
@@ -244,6 +261,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _setIndent(store, "plus");
           }
@@ -258,6 +276,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _moveBlock("up", store);
           }
@@ -268,6 +287,7 @@ function __getMenuListStructure(store) {
         "button",
         {
           class: ["de-menu"],
+          type: "button",
           onClick: () => {
             _moveBlock("down", store);
           }
@@ -285,6 +305,7 @@ function __getBlockListStructure(store) {
       "button",
       {
         class: ["de-add-block"],
+        type: "button",
         onClick: () => {
           _addBlock("text", store);
         }
@@ -297,6 +318,7 @@ function __getBlockListStructure(store) {
       "button",
       {
         class: ["de-add-block"],
+        type: "button",
         onClick: () => {
           _addBlock("heading1", store);
         }
@@ -309,6 +331,7 @@ function __getBlockListStructure(store) {
       "button",
       {
         class: ["de-add-block"],
+        type: "button",
         onClick: () => {
           _addBlock("heading2", store);
         }
@@ -321,6 +344,7 @@ function __getBlockListStructure(store) {
       "button",
       {
         class: ["de-add-block"],
+        type: "button",
         onClick: () => {
           _addBlock("heading3", store);
         }
@@ -333,6 +357,7 @@ function __getBlockListStructure(store) {
       "button",
       {
         class: ["de-add-block"],
+        type: "button",
         onClick: () => {
           _addBlock("ul", store);
         }
@@ -345,6 +370,7 @@ function __getBlockListStructure(store) {
       "button",
       {
         class: ["de-add-block"],
+        type: "button",
         onClick: () => {
           _addBlock("ol", store);
         }
@@ -357,6 +383,7 @@ function __getBlockListStructure(store) {
       "button",
       {
         class: ["de-add-block"],
+        type: "button",
         onClick: () => {
           _addBlock("code", store);
         }
@@ -369,6 +396,7 @@ function __getBlockListStructure(store) {
       "button",
       {
         class: ["de-add-block"],
+        type: "button",
         onClick: () => {
           _addBlock("divider", store);
         }

package/dist/runtime/utils/node/block.d.ts

@@ -15,6 +15,5 @@ export declare function _createCustomBlock(data: DECustomBlock): HTMLDivElement;
 export declare function _createDividerBlock(): HTMLDivElement;
 export declare function _updateCurrentBlock(event: Event, store: Ref<DragonEditorStore>): void;
 export declare function _updateHeadingBlockList(store: Ref<DragonEditorStore>): void;
-export declare function _setCodeBlockTheme(theme: DECodeblockTheme, store: Ref<DragonEditorStore>): Promise<void>;
-export declare function _setCodeBlockLanguage(language: DECodeblockLang, store: Ref<DragonEditorStore>): Promise<void>;
+export declare function _setCodeBlockStatus(theme: DECodeblockTheme, language: DECodeblockLang, store: Ref<DragonEditorStore>): Promise<void>;
 export declare function _setListBlockStyle(style: DEListStyle, store: Ref<DragonEditorStore>): void;

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

@@ -213,33 +213,14 @@ export function _updateHeadingBlockList(store) {
     });
   }
 }
-export async function _setCodeBlockTheme(theme, store) {
-  if (store.value.controlStatus.$currentBlock !== null) {
-    const $target = store.value.controlStatus.$currentBlock.querySelector(".de-language");
-    const $code = store.value.controlStatus.$currentBlock.querySelector(".de-code-content");
-    if ($target !== null && $code !== null) {
-      const convert = await store.value.codeToHtml($code.textContent ?? "", { lang: store.value.controlStatus.codeBlockLang, theme });
-      const $div = document.createElement("div");
-      $div.innerHTML = convert;
-      const $childCode = $div.querySelector("code");
-      if ($childCode !== null) {
-        $code.innerHTML = $childCode.innerHTML;
-        store.value.controlStatus.codeBlockTheme = theme;
-        store.value.controlStatus.$currentBlock.dataset["theme"] = theme;
-      }
-      _updateCursorData(store);
-      _updateModelData(store);
-    }
-  }
-}
-export async function _setCodeBlockLanguage(language, store) {
+export async function _setCodeBlockStatus(theme, language, store) {
   if (store.value.controlStatus.$currentBlock !== null) {
     const $target = store.value.controlStatus.$currentBlock.querySelector(".de-language");
     const $code = store.value.controlStatus.$currentBlock.querySelector(".de-code-content");
     if ($target !== null && $code !== null) {
       const targetValue = CODEBLOCKLANG.find((item) => item.code === language);
       if (targetValue !== void 0) {
-        const convert = await store.value.codeToHtml($code.textContent ?? "", { lang: language, theme: store.value.controlStatus.codeBlockTheme });
+        const convert = await store.value.codeToHtml($code.textContent ?? "", { lang: language, theme });
         const $div = document.createElement("div");
         $div.innerHTML = convert;
         const $childCode = $div.querySelector("code");
@@ -247,6 +228,8 @@ export async function _setCodeBlockLanguage(language, store) {
           $target.textContent = targetValue.text;
           $code.innerHTML = $childCode.innerHTML;
           store.value.controlStatus.codeBlockLang = targetValue.code;
+          store.value.controlStatus.codeBlockTheme = theme;
+          store.value.controlStatus.$currentBlock.dataset["theme"] = theme;
           _updateCursorData(store);
           _updateModelData(store);
         }

package/package.json

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