From ded0491c61f95fc554daed14b9e970944221c403 Mon Sep 17 00:00:00 2001 From: Doug MacKenzie Date: Tue, 25 Feb 2025 14:44:15 +1100 Subject: [PATCH] Move Focusable to main entry point --- .../subcomponents => }/Focusable/Focusable.module.scss | 0 .../Tooltip/subcomponents => }/Focusable/Focusable.tsx | 0 .../subcomponents => }/Focusable/_docs/ApiSpecification.mdx | 6 +++--- .../Focusable/_docs/Focusable.stories.tsx | 2 +- .../{__next__/Tooltip/subcomponents => }/Focusable/index.ts | 0 .../src/__next__/Tooltip/_docs/Tooltip.docs.stories.tsx | 3 ++- .../src/__next__/Tooltip/_docs/Tooltip.spec.stories.tsx | 3 ++- .../src/__next__/Tooltip/_docs/Tooltip.stories.tsx | 3 ++- packages/components/src/__next__/Tooltip/index.ts | 1 - packages/components/src/__next__/index.ts | 4 ++++ 10 files changed, 14 insertions(+), 8 deletions(-) rename packages/components/src/{__next__/Tooltip/subcomponents => }/Focusable/Focusable.module.scss (100%) rename packages/components/src/{__next__/Tooltip/subcomponents => }/Focusable/Focusable.tsx (100%) rename packages/components/src/{__next__/Tooltip/subcomponents => }/Focusable/_docs/ApiSpecification.mdx (79%) rename packages/components/src/{__next__/Tooltip/subcomponents => }/Focusable/_docs/Focusable.stories.tsx (89%) rename packages/components/src/{__next__/Tooltip/subcomponents => }/Focusable/index.ts (100%) diff --git a/packages/components/src/__next__/Tooltip/subcomponents/Focusable/Focusable.module.scss b/packages/components/src/Focusable/Focusable.module.scss similarity index 100% rename from packages/components/src/__next__/Tooltip/subcomponents/Focusable/Focusable.module.scss rename to packages/components/src/Focusable/Focusable.module.scss diff --git a/packages/components/src/__next__/Tooltip/subcomponents/Focusable/Focusable.tsx b/packages/components/src/Focusable/Focusable.tsx similarity index 100% rename from packages/components/src/__next__/Tooltip/subcomponents/Focusable/Focusable.tsx rename to packages/components/src/Focusable/Focusable.tsx diff --git a/packages/components/src/__next__/Tooltip/subcomponents/Focusable/_docs/ApiSpecification.mdx b/packages/components/src/Focusable/_docs/ApiSpecification.mdx similarity index 79% rename from packages/components/src/__next__/Tooltip/subcomponents/Focusable/_docs/ApiSpecification.mdx rename to packages/components/src/Focusable/_docs/ApiSpecification.mdx index c4f7b6bfe0d..a938b927f18 100644 --- a/packages/components/src/__next__/Tooltip/subcomponents/Focusable/_docs/ApiSpecification.mdx +++ b/packages/components/src/Focusable/_docs/ApiSpecification.mdx @@ -2,18 +2,18 @@ import { Canvas, Controls, Meta } from '@storybook/blocks' import { KAIOInstallation, ResourceLinks } from '~storybook/components' import * as exampleStories from './Focusable.stories' - + # Focusable API Specification Updated June 25, 2024 - + ## Overview diff --git a/packages/components/src/__next__/Tooltip/subcomponents/Focusable/_docs/Focusable.stories.tsx b/packages/components/src/Focusable/_docs/Focusable.stories.tsx similarity index 89% rename from packages/components/src/__next__/Tooltip/subcomponents/Focusable/_docs/Focusable.stories.tsx rename to packages/components/src/Focusable/_docs/Focusable.stories.tsx index 5ca427a029c..3abe9f71f87 100644 --- a/packages/components/src/__next__/Tooltip/subcomponents/Focusable/_docs/Focusable.stories.tsx +++ b/packages/components/src/Focusable/_docs/Focusable.stories.tsx @@ -4,7 +4,7 @@ import { Tag } from '~components/__next__/Tag' import { Focusable } from '../index' const meta = { - title: 'Components/Tooltip/Tooltip (next)/Focusable', + title: 'Components/Focusable', component: Focusable, parameters: { layout: 'centered', diff --git a/packages/components/src/__next__/Tooltip/subcomponents/Focusable/index.ts b/packages/components/src/Focusable/index.ts similarity index 100% rename from packages/components/src/__next__/Tooltip/subcomponents/Focusable/index.ts rename to packages/components/src/Focusable/index.ts diff --git a/packages/components/src/__next__/Tooltip/_docs/Tooltip.docs.stories.tsx b/packages/components/src/__next__/Tooltip/_docs/Tooltip.docs.stories.tsx index da4deceb0c6..6b063cb6034 100644 --- a/packages/components/src/__next__/Tooltip/_docs/Tooltip.docs.stories.tsx +++ b/packages/components/src/__next__/Tooltip/_docs/Tooltip.docs.stories.tsx @@ -3,11 +3,12 @@ import { type Meta, type StoryObj } from '@storybook/react' import isChromatic from 'chromatic' import { Button, IconButton } from '~components/Button' import { FieldMessage } from '~components/FieldMessage' +import { Focusable } from '~components/Focusable' import { Input } from '~components/Input' import { Label } from '~components/Label' import { Text } from '~components/Text' import { Icon } from '~components/__next__/Icon' -import { Focusable, Tooltip, TooltipTrigger } from '../index' +import { Tooltip, TooltipTrigger } from '../index' import * as TestStories from './Tooltip.spec.stories' const meta = { diff --git a/packages/components/src/__next__/Tooltip/_docs/Tooltip.spec.stories.tsx b/packages/components/src/__next__/Tooltip/_docs/Tooltip.spec.stories.tsx index c02629a97fb..d927063fd30 100644 --- a/packages/components/src/__next__/Tooltip/_docs/Tooltip.spec.stories.tsx +++ b/packages/components/src/__next__/Tooltip/_docs/Tooltip.spec.stories.tsx @@ -3,11 +3,12 @@ import { type Meta, type StoryObj } from '@storybook/react' import { expect, userEvent, waitFor, within } from '@storybook/test' import isChromatic from 'chromatic' import { Button, IconButton } from '~components/Button' +import { Focusable } from '~components/Focusable' import { Tab, TabList, TabPanel, TabPanels, Tabs } from '~components/Tabs' import { Text } from '~components/Text' import { Icon } from '~components/__next__/Icon' import { Tag } from '~components/__next__/Tag' -import { Focusable, Tooltip, TooltipTrigger } from '../index' +import { Tooltip, TooltipTrigger } from '../index' const meta = { title: 'Components/Tooltip/Tooltip (next)/Tests', diff --git a/packages/components/src/__next__/Tooltip/_docs/Tooltip.stories.tsx b/packages/components/src/__next__/Tooltip/_docs/Tooltip.stories.tsx index 57b5e1ae3cc..61c3b6d2e81 100644 --- a/packages/components/src/__next__/Tooltip/_docs/Tooltip.stories.tsx +++ b/packages/components/src/__next__/Tooltip/_docs/Tooltip.stories.tsx @@ -2,8 +2,9 @@ import React, { type FunctionComponent } from 'react' import { type Meta, type StoryObj } from '@storybook/react' import isChromatic from 'chromatic' import { Button } from '~components/Button' +import { Focusable } from '~components/Focusable' import { Tag } from '~components/__next__' -import { Focusable, Tooltip, TooltipTrigger } from '../index' +import { Tooltip, TooltipTrigger } from '../index' import * as testStories from './Tooltip.spec.stories' const meta = { diff --git a/packages/components/src/__next__/Tooltip/index.ts b/packages/components/src/__next__/Tooltip/index.ts index b86d72403b6..cdd0ab87cc3 100644 --- a/packages/components/src/__next__/Tooltip/index.ts +++ b/packages/components/src/__next__/Tooltip/index.ts @@ -1,3 +1,2 @@ export * from './Tooltip' export * from './TooltipTrigger' -export * from './subcomponents/Focusable' diff --git a/packages/components/src/__next__/index.ts b/packages/components/src/__next__/index.ts index 7563b2b2972..c3639bb6174 100644 --- a/packages/components/src/__next__/index.ts +++ b/packages/components/src/__next__/index.ts @@ -5,3 +5,7 @@ export * from './Select' export * from './Tag' export * from './Tabs' export * from './Tooltip' + +// This Focusable component was originally exported from here, but since moved to the main entry point because there's no name clash. +// This is just here to keep backwards compatibility until the 2.0 release +export * from '../Focusable'