Use false in order to hide toolbox

codex-team · Jul 31, 2020 · 9d0d169 · 9d0d169
1 parent 36ccfef
commit 9d0d169
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/components/modules/renderer.ts b/src/components/modules/renderer.ts
@@ -91,7 +91,7 @@ export default class Renderer extends Module {
         const toolToolboxSettings = (Tools.unavailable[tool] as BlockToolConstructable).toolbox;
         const userToolboxSettings = Tools.getToolSettings(tool).toolbox;
 
-        stubData.title = toolToolboxSettings.title || userToolboxSettings.title || stubData.title;
+        stubData.title = toolToolboxSettings.title || (userToolboxSettings && userToolboxSettings.title) || stubData.title;
       }
 
       const stub = BlockManager.insert({

diff --git a/src/components/modules/toolbar/toolbox.ts b/src/components/modules/toolbar/toolbox.ts
@@ -183,16 +183,16 @@ export default class Toolbox extends Module {
     //   return;
     // }
 
-    const userToolboxSettings = this.Editor.Tools.getToolSettings(toolName)[userSettings.TOOLBOX] || {};
+    const userToolboxSettings = this.Editor.Tools.getToolSettings(toolName)[userSettings.TOOLBOX];
 
-    if (userToolboxSettings.hidden === undefined ? toolToolboxSettings.hidden : userToolboxSettings.hidden === true) {
+    if ((userToolboxSettings ?? toolToolboxSettings) === false) {
       return;
     }
 
     const button = $.make('li', [ this.CSS.toolboxButton ]);
 
     button.dataset.tool = toolName;
-    button.innerHTML = userToolboxSettings.icon || toolToolboxSettings.icon;
+    button.innerHTML = (userToolboxSettings && userToolboxSettings.icon) || toolToolboxSettings.icon;
 
     $.append(this.nodes.toolbox, button);
 

diff --git a/types/tools/tool-settings.d.ts b/types/tools/tool-settings.d.ts
@@ -14,11 +14,6 @@ export interface ToolboxConfig {
    * HTML string with an icon for Toolbox
    */
   icon?: string;
-
-  /**
-   * Hide from tool box, but load the tool
-   */
-  hidden?: boolean;
 }
 
 /**
@@ -50,5 +45,5 @@ export interface ToolSettings {
   /**
    * Tool's Toolbox settings
    */
-  toolbox?: ToolboxConfig;
+  toolbox?: ToolboxConfig | false;
 }