@ones-editor/editor 2.2.16-beta.1 → 2.2.16-beta.2

package/dist/index.js

@@ -25882,25 +25882,97 @@ var __publicField = (obj, key, value) => {
       offset
     };
   }
+  class BlockAttributesHandler {
+    constructor(editor) {
+      __publicField(this, "textBlockAttributes", /* @__PURE__ */ new Map());
+      __publicField(this, "activeBlockAttributes", /* @__PURE__ */ new Map());
+      __publicField(this, "lastRange");
+      __publicField(this, "clear", () => {
+        this.activeBlockAttributes.clear();
+      });
+      __publicField(this, "handleSelectionChanged", () => {
+        var _a, _b, _c, _d;
+        const range = this.editor.selection.range;
+        if (range.isSimple() && ((_a = this.lastRange) == null ? void 0 : _a.start.blockId) === range.start.blockId && ((_b = this.lastRange) == null ? void 0 : _b.end.blockId) === range.end.blockId && ((_c = this.lastRange) == null ? void 0 : _c.start.offset) === range.start.offset && ((_d = this.lastRange) == null ? void 0 : _d.end.offset) === range.end.offset) {
+          return;
+        }
+        this.lastRange = range;
+        this.clear();
+      });
+      __publicField(this, "setActiveBlockAttributes", (attributes) => {
+        Array.from(this.activeBlockAttributes).forEach(([key, value]) => {
+          const op = { attributes, insert: "" };
+          if (key === "color" || key === "backgroundColor") {
+            if (value === null || value === void 0) {
+              deleteColor(op, key);
+            } else {
+              addColor(op, key, value);
+            }
+            return;
+          }
+          if (!value) {
+            delete attributes[key];
+          } else {
+            const scriptKeys = ["style-sub", "style-super"];
+            if (scriptKeys.includes(key)) {
+              const [another] = scriptKeys.filter((keys) => keys !== key);
+              delete attributes[another];
+            }
+            attributes[key] = value;
+          }
+        });
+      });
+      __publicField(this, "setEmptyBlockTextAttributes", (blockId, attributes) => {
+        this.textBlockAttributes.set(blockId, attributes);
+      });
+      __publicField(this, "setActiveAttribute", (attribute, value) => {
+        this.activeBlockAttributes.set(attribute, value);
+      });
+      this.editor = editor;
+      this.editor.addListener("docChanged", this.clear);
+      this.editor.addListener("selectionChanged", this.handleSelectionChanged);
+    }
+    static get(editor) {
+      return editor.addCustom("BlockAttributesHandler", () => new BlockAttributesHandler(editor));
+    }
+    destroy() {
+      this.editor.removeListener("docChanged", this.clear);
+      this.editor.removeListener("selectionChanged", this.handleSelectionChanged);
+    }
+    getEmptyBlockTextAttributes(blockId) {
+      var _a;
+      const attributes = cloneDeep__default.default((_a = this.textBlockAttributes.get(blockId)) != null ? _a : {});
+      Array.from(Object.entries(attributes)).forEach(([key, value]) => {
+        if (!value) {
+          delete attributes[key];
+        }
+      });
+      this.setActiveBlockAttributes(attributes);
+      if (Object.keys(attributes).length === 0) {
+        return void 0;
+      }
+      return attributes;
+    }
+  }
   const logger$3y = getLogger("insert-text");
   function getTextAttributes(editor, containerId, blockIndex, offset) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const blockData = editor.doc.getBlockData(containerId, blockIndex);
     assert(logger$3y, blockData, "no block data");
     assert(logger$3y, blockData.text, "no block text");
     if (getTextLength(blockData.text) === 0) {
       assert(logger$3y, offset === 0, "invalid text offset");
-      return (_a = editor.findCustom("block-attributes-handler")) == null ? void 0 : _a.getEmptyBlockTextAttributes(blockData.id);
+      return BlockAttributesHandler.get(editor).getEmptyBlockTextAttributes(blockData.id);
     }
     if (offset === 0) {
       return void 0;
     }
     const prev = splitToThree(blockData.text, offset - 1, 1).middle;
-    if ((_b = prev[0].attributes) == null ? void 0 : _b.box) {
+    if ((_a = prev[0].attributes) == null ? void 0 : _a.box) {
       return void 0;
     }
-    const attributes = (_c = prev[0].attributes) != null ? _c : {};
-    (_d = editor.findCustom("block-attributes-handler")) == null ? void 0 : _d.setActiveBlockAttributes(attributes);
+    const attributes = (_b = prev[0].attributes) != null ? _b : {};
+    BlockAttributesHandler.get(editor).setActiveBlockAttributes(attributes);
     if (Object.keys(attributes).length === 0) {
       return void 0;
     }
@@ -31085,75 +31157,6 @@ ${codeText}
     const editor = new Editor(parent, doc2, options);
     return editor;
   }
-  class BlockAttributesHandler {
-    constructor(editor) {
-      __publicField(this, "textBlockAttributes", /* @__PURE__ */ new Map());
-      __publicField(this, "activeBlockAttributes", /* @__PURE__ */ new Map());
-      __publicField(this, "lastRange");
-      __publicField(this, "clear", () => {
-        this.activeBlockAttributes.clear();
-      });
-      __publicField(this, "handleSelectionChanged", () => {
-        var _a, _b, _c, _d;
-        const range = this.editor.selection.range;
-        if (range.isSimple() && ((_a = this.lastRange) == null ? void 0 : _a.start.blockId) === range.start.blockId && ((_b = this.lastRange) == null ? void 0 : _b.end.blockId) === range.end.blockId && ((_c = this.lastRange) == null ? void 0 : _c.start.offset) === range.start.offset && ((_d = this.lastRange) == null ? void 0 : _d.end.offset) === range.end.offset) {
-          return;
-        }
-        this.lastRange = range;
-        this.clear();
-      });
-      __publicField(this, "setActiveBlockAttributes", (attributes) => {
-        Array.from(this.activeBlockAttributes).forEach(([key, value]) => {
-          const op = { attributes, insert: "" };
-          if (key === "color" || key === "backgroundColor") {
-            if (value === null || value === void 0) {
-              deleteColor(op, key);
-            } else {
-              addColor(op, key, value);
-            }
-            return;
-          }
-          if (!value) {
-            delete attributes[key];
-          } else {
-            const scriptKeys = ["style-sub", "style-super"];
-            if (scriptKeys.includes(key)) {
-              const [another] = scriptKeys.filter((keys) => keys !== key);
-              delete attributes[another];
-            }
-            attributes[key] = value;
-          }
-        });
-      });
-      __publicField(this, "setEmptyBlockTextAttributes", (blockId, attributes) => {
-        this.textBlockAttributes.set(blockId, attributes);
-      });
-      __publicField(this, "setActiveAttribute", (attribute, value) => {
-        this.activeBlockAttributes.set(attribute, value);
-      });
-      this.editor = editor;
-      this.editor.addListener("docChanged", this.clear);
-      this.editor.addListener("selectionChanged", this.handleSelectionChanged);
-    }
-    destroy() {
-      this.editor.removeListener("docChanged", this.clear);
-      this.editor.removeListener("selectionChanged", this.handleSelectionChanged);
-    }
-    getEmptyBlockTextAttributes(blockId) {
-      var _a;
-      const attributes = cloneDeep__default.default((_a = this.textBlockAttributes.get(blockId)) != null ? _a : {});
-      Array.from(Object.entries(attributes)).forEach(([key, value]) => {
-        if (!value) {
-          delete attributes[key];
-        }
-      });
-      this.setActiveBlockAttributes(attributes);
-      if (Object.keys(attributes).length === 0) {
-        return void 0;
-      }
-      return attributes;
-    }
-  }
   const DefaultColors = ["#B21B57", "#008796", "#7241CC", "#CC4C08", "#5D8F00", "#BD2C1C", "#D17D00"];
   class RemoteUsers extends tinyTypedEmitter.TypedEmitter {
     constructor(colors) {
@@ -41974,7 +41977,7 @@ ${codeText}
     destroy() {
       this.colorPaletteItem.destroy();
       this.element.removeEventListener("click", this.handleButtonClick);
-      this.element.removeEventListener("tou", this.handleButtonClick);
+      this.element.removeEventListener("touchend", this.handleButtonClick);
       this.removeAllListeners();
     }
     updatePaletteColor() {
@@ -60408,9 +60411,8 @@ $$${mathData.mathjaxText}$$
     return styles1;
   }
   function mergeActiveStyle(editor, style2) {
-    var _a;
     const attributes = Object.fromEntries(style2.entries());
-    (_a = editor.findCustom("block-attributes-handler")) == null ? void 0 : _a.setActiveBlockAttributes(attributes);
+    BlockAttributesHandler.get(editor).setActiveBlockAttributes(attributes);
     return new Map(Object.entries(attributes));
   }
   function applyTextStyle(editor, block, range, style2, value) {
@@ -60610,7 +60612,7 @@ $$${mathData.mathjaxText}$$
       this.colorItem.addListener("onClick", this.handleChangeColor);
     }
     get blockAttributesHandler() {
-      return this.editor.getCustom("block-attributes-handler");
+      return BlockAttributesHandler.get(this.editor);
     }
     getAvailableCommands(editor, block, range, params) {
       const disable = !isTextKindBlock(editor, block) || isSelectBoxOnly(editor) || isSelectedTitleBlock(editor);
@@ -60767,7 +60769,7 @@ $$${mathData.mathjaxText}$$
       return commands.map(TextCommandProvider.toTextCommand);
     }
     executeCommand(editor, block, range, item, params, result) {
-      var _a;
+      var _a, _b;
       if (!isTextKindBlock(editor, block)) {
         return false;
       }
@@ -60786,7 +60788,7 @@ $$${mathData.mathjaxText}$$
       const commandId = TextCommandProvider.fromTextCommandId(item.id);
       if (commandId.startsWith("style-")) {
         if (editor.selection.range.isCollapsed()) {
-          this.blockAttributesHandler.setActiveAttribute(commandId, value);
+          (_a = this.blockAttributesHandler) == null ? void 0 : _a.setActiveAttribute(commandId, value);
           return true;
         }
         if (getBlockTextLength$6(editor, block) === 0) {
@@ -60794,20 +60796,21 @@ $$${mathData.mathjaxText}$$
         }
       }
       for (const provider of this.providers) {
-        if ((_a = provider.executeCommand) == null ? void 0 : _a.call(provider, editor, block, range, { ...item, id: commandId }, params, result)) {
+        if ((_b = provider.executeCommand) == null ? void 0 : _b.call(provider, editor, block, range, { ...item, id: commandId }, params, result)) {
           return true;
         }
       }
       return false;
     }
     get blockAttributesHandler() {
-      return this.editor.getCustom("block-attributes-handler");
+      return BlockAttributesHandler.get(this.editor);
     }
     executeCommandOnEmptyText(block, item, params) {
-      let attributes = this.blockAttributesHandler.getEmptyBlockTextAttributes(getBlockId(block));
+      var _a, _b;
+      let attributes = (_a = this.blockAttributesHandler) == null ? void 0 : _a.getEmptyBlockTextAttributes(getBlockId(block));
       if (!attributes) {
         attributes = {};
-        this.blockAttributesHandler.setEmptyBlockTextAttributes(getBlockId(block), attributes);
+        (_b = this.blockAttributesHandler) == null ? void 0 : _b.setEmptyBlockTextAttributes(getBlockId(block), attributes);
       }
       const command = TextCommandProvider.fromTextCommandId(item.id);
       const value = params.value;
@@ -60819,9 +60822,9 @@ $$${mathData.mathjaxText}$$
       return true;
     }
     setCommandsStates(commands, block) {
-      var _a;
+      var _a, _b;
       const blockId = getBlockId(block);
-      const attributes = (_a = this.blockAttributesHandler.getEmptyBlockTextAttributes(blockId)) != null ? _a : {};
+      const attributes = (_b = (_a = this.blockAttributesHandler) == null ? void 0 : _a.getEmptyBlockTextAttributes(blockId)) != null ? _b : {};
       return commands.map((item) => {
         var _a2;
         const value = attributes[item.id];
@@ -88297,7 +88300,6 @@ ${data2.flowchartText}
     editor.input.addHandler(new ListPasteHandler());
     editor.doc.registerCallback(new HeadingBlockDocEvents(editor));
     editor.addCustom("remote-cursor", () => new RemoteCarets(editor));
-    editor.addCustom("block-attributes-handler", () => new BlockAttributesHandler(editor));
     if (!clientType.isMobile) {
       editor.addCustom("editor-quick-menu", () => {
         var _a2;
@@ -88382,7 +88384,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.2.16-beta.1";
+    editor.version = "2.2.16-beta.2";
     return editor;
   }
   function isDoc(doc2) {
@@ -88434,7 +88436,6 @@ ${data2.flowchartText}
     editor.input.addHandler(new OnesEditorPasteHandler(editor));
     editor.input.addHandler(new BlockLockerPasteHandler());
     editor.input.addHandler(new ListPasteHandler());
-    editor.addCustom("block-attributes-handler", () => new BlockAttributesHandler(editor));
     if (!clientType.isMobile) {
       editor.addCustom("editor-quick-menu", () => {
         var _a2;
@@ -88477,7 +88478,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.2.16-beta.1";
+    editor.version = "2.2.16-beta.2";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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