From a32ce3af5757be73e3d3742045f0cfa54392fca4 Mon Sep 17 00:00:00 2001 From: Charles de Dreuille Date: Wed, 17 Dec 2025 20:40:02 +0000 Subject: [PATCH] Fixes types Signed-off-by: Charles de Dreuille --- .../src/components/ButtonLink/ButtonLink.stories.tsx | 6 ++---- packages/ui/src/components/Dialog/Dialog.stories.tsx | 5 ++--- packages/ui/src/components/Header/Header.stories.tsx | 6 ++---- .../src/components/HeaderPage/HeaderPage.stories.tsx | 10 ++-------- packages/ui/src/components/Link/Link.stories.tsx | 6 ++---- packages/ui/src/components/Menu/Menu.stories.tsx | 5 +---- .../src/components/Menu/MenuAutocomplete.stories.tsx | 5 +---- .../Menu/MenuAutocompleteListBox.stories.tsx | 5 +---- .../ui/src/components/Menu/MenuListBox.stories.tsx | 5 +---- .../src/components/SearchField/SearchField.stories.tsx | 5 +---- packages/ui/src/components/Select/Select.stories.tsx | 6 ++---- packages/ui/src/components/Table/Table.stories.tsx | 6 ++---- packages/ui/src/components/Tabs/Tabs.stories.tsx | 6 ++---- .../ui/src/components/TagGroup/TagGroup.stories.tsx | 5 +---- packages/ui/src/components/Text/Text.stories.tsx | 5 +---- packages/ui/src/components/Tooltip/Tooltip.stories.tsx | 9 ++------- 16 files changed, 25 insertions(+), 70 deletions(-) diff --git a/packages/ui/src/components/ButtonLink/ButtonLink.stories.tsx b/packages/ui/src/components/ButtonLink/ButtonLink.stories.tsx index c08cdddf7d..4b9b9b747c 100644 --- a/packages/ui/src/components/ButtonLink/ButtonLink.stories.tsx +++ b/packages/ui/src/components/ButtonLink/ButtonLink.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2024 The Backstage Authors * @@ -15,7 +14,8 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ -import type { StoryFn, StoryObj } from '@storybook/react-vite'; +import preview from '../../../../../.storybook/preview'; +import type { StoryFn } from '@storybook/react-vite'; import { ButtonLink } from './ButtonLink'; import { Flex } from '../Flex'; import { MemoryRouter } from 'react-router-dom'; @@ -43,8 +43,6 @@ const meta = preview.meta({ }, }); -type Story = StoryObj; - export const Default = meta.story({ args: { children: 'Button', diff --git a/packages/ui/src/components/Dialog/Dialog.stories.tsx b/packages/ui/src/components/Dialog/Dialog.stories.tsx index 979dc987ec..7c7edc1801 100644 --- a/packages/ui/src/components/Dialog/Dialog.stories.tsx +++ b/packages/ui/src/components/Dialog/Dialog.stories.tsx @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import preview from '../../../../../.storybook/preview'; import { Dialog, @@ -61,12 +62,10 @@ export const Default = meta.story({ }, }); -export const Open = meta.story({ +export const Open = Default.extend({ args: { - ...Default.input.args, defaultOpen: true, }, - render: Default.input.render, }); export const NoTrigger = meta.story({ diff --git a/packages/ui/src/components/Header/Header.stories.tsx b/packages/ui/src/components/Header/Header.stories.tsx index 57cc58ed57..7d1aa3a00a 100644 --- a/packages/ui/src/components/Header/Header.stories.tsx +++ b/packages/ui/src/components/Header/Header.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2025 The Backstage Authors * @@ -15,7 +14,8 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ -import type { StoryObj, StoryFn } from '@storybook/react-vite'; +import preview from '../../../../../.storybook/preview'; +import type { StoryFn } from '@storybook/react-vite'; import { Header } from './Header'; import type { HeaderTab } from './types'; import { @@ -45,8 +45,6 @@ const meta = preview.meta({ }, }); -type Story = StoryObj; - const withRouter = (Story: StoryFn) => ( diff --git a/packages/ui/src/components/HeaderPage/HeaderPage.stories.tsx b/packages/ui/src/components/HeaderPage/HeaderPage.stories.tsx index 04a190c7e9..eeb6f6e56d 100644 --- a/packages/ui/src/components/HeaderPage/HeaderPage.stories.tsx +++ b/packages/ui/src/components/HeaderPage/HeaderPage.stories.tsx @@ -15,7 +15,7 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ -import type { StoryObj, StoryFn } from '@storybook/react-vite'; +import type { StoryFn } from '@storybook/react-vite'; import { HeaderPage } from './HeaderPage'; import type { HeaderTab } from '../Header/types'; import { MemoryRouter } from 'react-router-dom'; @@ -38,8 +38,6 @@ const meta = preview.meta({ }, }); -type Story = StoryObj; - const tabs: HeaderTab[] = [ { id: 'overview', @@ -207,12 +205,8 @@ export const WithEverything = meta.story({ ), }); -export const WithLayout = meta.story({ - args: { - ...WithEverything.input.args, - }, +export const WithLayout = WithEverything.extend({ decorators: [withRouter, ...layoutDecorator], - render: WithEverything.input.render, }); export const WithTabsMatchingStrategies = meta.story({ diff --git a/packages/ui/src/components/Link/Link.stories.tsx b/packages/ui/src/components/Link/Link.stories.tsx index c24b3ed592..7d680e5616 100644 --- a/packages/ui/src/components/Link/Link.stories.tsx +++ b/packages/ui/src/components/Link/Link.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2024 The Backstage Authors * @@ -15,7 +14,8 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ -import type { StoryFn, StoryObj } from '@storybook/react-vite'; +import preview from '../../../../../.storybook/preview'; +import type { StoryFn } from '@storybook/react-vite'; import { Link } from './Link'; import { Flex } from '../Flex'; import { Text } from '../Text'; @@ -36,8 +36,6 @@ const meta = preview.meta({ ], }); -type Story = StoryObj; - export const Default = meta.story({ args: { href: '/', diff --git a/packages/ui/src/components/Menu/Menu.stories.tsx b/packages/ui/src/components/Menu/Menu.stories.tsx index ef3621eeeb..ffe184d4ae 100644 --- a/packages/ui/src/components/Menu/Menu.stories.tsx +++ b/packages/ui/src/components/Menu/Menu.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2025 The Backstage Authors * @@ -15,7 +14,7 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ -import type { StoryObj } from '@storybook/react-vite'; +import preview from '../../../../../.storybook/preview'; import { MenuTrigger, SubmenuTrigger, @@ -51,8 +50,6 @@ const meta = preview.meta({ ], }); -type Story = StoryObj; - const options = [ { label: 'Apple', value: 'apple' }, { label: 'Banana', value: 'banana' }, diff --git a/packages/ui/src/components/Menu/MenuAutocomplete.stories.tsx b/packages/ui/src/components/Menu/MenuAutocomplete.stories.tsx index f75e9d7ba3..af68ec9415 100644 --- a/packages/ui/src/components/Menu/MenuAutocomplete.stories.tsx +++ b/packages/ui/src/components/Menu/MenuAutocomplete.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2025 The Backstage Authors * @@ -15,7 +14,7 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ -import type { StoryObj } from '@storybook/react-vite'; +import preview from '../../../../../.storybook/preview'; import { MenuTrigger, SubmenuTrigger, @@ -39,8 +38,6 @@ const meta = preview.meta({ ], }); -type Story = StoryObj; - const options = [ { label: 'Apple', value: 'apple' }, { label: 'Banana', value: 'banana' }, diff --git a/packages/ui/src/components/Menu/MenuAutocompleteListBox.stories.tsx b/packages/ui/src/components/Menu/MenuAutocompleteListBox.stories.tsx index b073e68336..e1c22fbd9e 100644 --- a/packages/ui/src/components/Menu/MenuAutocompleteListBox.stories.tsx +++ b/packages/ui/src/components/Menu/MenuAutocompleteListBox.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2025 The Backstage Authors * @@ -15,7 +14,7 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ -import type { StoryObj } from '@storybook/react-vite'; +import preview from '../../../../../.storybook/preview'; import { MenuTrigger, MenuAutocompleteListbox, @@ -41,8 +40,6 @@ const meta = preview.meta({ ], }); -type Story = StoryObj; - const options = [ { label: 'Apple', value: 'apple' }, { label: 'Banana', value: 'banana' }, diff --git a/packages/ui/src/components/Menu/MenuListBox.stories.tsx b/packages/ui/src/components/Menu/MenuListBox.stories.tsx index 34a485ffeb..2297598d0c 100644 --- a/packages/ui/src/components/Menu/MenuListBox.stories.tsx +++ b/packages/ui/src/components/Menu/MenuListBox.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2025 The Backstage Authors * @@ -15,7 +14,7 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ -import type { StoryObj } from '@storybook/react-vite'; +import preview from '../../../../../.storybook/preview'; import { MenuTrigger, MenuListBox, MenuListBoxItem } from './index'; import { Button, Flex, Text } from '../..'; import { useEffect, useState } from 'react'; @@ -34,8 +33,6 @@ const meta = preview.meta({ ], }); -type Story = StoryObj; - export const Default = meta.story({ args: { children: null, diff --git a/packages/ui/src/components/SearchField/SearchField.stories.tsx b/packages/ui/src/components/SearchField/SearchField.stories.tsx index ae02bba5e8..2e07e742ad 100644 --- a/packages/ui/src/components/SearchField/SearchField.stories.tsx +++ b/packages/ui/src/components/SearchField/SearchField.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2024 The Backstage Authors * @@ -15,8 +14,8 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ +import preview from '../../../../../.storybook/preview'; import { useState } from 'react'; -import type { StoryObj } from '@storybook/react-vite'; import { SearchField } from './SearchField'; import { Form } from 'react-aria-components'; import { Flex } from '../Flex'; @@ -43,8 +42,6 @@ const meta = preview.meta({ }, }); -type Story = StoryObj; - export const Default = meta.story({ args: { name: 'url', diff --git a/packages/ui/src/components/Select/Select.stories.tsx b/packages/ui/src/components/Select/Select.stories.tsx index 752f9a1174..e3c2ad41aa 100644 --- a/packages/ui/src/components/Select/Select.stories.tsx +++ b/packages/ui/src/components/Select/Select.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2025 The Backstage Authors * @@ -14,7 +13,8 @@ import preview from '../../../../../.storybook/preview'; * See the License for the specific language governing permissions and * limitations under the License. */ -import type { StoryObj } from '@storybook/react-vite'; + +import preview from '../../../../../.storybook/preview'; import { Select } from './Select'; import { Flex } from '../Flex'; import { Form } from 'react-aria-components'; @@ -28,8 +28,6 @@ const meta = preview.meta({ }, }); -type Story = StoryObj; - const fontOptions = [ { value: 'sans', label: 'Sans-serif' }, { value: 'serif', label: 'Serif' }, diff --git a/packages/ui/src/components/Table/Table.stories.tsx b/packages/ui/src/components/Table/Table.stories.tsx index d217091722..f7687af1c3 100644 --- a/packages/ui/src/components/Table/Table.stories.tsx +++ b/packages/ui/src/components/Table/Table.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2025 The Backstage Authors * @@ -15,8 +14,9 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ +import preview from '../../../../../.storybook/preview'; import { useState } from 'react'; -import type { StoryFn, StoryObj } from '@storybook/react-vite'; +import type { StoryFn } from '@storybook/react-vite'; import { type Selection } from 'react-aria-components'; import { Table, @@ -55,8 +55,6 @@ const meta = preview.meta({ // Work in progress to fix it here - https://github.com/backstage/backstage/pull/30687 const data1 = data1Raw.slice(0, 10); -type Story = StoryObj; - export const TableOnly = meta.story({ render: () => { return ( diff --git a/packages/ui/src/components/Tabs/Tabs.stories.tsx b/packages/ui/src/components/Tabs/Tabs.stories.tsx index b60d15c0d0..2a02bedc8c 100644 --- a/packages/ui/src/components/Tabs/Tabs.stories.tsx +++ b/packages/ui/src/components/Tabs/Tabs.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2024 The Backstage Authors * @@ -15,7 +14,8 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ -import type { StoryFn, StoryObj } from '@storybook/react-vite'; +import preview from '../../../../../.storybook/preview'; +import type { StoryFn } from '@storybook/react-vite'; import { Tabs, TabList, Tab, TabPanel } from './Tabs'; import { MemoryRouter } from 'react-router-dom'; import { Box } from '../Box'; @@ -26,8 +26,6 @@ const meta = preview.meta({ component: Tabs, }); -type Story = StoryObj; - const withRouter = (Story: StoryFn) => ( diff --git a/packages/ui/src/components/TagGroup/TagGroup.stories.tsx b/packages/ui/src/components/TagGroup/TagGroup.stories.tsx index 2fd3e6013f..d33eed8bf1 100644 --- a/packages/ui/src/components/TagGroup/TagGroup.stories.tsx +++ b/packages/ui/src/components/TagGroup/TagGroup.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2025 The Backstage Authors * @@ -15,8 +14,8 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ +import preview from '../../../../../.storybook/preview'; import { useState } from 'react'; -import type { StoryObj } from '@storybook/react-vite'; import { TagGroup, Tag } from '.'; import type { Selection } from 'react-aria-components'; import { Flex } from '../../'; @@ -57,8 +56,6 @@ const meta = preview.meta({ ], }); -type Story = StoryObj; - const initialList: ListItem[] = [ { id: 'banana', name: 'Banana', icon: }, { diff --git a/packages/ui/src/components/Text/Text.stories.tsx b/packages/ui/src/components/Text/Text.stories.tsx index e6afd31ffa..09a317716a 100644 --- a/packages/ui/src/components/Text/Text.stories.tsx +++ b/packages/ui/src/components/Text/Text.stories.tsx @@ -1,4 +1,3 @@ -import preview from '../../../../../.storybook/preview'; /* * Copyright 2024 The Backstage Authors * @@ -15,7 +14,7 @@ import preview from '../../../../../.storybook/preview'; * limitations under the License. */ -import type { StoryObj } from '@storybook/react-vite'; +import preview from '../../../../../.storybook/preview'; import { Text } from './Text'; import { Flex } from '../Flex'; @@ -27,8 +26,6 @@ const meta = preview.meta({ }, }); -type Story = StoryObj; - export const Default = meta.story({ args: { children: diff --git a/packages/ui/src/components/Tooltip/Tooltip.stories.tsx b/packages/ui/src/components/Tooltip/Tooltip.stories.tsx index f0997ef7ad..a636a356ef 100644 --- a/packages/ui/src/components/Tooltip/Tooltip.stories.tsx +++ b/packages/ui/src/components/Tooltip/Tooltip.stories.tsx @@ -14,7 +14,6 @@ * limitations under the License. */ import preview from '../../../../../.storybook/preview'; -import { Placement } from '@react-types/overlays'; import { TooltipTrigger, Tooltip } from './Tooltip'; import { Button } from '../Button/Button'; @@ -29,10 +28,6 @@ const meta = preview.meta({ isDisabled: { control: { type: 'boolean' }, }, - placement: { - options: ['top', 'right', 'bottom', 'left'], - control: { type: 'inline-radio' }, - }, delay: { control: { type: 'number' }, }, @@ -40,7 +35,7 @@ const meta = preview.meta({ control: { type: 'number' }, }, }, - render: ({ children, isOpen, isDisabled, placement, delay, closeDelay }) => ( + render: ({ children, isOpen, isDisabled, delay, closeDelay }) => ( - {children ?? 'I am a tooltip'} + {children ?? 'I am a tooltip'} ), });