@ones-editor/editor 2.9.8-beta.21 → 2.9.8-beta.23

package/@ones-editor/ui/src/providers/list.d.ts

@@ -7,7 +7,7 @@ export default class ListProvider implements OnesEditorCommandProvider {
     getAvailableCommands(editor: OnesEditor, block: BlockElement, range: SelectionRange, params?: CommandParams): CommandItem[];
     getInsertCommands(): CommandItem[];
     convertToList(editor: OnesEditor, block: BlockElement, listType: 'unordered' | 'ordered' | 'unchecked'): void;
-    insertList(editor: OnesEditor, containerId: string, blockIndex: number, listType: 'unordered' | 'ordered' | 'unchecked'): void;
+    insertList(editor: OnesEditor, containerId: string, blockIndex: number, listType: 'unordered' | 'ordered' | 'unchecked', command: CommandItem): void;
     executeCommand(editor: OnesEditor, block: BlockElement, range: SelectionRange, command: CommandItem): boolean;
     executeInsertCommand: (editor: OnesEditor, containerId: string, blockIndex: number, command: CommandItem) => boolean;
 }

package/@ones-editor/ui-base/src/command-bar/command-bar.d.ts

@@ -22,6 +22,7 @@ export default abstract class CommandBar extends TypedEmitter<CommandBarEvents>
     get isSubCommandBar(): boolean;
     updateItems(items: CommandItem[]): void;
     handleDocumentKeydown: (event: KeyboardEvent) => boolean;
+    protected canClose(): boolean;
     protected handleDocumentMouseDown: (event: MouseEvent | TouchEvent) => void;
     protected handleHidden: () => void;
     protected handleShown: () => void;

package/@ones-editor/ui-base/src/command-bar/fixed-toolbar.d.ts

@@ -6,6 +6,7 @@ export default class FixedToolbar extends CommandBar {
     handleDocumentKeydown: (event: KeyboardEvent) => boolean;
     protected initCommandBarElement(elem: HTMLElement): void;
     protected initItemElement(item: CommandItem, elem: CommandItemElement): void;
+    protected canClose(): boolean;
     close(): void;
     getSubBarCreateOptions: (item: CommandItem) => CommandBarOptions;
     getSubBarOptions: (item: CommandItem) => ManualShowCommandBarOptions;

package/dist/index.js

@@ -28825,10 +28825,19 @@ var __publicField = (obj, key, value) => {
       });
       this.editor = editor;
       const block = editor.getFirstBlock();
-      const blockId = getBlockId(block);
       this.caret = new EditorCaret(editor);
