@ones-editor/editor 2.2.14-beta.7 → 2.2.14-beta.8

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

@@ -20,7 +20,7 @@ export declare class TextColorItem extends TypedEmitter<ColorPaletteEvents> impl
     latestColors: Colors;
     private currentTextColors;
     constructor(editor: OnesEditor, storageName?: string);
-    getColorsFromLocalStorage(): Colors;
+    updateLatestColorFromCache(): Colors;
     destroy(): void;
     handlePaletteClick: (type: ColorAction, value: number) => void;
     handleButtonClick: (event: MouseEvent) => void;

package/dist/index.js

@@ -41846,6 +41846,7 @@ ${codeText}
   }
   const textColorItem = "";
   const DEFAULT_BG_COLOR = 2;
+  const NULLABLE_COLOR = -1;
   class TextColorItem extends tinyTypedEmitter.TypedEmitter {
     constructor(editor, storageName = "color-item") {
       super();
@@ -41903,16 +41904,15 @@ ${codeText}
             this.latestColors[0] = null;
           } else if (value === ColorClearActions.clearBackground) {
             this.latestColors[1] = null;
-          }
-        }
-        if (value === ColorClearActions.clearColor || value === ColorClearActions.clearBackground) {
-          if (this.latestColors.every((color) => color === null)) {
-            this.latestColors[1] = DEFAULT_BG_COLOR;
+          } else {
+            this.latestColors = [null, null];
           }
         }
         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()) || "");
+        const colorIdx = (_a = this.latestColors[0]) != null ? _a : NULLABLE_COLOR;
+        const bgColorIdx = (_b = this.latestColors[1]) != null ? _b : NULLABLE_COLOR;
+        this.editor.settingsProvider.setItem(`${this.storageName}-color`, `${colorIdx}`);
+        this.editor.settingsProvider.setItem(`${this.storageName}-backgroundColor`, `${bgColorIdx}`);
       });
       __publicField(this, "beforePopup", () => {
         this.updatePaletteColor();
@@ -41925,24 +41925,24 @@ ${codeText}
       this.children.push(this.colorPaletteItem);
       this.element = createColorButton();
       this.element.addEventListener("click", this.handleButtonClick);
-      const existColors = this.getColorsFromLocalStorage();
-      this.latestColors = existColors;
-      this.setCurrentButtonColor(this.latestColors);
       this.element.setAttribute(`data-editor-tooltip-${editor.clientId}`, this.name);
     }
-    getColorsFromLocalStorage() {
-      const colors = [null, null];
+    updateLatestColorFromCache() {
       const color = Number.parseInt(this.editor.settingsProvider.getItem(`${this.storageName}-color`) || "", 10);
       const backgroundColor = Number.parseInt(this.editor.settingsProvider.getItem(`${this.storageName}-backgroundColor`) || "", 10);
+      if ([color, backgroundColor].every(Number.isNaN)) {
+        const defaultColors = [null, DEFAULT_BG_COLOR];
+        this.latestColors = defaultColors;
+        return defaultColors;
+      }
+      const colors = [null, null];
       if (!Number.isNaN(color)) {
-        colors[0] = color;
+        colors[0] = color === NULLABLE_COLOR ? null : color;
       }
       if (!Number.isNaN(backgroundColor)) {
-        colors[1] = backgroundColor;
-      }
-      if (colors.every((c) => c === null)) {
-        colors[1] = DEFAULT_BG_COLOR;
+        colors[1] = backgroundColor === NULLABLE_COLOR ? null : backgroundColor;
       }
+      this.latestColors = colors;
       return colors;
     }
     destroy() {
@@ -41951,8 +41951,9 @@ ${codeText}
       this.removeAllListeners();
     }
     updatePaletteColor() {
-      this.colorPaletteItem.palette.setColor("color", null);
-      this.colorPaletteItem.palette.setColor("backgroundColor", null);
+      const [color, backgroundColor] = this.latestColors;
+      this.colorPaletteItem.palette.setColor("color", color);
+      this.colorPaletteItem.palette.setColor("backgroundColor", backgroundColor);
     }
     setCurrentTextColors(colors) {
       this.currentTextColors = colors;
@@ -60588,7 +60589,7 @@ $$${mathData.mathjaxText}$$
       __publicField(this, "updateButtonColor", (range) => {
         const currentTextColor = editorRangeGetColor(this.editor, range, this.getEmptyTextBlockColor);
         this.colorItem.setCurrentTextColors(currentTextColor);
-        const lastButtonColor = this.colorItem.getColorsFromLocalStorage();
+        const lastButtonColor = this.colorItem.updateLatestColorFromCache();
         this.colorItem.setCurrentButtonColor(lastButtonColor);
       });
       __publicField(this, "setActiveAttribute", (type, value) => {
@@ -88830,7 +88831,7 @@ ${data2.plantumlText}
         }
       }
     });
-    editor.version = "2.2.14-beta.7";
+    editor.version = "2.2.14-beta.8";
     return editor;
   }
   function isDoc(doc2) {
@@ -88931,7 +88932,7 @@ ${data2.plantumlText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "2.2.14-beta.7";
+    editor.version = "2.2.14-beta.8";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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