@tempoxyz/ds 0.2.6 → 0.3.0

package/src/web/components/AlertDialog.tsx

@@ -1,26 +1,32 @@
 import * as BaseUi from '@base-ui/react/alert-dialog'
-import type { ComponentPropsWithRef } from 'react'
-import type * as zyzz from 'zyzz'
-import { style } from '../zyzz.config.js'
-import { styles as dialog } from './Dialog.js'
+import { Dialog } from './Dialog.js'
 
 /**
  * A modal confirmation that interrupts the page until the user decides. The popup has
  * `role="alertdialog"`, traps focus, locks page scroll and closes on Escape or a `Close` part, but
- * never on an outside press. Focus returns to the trigger on close.
+ * never on an outside press. Focus returns to the trigger on close. It shares the parts and look of
+ * `Dialog`, at the `small` size by default.
  *
  * - Reserve it for decisions that need an explicit answer, such as destructive confirmations.
- * - Always include `Title` and `Description`, which name and describe the popup.
+ * - Always include `Title` and `Description` in a `Header`, which name and describe the popup.
  * - Label actions with specific verbs, such as `Delete key`, not `OK`.
  *
  * @example
  * <AlertDialog.Root>
- *   <AlertDialog.Trigger render={<Button variant="negative" />}>Delete key</AlertDialog.Trigger>
+ *   <AlertDialog.Trigger render={<Button />}>Delete key</AlertDialog.Trigger>
  *   <AlertDialog.Popup>
- *     <AlertDialog.Title>Delete this key?</AlertDialog.Title>
- *     <AlertDialog.Description>Apps that use this key stop working.</AlertDialog.Description>
- *     <AlertDialog.Close render={<Button variant="secondary" />}>Cancel</AlertDialog.Close>
- *     <AlertDialog.Close render={<Button variant="negative" />}>Delete key</AlertDialog.Close>
+ *     <AlertDialog.Header>
+ *       <AlertDialog.Title>Delete this key?</AlertDialog.Title>
+ *       <AlertDialog.Description>Apps that use this key stop working.</AlertDialog.Description>
+ *     </AlertDialog.Header>
+ *     <ButtonGroup>
+ *       <AlertDialog.Close render={<Button size="large" variant="secondary" />}>
+ *         Cancel
+ *       </AlertDialog.Close>
+ *       <AlertDialog.Close render={<Button size="large" />}>
+ *         Delete key
+ *       </AlertDialog.Close>
+ *     </ButtonGroup>
  *   </AlertDialog.Popup>
  * </AlertDialog.Root>
  *
@@ -31,127 +37,57 @@ import { styles as dialog } from './Dialog.js'
  * @see {@link https://www.w3.org/WAI/WCAG22/Understanding/keyboard.html | WCAG 2.2 Keyboard}
  */
 export namespace AlertDialog {
+  /** Renders the content `<div>` between the header and the footer, as `Dialog.Body` does. */
+  export const Body = Dialog.Body
+
   /** Closes the dialog on click. Pass `render` to style it as a `Button`. */
   export const Close = BaseUi.AlertDialog.Close
 
+  /** Renders a `p` that describes the popup through `aria-describedby`. State the consequence here. */
+  export const Description = Dialog.Description
+
+  /** Holds the `Title` and `Description`, and lays them out as `Dialog.Header` does. */
+  export const Header = Dialog.Header
+
   /** Owns the open state. Pass `open` and `onOpenChange` to control it. The dialog is always modal. */
   export const Root = BaseUi.AlertDialog.Root
 
+  /** Renders an `h2` that names the popup through `aria-labelledby`. */
+  export const Title = Dialog.Title
+
   /** Opens the dialog on click. Pass `render` to style it as a `Button`. */
   export const Trigger = BaseUi.AlertDialog.Trigger
 
-  export namespace Root {
-    export type Props = BaseUi.AlertDialog.Root.Props
+  export namespace Body {
+    export type Props = Dialog.Body.Props
   }
 
-  /** Renders a `p` that describes the popup through `aria-describedby`. State the consequence here. */
-  export function Description(props: Description.Props) {
-    const { className, vars, ...attributes } = props
+  export namespace Description {
+    export type Props = Dialog.Description.Props
+  }
 
-    return (
-      <BaseUi.AlertDialog.Description
-        {...attributes}
-        {...dialog.description({ className, style: props.style, vars })}
-      />
-    )
+  export namespace Header {
+    export type Props = Dialog.Header.Props
   }
 
-  export namespace Description {
-    export type Props = ComponentPropsWithRef<'p'> & zyzz.Props.Variants<typeof dialog.description>
+  export namespace Root {
+    export type Props = BaseUi.AlertDialog.Root.Props
+  }
+
+  export namespace Title {
+    export type Props = Dialog.Title.Props
   }
 
   /**
-   * Renders the portal, scrim, viewport and popup. The popup stays centered at every width.
-   * Opening focuses the first tabbable element. When that is a destructive action, pass the
-   * cancel button's ref to `initialFocus`.
+   * Renders the portal, scrim, viewport and popup as `Dialog.Popup` does, with `size` defaulting
+   * to `small`. Opening focuses the first tabbable element. When that is a destructive action, pass
+   * the cancel button's ref to `initialFocus`.
    */
   export function Popup(props: Popup.Props) {
-    const { className, vars, ...attributes } = props
-
-    return (
-      <BaseUi.AlertDialog.Portal>
-        <BaseUi.AlertDialog.Backdrop {...dialog.backdrop()} />
-        <BaseUi.AlertDialog.Viewport {...styles.viewport()}>
-          <BaseUi.AlertDialog.Popup
-            {...attributes}
-            {...styles.popup({ className, style: props.style, vars })}
-          />
-        </BaseUi.AlertDialog.Viewport>
-      </BaseUi.AlertDialog.Portal>
-    )
+    return <Dialog.Popup {...props} size={props.size ?? 'small'} />
   }
 
   export namespace Popup {
-    export type Props = ComponentPropsWithRef<'div'> &
-      zyzz.Props.Variants<typeof styles.popup> &
-      Pick<BaseUi.AlertDialog.Popup.Props, 'finalFocus' | 'initialFocus' | 'render'>
-  }
-
-  /** Renders an `h2` that names the popup through `aria-labelledby`. */
-  export function Title(props: Title.Props) {
-    const { className, vars, ...attributes } = props
-
-    return (
-      <BaseUi.AlertDialog.Title
-        {...attributes}
-        {...dialog.title({ className, style: props.style, vars })}
-      />
-    )
-  }
-
-  export namespace Title {
-    export type Props = ComponentPropsWithRef<'h2'> & zyzz.Props.Variants<typeof dialog.title>
+    export type Props = Dialog.Popup.Props
   }
 }
-
-namespace styles {
-  export const popup = style(
-    {
-      backgroundColor: 'background.raised',
-      borderRadius: '16',
-      boxShadow: 'modal',
-      boxSizing: 'border-box',
-      color: 'foreground',
-      maxWidth: '384',
-      outline: 'none !custom',
-      padding: '24',
-      transitionDuration: '280',
-      transitionProperty: 'opacity, scale',
-      transitionTimingFunction: 'spring',
-      typography: 'copy.14',
-      width: '100% !custom',
-      selectors: {
-        '&[data-ending-style]': {
-          opacity: '0 !custom',
-          scale: 'enter',
-          transitionDuration: '180',
-        },
-        '&[data-starting-style]': {
-          opacity: '0 !custom',
-          scale: 'enter',
-        },
-      },
-      '@media (prefers-reduced-motion: reduce)': {
-        transitionProperty: 'opacity',
-        selectors: {
-          '&[data-ending-style], &[data-starting-style]': { scale: 'none !custom' },
-        },
-      },
-    },
-    { id: 'tds/web/alert-dialog/popup' },
-  )
-
-  export const viewport = style(
-    {
-      alignItems: 'center',
-      boxSizing: 'border-box',
-      display: 'grid',
-      inset: '0',
-      justifyItems: 'center',
-      overflowY: 'auto',
-      padding: '16',
-      position: 'fixed',
-    },
-    { id: 'tds/web/alert-dialog/viewport' },
-  )
-}

package/src/web/components/Amount.tsx

@@ -167,19 +167,19 @@ namespace styles {
           right: { textAlign: 'right' },
         },
         size: {
-          lg: { typography: 'heading.32' },
-          md: { typography: 'heading.20' },
-          sm: { typography: 'copy.14.strong' },
-          xl: { typography: 'heading.40' },
+          lg: { typography: 'heading.h1' },
+          md: { typography: 'heading.h3' },
+          sm: { typography: 'body.b2Strong' },
+          xl: { typography: 'display.d2' },
         },
         strikethrough: {
           false: {},
-          true: { color: 'gray.900', textDecoration: 'line-through !custom' },
+          true: { color: 'content.secondary', textDecoration: 'line-through !custom' },
         },
       },
     },
     { id: 'tds/web/amount' },
   )
 
-  export const symbol = style({ color: 'gray.900' }, { id: 'tds/web/amount/symbol' })
+  export const symbol = style({ color: 'content.secondary' }, { id: 'tds/web/amount/symbol' })
 }

package/src/web/components/AmountInput.tsx

@@ -1,13 +1,12 @@
-import { type ComponentPropsWithRef, useState } from 'react'
+import { useState } from 'react'
 import { TextMorph } from 'torph/react'
-import type * as zyzz from 'zyzz'
 import { style } from '../zyzz.config.js'
-import { Input } from './Input.js'
+import { TextInput } from './TextInput.js'
 import * as AmountContext from './internal/AmountContext.js'
 
 /**
- * Decimal amount entry. The value is a raw string with a dot separator and no grouping
- * separators, and input that is not a non-negative decimal is rejected.
+ * The amount card: a filled surface with heading-size digits. The value is a raw string with a dot
+ * separator and no grouping separators, and input that is not a non-negative decimal is rejected.
  *
  * The text around a comma decides whether it groups thousands or separates decimals:
  *
@@ -25,17 +24,20 @@ import * as AmountContext from './internal/AmountContext.js'
  * `Control` is a text input with `inputMode="decimal"`, so mobile keyboards show digits without
  * the scroll and spinner behavior of `type="number"`.
  *
- * - Give the field a visible label, such as `Field.Label`. Show the unit with `Prefix` or
- *   `Suffix`.
- * - Explain an invalid amount with text, such as `Field.Error`, not only the red ring.
- * - Wire `Max` to set the value yourself, and name what it fills when the label is ambiguous.
+ * - Inside a `Field.Root`, put the `Field.Label` and `Field.Description` in the root. They take
+ *   their own rows above and below the amount.
+ * - Name the token beside the digits with a `Token`, which opens a token picker.
+ * - Explain an invalid amount with text, such as `Field.Error`, not only the red fill.
  *
  * @example
- * <AmountInput.Root onValueChange={setValue} value={value}>
- *   <AmountInput.Prefix>$</AmountInput.Prefix>
- *   <AmountInput.Control aria-label="Amount" placeholder="0.00" />
- *   <AmountInput.Max onClick={() => setValue(balance)} />
- * </AmountInput.Root>
+ * <Field.Root>
+ *   <AmountInput.Root onValueChange={setValue} value={value}>
+ *     <Field.Label>You send</Field.Label>
+ *     <AmountInput.Control placeholder="0.00" />
+ *     <Token symbol="pathUSD" />
+ *     <Field.Description>Balance 2,480.32</Field.Description>
+ *   </AmountInput.Root>
+ * </Field.Root>
  *
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/input/text | MDN input type text}
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Global_attributes/inputmode | MDN inputmode attribute}
@@ -45,12 +47,12 @@ import * as AmountContext from './internal/AmountContext.js'
  */
 export namespace AmountInput {
   /**
-   * Owns the amount and renders an `Input.Group`, so `size`, `variant` and `invalid` apply here.
-   * Pass `value` and `onValueChange` to control it. A rejected keystroke leaves the value
-   * unchanged and does not call `onValueChange`.
+   * Owns the amount and renders the card as a `TextInput.Group`, so `invalid` applies here. Pass
+   * `value` and `onValueChange` to control it. A rejected keystroke leaves the value unchanged and
+   * does not call `onValueChange`.
    */
   export function Root(props: Root.Props) {
-    const { defaultValue = '', onValueChange, value: controlled, ...attributes } = props
+    const { className, defaultValue = '', onValueChange, value: controlled, ...attributes } = props
     const [uncontrolled, setUncontrolled] = useState(defaultValue)
     const value = controlled ?? uncontrolled
 
@@ -64,13 +66,16 @@ export namespace AmountInput {
           },
         }}
       >
-        <Input.Group {...attributes} />
+        <TextInput.Group {...attributes} {...styles.root({ className, style: props.style })} />
       </AmountContext.Context.Provider>
     )
   }
 
   export namespace Root {
-    export type Props = Omit<Input.Group.Props, 'defaultValue' | 'onChange'> & {
+    export type Props = Omit<
+      TextInput.Group.Props,
+      'defaultValue' | 'onChange' | 'success' | 'variant'
+    > & {
       /** @default '' */
       defaultValue?: string | undefined
       onValueChange?: ((value: string) => void) | undefined
@@ -82,14 +87,14 @@ export namespace AmountInput {
   export function Control(props: Control.Props) {
     const amount = AmountContext.use()
     const [typed, setTyped] = useState<{ caret: number | null; text: string; value: string }>()
-    // Typed edits morph at the caret. Other changes, such as Max, roll digits by place value.
+    // Typed edits morph at the caret. Values the app sets roll digits by place value.
     const edit = typed?.value === amount.value ? typed : undefined
     const caret = edit?.caret ?? undefined
     const text = edit?.text ?? amount.value
 
     return (
       <span {...styles.control()}>
-        <Input.Control
+        <TextInput.Control
           autoComplete="off"
           inputMode="decimal"
           {...props}
@@ -116,39 +121,10 @@ export namespace AmountInput {
 
   export namespace Control {
     export type Props = Omit<
-      Input.Control.Props,
+      TextInput.Control.Props,
       'defaultValue' | 'onChange' | 'onValueChange' | 'type' | 'value'
     >
   }
-
-  /**
-   * Shortcut for the largest allowed amount. Hidden while the field is invalid. It renders a
-   * `type="button"` labelled "Max" by default and does not change the value itself, so set the
-   * amount from `onClick`.
-   */
-  export function Max(props: Max.Props) {
-    const { children, className, vars, ...attributes } = props
-
-    return (
-      <button
-        type="button"
-        {...attributes}
-        {...styles.max({ className, style: props.style, vars })}
-      >
-        {children ?? 'Max'}
-      </button>
-    )
-  }
-
-  export namespace Max {
-    export type Props = ComponentPropsWithRef<'button'> & zyzz.Props.Variants<typeof styles.max>
-  }
-
-  /** Leading adornment, such as a currency symbol. Same component as `Input.Prefix`. */
-  export const Prefix = Input.Prefix
-
-  /** Trailing adornment, such as a token code. Same component as `Input.Suffix`. */
-  export const Suffix = Input.Suffix
 }
 
 /** Returns the raw decimal for typed text, or `undefined` when it is not a non-negative decimal. */
@@ -181,108 +157,57 @@ namespace styles {
     { id: 'tds/web/amount-input/control' },
   )
 
+  // The placeholder takes the subtle color, lighter than the tertiary placeholder of a text field.
   export const input = style(
     {
       gridArea: '1 / 1 !custom',
       WebkitTextFillColor: 'transparent !custom',
       width: '100% !custom',
-      selectors: { '&::placeholder': { WebkitTextFillColor: 'currentColor !custom' } },
-    },
-    { id: 'tds/web/amount-input/input' },
-  )
-
-  export const max = style(
-    {
-      backgroundColor: 'grayAlpha.200',
-      border: 'none !custom',
-      color: 'foreground',
-      cursor: 'pointer',
-      flexShrink: '0 !custom',
-      outlineColor: 'transparent !custom',
-      outlineOffset: '0',
-      outlineStyle: 'solid !custom',
-      outlineWidth: '2',
-      position: 'relative',
-      transitionDuration: '160',
-      transitionProperty: 'background-color, outline-color, outline-offset, scale',
-      transitionTimingFunction: 'snappy',
       selectors: {
-        // Each field size insets Max equally from the end and the top, with a concentric radius.
-        '[data-size="large"] > &': {
-          borderRadius: '8',
-          height: '40',
-          marginInlineEnd: '-12',
-          paddingInline: '16',
-          typography: 'button.14',
-        },
-        '[data-size="medium"] > &': {
-          borderRadius: '6',
-          height: '28',
-          marginInlineEnd: '-10',
-          paddingInline: '12',
-          typography: 'button.12',
-        },
-        '[data-size="small"] > &': {
-          borderRadius: '4',
-          height: '24',
-          marginInlineEnd: '-8',
-          paddingInline: '8',
-          typography: 'button.12',
-        },
-        // A small stacked field takes the medium size, so Max takes the medium inset.
-        '[data-variant="stacked"] > [data-size="small"] > &': {
-          borderRadius: '6',
-          height: '28',
-          marginInlineEnd: '-10',
-          paddingInline: '12',
-          typography: 'button.12',
-        },
-        // A card group keeps its padding, so Max sits on the content edge.
-        '[data-variant="card"] > &': {
-          borderRadius: '8',
-          height: '32',
-          marginInlineEnd: '0',
-          paddingInline: '12',
-          typography: 'button.12',
-        },
-        '&::after': { content: '"" !custom', inset: '-4', position: 'absolute' },
-        '&:active': { scale: 'press' },
-        '&:focus-visible': { outlineColor: 'blue.700', outlineOffset: '2' },
-        '&:hover': { backgroundColor: 'grayAlpha.300' },
-        '[data-invalid] &': { display: 'none' },
-      },
-      '@media (prefers-reduced-motion: reduce)': {
-        transitionProperty: 'background-color, outline-color',
-        selectors: { '&:active': { scale: 'none !custom' } },
+        '&::placeholder': { color: 'content.subtle', WebkitTextFillColor: 'currentColor !custom' },
       },
     },
-    { id: 'tds/web/amount-input/max' },
+    { id: 'tds/web/amount-input/input' },
   )
 
-  // Mirrors the typography of `Input.Control` so the morphing text sits over the transparent input text.
+  // Inherits the root's type, as `TextInput.Control` does, so the morphing text covers the input text.
   export const morph = style(
     {
-      color: 'foreground',
+      color: 'content.primary',
       font: 'inherit !custom',
       gridArea: '1 / 1 !custom',
       overflow: 'hidden',
       pointerEvents: 'none !custom',
       whiteSpace: 'pre',
+      selectors: { ':has(> input:disabled) > &': { color: 'content.subtle' } },
+    },
+    { id: 'tds/web/amount-input/morph' },
+  )
+
+  /**
+   * Overrides the 48px field of `TextInput.Group`, whose rules load first. It wraps onto rows, so a
+   * `Field.Label` and `Field.Description` inside take their own lines.
+   */
+  export const root = style(
+    {
+      borderRadius: 'sm',
+      flexWrap: 'wrap',
+      height: 'auto !custom',
+      paddingBlock: '16',
+      paddingInline: '20',
+      rowGap: '8',
+      typography: 'heading.h1',
       selectors: {
-        '[data-variant="card"] > &': {
-          typography: 'heading.24',
-        },
-        '[data-variant="card"][data-size="small"] &': {
-          typography: 'heading.20',
+        '& > label': {
+          color: 'content.secondary',
+          flexBasis: '100% !custom',
+          typography: 'body.b3',
         },
-        '[data-variant="card"][data-size="large"] &': {
-          typography: 'heading.32',
-        },
-        // The value sits below the floating label, which needs more room in a large field.
-        '[data-variant="stacked"] &': { paddingTop: '12' },
-        '[data-variant="stacked"] [data-size="large"] &': { paddingTop: '16' },
+        '& > :is(p, [data-field-error])': { flexBasis: '100% !custom' },
+        // A `Field.Description`, such as the balance, takes the tertiary color.
+        '& > p': { color: 'content.tertiary' },
       },
     },
-    { id: 'tds/web/amount-input/morph' },
+    { id: 'tds/web/amount-input' },
   )
 }