-      const pos = createSimpleBlockPosition(blockId, 0, "normal");
-      this._range = createEditorSelectionRange(editor, { anchor: pos, focus: pos });
+      if (isComplexKindBlock(editor, block)) {
+        const simpleBlock = complexBlockGetFirstSimpleChild(editor, block, {
+          visibleOnly: true
+        }) || block;
+        const blockId = getBlockId(simpleBlock);
+        const pos = createSimpleBlockPosition(blockId, 0, "normal");
+        this._range = createEditorSelectionRange(editor, { anchor: pos, focus: pos });
+      } else {
+        const blockId = getBlockId(block);
+        const pos = createSimpleBlockPosition(blockId, 0, "normal");
+        this._range = createEditorSelectionRange(editor, { anchor: pos, focus: pos });
+      }
       this.lastCaretRect = null;
       this.editor.addListener("blockDeleted", this.handleBlockDelete);
       setTimeout(() => {
@@ -41411,12 +41420,18 @@ ${codeText}
         return true;
       });
       __publicField(this, "handleDocumentMouseDown", (event) => {
-        var _a, _b;
+        var _a, _b, _c;
         if (event.target instanceof Element) {
           if ((_b = (_a = this.options).beforeClose) == null ? void 0 : _b.call(_a, event)) {
             return;
           }
           if (!this.isInCommandBar(event.target)) {
+            if (((_c = this.canClose) == null ? void 0 : _c.call(this)) === false) {
+              return;
+            }
+            if (!this.isVisible) {
+              return;
+            }
             const events2 = this.listeners("closing");
             for (let i = 0; i < events2.length; i++) {
               if (events2[i](this, event) === false) {
@@ -41676,6 +41691,9 @@ ${codeText}
         this.content.appendChild(child);
       });
     }
+    canClose() {
+      return true;
+    }
     get popper() {
       return this.content.closest("[data-tippy-root]");
     }
@@ -42702,6 +42720,12 @@ ${codeText}
     initItemElement(item, elem) {
       initToolbarItem(item, elem, this.options);
     }
+    canClose() {
+      if (this.subBar) {
+        return true;
+      }
+      return false;
+    }
     close() {
       this.clearSelectedItem();
       if (this.subBar) {
@@ -43871,6 +43895,9 @@ ${codeText}
       __publicField(this, "handlePaletteClick", (type, value) => {
         this.setLatestColors(type, value);
         this.emit("onClick", type, value);
+        setTimeout(() => {
+          this.editor.emit("textColorChanged", this.editor, this);
+        }, 100);
       });
       __publicField(this, "handleButtonClick", () => {
         const [color, backgroundColor] = this.latestColors;
@@ -43896,6 +43923,9 @@ ${codeText}
           this.emit("onClick", "backgroundColor", backgroundColor);
         }
         this.currentTextColors = [color, backgroundColor];
+        setTimeout(() => {
+          this.editor.emit("textColorChanged", this.editor, this);
+        }, 100);
       });
       __publicField(this, "setLatestColors", (type, value) => {
         var _a, _b;
@@ -43933,6 +43963,13 @@ ${codeText}
       this.element.addEventListener("click", this.handleButtonClick);
       this.bindColorButtonEvents();
       this.element.setAttribute(`data-editor-tooltip-${editor.clientId}`, this.name);
+      this.editor.addListener("textColorChanged", (e2, sender) => {
+        if (sender !== this) {
+          this.latestColors = this.getColorsFromLocalStorage();
+          this.setCurrentButtonColor(this.latestColors);
+          this.updatePaletteColor();
+        }
+      });
     }
     bindColorButtonEvents() {
       if (clientType.isMobile) {
@@ -53197,15 +53234,15 @@ ${codeText}
       __publicField(this, "id", "ListProvider");
       __publicField(this, "executeInsertCommand", (editor, containerId, blockIndex, command) => {
         if (command.id === "unordered-list") {
-          this.insertList(editor, containerId, blockIndex, "unordered");
+          this.insertList(editor, containerId, blockIndex, "unordered", command);
           return true;
         }
         if (command.id === "ordered-list") {
-          this.insertList(editor, containerId, blockIndex, "ordered");
+          this.insertList(editor, containerId, blockIndex, "ordered", command);
           return true;
         }
         if (command.id === "check-list") {
-          this.insertList(editor, containerId, blockIndex, "unchecked");
+          this.insertList(editor, containerId, blockIndex, "unchecked", command);
           return true;
         }
         return false;
@@ -53288,21 +53325,66 @@ ${codeText}
         });
       }
     }
-    insertList(editor, containerId, blockIndex, listType) {
+    insertList(editor, containerId, blockIndex, listType, command) {
       var _a;
-      const blockList = editor.getChildContainerData(containerId);
-      const block = (_a = editor.findBlockByIndex(containerId, blockIndex)) != null ? _a : editor.getBlockById(blockList[blockList.length - 1].id);
-      const convertResult = convertBlockFrom(editor, block, "list", {
+      editor.getChildContainerData(containerId);
+      let sourceIndex = blockIndex;
+      let insertBefore = true;
+      if (((_a = command.source) == null ? void 0 : _a.indexOf("/insert-block-after")) !== -1) {
+        insertBefore = false;
+        if (blockIndex > 0) {
+          sourceIndex = blockIndex - 1;
+        }
+      }
+      const currentBlock = editor.findBlockByIndex(containerId, sourceIndex);
+      if (!currentBlock) {
+        return;
+      }
+      const convertResult = convertBlockFrom(editor, currentBlock, "list", {
         offset: 0,
         data: {
           listType
         }
       });
-      if (convertResult) {
-        editor.undoManager.runInGroup(() => {
-          editor.insertBlock(containerId, blockIndex, convertResult.blockData);
-        });
+      const newData = convertResult == null ? void 0 : convertResult.blockData;
+      if (!newData) {
+        return;
+      }
+      const oldData = editor.getBlockData(currentBlock);
+      const oldType = getListType(oldData);
+      const newType = getListType(newData);
+      if (oldType === newType) {
+        if (typeof newData.start === "number") {
+          if (typeof oldData.start === "number") {
+            if (insertBefore) {
+              newData.start = oldData.start - 1;
+            } else {
+              newData.start = oldData.start + 1;
+            }
+          } else {
+            if (insertBefore) {
+              newData.start -= 1;
+            } else {
+              newData.start += 1;
+            }
+          }
+        }
+        if (typeof newData.start === "number" && newData.start <= 0) {
+          newData.start = 1;
+        }
+        newData.groupId = oldData.groupId;
+      }
+      newData.text = [];
+      if (oldType === newType) {
+        newData.heading = oldData.heading;
+      } else {
+        delete newData.heading;
       }
+      editor.undoManager.runInGroup(() => {
+        const newBlock = editor.insertBlock(containerId, blockIndex, newData);
+        const fix = new FixStartByList(editor, newBlock);
+        fix.fix();
+      });
     }
     executeCommand(editor, block, range, command) {
       if (!isTextKindBlock(editor, block)) {
@@ -64261,7 +64343,7 @@ $$${mathData.mathjaxText}$$
     const failedLoad = !!block.querySelector(".images > .image-container.error, .images > .image-container.empty ");
     const width = calImageBlockStyleWidth(editor, blockData, parentContainer, failedLoad);
     const height = calBlockHeight(editor, blockData, parentContainer, failedLoad);
-    if (width.startsWith("0") && height.startsWith("0")) {
+    if (width.startsWith("0") || height.startsWith("0")) {
       const image = block.querySelector("img");
       if (image) {
         image.onload = () => {
@@ -94125,9 +94207,11 @@ ${JSON.stringify(error2, null, 2)}`);
         Heading3Icon,
         Heading4Icon,
         Heading5Icon,
-        Heading6Icon
+        Heading6Icon,
+        Heading7Icon,
+        Heading8Icon
       ];
-      for (let i = 1; i <= 6; i++) {
+      for (let i = 1; i <= 8; i++) {
         this.children.push({
           name: i18n$1.t("commands.heading", { name: `${i}` }),
           id: `heading-${i}`,
@@ -94362,6 +94446,8 @@ ${JSON.stringify(error2, null, 2)}`);
         event.stopPropagation();
       });
       this.provider = new ColorStyleProvider(editor);
+      this.latestColors = this.getColorsFromLocalStorage();
+      this.setCurrentButtonColor(this.latestColors);
       this.addListener("onClick", this.handleChangeColor);
       this.element.addEventListener("mousedown", this.handleMousedown);
     }
@@ -94529,7 +94615,7 @@ ${JSON.stringify(error2, null, 2)}`);
     async onClick(editor, item) {
       const block = editor.getBlockById(editor.selection.range.start.blockId);
       const container = editor.getParentContainer(block);
-      const index2 = editor.getBlockIndex(block);
+      let index2 = editor.getBlockIndex(block);
       const file2 = await selectFile("*");
       if (!file2) {
         return;
@@ -94547,7 +94633,14 @@ ${JSON.stringify(error2, null, 2)}`);
         creator: editor.doc.getUser().displayName,
         previewType: FilePreviewType.Card
       };
-      editor.insertEmbed(getContainerId(container), index2 + 1, "office", data2);
+      if (!isEmptyTextBlock(editor, block)) {
+        index2 += 1;
+      }
+      const embedBlock = editor.insertEmbed(getContainerId(container), index2, "office", data2);
+      const nextBlock = getNextBlock(embedBlock);
+      if (nextBlock && isTextKindBlock(editor, nextBlock)) {
+        editor.selection.selectBlock(nextBlock, 0);
+      }
     }
   }
   class InsertMentionItem {
@@ -94741,6 +94834,12 @@ ${JSON.stringify(error2, null, 2)}`);
         tooltipId: editor.clientId,
         id: "main-toolbar"
       });
+      this.toolbar.addListener("closing", () => {
+        setTimeout(() => {
+          editor.focus();
+        }, 100);
+        return true;
+      });
       this.toolbar.addListener("click", this.handleClick);
       this.editor.addListener("selectionChanged", this.handleSelectionChanged);
       this.updateState();
@@ -95365,7 +95464,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "2.9.8-beta.21";
+    editor.version = "2.9.8-beta.23";
     return editor;
   }
   function isDoc(doc2) {
@@ -95497,7 +95596,7 @@ ${JSON.stringify(error2, null, 2)}`);
     OnesEditorDropTarget.register(editor);
     OnesEditorTocProvider.register(editor);
     OnesEditorExclusiveBlock.register(editor);
-    editor.version = "2.9.8-beta.21";
+    editor.version = "2.9.8-beta.23";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.9.8-beta.21",
+  "version": "2.9.8-beta.23",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {