@ones-editor/editor 2.1.8-beta.10 → 2.1.8-beta.12

package/@ones-editor/ui-base/src/color-button/text-color-item.d.ts

@@ -28,5 +28,6 @@ export declare class TextColorItem extends TypedEmitter<ColorPaletteEvents> impl
     beforePopup: () => void;
     updatePaletteColor(): void;
     setCurrentTextColors(colors: [number | null, number | null]): void;
+    setCurrentButtonColor(colors: [number | null, number | null]): void;
 }
 export {};

package/dist/index.js

@@ -39087,7 +39087,7 @@ ${codeText}
   const zhCN$w = {
     colorPalette: {
       colorDesc: "\u5B57\u4F53\u989C\u8272",
-      name: "\u6587\u672C\u989C\u8272",
+      name: "\u5B57\u4F53\u989C\u8272",
       backgroundDesc: "\u80CC\u666F\u989C\u8272",
       reset: "\u6062\u590D\u9ED8\u8BA4",
       more: "\u66F4\u591A\u989C\u8272"
@@ -39151,7 +39151,7 @@ ${codeText}
   const jaJP$w = {
     colorPalette: {
       colorDesc: "\u30D5\u30A9\u30F3\u30C8\u306E\u8272",
-      name: "\u30C6\u30AD\u30B9\u30C8\u306E\u8272",
+      name: "\u30D5\u30A9\u30F3\u30C8\u306E\u8272",
       backgroundDesc: "\u80CC\u666F\u8272",
       reset: "\u30C7\u30D5\u30A9\u30EB\u30C8\u306B\u623B\u3059",
       more: "\u305D\u306E\u4ED6\u306E\u8272"
@@ -41572,7 +41572,7 @@ ${codeText}
             this.latestColors[1] = DEFAULT_BG_COLOR;
           }
         }
-        setColorButtonColor(this.element, this.latestColors);
+        this.setCurrentButtonColor(this.latestColors);
         this.editor.settingsProvider.setItem(`${this.storageName}-color`, ((_a = this.latestColors[0]) == null ? void 0 : _a.toString()) || "");
         this.editor.settingsProvider.setItem(`${this.storageName}-backgroundColor`, ((_b = this.latestColors[1]) == null ? void 0 : _b.toString()) || "");
       });
@@ -41589,7 +41589,7 @@ ${codeText}
       this.element.addEventListener("click", this.handleButtonClick);
       const existColors = this.getColorsFromLocalStorage();
       this.latestColors = existColors;
-      setColorButtonColor(this.element, this.latestColors);
+      this.setCurrentButtonColor(this.latestColors);
       this.element.setAttribute(`data-editor-tooltip-${editor.clientId}`, this.name);
     }
     getColorsFromLocalStorage() {
@@ -41615,7 +41615,9 @@ ${codeText}
     }
     setCurrentTextColors(colors) {
       this.currentTextColors = colors;
-      setColorButtonColor(this.element, this.currentTextColors);
+    }
+    setCurrentButtonColor(colors) {
+      setColorButtonColor(this.element, colors);
     }
   }
   const input = "";
@@ -59442,9 +59444,11 @@ $$${mathData.mathjaxText}$$
         setColorToAttributes(attributes, type, value);
         (_c = this.blockAttributesHandler) == null ? void 0 : _c.setEmptyBlockTextAttributes(blockId, attributes);
       });
-      __publicField(this, "updateButtonColor", () => {
-        const colors = this.colorItem.getColorsFromLocalStorage();
-        this.colorItem.setCurrentTextColors(colors);
+      __publicField(this, "updateButtonColor", (range) => {
+        const currentTextColor = editorRangeGetColor(this.editor, range, this.getEmptyTextBlockColor);
+        this.colorItem.setCurrentTextColors(currentTextColor);
+        const lastButtonColor = this.colorItem.getColorsFromLocalStorage();
+        this.colorItem.setCurrentButtonColor(lastButtonColor);
       });
       __publicField(this, "setActiveAttribute", (type, value) => {
         if (type === "color" || type === "backgroundColor") {
@@ -59490,7 +59494,7 @@ $$${mathData.mathjaxText}$$
       if (disable && (params == null ? void 0 : params.isFilter)) {
         return [];
       }
-      this.updateButtonColor();
+      this.updateButtonColor(range);
       return [{ ...this.colorItem, states: disable ? ["disabled"] : [], childrenPlacement: "bottom" }];
     }
     getInsertCommands() {
@@ -87774,7 +87778,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.8-beta.10";
+    editor.version = "2.1.8-beta.12";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -87875,7 +87879,7 @@ ${data2.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.1.8-beta.10";
+    editor.version = "2.1.8-beta.12";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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