Replace Tool.extraButtons by Tool.queryExtraButtons

benlau · Mar 10, 2024 · 5a94ad1 · 5a94ad1
1 parent 4bf8c1d
commit 5a94ad1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/src/panel.ts b/src/panel.ts
@@ -216,6 +216,8 @@ export default class Panel {
     }
 
     async onLoaded() {
+        /// Triggered by DDDot.onLoad which may be called multiple times
+        /// e.g when the panel is hidden and shown again
         const {
             joplinService,
             joplinRepo,
@@ -241,9 +243,10 @@ export default class Panel {
                     key,
                     title,
                     hasView,
-                    extraButtons,
                 } = tool;
 
+                const extraButtons = await tool.queryExtraButtons();
+
                 const enabled = await tool.updateEnabledFromSetting();
 
                 if (enabled) {

diff --git a/src/tools/outline/index.ts b/src/tools/outline/index.ts
@@ -69,16 +69,25 @@ export default class OutlineTool extends Tool {
         };
     }
 
-    get extraButtons() {
-        return [
-            {
-                tooltip: t("outline.resize_to_fit_tooltip"),
-                icon: "fas fa-expand-arrows-alt",
-                message: {
-                    type: "outline.onAutoResizeClicked",
+    async queryExtraButtons() {
+        const resizeMode = await this.joplinRepo.settingsLoad(
+            OutlineResizeModeSettingKey,
+            OutlineToolResizeMode.Manual,
+        );
+
+        if (resizeMode === OutlineToolResizeMode.Manual) {
+            return [
+                {
+                    tooltip: t("outline.resize_to_fit_tooltip"),
+                    icon: "fas fa-expand-arrows-alt",
+                    message: {
+                        type: "outline.onAutoResizeClicked",
+                    },
                 },
-            },
-        ];
+            ];
+        }
+
+        return [];
     }
 
     @blockDisabled

diff --git a/src/tools/shortcuts/index.ts b/src/tools/shortcuts/index.ts
@@ -128,7 +128,7 @@ export default class Shortcuts extends Tool {
         return t("shortcuts.title");
     }
 
-    get extraButtons() {
+    async queryExtraButtons() {
         return [
             {
                 tooltip: t("shortcuts.import_export_tooltip"),

diff --git a/src/tools/tool.ts b/src/tools/tool.ts
@@ -62,16 +62,16 @@ export default class Tool {
         return true;
     }
 
-    get extraButtons(): ToolButton[] {
-        return [];
-    }
-
     async updateEnabledFromSetting() {
         const res = await this.joplinRepo.settingsLoad(this.genSettingKey("enabled"), true);
         this.isEnabled = res as Boolean;
         return res;
     }
 
+    async queryExtraButtons(): Promise<ToolButton[]> {
+        return [];
+    }
+
     genSettingKey(key: string) {
         return `dddot.settings.${this.key}.${key}`;
     }