Merge pull request #19959 from storybookjs/tom/sb-773-docs2-toolbar-i…

…tems-changed-in-docs-mode

Return to filtering toolbars in docs mode, but don't filter menu

code/ui/blocks/src/components/Toolbar.tsx

@@ -1,13 +1,7 @@
 import type { FC, MouseEvent } from 'react';
 import React, { Fragment } from 'react';
 import { styled } from '@storybook/theming';
-import {
-  FlexBar,
-  Icons,
-  IconButton,
-  IconButtonSkeleton,
-  getStoryHref,
-} from '@storybook/components';
+import { FlexBar, Icons, IconButton, IconButtonSkeleton } from '@storybook/components';
 
 interface ZoomProps {
   zoom: (val: number) => void;
@@ -64,17 +58,6 @@ const Zoom: FC<ZoomProps> = ({ zoom, resetZoom }) => (
   </>
 );
 
-const Eject: FC<EjectProps> = ({ baseUrl, storyId }) => (
-  <IconButton
-    key="opener"
-    href={getStoryHref(baseUrl, storyId)}
-    target="_blank"
-    title="Open canvas in new tab"
-  >
-    <Icons icon="share" />
-  </IconButton>
-);
-
 const Bar = styled(FlexBar)({
   position: 'absolute',
   left: 0,
@@ -99,8 +82,5 @@ export const Toolbar: FC<ToolbarProps> = ({
         <Zoom {...{ zoom, resetZoom }} />
       )}
     </Fragment>
-    <Fragment key="right">
-      {storyId && (isLoading ? <IconButtonSkeleton /> : <Eject {...{ storyId, baseUrl }} />)}
-    </Fragment>
   </Bar>
 );

code/ui/manager/src/components/preview/toolbar.tsx

@@ -141,7 +141,7 @@ const useTools = (
   );
 
   return useMemo(() => {
-    return entry?.type === 'story'
+    return ['story', 'docs'].includes(entry?.type)
       ? filterTools(tools, toolsExtra, tabs, {
           viewMode,
           entry,

code/ui/manager/src/components/preview/tools/menu.tsx

@@ -12,7 +12,7 @@ const menuMapper = ({ api, state }: Combo) => ({
 export const menuTool: Addon = {
   title: 'menu',
   id: 'menu',
-  match: ({ viewMode }) => viewMode === 'story',
+  match: ({ viewMode }) => ['story', 'docs'].includes(viewMode),
   render: () => (
     <Consumer filter={menuMapper}>
       {({ isVisible, toggle, singleStory }) =>