From 9ed36d93b4af4adb4801c0c175d8e83c160c2bf4 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 12 Jul 2019 19:48:11 +0200 Subject: [PATCH] MIGRATE more components to improved Tooltip --- .../contexts/src/manager/components/ToolBarMenu.tsx | 6 +++--- lib/components/src/index.ts | 2 +- .../src/tooltip/TooltipMessage.stories.tsx | 2 +- lib/ui/src/components/sidebar/SidebarHeading.js | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/contexts/src/manager/components/ToolBarMenu.tsx b/addons/contexts/src/manager/components/ToolBarMenu.tsx index 1054bddf83e..dc19a6fccf7 100644 --- a/addons/contexts/src/manager/components/ToolBarMenu.tsx +++ b/addons/contexts/src/manager/components/ToolBarMenu.tsx @@ -1,5 +1,5 @@ import React, { ComponentProps } from 'react'; -import { Icons, IconButton, WithTooltip, TabButton } from '@storybook/components'; +import { Icons, IconButton, WithTooltipPure, TabButton } from '@storybook/components'; import { ToolBarMenuOptions } from './ToolBarMenuOptions'; import { ContextNode, FCNoChildren } from '../../shared/types.d'; @@ -20,7 +20,7 @@ export const ToolBarMenu: ToolBarMenu = ({ setExpanded, optionsProps, }) => ( - {title} )} - + ); diff --git a/lib/components/src/index.ts b/lib/components/src/index.ts index c986162212d..9d59301baed 100644 --- a/lib/components/src/index.ts +++ b/lib/components/src/index.ts @@ -16,7 +16,7 @@ export { Button } from './Button/Button'; export { Form } from './form/index'; // Tooltips -export { WithTooltip } from './tooltip/WithTooltip'; +export { WithTooltip, WithTooltipPure } from './tooltip/WithTooltip'; export { TooltipMessage } from './tooltip/TooltipMessage'; export { TooltipNote } from './tooltip/TooltipNote'; export { TooltipLinkList } from './tooltip/TooltipLinkList'; diff --git a/lib/components/src/tooltip/TooltipMessage.stories.tsx b/lib/components/src/tooltip/TooltipMessage.stories.tsx index c7fd4efa3dc..747b4790d05 100644 --- a/lib/components/src/tooltip/TooltipMessage.stories.tsx +++ b/lib/components/src/tooltip/TooltipMessage.stories.tsx @@ -7,7 +7,7 @@ import { TooltipMessage } from './TooltipMessage'; storiesOf('basics/Tooltip/TooltipMessage', module) .addDecorator(storyFn => (
- +
Tooltip
diff --git a/lib/ui/src/components/sidebar/SidebarHeading.js b/lib/ui/src/components/sidebar/SidebarHeading.js index 5bc6faab3d6..8d8021757b6 100644 --- a/lib/ui/src/components/sidebar/SidebarHeading.js +++ b/lib/ui/src/components/sidebar/SidebarHeading.js @@ -100,7 +100,6 @@ const Brand = withTheme(({ theme: { brand: { title = 'Storybook', url = './', im }); const SidebarHeading = ({ menuHighlighted, menu, ...props }) => { - const [tooltipShown, onVisibilityChange] = useState(false); return ( @@ -110,16 +109,17 @@ const SidebarHeading = ({ menuHighlighted, menu, ...props }) => { ( ({ ...i, - onClick: (...args) => onVisibilityChange(false) || i.onClick(...args), + onClick: (...args) => { + i.onClick(...args); + onHide(); + }, }))} /> - } + )} closeOnClick >