@ones-editor/editor 2.8.40 → 2.8.42

package/dist/index.js

@@ -52634,59 +52634,57 @@ ${codeText}
     async handleBeforePasteDoc(editor, doc2) {
       const groupIds = /* @__PURE__ */ new Map();
       const startIds = /* @__PURE__ */ new Map();
-      Object.values(doc2.blocks).forEach((blocks) => {
-        blocks.forEach((block, index2) => {
-          if (block.type === "list") {
-            if (index2 === 0) {
-              const startBlock = editor.selection.startBlock;
-              if (isListBlock(startBlock)) {
-                const { start, groupId: groupId2, level, type } = getListBlockProperties(startBlock);
-                const newType = getListType(block);
+      doc2.blocks.root.forEach((block, index2) => {
+        if (block.type === "list") {
+          if (index2 === 0) {
+            const startBlock = editor.selection.startBlock;
+            if (isListBlock(startBlock)) {
+              const { start, groupId: groupId2, level, type } = getListBlockProperties(startBlock);
+              const newType = getListType(block);
+              const oldGroupId = block.groupId;
+              block.groupId = groupId2;
+              block.start = start;
+              block.level = level;
+              const data2 = makeListBlockTypeData(type);
+              Object.assign(block, data2);
+              if (level === block.level && type === newType) {
+                groupIds.set(oldGroupId, groupId2);
+                startIds.set(groupId2, start);
+              }
+              this.fixStartByList = new FixStartByWillDeletedList(editor, startBlock);
+              return;
+            }
+            const preBlock = getPrevBlock(startBlock);
+            if (preBlock && isListBlock(preBlock)) {
+              const { start, groupId: groupId2, level, type } = getListBlockProperties(preBlock);
+              const newType = getListType(block);
+              if (level === block.level && type === newType) {
                 const oldGroupId = block.groupId;
                 block.groupId = groupId2;
-                block.start = start;
+                block.start = start + 1;
                 block.level = level;
-                const data2 = makeListBlockTypeData(type);
-                Object.assign(block, data2);
-                if (level === block.level && type === newType) {
-                  groupIds.set(oldGroupId, groupId2);
-                  startIds.set(groupId2, start);
-                }
-                this.fixStartByList = new FixStartByWillDeletedList(editor, startBlock);
+                groupIds.set(oldGroupId, groupId2);
+                startIds.set(groupId2, start + 1);
+                this.fixStartByList = new FixStartByWillDeletedList(editor, preBlock);
                 return;
               }
-              const preBlock = getPrevBlock(startBlock);
-              if (preBlock && isListBlock(preBlock)) {
-                const { start, groupId: groupId2, level, type } = getListBlockProperties(preBlock);
-                const newType = getListType(block);
-                if (level === block.level && type === newType) {
-                  const oldGroupId = block.groupId;
-                  block.groupId = groupId2;
-                  block.start = start + 1;
-                  block.level = level;
-                  groupIds.set(oldGroupId, groupId2);
-                  startIds.set(groupId2, start + 1);
-                  this.fixStartByList = new FixStartByWillDeletedList(editor, preBlock);
-                  return;
-                }
-              }
-            }
-            const groupId = groupIds.get(block.groupId);
-            if (!groupId) {
-              const newGroupId = genId();
-              groupIds.set(block.groupId, newGroupId);
-              block.groupId = newGroupId;
-              block.start = 1;
-              startIds.set(newGroupId, 1);
-            } else {
-              const start = startIds.get(groupId);
-              assert(logger$20, start, "start is null");
-              block.start = start + 1;
-              block.groupId = groupId;
-              startIds.set(groupId, start + 1);
             }
           }
-        });
+          const groupId = groupIds.get(block.groupId);
+          if (!groupId) {
+            const newGroupId = genId();
+            groupIds.set(block.groupId, newGroupId);
+            block.groupId = newGroupId;
+            block.start = 1;
+            startIds.set(newGroupId, 1);
+          } else {
+            const start = startIds.get(groupId);
+            assert(logger$20, start, "start is null");
+            block.start = start + 1;
+            block.groupId = groupId;
+            startIds.set(groupId, start + 1);
+          }
+        }
       });
       return false;
     }
@@ -92300,7 +92298,7 @@ ${JSON.stringify(error2, null, 2)}`);
           return;
         }
       }
-      if (block.type === "text" || block.textOnly === true) {
+      if (block.type === "text" || block.type === "code-line" || block.textOnly === true) {
         const blockObj = await getBlockObject(block, md5HexFunc, getTextsByBox);
         await dbg.addTextBlock(blockObj);
         return;
@@ -93278,10 +93276,15 @@ ${JSON.stringify(error2, null, 2)}`);
       }
       this.children = commands;
     }
-    onClick(editor, item) {
+    onClick(editor, item, commandBar2) {
       const provider = new InsertMenuProvider(editor);
       const startBlock = editor.getBlockById(editor.selection.range.start.blockId);
       provider.executeCommand(editor, startBlock, editor.selection.range, item, {});
+      commandBar2.close("clickItem");
+      const bar2 = commandBar2;
+      if (bar2.closeable) {
+        bar2.closeable.close("clickItem");
+      }
     }
   }
   const FindIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<circle cx="11.5" cy="11.5" r="2.5" stroke="currentColor"></circle>\n<path d="M13.3542 13.3542L15 15" stroke="currentColor"></path>\n<path d="M13.5 8V5.41421C13.5 5.149 13.3946 4.89464 13.2071 4.70711L10.2929 1.79289C10.1054 1.60536 9.851 1.5 9.58579 1.5H3.5C2.94772 1.5 2.5 1.94772 2.5 2.5V13.5C2.5 14.0523 2.94772 14.5 3.5 14.5H8" stroke="currentColor" stroke-linejoin="round"></path>\n<path d="M9.5 1.5V4.5C9.5 5.05228 9.94772 5.5 10.5 5.5H13.5" stroke="currentColor" stroke-linejoin="round"></path>\n</svg>';
@@ -93474,6 +93477,11 @@ ${JSON.stringify(error2, null, 2)}`);
           moreItems.push(item);
         }
       });
+      if (moreItems.length > 0) {
+        if (moreItems[moreItems.length - 1].type === "separator") {
+          moreItems.pop();
+        }
+      }
       this.hidden = moreItems.length === 0;
       this.children = moreItems;
       toolbar2.updateItems(items);
@@ -93583,7 +93591,7 @@ ${JSON.stringify(error2, null, 2)}`);
       __publicField(this, "handleClick", (bar2, item) => {
         const command = item;
         if (command.onClick) {
-          command.onClick(this.editor, command);
+          command.onClick(this.editor, command, bar2);
           this.handleSelectionChanged();
           return;
         }
@@ -93605,7 +93613,7 @@ ${JSON.stringify(error2, null, 2)}`);
           const parent = findParent(i, item.id);
           if (parent) {
             if (parent.onClick) {
-              parent.onClick(this.editor, item);
+              parent.onClick(this.editor, item, bar2);
               this.handleSelectionChanged();
               return;
             }
@@ -93922,7 +93930,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "2.8.40";
+    editor.version = "2.8.42";
     return editor;
   }
   function isDoc(doc2) {
@@ -94035,7 +94043,7 @@ ${JSON.stringify(error2, null, 2)}`);
       }
     });
     OnesEditorToolbar.register(editor);
-    editor.version = "2.8.40";
+    editor.version = "2.8.42";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.8.40",
+  "version": "2.8.42",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {