diff --git a/packages/react/src/Column/Column.test.tsx b/packages/react/src/Column/Column.test.tsx index f81fb12027..76a3f98c52 100644 --- a/packages/react/src/Column/Column.test.tsx +++ b/packages/react/src/Column/Column.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react' import { createRef } from 'react' import { Column, columnGapSizes } from './Column' -import { crossAlignOptionsForColumn, mainAlignOptions } from '../common/layout' +import { crossAlignOptionsForColumn, mainAlignOptions } from '../common/types' import '@testing-library/jest-dom' describe('Column', () => { diff --git a/packages/react/src/Column/Column.tsx b/packages/react/src/Column/Column.tsx index fd0e7c584b..1bceefda2e 100644 --- a/packages/react/src/Column/Column.tsx +++ b/packages/react/src/Column/Column.tsx @@ -6,7 +6,7 @@ import clsx from 'clsx' import { forwardRef } from 'react' import type { HTMLAttributes, PropsWithChildren } from 'react' -import type { CrossAlignForColumn, MainAlign } from '../common/layout' +import type { CrossAlignForColumn, MainAlign } from '../common/types' export const columnGapSizes = ['none', 'extra-small', 'small', 'large', 'extra-large'] as const diff --git a/packages/react/src/Row/Row.test.tsx b/packages/react/src/Row/Row.test.tsx index 4aae85a7fe..3a9082708e 100644 --- a/packages/react/src/Row/Row.test.tsx +++ b/packages/react/src/Row/Row.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react' import { createRef } from 'react' import { Row, rowGapSizes } from './Row' -import { crossAlignOptions, mainAlignOptions } from '../common/layout' +import { crossAlignOptions, mainAlignOptions } from '../common/types' import '@testing-library/jest-dom' describe('Row', () => { diff --git a/packages/react/src/Row/Row.tsx b/packages/react/src/Row/Row.tsx index 446829799a..b1f6be9e07 100644 --- a/packages/react/src/Row/Row.tsx +++ b/packages/react/src/Row/Row.tsx @@ -6,7 +6,7 @@ import clsx from 'clsx' import { forwardRef } from 'react' import type { HTMLAttributes, PropsWithChildren } from 'react' -import type { CrossAlign, MainAlign } from '../common/layout' +import type { CrossAlign, MainAlign } from '../common/types' export const rowGapSizes = ['none', 'extra-small', 'small', 'large', 'extra-large'] as const diff --git a/packages/react/src/common/aspectRatio.ts b/packages/react/src/common/aspectRatio.ts deleted file mode 100644 index ed16b5a14e..0000000000 --- a/packages/react/src/common/aspectRatio.ts +++ /dev/null @@ -1,4 +0,0 @@ -export type AspectRatioProps = { - /** The aspect ratio to display media content in. */ - aspectRatio?: 'x-tall' | 'tall' | 'square' | 'wide' | 'x-wide' | '2x-wide' -} diff --git a/packages/react/src/common/layout.ts b/packages/react/src/common/types.ts similarity index 78% rename from packages/react/src/common/layout.ts rename to packages/react/src/common/types.ts index 9b7a20f4f0..3a294b70a9 100644 --- a/packages/react/src/common/layout.ts +++ b/packages/react/src/common/types.ts @@ -1,3 +1,8 @@ +export type AspectRatioProps = { + /** The aspect ratio to display media content in. */ + aspectRatio?: 'x-tall' | 'tall' | 'square' | 'wide' | 'x-wide' | '2x-wide' +} + export const crossAlignOptions = ['start', 'center', 'baseline', 'end'] as const export type CrossAlign = (typeof crossAlignOptions)[number] diff --git a/storybook/src/components/Column/Column.stories.tsx b/storybook/src/components/Column/Column.stories.tsx index 65d8c40323..d9b595291f 100644 --- a/storybook/src/components/Column/Column.stories.tsx +++ b/storybook/src/components/Column/Column.stories.tsx @@ -5,7 +5,7 @@ import { Card, Heading, Paragraph } from '@amsterdam/design-system-react' import { Column } from '@amsterdam/design-system-react/src' -import { crossAlignOptionsForColumn, mainAlignOptions } from '@amsterdam/design-system-react/src/common/layout' +import { crossAlignOptionsForColumn, mainAlignOptions } from '@amsterdam/design-system-react/src/common/types' import { Meta, StoryObj } from '@storybook/react' const ThreeItems = [ diff --git a/storybook/src/components/Row/Row.stories.tsx b/storybook/src/components/Row/Row.stories.tsx index 9296559050..2b962f4a5a 100644 --- a/storybook/src/components/Row/Row.stories.tsx +++ b/storybook/src/components/Row/Row.stories.tsx @@ -5,7 +5,7 @@ import { Avatar, Heading, Link } from '@amsterdam/design-system-react' import { Row } from '@amsterdam/design-system-react/src' -import { crossAlignOptions, mainAlignOptions } from '@amsterdam/design-system-react/src/common/layout' +import { crossAlignOptions, mainAlignOptions } from '@amsterdam/design-system-react/src/common/types' import { Meta, StoryObj } from '@storybook/react' const ThreeItems = [