@ones-editor/editor 1.0.2-beta.16 → 1.0.2-beta.18

package/dist/index.js

@@ -23466,9 +23466,10 @@ var __publicField = (obj, key, value) => {
         for (let i = 0; i < blocks.length; i++) {
           if (i === 0) {
             const currentBlock = editor.getBlockByIndex(containerId, blockIndex2);
-            if (currentBlock && isTextKindBlock(editor, currentBlock) && isEmptyTextBlock(editor, currentBlock) && blocks[i].type === "text") {
+            const isTextKindInsert = blocks[i].type === "text" || blocks[i].type === "list";
+            if (currentBlock && isTextKindBlock(editor, currentBlock) && isEmptyTextBlock(editor, currentBlock) && isTextKindInsert) {
               editor.insertTextToBlock(block, 0, (_a = blocks[i].text) != null ? _a : []);
-              if (Object.prototype.hasOwnProperty.call(blocks[i], "heading")) {
+              if (Object.keys(blocks[i]).length > 3) {
                 editor.updateBlockData(currentBlock, blocks[i]);
               }
               continue;
@@ -25375,7 +25376,30 @@ var __publicField = (obj, key, value) => {
     addMetaToDoc(editor, doc2);
     const htmlFragment = docToHtmlFragment(editor, doc2);
     const html = injectDocToHtmlFragment(htmlFragment, doc2);
-    const markdown = docToMarkdown(editor, doc2);
+    let markdown = "";
+    const lines = [];
+    let hasCodeBlock = false;
+    doc2.blocks.root.forEach((b, index2) => {
+      const parentContainer = editor.getParentContainer(editor.getBlockById(b.id));
+      const parentBlock = getParentBlock(parentContainer);
+      const isCodeTextBlock2 = parentBlock && getBlockType(parentBlock) === "code";
+      if (isCodeTextBlock2) {
+        if (!hasCodeBlock) {
+          const codeBlock2 = parentBlock;
+          const codeBlockData = editor.getBlockData(codeBlock2);
+          const codeText = editor.getSelectedText();
+          lines.push(`\`\`\`${codeBlockData.language}
+${codeText}
+\`\`\`
+`);
+          hasCodeBlock = true;
+        }
+      } else {
+        lines.push(blockToMarkdown(editor, b, doc2, [{ containerId: "root", blockIndex: index2 }]));
+      }
+    });
+    lines[lines.length - 1] = lines[lines.length - 1].trimEnd();
+    markdown = lines.join("\n");
     const blob = new Blob([html], {
       type: "text/html"
     });
@@ -42798,7 +42822,7 @@ var __publicField = (obj, key, value) => {
   }
   function updateMarker(marker, listData) {
     const type = getListType(listData);
-    if (type === "text-only" && !listData.level) {
+    if (type === "text-only") {
       return;
     }
     if (type === "checked") {
@@ -57275,15 +57299,15 @@ ${codeText}
         canSelectBlock = true;
       }
       if (selection.range.start.isSimple() && selection.range.end.isSimple()) {
-        canSelectBlock = selection.range.start.offset > 0;
+        canSelectBlock = selection.range.start.offset > 0 && selection.range.getSelectedBlocks().length === 1;
       }
-      const commandItems = [];
-      if (canSelectBlock) {
-        commandItems.push({
+      const commandItems = [
+        {
           id: "select-block",
-          name: this.t("contextMenu.selectBlock")
-        });
-      }
+          name: this.t("contextMenu.selectBlock"),
+          states: canSelectBlock ? [] : ["disabled"]
+        }
+      ];
       commandItems.push({
         id: "select-all",
         name: this.t("contextMenu.selectAll")
@@ -57309,8 +57333,8 @@ ${codeText}
         const { x, y } = event;
         const nextRange = getBlockNearestRangeFromPoint(this.editor, x, y);
         const oldRange = this.editor.selection.range;
-        const selectBlocks = oldRange.getSelectedBlocks();
-        if (oldRange.focus.blockId !== (nextRange == null ? void 0 : nextRange.focus.blockId) && !(selectBlocks == null ? void 0 : selectBlocks.some((block) => block.block.id !== oldRange.focus.blockId))) {
+        const rangeInSelected = oldRange.getSelectedBlocks().some((selectBlock) => selectBlock.block.id === (nextRange == null ? void 0 : nextRange.focus.blockId));
+        if (oldRange.focus.blockId !== (nextRange == null ? void 0 : nextRange.focus.blockId) && oldRange.focus.isSimple() && !rangeInSelected) {
           this.editor.selectionHandler.handleMouseDown(event, { autoScroll: false });
         }
       });
@@ -65323,7 +65347,11 @@ ${codeText}
         }
       }
     };
-    return { ...properties, ...contextMenuProperties, abstract: i18n$1.t("drawio.abstract") };
+    properties.blockCommands = {
+      ...properties.blockCommands,
+      ...contextMenuProperties.blockCommands
+    };
+    return { ...properties, abstract: i18n$1.t("drawio.abstract") };
   }
   const enUS$4 = {
     drawio: {
@@ -71064,15 +71092,18 @@ ${codeText}
     };
   }
   function getGraphEmbedBlockProperties(editor, block, type, properties) {
-    const graphBlockCommands = getGraphBlockContextMenuCommands(editor, block, type);
+    const graphBlockContextMenuCommands = getGraphBlockContextMenuCommands(editor, block, type);
     const graphEmbedBlockProperties = {
       blockCommands: {
         "hovering-toolbar": new GraphBlockCommands(editor, block, type, properties)
       },
       abstract: lodash.exports.capitalize(type)
     };
-    if (graphBlockCommands) {
-      return { ...graphEmbedBlockProperties, ...graphBlockCommands };
+    if (graphBlockContextMenuCommands) {
+      graphEmbedBlockProperties.blockCommands = {
+        ...graphEmbedBlockProperties.blockCommands,
+        ...graphBlockContextMenuCommands.blockCommands
+      };
     }
     return graphEmbedBlockProperties;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "1.0.2-beta.16",
+  "version": "1.0.2-beta.18",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",