Refactor ToolbarMenuList component to remove deprecated showName prop…

…erty and update title handling
storybookjs · Mar 31, 2023 · 23e9b51 · 23e9b51
1 parent 9f68b5d
commit 23e9b51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/code/addons/toolbars/src/components/ToolbarMenuList.tsx b/code/addons/toolbars/src/components/ToolbarMenuList.tsx
@@ -17,7 +17,7 @@ export const ToolbarMenuList: FC<ToolbarMenuListProps> = withKeyboardCycle(
     id,
     name,
     description,
-    toolbar: { icon: _icon, items, title: _title, showName, preventDynamicIcon, dynamicTitle },
+    toolbar: { icon: _icon, items, title: _title, preventDynamicIcon, dynamicTitle },
   }) => {
     const [globals, updateGlobals] = useGlobals();
     const [isTooltipVisible, setIsTooltipVisible] = useState(false);
@@ -32,12 +32,12 @@ export const ToolbarMenuList: FC<ToolbarMenuListProps> = withKeyboardCycle(
     }
 
     // Deprecation support for old "name of global arg used as title"
-    if (showName && !title) {
+    if (!title) {
       title = name;
       deprecate(
         '`showName` is deprecated as `name` will stop having dual purposes in the future. Please specify a `title` in `globalTypes` instead.'
       );
-    } else if (!showName && !icon && !title) {
+    } else if (!icon && !title) {
       title = name;
       deprecate(
         `Using the \`name\` "${name}" as toolbar title for backward compatibility. \`name\` will stop having dual purposes in the future. Please specify either a \`title\` or an \`icon\` in \`globalTypes\` instead.`

diff --git a/code/addons/toolbars/src/types.ts b/code/addons/toolbars/src/types.ts
@@ -31,8 +31,6 @@ export interface NormalizedToolbarConfig {
   preventDynamicIcon?: boolean;
   items: ToolbarItem[];
   shortcuts?: ToolbarShortcuts;
-  /** @deprecated "name" no longer dual purposes as title - use "title" if a title is wanted */
-  showName?: boolean;
   /** Change title based on selected value */
   dynamicTitle?: boolean;
 }