@cognitap/radiant 0.0.16 → 0.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -2
- package/dist/library/Accordion.js.map +1 -1
- package/dist/library/Alert.d.ts +37 -0
- package/dist/library/Alert.d.ts.map +1 -0
- package/dist/library/Alert.js +28 -0
- package/dist/library/Alert.js.map +1 -0
- package/dist/library/AlertDialog.js.map +1 -1
- package/dist/library/Button.js.map +1 -1
- package/dist/library/Card.js.map +1 -1
- package/dist/library/Checkbox.js.map +1 -1
- package/dist/library/Collapsible.js.map +1 -1
- package/dist/library/Combobox.js.map +1 -1
- package/dist/library/Dialog.js.map +1 -1
- package/dist/library/Field.js.map +1 -1
- package/dist/library/Input.js.map +1 -1
- package/dist/library/Link.js.map +1 -1
- package/dist/library/Menu.d.ts +22 -0
- package/dist/library/Menu.d.ts.map +1 -0
- package/dist/library/Menu.js +144 -0
- package/dist/library/Menu.js.map +1 -0
- package/dist/library/Popover.d.ts +1 -0
- package/dist/library/Popover.d.ts.map +1 -1
- package/dist/library/Popover.js +1 -1
- package/dist/library/Popover.js.map +1 -1
- package/dist/library/RadioGroup.js.map +1 -1
- package/dist/library/Select.js.map +1 -1
- package/dist/library/Slider.js.map +1 -1
- package/dist/library/Switch.js.map +1 -1
- package/dist/library/Tabs.js.map +1 -1
- package/dist/library/Textarea.js.map +1 -1
- package/dist/library/ThemeScope.js.map +1 -1
- package/dist/library/Tooltip.js.map +1 -1
- package/dist/library/actionStyles.js +1 -1
- package/dist/library/actionStyles.js.map +1 -1
- package/dist/library/cn.d.ts.map +1 -1
- package/dist/library/cn.js +17 -0
- package/dist/library/cn.js.map +1 -1
- package/dist/library/color/colorFamilies.js.map +1 -1
- package/dist/library/color/generateColorWall.js.map +1 -1
- package/dist/library/color/index.js.map +1 -1
- package/dist/library/color/oklch.js.map +1 -1
- package/dist/library/color/recommendColorPalette.js.map +1 -1
- package/dist/library/comboboxStyles.js.map +1 -1
- package/dist/library/controlStyles.js.map +1 -1
- package/dist/library/examples/expressive.js.map +1 -1
- package/dist/library/examples/glass.js.map +1 -1
- package/dist/library/examples/index.js.map +1 -1
- package/dist/library/examples/jelly.js.map +1 -1
- package/dist/library/examples/preset-values.js.map +1 -1
- package/dist/library/examples/radiant.js.map +1 -1
- package/dist/library/examples/sharp-3d.js.map +1 -1
- package/dist/library/examples/soft-squircle.js.map +1 -1
- package/dist/library/examples/ticket.js.map +1 -1
- package/dist/library/index.d.ts +4 -0
- package/dist/library/index.d.ts.map +1 -1
- package/dist/library/index.js +2 -0
- package/dist/library/index.js.map +1 -1
- package/dist/library/internal/events.js.map +1 -1
- package/dist/library/internal/ids.js.map +1 -1
- package/dist/library/internal/popover.js.map +1 -1
- package/dist/library/internal/select.js.map +1 -1
- package/dist/library/internal/selection.js.map +1 -1
- package/dist/library/internal/switchDrag.js.map +1 -1
- package/dist/library/motion/MotionLink.js.map +1 -1
- package/dist/library/motion/browser.js.map +1 -1
- package/dist/library/motion/config.js.map +1 -1
- package/dist/library/motion/context.js.map +1 -1
- package/dist/library/motion/drag.js.map +1 -1
- package/dist/library/motion/dragBrowser.js.map +1 -1
- package/dist/library/motion/follow.js.map +1 -1
- package/dist/library/motion/host.js.map +1 -1
- package/dist/library/motion/index.js.map +1 -1
- package/dist/library/motion/layout.js.map +1 -1
- package/dist/library/motion/layoutDom.js.map +1 -1
- package/dist/library/motion/popup.js.map +1 -1
- package/dist/library/motion/press.js.map +1 -1
- package/dist/library/motion/pressPolicy.js.map +1 -1
- package/dist/library/motion/react.js.map +1 -1
- package/dist/library/motion/runtime.js.map +1 -1
- package/dist/library/motion/transitions.js.map +1 -1
- package/dist/library/presentation.js.map +1 -1
- package/dist/library/react/useComboboxPopup.js.map +1 -1
- package/dist/library/react/useComposedRefs.js.map +1 -1
- package/dist/library/react/useControllableState.js.map +1 -1
- package/dist/library/react/useNativeOwner.js.map +1 -1
- package/dist/library/react/usePopoverSurface.js.map +1 -1
- package/dist/library/react/useSwitchDrag.js.map +1 -1
- package/dist/library/selectStyles.js.map +1 -1
- package/dist/library/styles.css +1 -1
- package/dist/library/themes/components.d.ts +29 -0
- package/dist/library/themes/components.d.ts.map +1 -1
- package/dist/library/themes/components.js +29 -0
- package/dist/library/themes/components.js.map +1 -1
- package/dist/library/themes/default.js.map +1 -1
- package/dist/library/themes/defineTheme.js.map +1 -1
- package/dist/library/themes/index.js.map +1 -1
- package/dist/library/themes/themeDocument.js.map +1 -1
- package/dist/library/themes/themeDocumentTypes.js.map +1 -1
- package/dist/library/themes/tokens.js.map +1 -1
- package/dist/library/themes/types.js.map +1 -1
- package/dist/library/themes/updateThemeAppearance.js.map +1 -1
- package/dist/library/typography/index.js.map +1 -1
- package/dist/library/typography/types.js.map +1 -1
- package/docs/architecture.md +5 -5
- package/docs/theming.md +1 -1
- package/package.json +1 -1
- package/src/Alert.tsx +95 -0
- package/src/Menu.tsx +248 -0
- package/src/Popover.tsx +2 -1
- package/src/actionStyles.ts +1 -1
- package/src/cn.ts +17 -0
- package/src/index.ts +21 -0
- package/src/themes/components.ts +29 -0
package/docs/architecture.md
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
# Architecture
|
|
2
2
|
|
|
3
|
-
How Radiant's
|
|
3
|
+
How Radiant's twenty-one families fit together and why. Props are on the
|
|
4
4
|
[docs site](https://github.com/cognitap/radiant-docs); themes are in [theming](theming.md); springs are in
|
|
5
5
|
[motion](motion.md).
|
|
6
6
|
|
|
7
7
|
The families are Button, Link, Field, Input, Textarea, Select, Combobox, Checkbox, Switch, Slider, RadioGroup (with Radio),
|
|
8
|
-
Dialog, AlertDialog, Popover, Tooltip, Collapsible, Accordion, Tabs and Card. All ship in one package,
|
|
8
|
+
Dialog, AlertDialog, Popover, Tooltip, Menu, Alert, Collapsible, Accordion, Tabs and Card. All ship in one package,
|
|
9
9
|
`@cognitap/radiant`. Deep imports are unsupported.
|
|
10
10
|
|
|
11
11
|
## Native first
|
|
@@ -106,7 +106,7 @@ host, never a wrapper:
|
|
|
106
106
|
| Input / Checkbox / Switch / Slider / Radio | Native `input` |
|
|
107
107
|
| Textarea | Native `textarea` |
|
|
108
108
|
| Select / SelectPortal / Combobox / ComboboxPortal | None; state / portal |
|
|
109
|
-
| Popover /
|
|
109
|
+
| Popover, Tooltip, Menu / their Portals | None; state / portal |
|
|
110
110
|
| PopoverTrigger / PopoverClose / PopoverContent | Button's `button` / Button's `button` / `div` |
|
|
111
111
|
| SelectTrigger / SelectContent / SelectViewport / SelectItem | Button's `button` / `div` / `div` / `div` |
|
|
112
112
|
| ComboboxInput / ComboboxContent / ComboboxItem | Native `input` / `div` / `div` |
|
|
@@ -120,7 +120,7 @@ host, never a wrapper:
|
|
|
120
120
|
| Collapsible / CollapsibleTrigger / CollapsibleContent | `details` / `summary` / `div` |
|
|
121
121
|
| Accordion / AccordionItem / AccordionTrigger / AccordionContent | `div` / `details` / `summary` / `div` |
|
|
122
122
|
| Card / CardHeader / CardContent / CardFooter | `div` |
|
|
123
|
-
| CardTitle / CardDescription
|
|
123
|
+
| CardTitle and AlertTitle / CardDescription and AlertDescription | Heading chosen by `level` / `p` |
|
|
124
124
|
|
|
125
125
|
Internal parts take `className` and `style` through a `parts` map. Field has
|
|
126
126
|
`label`, `description`, `error` and `required`. Checkbox, Switch and Radio have
|
|
@@ -195,7 +195,7 @@ For cancellable actions, disabled and pending guards run first, then the
|
|
|
195
195
|
consumer handler, then the state request if `defaultPrevented` is false. Native
|
|
196
196
|
change, toggle and blur are observations and cannot veto anything. Library and
|
|
197
197
|
caller refs get the same host, and callback-ref cleanup functions are honored.
|
|
198
|
-
`useField`, `useDialog`, `useCombobox`, `useTabs`, `useCollapsible` and `useAccordion` read and request
|
|
198
|
+
`useField`, `useDialog`, `usePopover`, `useTooltip`, `useMenu`, `useCombobox`, `useTabs`, `useCollapsible` and `useAccordion` read and request
|
|
199
199
|
state, and return `null` outside their owner. Parts that need a root throw when misplaced. Lifecycle,
|
|
200
200
|
SSR and hydration details are in [React bindings](react-bindings.md).
|
|
201
201
|
|
package/docs/theming.md
CHANGED
|
@@ -90,7 +90,7 @@ example, `components.button.radius` changes Button only, while
|
|
|
90
90
|
component never falls back to another component's override.
|
|
91
91
|
|
|
92
92
|
Component keys are grouped by family under `components`: `button`, `link`,
|
|
93
|
-
`field`, `input`, `textarea`, `slider`, `select`, `combobox`, `checkbox`, `switch`, `radio`, `radioGroup`, `dialog`, `popover`, `tooltip`, `collapsible`,
|
|
93
|
+
`field`, `input`, `textarea`, `slider`, `select`, `combobox`, `checkbox`, `switch`, `radio`, `radioGroup`, `dialog`, `popover`, `tooltip`, `menu`, `alert`, `collapsible`,
|
|
94
94
|
`accordion`, `tabs` and `card`. Every key is listed in
|
|
95
95
|
[`src/themes/components.ts`](../src/themes/components.ts). Button-only fonts,
|
|
96
96
|
uppercase, shadows, squash and pressed shape belong under `components.button`.
|
package/package.json
CHANGED
package/src/Alert.tsx
ADDED
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import type { ComponentProps } from 'react'
|
|
2
|
+
import { cn } from './cn.js'
|
|
3
|
+
import { actionTone } from './actionStyles.js'
|
|
4
|
+
import { joinIds } from './internal/ids.js'
|
|
5
|
+
import type { Tone } from './presentation.js'
|
|
6
|
+
import type { ThemeStyle } from './themes/defineTheme.js'
|
|
7
|
+
|
|
8
|
+
export type AlertAnnouncement = 'off' | 'polite' | 'assertive'
|
|
9
|
+
export type AlertTone = Tone
|
|
10
|
+
export type AlertProps = Omit<
|
|
11
|
+
ComponentProps<'div'>,
|
|
12
|
+
'style' | 'role' | 'aria-live' | 'aria-atomic'
|
|
13
|
+
> & {
|
|
14
|
+
style?: ThemeStyle
|
|
15
|
+
'data-slot'?: string
|
|
16
|
+
/** Visual palette only; urgency is chosen independently through announce. */
|
|
17
|
+
tone?: AlertTone
|
|
18
|
+
/** Static information is silent by default. Live roles carry their native ARIA defaults. */
|
|
19
|
+
announce?: AlertAnnouncement
|
|
20
|
+
}
|
|
21
|
+
const headings = { 1: 'h1', 2: 'h2', 3: 'h3', 4: 'h4', 5: 'h5', 6: 'h6' } as const
|
|
22
|
+
export type AlertHeadingLevel = keyof typeof headings
|
|
23
|
+
export type AlertTitleProps = Omit<ComponentProps<'h2'>, 'style'> & {
|
|
24
|
+
style?: ThemeStyle
|
|
25
|
+
'data-slot'?: string
|
|
26
|
+
level?: AlertHeadingLevel
|
|
27
|
+
}
|
|
28
|
+
export type AlertDescriptionProps = Omit<ComponentProps<'p'>, 'style'> & {
|
|
29
|
+
style?: ThemeStyle
|
|
30
|
+
'data-slot'?: string
|
|
31
|
+
}
|
|
32
|
+
const colorMotion =
|
|
33
|
+
'transition-colors duration-[var(--rad-motion-color-duration,150ms)] motion-reduce:transition-none'
|
|
34
|
+
|
|
35
|
+
/** Inline content, never a focus manager, timer, dismissal owner or announcement queue. */
|
|
36
|
+
export function Alert({ announce = 'off', tone = 'neutral', className, ...props }: AlertProps) {
|
|
37
|
+
if (!['off', 'polite', 'assertive'].includes(announce))
|
|
38
|
+
throw new TypeError('Alert announce must be off, polite or assertive.')
|
|
39
|
+
const named = Boolean(props['aria-label'] || props['aria-labelledby'])
|
|
40
|
+
const role =
|
|
41
|
+
announce === 'assertive'
|
|
42
|
+
? 'alert'
|
|
43
|
+
: announce === 'polite'
|
|
44
|
+
? 'status'
|
|
45
|
+
: named
|
|
46
|
+
? 'group'
|
|
47
|
+
: undefined
|
|
48
|
+
return (
|
|
49
|
+
<div
|
|
50
|
+
{...props}
|
|
51
|
+
role={role}
|
|
52
|
+
aria-live={undefined}
|
|
53
|
+
aria-atomic={undefined}
|
|
54
|
+
data-slot={joinIds('alert', props['data-slot'])}
|
|
55
|
+
data-tone={tone}
|
|
56
|
+
data-announce={announce}
|
|
57
|
+
className={cn(
|
|
58
|
+
actionTone({ tone }),
|
|
59
|
+
colorMotion,
|
|
60
|
+
'box-border grid w-full min-w-0 break-words text-start antialiased gap-[var(--rad-alert-gap,var(--rad-spacing-header-gap,0.375rem))] p-[var(--rad-alert-padding,var(--rad-surface-padding,1.5rem))] rounded-[var(--rad-alert-radius,var(--rad-surface-radius,0.75rem))]',
|
|
61
|
+
'bg-[var(--rad-alert-background,var(--_action-soft))] [color:var(--rad-alert-color,var(--_action-ink))] [border-color:var(--rad-alert-border-color,var(--_action-edge))] [border-width:var(--rad-alert-border-width,var(--rad-surface-border-width,1px))] [border-style:var(--rad-alert-border-style,var(--rad-surface-border-style,solid))] [box-shadow:var(--rad-alert-shadow,none)]',
|
|
62
|
+
'font-[family-name:var(--rad-typography-roles-ui-body-family,system-ui,sans-serif)] text-[length:var(--rad-typography-roles-ui-body-size,0.875rem)] font-[number:var(--rad-typography-roles-ui-body-weight,400)] leading-[var(--rad-typography-roles-ui-body-line-height,1.5)] tracking-[var(--rad-typography-roles-ui-body-letter-spacing,-0.011em)]',
|
|
63
|
+
'forced-colors:border-[CanvasText] forced-colors:bg-[Canvas] forced-colors:text-[CanvasText] forced-colors:shadow-none',
|
|
64
|
+
className
|
|
65
|
+
)}
|
|
66
|
+
/>
|
|
67
|
+
)
|
|
68
|
+
}
|
|
69
|
+
export function AlertTitle({ level = 2, className, ...props }: AlertTitleProps) {
|
|
70
|
+
const Tag = headings[level]
|
|
71
|
+
return (
|
|
72
|
+
<Tag
|
|
73
|
+
{...props}
|
|
74
|
+
data-slot={joinIds('alert-title', props['data-slot'])}
|
|
75
|
+
className={cn(
|
|
76
|
+
colorMotion,
|
|
77
|
+
'm-0 min-w-0 break-words font-[family-name:var(--rad-typography-roles-ui-title-family,system-ui,sans-serif)] text-[length:var(--rad-alert-title-size,var(--rad-typography-roles-ui-title-size,1.125rem))] font-[number:var(--rad-alert-title-weight,var(--rad-typography-roles-ui-title-weight,600))] leading-[var(--rad-typography-roles-ui-title-line-height,1.3)] tracking-[var(--rad-typography-roles-ui-title-letter-spacing,-0.015em)]',
|
|
78
|
+
className
|
|
79
|
+
)}
|
|
80
|
+
/>
|
|
81
|
+
)
|
|
82
|
+
}
|
|
83
|
+
export function AlertDescription({ className, ...props }: AlertDescriptionProps) {
|
|
84
|
+
return (
|
|
85
|
+
<p
|
|
86
|
+
{...props}
|
|
87
|
+
data-slot={joinIds('alert-description', props['data-slot'])}
|
|
88
|
+
className={cn(
|
|
89
|
+
colorMotion,
|
|
90
|
+
'm-0 min-w-0 break-words text-[length:var(--rad-alert-description-size,var(--rad-typography-roles-ui-body-size,0.875rem))] leading-[var(--rad-typography-roles-ui-body-line-height,1.5)]',
|
|
91
|
+
className
|
|
92
|
+
)}
|
|
93
|
+
/>
|
|
94
|
+
)
|
|
95
|
+
}
|
package/src/Menu.tsx
ADDED
|
@@ -0,0 +1,248 @@
|
|
|
1
|
+
'use client'
|
|
2
|
+
|
|
3
|
+
import {
|
|
4
|
+
createContext,
|
|
5
|
+
useContext,
|
|
6
|
+
useId,
|
|
7
|
+
useLayoutEffect,
|
|
8
|
+
useRef,
|
|
9
|
+
type MouseEvent,
|
|
10
|
+
type ReactNode,
|
|
11
|
+
type RefObject
|
|
12
|
+
} from 'react'
|
|
13
|
+
import {
|
|
14
|
+
Popover,
|
|
15
|
+
PopoverTrigger,
|
|
16
|
+
PopoverContent,
|
|
17
|
+
PopoverClose,
|
|
18
|
+
PopoverPortal,
|
|
19
|
+
usePopover,
|
|
20
|
+
type PopoverProps,
|
|
21
|
+
type PopoverState,
|
|
22
|
+
type PopoverContentProps
|
|
23
|
+
} from './Popover.js'
|
|
24
|
+
import type { ButtonProps, ButtonRenderProps } from './Button.js'
|
|
25
|
+
import { cn } from './cn.js'
|
|
26
|
+
import { composeAction } from './internal/events.js'
|
|
27
|
+
import { joinIds } from './internal/ids.js'
|
|
28
|
+
import { matchSelectText } from './internal/select.js'
|
|
29
|
+
import { useComposedRefs } from './react/useComposedRefs.js'
|
|
30
|
+
|
|
31
|
+
export type MenuProps = PopoverProps
|
|
32
|
+
export type MenuState = PopoverState
|
|
33
|
+
export type MenuRenderProps = ButtonRenderProps
|
|
34
|
+
export type MenuPortalProps = { children?: ReactNode }
|
|
35
|
+
export type MenuTriggerProps = Omit<ButtonProps, 'id' | 'aria-haspopup'>
|
|
36
|
+
export type MenuContentProps = Omit<
|
|
37
|
+
PopoverContentProps,
|
|
38
|
+
'role' | 'aria-labelledby' | 'aria-orientation' | 'tabIndex' | 'initialFocusRef'
|
|
39
|
+
>
|
|
40
|
+
export type MenuItemProps = Omit<
|
|
41
|
+
ButtonProps,
|
|
42
|
+
'role' | 'tabIndex' | 'aria-disabled' | 'onSelect'
|
|
43
|
+
> & {
|
|
44
|
+
textValue?: string
|
|
45
|
+
onSelect?: (event: MouseEvent<HTMLButtonElement>) => void
|
|
46
|
+
}
|
|
47
|
+
type Context = MenuState & {
|
|
48
|
+
triggerId: string
|
|
49
|
+
trigger: RefObject<HTMLButtonElement | null>
|
|
50
|
+
content: RefObject<HTMLDivElement | null>
|
|
51
|
+
intent: RefObject<'first' | 'last'>
|
|
52
|
+
setIntent: (edge: 'first' | 'last') => void
|
|
53
|
+
}
|
|
54
|
+
const MenuContext = createContext<Context | null>(null)
|
|
55
|
+
export function useMenu(): MenuState | null {
|
|
56
|
+
return useContext(MenuContext)
|
|
57
|
+
}
|
|
58
|
+
function useMenuContext() {
|
|
59
|
+
const menu = useContext(MenuContext)
|
|
60
|
+
if (!menu) throw new Error('Menu parts must render inside Menu.')
|
|
61
|
+
return menu
|
|
62
|
+
}
|
|
63
|
+
export function Menu({ children, ...props }: MenuProps) {
|
|
64
|
+
return (
|
|
65
|
+
<Popover {...props}>
|
|
66
|
+
<MenuOwner>{children}</MenuOwner>
|
|
67
|
+
</Popover>
|
|
68
|
+
)
|
|
69
|
+
}
|
|
70
|
+
function MenuOwner({ children }: { children?: ReactNode }) {
|
|
71
|
+
const state = usePopover()!
|
|
72
|
+
const triggerId = useId()
|
|
73
|
+
const trigger = useRef<HTMLButtonElement>(null)
|
|
74
|
+
const content = useRef<HTMLDivElement>(null)
|
|
75
|
+
const intent = useRef<'first' | 'last'>('first')
|
|
76
|
+
return (
|
|
77
|
+
<MenuContext.Provider
|
|
78
|
+
value={{
|
|
79
|
+
...state,
|
|
80
|
+
triggerId,
|
|
81
|
+
trigger,
|
|
82
|
+
content,
|
|
83
|
+
intent,
|
|
84
|
+
setIntent: edge => {
|
|
85
|
+
intent.current = edge
|
|
86
|
+
}
|
|
87
|
+
}}
|
|
88
|
+
>
|
|
89
|
+
{children}
|
|
90
|
+
</MenuContext.Provider>
|
|
91
|
+
)
|
|
92
|
+
}
|
|
93
|
+
function items(node: HTMLElement) {
|
|
94
|
+
return Array.from(node.querySelectorAll<HTMLButtonElement>('button[role="menuitem"]')).filter(
|
|
95
|
+
item => item.closest('[role="menu"]') === node
|
|
96
|
+
)
|
|
97
|
+
}
|
|
98
|
+
function focusItem(node: HTMLElement, item?: HTMLButtonElement) {
|
|
99
|
+
for (const candidate of items(node)) candidate.tabIndex = candidate === item ? 0 : -1
|
|
100
|
+
;(item ?? node).focus({ preventScroll: true })
|
|
101
|
+
}
|
|
102
|
+
export function MenuTrigger({ ref, onKeyDown, onClick, ...props }: MenuTriggerProps) {
|
|
103
|
+
const menu = useMenuContext()
|
|
104
|
+
const host = useComposedRefs(menu.trigger, ref)
|
|
105
|
+
return (
|
|
106
|
+
<PopoverTrigger
|
|
107
|
+
{...props}
|
|
108
|
+
ref={host}
|
|
109
|
+
id={menu.triggerId}
|
|
110
|
+
aria-haspopup="menu"
|
|
111
|
+
data-slot={joinIds('menu-trigger', props['data-slot'])}
|
|
112
|
+
onClick={composeAction(onClick, () => {
|
|
113
|
+
menu.setIntent('first')
|
|
114
|
+
})}
|
|
115
|
+
onKeyDown={composeAction(onKeyDown, event => {
|
|
116
|
+
if (
|
|
117
|
+
(event.key !== 'ArrowDown' && event.key !== 'ArrowUp') ||
|
|
118
|
+
props.disabled ||
|
|
119
|
+
props.pending ||
|
|
120
|
+
event.currentTarget.matches(':disabled')
|
|
121
|
+
)
|
|
122
|
+
return
|
|
123
|
+
event.preventDefault()
|
|
124
|
+
menu.setIntent(event.key === 'ArrowUp' ? 'last' : 'first')
|
|
125
|
+
if (menu.open && menu.content.current) {
|
|
126
|
+
const options = items(menu.content.current)
|
|
127
|
+
focusItem(
|
|
128
|
+
menu.content.current,
|
|
129
|
+
menu.intent.current === 'last' ? options.at(-1) : options[0]
|
|
130
|
+
)
|
|
131
|
+
} else menu.setOpen(true)
|
|
132
|
+
})}
|
|
133
|
+
/>
|
|
134
|
+
)
|
|
135
|
+
}
|
|
136
|
+
export function MenuPortal(props: MenuPortalProps) {
|
|
137
|
+
useMenuContext()
|
|
138
|
+
return <PopoverPortal {...props} />
|
|
139
|
+
}
|
|
140
|
+
export function MenuContent({ ref, className, onKeyDown, ...props }: MenuContentProps) {
|
|
141
|
+
const menu = useMenuContext()
|
|
142
|
+
const host = useComposedRefs(menu.content, ref)
|
|
143
|
+
const search = useRef({ text: '', time: 0 })
|
|
144
|
+
useLayoutEffect(() => {
|
|
145
|
+
search.current = { text: '', time: 0 }
|
|
146
|
+
const node = menu.content.current
|
|
147
|
+
if (!menu.open || !node) return
|
|
148
|
+
const options = items(node)
|
|
149
|
+
focusItem(node, menu.intent.current === 'last' ? options.at(-1) : options[0])
|
|
150
|
+
}, [menu.open, menu.content, menu.intent])
|
|
151
|
+
return (
|
|
152
|
+
<PopoverContent
|
|
153
|
+
{...props}
|
|
154
|
+
ref={host}
|
|
155
|
+
role="menu"
|
|
156
|
+
aria-orientation="vertical"
|
|
157
|
+
aria-labelledby={menu.triggerId}
|
|
158
|
+
tabIndex={-1}
|
|
159
|
+
data-slot={joinIds('menu-content', props['data-slot'])}
|
|
160
|
+
className={cn(
|
|
161
|
+
'w-[var(--rad-menu-width,16rem)] gap-0 p-[var(--rad-menu-padding,0.25rem)] rounded-[var(--rad-menu-radius,var(--rad-surface-radius,0.75rem))]',
|
|
162
|
+
'bg-[var(--rad-menu-background,var(--rad-color-surface,white))] [color:var(--rad-menu-color,var(--rad-color-foreground))] [border-color:var(--rad-menu-border-color,var(--rad-color-border))] [border-width:var(--rad-menu-border-width,var(--rad-surface-border-width,1px))] [border-style:var(--rad-menu-border-style,var(--rad-surface-border-style,solid))] [box-shadow:var(--rad-menu-shadow,var(--rad-surface-overlay-shadow,0_8px_32px_#0003))]',
|
|
163
|
+
'forced-colors:border-[CanvasText] forced-colors:bg-[Canvas] forced-colors:text-[CanvasText]',
|
|
164
|
+
className
|
|
165
|
+
)}
|
|
166
|
+
onKeyDown={event => {
|
|
167
|
+
onKeyDown?.(event)
|
|
168
|
+
if (event.defaultPrevented) return
|
|
169
|
+
const node = event.currentTarget
|
|
170
|
+
const target = event.target as HTMLElement
|
|
171
|
+
if (target.closest('[role="menu"]') !== node) return
|
|
172
|
+
if (event.key === 'Tab') {
|
|
173
|
+
// Let the browser continue from the opener after closing, in either direction.
|
|
174
|
+
menu.trigger.current?.focus({ preventScroll: true })
|
|
175
|
+
menu.setOpen(false)
|
|
176
|
+
return
|
|
177
|
+
}
|
|
178
|
+
if (event.altKey || event.ctrlKey || event.metaKey || event.nativeEvent.isComposing) return
|
|
179
|
+
const options = items(node)
|
|
180
|
+
const index = options.indexOf(node.ownerDocument.activeElement as HTMLButtonElement)
|
|
181
|
+
let next: HTMLButtonElement | undefined
|
|
182
|
+
if (event.key === 'Home') next = options[0]
|
|
183
|
+
else if (event.key === 'End') next = options.at(-1)
|
|
184
|
+
else if (event.key === 'ArrowDown') next = options[(index + 1) % options.length]
|
|
185
|
+
else if (event.key === 'ArrowUp')
|
|
186
|
+
next = options[(index - 1 + options.length) % options.length]
|
|
187
|
+
else if (event.key.length === 1 && event.key !== ' ') {
|
|
188
|
+
const now = node.ownerDocument.defaultView!.performance.now()
|
|
189
|
+
search.current.text =
|
|
190
|
+
(now - search.current.time > 700 ? '' : search.current.text) + event.key
|
|
191
|
+
search.current.time = now
|
|
192
|
+
const match = matchSelectText(
|
|
193
|
+
options.map((item, i) => ({
|
|
194
|
+
value: String(i),
|
|
195
|
+
textValue: item.dataset.textValue ?? item.textContent ?? ''
|
|
196
|
+
})),
|
|
197
|
+
search.current.text,
|
|
198
|
+
String(index)
|
|
199
|
+
)
|
|
200
|
+
if (match !== undefined) next = options[Number(match)]
|
|
201
|
+
} else return
|
|
202
|
+
event.preventDefault()
|
|
203
|
+
if (next) focusItem(node, next)
|
|
204
|
+
}}
|
|
205
|
+
/>
|
|
206
|
+
)
|
|
207
|
+
}
|
|
208
|
+
export function MenuItem({
|
|
209
|
+
disabled = false,
|
|
210
|
+
textValue,
|
|
211
|
+
onSelect,
|
|
212
|
+
onClick,
|
|
213
|
+
onFocus,
|
|
214
|
+
onPointerMove,
|
|
215
|
+
className,
|
|
216
|
+
motion,
|
|
217
|
+
...props
|
|
218
|
+
}: MenuItemProps) {
|
|
219
|
+
const menu = useMenuContext()
|
|
220
|
+
return (
|
|
221
|
+
<PopoverClose
|
|
222
|
+
{...props}
|
|
223
|
+
disabled={undefined}
|
|
224
|
+
aria-disabled={disabled || undefined}
|
|
225
|
+
role="menuitem"
|
|
226
|
+
tabIndex={-1}
|
|
227
|
+
motion={disabled ? 'off' : motion}
|
|
228
|
+
data-slot={joinIds('menu-item', props['data-slot'])}
|
|
229
|
+
data-text-value={textValue}
|
|
230
|
+
className={cn(
|
|
231
|
+
'h-auto w-full justify-start [background-image:none] inset-shadow-none [border-width:0] [border-style:none] bg-transparent text-start text-inherit shadow-none p-[var(--rad-menu-item-padding,0.625rem)] rounded-[var(--rad-menu-item-radius,var(--rad-control-radius,0.5rem))]',
|
|
232
|
+
'hover:bg-[var(--rad-menu-item-focus-background,color-mix(in_oklab,var(--rad-color-accent)_12%,var(--rad-color-surface)))] focus:bg-[var(--rad-menu-item-focus-background,color-mix(in_oklab,var(--rad-color-accent)_12%,var(--rad-color-surface)))] focus:[color:var(--rad-menu-item-focus-color,color-mix(in_oklab,var(--rad-color-accent)_25%,var(--rad-color-foreground)))]',
|
|
233
|
+
'aria-disabled:cursor-not-allowed aria-disabled:opacity-[var(--rad-state-disabled-opacity,0.5)] forced-colors:aria-disabled:text-[GrayText] forced-colors:aria-disabled:opacity-100 forced-colors:focus:bg-[Highlight] forced-colors:focus:text-[HighlightText]',
|
|
234
|
+
className
|
|
235
|
+
)}
|
|
236
|
+
onClick={composeAction(onClick, onSelect, () => disabled)}
|
|
237
|
+
onFocus={event => {
|
|
238
|
+
onFocus?.(event)
|
|
239
|
+
const node = menu.content.current
|
|
240
|
+
if (node)
|
|
241
|
+
for (const item of items(node)) item.tabIndex = item === event.currentTarget ? 0 : -1
|
|
242
|
+
}}
|
|
243
|
+
onPointerMove={composeAction(onPointerMove, event => {
|
|
244
|
+
if (event.pointerType !== 'touch') event.currentTarget.focus({ preventScroll: true })
|
|
245
|
+
})}
|
|
246
|
+
/>
|
|
247
|
+
)
|
|
248
|
+
}
|
package/src/Popover.tsx
CHANGED
|
@@ -91,6 +91,7 @@ export type PopoverRenderProps = ButtonRenderProps
|
|
|
91
91
|
export type PopoverPortalProps = { children?: ReactNode }
|
|
92
92
|
export type PopoverContentProps = Omit<ComponentProps<'div'>, 'style' | 'popover' | 'id'> & {
|
|
93
93
|
style?: ThemeStyle
|
|
94
|
+
'data-slot'?: string
|
|
94
95
|
side?: PopoverSide
|
|
95
96
|
align?: PopoverAlign
|
|
96
97
|
sideOffset?: number
|
|
@@ -184,7 +185,7 @@ export function PopoverContent({
|
|
|
184
185
|
ref={transitionRef}
|
|
185
186
|
id={popover.contentId}
|
|
186
187
|
popover="manual"
|
|
187
|
-
data-slot=
|
|
188
|
+
data-slot={joinIds('popover-content', props['data-slot'])}
|
|
188
189
|
data-state={popover.open ? 'open' : 'closed'}
|
|
189
190
|
data-side={side}
|
|
190
191
|
data-align={align}
|
package/src/actionStyles.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { cva } from 'class-variance-authority'
|
|
2
2
|
|
|
3
|
-
// Palette and readable ink are shared by
|
|
3
|
+
// Palette and readable ink are shared by actions, text links and inline feedback. Ink is
|
|
4
4
|
// mixed toward the scope foreground so pale warning/accent fills stay readable
|
|
5
5
|
// on an unfilled surface in either mode. Neutral preserves the quiet palette.
|
|
6
6
|
const tones = {
|
package/src/cn.ts
CHANGED
|
@@ -17,6 +17,7 @@ export const cn: CnFunction = createCn({
|
|
|
17
17
|
'font-(--rad-tabs-font-family)'
|
|
18
18
|
],
|
|
19
19
|
'font-weight': [
|
|
20
|
+
'font-(--rad-alert-title-weight)',
|
|
20
21
|
'font-(--rad-tooltip-font-weight)',
|
|
21
22
|
...roleClasses('font', 'weight'),
|
|
22
23
|
'font-(--rad-combobox-font-weight)',
|
|
@@ -25,6 +26,8 @@ export const cn: CnFunction = createCn({
|
|
|
25
26
|
'font-(--rad-tabs-font-weight)'
|
|
26
27
|
],
|
|
27
28
|
'font-size': [
|
|
29
|
+
'text-(--rad-alert-title-size)',
|
|
30
|
+
'text-(--rad-alert-description-size)',
|
|
28
31
|
'text-(--rad-tooltip-font-size)',
|
|
29
32
|
...roleClasses('text', 'size'),
|
|
30
33
|
...roleClasses('text', 'fluid-size'),
|
|
@@ -42,6 +45,7 @@ export const cn: CnFunction = createCn({
|
|
|
42
45
|
'h-(--rad-slider-length)'
|
|
43
46
|
],
|
|
44
47
|
w: [
|
|
48
|
+
'w-(--rad-menu-width)',
|
|
45
49
|
'w-(--rad-popover-width)',
|
|
46
50
|
'w-(--rad-switch-width)',
|
|
47
51
|
'w-(--rad-slider-height)',
|
|
@@ -50,6 +54,7 @@ export const cn: CnFunction = createCn({
|
|
|
50
54
|
'max-w': ['max-w-(--rad-tooltip-max-width)'],
|
|
51
55
|
size: ['size-(--rad-slider-thumb-size)', 'size-(--rad-slider-track-size)'],
|
|
52
56
|
gap: [
|
|
57
|
+
'gap-(--rad-alert-gap)',
|
|
53
58
|
'gap-(--rad-popover-gap)',
|
|
54
59
|
'gap-(--rad-switch-gap)',
|
|
55
60
|
'gap-(--rad-tabs-gap)',
|
|
@@ -64,6 +69,9 @@ export const cn: CnFunction = createCn({
|
|
|
64
69
|
'px-(--rad-tabs-trigger-padding)'
|
|
65
70
|
],
|
|
66
71
|
p: [
|
|
72
|
+
'p-(--rad-alert-padding)',
|
|
73
|
+
'p-(--rad-menu-padding)',
|
|
74
|
+
'p-(--rad-menu-item-padding)',
|
|
67
75
|
'p-(--rad-tooltip-padding)',
|
|
68
76
|
'p-(--rad-popover-padding)',
|
|
69
77
|
'p-(--rad-combobox-content-padding)',
|
|
@@ -72,6 +80,9 @@ export const cn: CnFunction = createCn({
|
|
|
72
80
|
'p-(--rad-tabs-content-padding)'
|
|
73
81
|
],
|
|
74
82
|
rounded: [
|
|
83
|
+
'rounded-(--rad-alert-radius)',
|
|
84
|
+
'rounded-(--rad-menu-radius)',
|
|
85
|
+
'rounded-(--rad-menu-item-radius)',
|
|
75
86
|
'rounded-(--rad-tooltip-radius)',
|
|
76
87
|
'rounded-(--rad-popover-radius)',
|
|
77
88
|
'rounded-(--rad-combobox-radius)',
|
|
@@ -90,6 +101,8 @@ export const cn: CnFunction = createCn({
|
|
|
90
101
|
'rounded-(--rad-tabs-content-radius)'
|
|
91
102
|
],
|
|
92
103
|
'border-w': [
|
|
104
|
+
'border-(--rad-alert-border-width)',
|
|
105
|
+
'border-(--rad-menu-border-width)',
|
|
93
106
|
'border-(--rad-tooltip-border-width)',
|
|
94
107
|
'border-(--rad-popover-border-width)',
|
|
95
108
|
'border-(--rad-combobox-border-width)',
|
|
@@ -100,6 +113,8 @@ export const cn: CnFunction = createCn({
|
|
|
100
113
|
'border-(--rad-tabs-trigger-border-width)'
|
|
101
114
|
],
|
|
102
115
|
'border-style': [
|
|
116
|
+
'border-(--rad-alert-border-style)',
|
|
117
|
+
'border-(--rad-menu-border-style)',
|
|
103
118
|
'border-(--rad-tooltip-border-style)',
|
|
104
119
|
'border-(--rad-popover-border-style)',
|
|
105
120
|
'border-(--rad-combobox-border-style)',
|
|
@@ -108,6 +123,8 @@ export const cn: CnFunction = createCn({
|
|
|
108
123
|
'border-(--rad-switch-border-style)'
|
|
109
124
|
],
|
|
110
125
|
shadow: [
|
|
126
|
+
'shadow-(--rad-alert-shadow)',
|
|
127
|
+
'shadow-(--rad-menu-shadow)',
|
|
111
128
|
'shadow-(--rad-tooltip-shadow)',
|
|
112
129
|
'shadow-(--rad-popover-shadow)',
|
|
113
130
|
'shadow-(--rad-combobox-shadow)',
|
package/src/index.ts
CHANGED
|
@@ -241,3 +241,24 @@ export type {
|
|
|
241
241
|
MotionInteraction,
|
|
242
242
|
SpringParameters
|
|
243
243
|
} from './motion/config.js'
|
|
244
|
+
|
|
245
|
+
export { Menu, MenuTrigger, MenuContent, MenuItem, MenuPortal, useMenu } from './Menu.js'
|
|
246
|
+
export type {
|
|
247
|
+
MenuProps,
|
|
248
|
+
MenuState,
|
|
249
|
+
MenuTriggerProps,
|
|
250
|
+
MenuContentProps,
|
|
251
|
+
MenuItemProps,
|
|
252
|
+
MenuPortalProps,
|
|
253
|
+
MenuRenderProps
|
|
254
|
+
} from './Menu.js'
|
|
255
|
+
|
|
256
|
+
export { Alert, AlertTitle, AlertDescription } from './Alert.js'
|
|
257
|
+
export type {
|
|
258
|
+
AlertProps,
|
|
259
|
+
AlertTitleProps,
|
|
260
|
+
AlertDescriptionProps,
|
|
261
|
+
AlertAnnouncement,
|
|
262
|
+
AlertTone,
|
|
263
|
+
AlertHeadingLevel
|
|
264
|
+
} from './Alert.js'
|
package/src/themes/components.ts
CHANGED
|
@@ -381,6 +381,35 @@ export const componentRegistry = {
|
|
|
381
381
|
descriptionColor: 'css',
|
|
382
382
|
descriptionSize: 'css'
|
|
383
383
|
},
|
|
384
|
+
menu: {
|
|
385
|
+
width: 'css',
|
|
386
|
+
padding: 'css',
|
|
387
|
+
radius: 'css',
|
|
388
|
+
background: 'css',
|
|
389
|
+
color: 'css',
|
|
390
|
+
borderColor: 'css',
|
|
391
|
+
borderWidth: 'css',
|
|
392
|
+
borderStyle: 'css',
|
|
393
|
+
shadow: 'css',
|
|
394
|
+
itemPadding: 'css',
|
|
395
|
+
itemRadius: 'css',
|
|
396
|
+
itemFocusBackground: 'css',
|
|
397
|
+
itemFocusColor: 'css'
|
|
398
|
+
},
|
|
399
|
+
alert: {
|
|
400
|
+
radius: 'css',
|
|
401
|
+
padding: 'css',
|
|
402
|
+
gap: 'css',
|
|
403
|
+
background: 'css',
|
|
404
|
+
color: 'css',
|
|
405
|
+
borderColor: 'css',
|
|
406
|
+
borderWidth: 'css',
|
|
407
|
+
borderStyle: 'css',
|
|
408
|
+
shadow: 'css',
|
|
409
|
+
titleSize: 'css',
|
|
410
|
+
titleWeight: 'weight',
|
|
411
|
+
descriptionSize: 'css'
|
|
412
|
+
},
|
|
384
413
|
radioGroup: { gap: 'css' }
|
|
385
414
|
} as const
|
|
386
415
|
|