uikit-react-public 0.17.4 → 0.21.8

package/lib/components/Breadcrumbs/Breadcrumb.tsx

@@ -1,23 +1,24 @@
-import { memo } from 'react';
 import { css, cx } from '@emotion/css';
-import { Link, LinkProps } from '../';
-
-const NAME = 'ucl-timetable-breadcrumb';
-const ACTIVE_NAME = 'ucl-timetable-breadcrumb--active';
-const INACTIVE_NAME = 'ucl-timetable-breadcrumb--inactive';
+import Link, { LinkProps } from '../Link';
+import { memo } from 'react';
 
-export interface BreadcrumbProps extends LinkProps {
-  testId?: string;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export interface BreadcrumbProps extends Omit<LinkProps<any>, 'href' | 'to'> {
   uri: string;
   isActive?: boolean;
 }
 
+const NAME = 'ucl-uikit-breadcrumb';
+const ACTIVE_NAME = 'ucl-uikit-breadcrumb--active';
+const INACTIVE_NAME = 'ucl-uikit-breadcrumb--inactive';
+
 const Breadcrumb = ({
   testId = NAME,
   uri,
   className,
   children,
   isActive,
+  component,
   ...props
 }: BreadcrumbProps) => {
   const activeBreadcrumb =
@@ -56,23 +57,36 @@ const Breadcrumb = ({
       <span
         className={activeBreadcrumbStyle}
         data-testid={testId}
-        {...props}
       >
         {children}
       </span>
     );
-  } else {
+  }
+
+  if (component) {
     return (
       <Link
+        component={component}
         className={inactiveBreadcrumbStyle}
-        data-testid={testId}
-        href={uri}
+        testId={testId}
+        to={uri}
         {...props}
       >
         {children}
       </Link>
     );
   }
+
+  return (
+    <Link
+      className={inactiveBreadcrumbStyle}
+      testId={testId}
+      href={uri}
+      {...props}
+    >
+      {children}
+    </Link>
+  );
 };
 
 export default memo(Breadcrumb);

package/lib/components/Breadcrumbs/Breadcrumbs.tsx

@@ -4,7 +4,7 @@ import { Icon } from '../';
 import Breadcrumb from './Breadcrumb';
 import { useTheme } from '../../theme';
 
-const NAME = 'ucl-timetable-breadcrumbs';
+const NAME = 'ucl-uikit-breadcrumbs';
 
 export interface BreadcrumbsProps extends HTMLAttributes<HTMLElement> {
   testId?: string;

package/lib/components/Breadcrumbs/__tests__/Breadcrumbs.test.tsx

@@ -10,9 +10,7 @@ describe('Breadcrumbs', () => {
     const renderResult = render(
       <ThemeContextProvider>
         <Breadcrumbs>
-          <Breadcrumbs.Breadcrumb uri='/'>
-            Home
-          </Breadcrumbs.Breadcrumb>
+          <Breadcrumbs.Breadcrumb uri='/'>Home</Breadcrumbs.Breadcrumb>
           <Breadcrumbs.Breadcrumb uri='/showcase'>
             Timetable
           </Breadcrumbs.Breadcrumb>
@@ -22,9 +20,7 @@ describe('Breadcrumbs', () => {
         </Breadcrumbs>
       </ThemeContextProvider>
     );
-    expect(
-      renderResult.container.firstChild
-    ).toMatchSnapshot();
+    expect(renderResult.container.firstChild).toMatchSnapshot();
   });
 
   test('snapshot: Custom Test ID', () => {
@@ -52,9 +48,7 @@ describe('Breadcrumbs', () => {
         </Breadcrumbs>
       </ThemeContextProvider>
     );
-    expect(
-      renderResult.container.firstChild
-    ).toMatchSnapshot();
+    expect(renderResult.container.firstChild).toMatchSnapshot();
   });
 
   // Interaction tests
@@ -63,9 +57,7 @@ describe('Breadcrumbs', () => {
     render(
       <ThemeContextProvider>
         <Breadcrumbs>
-          <Breadcrumbs.Breadcrumb uri='/'>
-            Home
-          </Breadcrumbs.Breadcrumb>
+          <Breadcrumbs.Breadcrumb uri='/'>Home</Breadcrumbs.Breadcrumb>
           <Breadcrumbs.Breadcrumb uri='/showcase'>
             Timetable
           </Breadcrumbs.Breadcrumb>
@@ -75,12 +67,8 @@ describe('Breadcrumbs', () => {
         </Breadcrumbs>
       </ThemeContextProvider>
     );
-    const breadcrumbs = screen.getByTestId(
-      'ucl-timetable-breadcrumbs'
-    );
-    const breadcrumb = screen.getAllByTestId(
-      'ucl-timetable-breadcrumb'
-    );
+    const breadcrumbs = screen.getByTestId('ucl-uikit-breadcrumbs');
+    const breadcrumb = screen.getAllByTestId('ucl-uikit-breadcrumb');
     expect(breadcrumbs).toBeDefined();
     expect(breadcrumb).toBeDefined();
   });
@@ -111,15 +99,9 @@ describe('Breadcrumbs', () => {
       </ThemeContextProvider>
     );
     const breadcrumbs = screen.getByTestId('custom-testid');
-    const breadcrumb1 = screen.getByTestId(
-      'custom-testid-1'
-    );
-    const breadcrumb2 = screen.getByTestId(
-      'custom-testid-2'
-    );
-    const breadcrumb3 = screen.getByTestId(
-      'custom-testid-3'
-    );
+    const breadcrumb1 = screen.getByTestId('custom-testid-1');
+    const breadcrumb2 = screen.getByTestId('custom-testid-2');
+    const breadcrumb3 = screen.getByTestId('custom-testid-3');
     expect(breadcrumbs).toBeDefined();
     expect(breadcrumb1).toBeDefined();
     expect(breadcrumb2).toBeDefined();

package/lib/components/Breadcrumbs/__tests__/__snapshots__/Breadcrumbs.test.tsx.snap

@@ -2,15 +2,15 @@
 
 exports[`Breadcrumbs > Snapshot: No props 1`] = `
 <nav
-  class="ucl-timetable-breadcrumbs"
-  data-testid="ucl-timetable-breadcrumbs"
+  class="ucl-uikit-breadcrumbs"
+  data-testid="ucl-uikit-breadcrumbs"
 >
   <span
     class="css-4ys53n"
   >
     <span
-      class="css-0 ucl-timetable-breadcrumb ucl-timetable-breadcrumb--active"
-      data-testid="ucl-timetable-breadcrumb"
+      class="css-0 ucl-uikit-breadcrumb ucl-uikit-breadcrumb--active"
+      data-testid="ucl-uikit-breadcrumb"
     >
       Home
     </span>
@@ -18,6 +18,7 @@ exports[`Breadcrumbs > Snapshot: No props 1`] = `
       class="ucl-uikit-icon css-1ez1cy1"
       data-testid="ucl-uikit-icon"
       fill="none"
+      focusable="false"
       height="24"
       stroke="currentColor"
       stroke-linecap="round"
@@ -27,8 +28,8 @@ exports[`Breadcrumbs > Snapshot: No props 1`] = `
       width="24"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <polyline
-        points="9 18 15 12 9 6"
+      <path
+        d="m9 18 6-6-6-6"
       />
     </svg>
   </span>
@@ -36,8 +37,8 @@ exports[`Breadcrumbs > Snapshot: No props 1`] = `
     class="css-4ys53n"
   >
     <a
-      class="ucl-uikit-base-link ucl-uikit-link ucl-timetable-breadcrumb ucl-timetable-breadcrumb--inactive css-c7kkpi"
-      data-testid="ucl-timetable-breadcrumb"
+      class="ucl-uikit-base-link ucl-uikit-link ucl-uikit-breadcrumb ucl-uikit-breadcrumb--inactive css-dh2n9h"
+      data-testid="ucl-uikit-breadcrumb"
       href="/showcase"
     >
       Timetable
@@ -46,6 +47,7 @@ exports[`Breadcrumbs > Snapshot: No props 1`] = `
       class="ucl-uikit-icon css-1ez1cy1"
       data-testid="ucl-uikit-icon"
       fill="none"
+      focusable="false"
       height="24"
       stroke="currentColor"
       stroke-linecap="round"
@@ -55,8 +57,8 @@ exports[`Breadcrumbs > Snapshot: No props 1`] = `
       width="24"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <polyline
-        points="9 18 15 12 9 6"
+      <path
+        d="m9 18 6-6-6-6"
       />
     </svg>
   </span>
@@ -64,8 +66,8 @@ exports[`Breadcrumbs > Snapshot: No props 1`] = `
     class="css-4ys53n"
   >
     <a
-      class="ucl-uikit-base-link ucl-uikit-link ucl-timetable-breadcrumb ucl-timetable-breadcrumb--inactive css-c7kkpi"
-      data-testid="ucl-timetable-breadcrumb"
+      class="ucl-uikit-base-link ucl-uikit-link ucl-uikit-breadcrumb ucl-uikit-breadcrumb--inactive css-dh2n9h"
+      data-testid="ucl-uikit-breadcrumb"
       href="/showcase/breadcrumbs"
     >
       Personal
@@ -76,14 +78,14 @@ exports[`Breadcrumbs > Snapshot: No props 1`] = `
 
 exports[`Breadcrumbs > snapshot: Custom Test ID 1`] = `
 <nav
-  class="ucl-timetable-breadcrumbs"
+  class="ucl-uikit-breadcrumbs"
   data-testid="custom-testid"
 >
   <span
     class="css-4ys53n"
   >
     <span
-      class="css-0 ucl-timetable-breadcrumb ucl-timetable-breadcrumb--active"
+      class="css-0 ucl-uikit-breadcrumb ucl-uikit-breadcrumb--active"
       data-testid="custom-testid-1"
     >
       Home
@@ -92,6 +94,7 @@ exports[`Breadcrumbs > snapshot: Custom Test ID 1`] = `
       class="ucl-uikit-icon css-1ez1cy1"
       data-testid="ucl-uikit-icon"
       fill="none"
+      focusable="false"
       height="24"
       stroke="currentColor"
       stroke-linecap="round"
@@ -101,8 +104,8 @@ exports[`Breadcrumbs > snapshot: Custom Test ID 1`] = `
       width="24"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <polyline
-        points="9 18 15 12 9 6"
+      <path
+        d="m9 18 6-6-6-6"
       />
     </svg>
   </span>
@@ -110,7 +113,7 @@ exports[`Breadcrumbs > snapshot: Custom Test ID 1`] = `
     class="css-4ys53n"
   >
     <a
-      class="ucl-uikit-base-link ucl-uikit-link ucl-timetable-breadcrumb ucl-timetable-breadcrumb--inactive css-c7kkpi"
+      class="ucl-uikit-base-link ucl-uikit-link ucl-uikit-breadcrumb ucl-uikit-breadcrumb--inactive css-dh2n9h"
       data-testid="custom-testid-2"
       href="/showcase"
     >
@@ -120,6 +123,7 @@ exports[`Breadcrumbs > snapshot: Custom Test ID 1`] = `
       class="ucl-uikit-icon css-1ez1cy1"
       data-testid="ucl-uikit-icon"
       fill="none"
+      focusable="false"
       height="24"
       stroke="currentColor"
       stroke-linecap="round"
@@ -129,8 +133,8 @@ exports[`Breadcrumbs > snapshot: Custom Test ID 1`] = `
       width="24"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <polyline
-        points="9 18 15 12 9 6"
+      <path
+        d="m9 18 6-6-6-6"
       />
     </svg>
   </span>
@@ -138,7 +142,7 @@ exports[`Breadcrumbs > snapshot: Custom Test ID 1`] = `
     class="css-4ys53n"
   >
     <a
-      class="ucl-uikit-base-link ucl-uikit-link ucl-timetable-breadcrumb ucl-timetable-breadcrumb--inactive css-c7kkpi"
+      class="ucl-uikit-base-link ucl-uikit-link ucl-uikit-breadcrumb ucl-uikit-breadcrumb--inactive css-dh2n9h"
       data-testid="custom-testid-3"
       href="/showcase/breadcrumbs"
     >

package/lib/components/Button/Button.mdx

@@ -1,25 +1,19 @@
-import * as ButtonStories from "./Button.stories";
+import * as ButtonStories from './Button.stories';
 import {
   Meta,
   Title,
   Subtitle,
+  Description,
   Canvas,
   Controls,
   ArgTypes,
-} from "@storybook/blocks";
+} from '@storybook/blocks';
 
 export const usage = {
   default: `<Button>Default Button</Button>`,
-  primary: `<Button variant='primary'>Primary Button</Button>`,
   secondary: `<Button variant='secondary'>Secondary Button</Button>`,
-  tertiary: `<Button variant='tertiary'>Tertiary Button</Button>`,
-  destructive: `<Button destructive>Destructive Button</Button>`,
-  destructiveSecondary: `<Button variant='secondary' destructive>Destructive Secondary Button</Button>`,
-  disabled: `<Button disabled>Disabled Button</Button>`,
-  disabledSecondary: `<Button variant='secondary' disabled>Disabled Secondary Button</Button>`,
-  disabledTertiary: `<Button variant='tertiary' disabled>Disabled Tertiary Button</Button>`,
+  destructive: `<Button variant='primary-destructive'>Destructive Button</Button>`,
   withIcon: `<Button icon={<Icon.AlertTriangle />}>Button</Button>`,
-  iconOnly: `<Button icon={<Icon.AlertTriangle />} aria-label='Button description' tooltip='Tooltip' />`,
   loading: `<Button loading>Loading Button</Button>`,
   link: `<Button as='a' href='https://www.ucl.ac.uk' target='_blank'>Go to UCL&#39;s website</Button>`,
   fullWidth: `<Button fullWidth>Full Width Button</Button>`,
@@ -28,298 +22,57 @@ export const usage = {
 <Meta of={ButtonStories} />
 <Title />
 <Subtitle>
-  A polymorphic button component with multiple variants & lots of features
+  A polymorphic button component with modern variants and backwards-compatible legacy props
 </Subtitle>
 
-The primary use case for the `<Button>` component is to create a clickable button element on a screen — self-evidently a common UI/UX pattern that doesn't need much additional explanation.
+<Description>
+`Button` supports the richer variant set and still supports legacy props such as `destructive` and `size='default'` for compatibility.
+</Description>
 
-Technically speaking, we mean the <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/button' target='_blank'>native HTML `<button>` element</a>, which accepts click events that can trigger changes in application state.
-
-The `<Button>` component is, therefore, essentially a wrapper for this native `<button>` element, with styling in accordance with UCL Design System guidelines.
-
-Use this component when you want a clear 'button' in your user interface that has an associated '_action_': e.g. 'Submit', 'Save', 'Delete', etc. An 'action' in this context triggers some kind of change in the application state.
-
-- **Design specifications** available in Figma: <a href="https://www.figma.com/design/8Sm5PxWOWJYpYXAzhRzUzt/UCL-Design-System-UI-Kit?node-id=2128-184" target="_blank">UCL Design System UI Kit | Buttons</a>
-- **Component files** located in `lib/component/Button/` in the UIKit-React repository: <a href='https://github.com/ucl-isd/uikit-react/tree/main/lib/components/Button' target='_blank'>ucl-isd/uikit-react | Button</a>
-
-<Canvas source={{ code: usage.default }} />
-
-[Interactive table of props available below.](#props)
-
-## Contents
-
-- [Variants](#variants)
-  - [Primary](#primary)
-  - [Secondary](#secondary)
-  - [Tertiary](#tertiary)
-- [Destructive buttons](#destructive-buttons)
-- [Disabled buttons](#disabled-buttons)
-- [Icons](#icons)
-  - [Icon right](#icon-right)
-  - [Icon only](#icon-only)
-- [Loading Spinner](#loading-spinner)
-- [Polymorphism](#polymorphism)
-- [Full width](#full-width)
-- [Props](#props)
+<Canvas of={ButtonStories.Default} source={{ code: usage.default }} />
 
 ## Variants
 
-The `<Button>` component has three 'variants', which describe <a href='https://www.interaction-design.org/literature/topics/visual-hierarchy' target='_blank'>visual hierarchy</a>:
-
-- **primary** (default)
-- **secondary**
-- **tertiary**
-
-'Primary' buttons are the most obvious, clear, and demand attention from the user. 'Secondary' buttons are less important, and 'tertiary' buttons are the least important.
-
-`variant?: 'primary' | 'secondary' | 'tertiary';`
-
-### Primary
-
-The default variant of the button. The most important or most common actions should use this variant.
-
-<Canvas
-  of={ButtonStories.Primary}
-  sourceState="shown"
-  source={{ code: usage.primary }}
-/>
-
-### Secondary
-
-The secondary variant is used for less important actions. It should be used when the primary action is already clear, and you want to provide an alternative action that is still visible but not as prominent.
-
-You might, for example, use a 'secondary' button that cancels an action, or takes the user on a path away from their most likely current goal.
-
-<Canvas
-  of={ButtonStories.Secondary}
-  sourceState="shown"
-  source={{ code: usage.secondary }}
-/>
-
-## Tertiary
-
-Tertiary buttons add one final layer of diminishing importance. They are used for actions that are less important than the primary and secondary actions.
+Use `variant` to control hierarchy and emphasis.
 
-<Canvas
-  of={ButtonStories.Tertiary}
-  sourceState="shown"
-  source={{ code: usage.tertiary }}
-/>
+<Canvas of={ButtonStories.Primary} />
+<Canvas of={ButtonStories.Secondary} source={{ code: usage.secondary }} />
+<Canvas of={ButtonStories.Tertiary} />
+<Canvas of={ButtonStories.Accent} />
+<Canvas of={ButtonStories.PrimarySubtle} />
+<Canvas of={ButtonStories.Destructive} source={{ code: usage.destructive }} />
 
-## Destructive buttons
+## Sizes
 
-Actions that delete or remove something from the application should be clearly marked as 'destructive'. This is a UX pattern that makes it clear this action is _not reversible_.
+<Canvas of={ButtonStories.Small} />
+<Canvas of={ButtonStories.Large} />
 
-Note that only 'primary' and 'secondary' button variants can be marked as 'destructive'. This is intentional: any action that is destructive should be considered 'important' enough that using a tertiary button is not appropriate.
+## States
 
-`destructive?: boolean;`
-
-<Canvas
-  of={ButtonStories.Destructive}
-  sourceState="shown"
-  source={{ code: usage.destructive }}
-/>
-<Canvas
-  of={ButtonStories.DestructiveSecondary}
-  sourceState="shown"
-  source={{ code: usage.destructiveSecondary }}
-/>
-
-## Disabled buttons
-
-A button that *could* be used but is *currently disabled* due to the application's state.
-
-A button in this state **cannot be pressed**, from a technical implementation: click events are not triggered, even if an `onClick` callback prop is passed to the `<Button>`.
-
-_Technical info_: The <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Attributes/disabled' target='_blank'>`disabled` attribute</a> is available on the native `<button>` element. The `<Button>` component simply passes this attribute to the underlying `<button>` element.
-
-All variants of the button can be disabled.
-
-`disabled?: boolean;`
-
-<Canvas
-  of={ButtonStories.Disabled}
-  sourceState="shown"
-  source={{ code: usage.disabled }}
-/>
-<Canvas
-  of={ButtonStories.DisabledSecondary}
-  sourceState="shown"
-  source={{ code: usage.disabledSecondary }}
-/>
-<Canvas
-  of={ButtonStories.DisabledTertiary}
-  sourceState="shown"
-  source={{ code: usage.disabledTertiary }}
-/>
+<Canvas of={ButtonStories.Disabled} />
+<Canvas of={ButtonStories.Loading} source={{ code: usage.loading }} />
 
 ## Icons
 
-Pass an <a href='?path=/docs/components-ready-to-use-icon--documentation' target='_blank'>icon</a> to the `<Button>` via the `icon` prop.
-
-**_Technical note:_** The `icon` prop takes **an actual `<Icon>` component, not an icon name** as a string.
-
-Any icon available in this component can be used — the `<Icon>` component also accepts custom SVG icons.
-
-Specify the position of the icon using the `iconPosition` prop. The default is `left`, and you can also specify `right`.
-
-`icon?: ReactNode;` <br />
-`iconPosition?: 'left' | 'right';`
-
-<Canvas
-  of={ButtonStories.WithIcon}
-  sourceState="shown"
-  source={{ code: usage.withIcon }}
-/>
-
-### Icon right
-
-`iconPosition: 'right'`
-
-```tsx
-<Button icon={<Icon.Upload />} iconPosition='right'>
-  Upload
-</Button>
-```
-
-[Check this component story to see the icon on the right.](?path=/story/components-ready-to-use-button--with-icon&args=iconPosition:right)
-
-### Icon only
-
-To render a `<Button>` that _only_ displays an icon, you can simply not pass in any children. 
-
-<Canvas
-  of={ButtonStories.IconOnly}
-  sourceState="shown"
-  source={{ code: usage.iconOnly }}
-/>
-
-_Background info:_ An HTML element that has no children is known as a '<a href='https://developer.mozilla.org/en-US/docs/Glossary/Void_element' target='_blank'>void element</a>', or an 'empty' element. We must 'self-close' these elements in React using the `/>` syntax: `<Button />`
-
-The component logic checks whether children are provided. An empty string will count as 'not provided'. The width of the `<Button>` is then set according to a single centred icon. 
-
-UIKit-React also [provides an `<IconButton>` component](?path=/docs/components-ready-to-use-iconbutton--documentation), which is simply an `<Icon>` wrapped in a `<button>`. This is a more generic component, without the additional features of the `<Button>` component. If you **only want an icon that is clickable** (it can handle click events via an `onClick` callback prop), just use the `<IconButton>` component, instead.
-
-- **UX recommendation:** Include text to appear on hover via the `tooltip` prop, so users receive a text description alongside the icon: <br />`tooltip='Edit'`
-- **Accessibility recommendation:** Include text to be read by assistive technologies (<a href='https://abilitynet.org.uk/factsheets/introduction-screen-readers' target='_blank'>screen readers</a>) via an `aria-label` prop, so users with visual impairments understand the purpose of the button: <br />`aria-label='Edit item'`
-
-```tsx
-<Button icon={<Icon.Edit />} aria-label="Edit item" tooltip="Edit" />
-```
-
-More information about ARIA labels can be found here:
-
-- {<a
-  href="https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Reference/Attributes/aria-label"
-  target="\_blank"
-  > aria-label - ARIA | MDN</a>}
-- {<a
-  href="https://www.aditus.io/aria/aria-label"
-  target="\_blank"
-  > aria-label - examples and best practices | Aditus</a>}
-
-## Loading Spinner
-
-Pass a `loading` prop to the `<Button>` to show a [loading Spinner](?path=/docs/components-ready-to-use-spinner--documentation).
-
-The appropriate use case for this is to communicate to the user that an external process is happening and is not yet complete.
-
-We expect the most common example is handling asynchronous requests to servers: a 'Submit' button for a web form that awaits a success response from the server.
-
-Note that the button _cannot be pressed_ while `loading` is `true`. Click events will not be triggered. This is purposefully to prevent users triggering the same action multiple times while waiting.
-
-`loading?: boolean;`
-
-<Canvas
-  of={ButtonStories.Loading}
-  sourceState="shown"
-  source={{ code: usage.loading }}
-/>
-
-_Technical info:_ The `loading` prop would be bound to a stateful variable in the parent component. This 'loading' state is set to `true` when the button is pressed, and set to `false` when the server response is received:
-
-```tsx
-<Button loading={loading}>Submit</Button>
-```
+<Canvas of={ButtonStories.WithIcon} source={{ code: usage.withIcon }} />
+<Canvas of={ButtonStories.IconOnly} />
 
 ## Polymorphism
 
-We recognise that sometimes buttons are required to be used in a 'link-like' context. For example, instead of triggering a change in application state, the button takes a user to a screen in which this can be done. For flexibility, a different element to the native `<button>` element can be specified via the `as` prop.
+<Canvas of={ButtonStories.Link} source={{ code: usage.link }} />
 
-This principle is known as '<a href='https://www.freecodecamp.org/news/build-strongly-typed-polymorphic-components-with-react-and-typescript/' target='_blank'>polymorphism</a>' in React.
+## Layout
 
-The `<Button>` component is polymorphic, and we expect developers may want to specify either:
+<Canvas of={ButtonStories.FullWidth} source={{ code: usage.fullWidth }} />
 
-- an anchor `<a>` element
-- a custom routing component (e.g. `Link` from `wouter`)
+## Common Margins
 
-_We do not expect developers to use the `<Button>` component as a generic wrapper for any HTML element._
-
-The `as` prop supports either a string or a React component. If unspecified, the default is of course the native `<button>` element.
-
-Given we want the button element to be an anchor `<a>`, we provide: `as='a'`.
-
-```tsx
-<Button as="a" href="https://www.ucl.ac.uk">
-  Link
-</Button>
-```
-
-Note we can also add in any other standard HTML attributes that are valid for the `<a>` element, such as `href`, `target`, etc. Particularly, `target='_blank'` usefully **opens the link in a new tab**.
-
-In the example below, the `<Button>` will take you to UCL's website when clicked:
-
-<Canvas
-  of={ButtonStories.Link}
-  sourceState="shown"
-  source={{ code: usage.link }}
-/>
-
-Using a custom routing component, such as <a href='https://github.com/molefrog/wouter?tab=readme-ov-file#link-hrefpath-' target='_blank'>`Link` from `wouter`</a>, we just need to import the component in the current file, then pass it directly to the `as` prop.
-
-```tsx
-import { Link } from "wouter";
-
-// ...
-
-<Button as={Link} to="/">
-  Link
-</Button>;
-```
-
-_Technical note:_ The `disabled` attribute is not natively available on an anchor `<a>` element. To prevent link-like buttons from successfully triggering a redirect on click when the `<Button>` otherwise appears disabled, the `href` attribute of the anchor-button is removed. This has the same effect, and the underlying `<a>` tag will not redirect the user.
-**For custom routing components, this functionality would need to be implemented manually.**
-
-## Full width
-
-A `fullWidth` prop sets the value of the `width` CSS property of the button to `100%`. This tells the button to take up the full width of its parent container — this could otherwise be set via a `className` prop.
-
-We recommend full width buttons be **no more than 350px wide** in practice, and used primarily on mobile devices. 
-
-<div style={{ maxWidth: "350px", margin: "0 auto" }}>
-  <Canvas
-    of={ButtonStories.FullWidth}
-    sourceState="none"
-    source={{ code: usage.fullWidth }}
-  />
-</div>
-
-```tsx
-<Button fullWidth>Full Width Button</Button>
-```
+<Canvas of={ButtonStories.CommonMargins} />
 
 ## Props
 
-Full props specification for `<Button>` is below.
-
-Note that `<Button>` makes use of optional 'common' margin props, [as demonstrated in this component story](?path=/story/components-ready-to-use-button--common-margins&args=m:m24).
-
-<Canvas
-  of={ButtonStories.Default}
-  sourceState="hidden"
-  source={{ code: usage.default }}
-/>
+<ArgTypes of={ButtonStories} />
 
-You can use the controls below to manipulate the `<Button>` component above.
+## Interactive Controls
 
-<Controls />
+<Controls of={ButtonStories.Default} />