@cognitap/radiant 0.0.77 → 0.0.78
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 +25 -2
- package/dist/library/charts/Charts.d.ts.map +1 -1
- package/dist/library/charts/Charts.js +5 -1
- package/dist/library/charts/Charts.js.map +1 -1
- package/dist/library/components/AppShell/AppShell.d.ts.map +1 -1
- package/dist/library/components/AppShell/AppShell.js +6 -5
- package/dist/library/components/AppShell/AppShell.js.map +1 -1
- package/dist/library/components/Breadcrumb/Breadcrumb.d.ts +2 -1
- package/dist/library/components/Breadcrumb/Breadcrumb.d.ts.map +1 -1
- package/dist/library/components/Breadcrumb/Breadcrumb.js +4 -9
- package/dist/library/components/Breadcrumb/Breadcrumb.js.map +1 -1
- package/dist/library/components/Carousel/Carousel.d.ts.map +1 -1
- package/dist/library/components/Carousel/Carousel.js +5 -3
- package/dist/library/components/Carousel/Carousel.js.map +1 -1
- package/dist/library/components/Checkbox/Checkbox.d.ts +3 -1
- package/dist/library/components/Checkbox/Checkbox.d.ts.map +1 -1
- package/dist/library/components/Checkbox/Checkbox.js +7 -7
- package/dist/library/components/Checkbox/Checkbox.js.map +1 -1
- package/dist/library/components/CodeBlock/CodeBlock.js +2 -2
- package/dist/library/components/CodeBlock/CodeBlock.js.map +1 -1
- package/dist/library/components/Collapsible/Collapsible.d.ts.map +1 -1
- package/dist/library/components/Collapsible/Collapsible.js +3 -5
- package/dist/library/components/Collapsible/Collapsible.js.map +1 -1
- package/dist/library/components/Combobox/Combobox.d.ts +9 -1
- package/dist/library/components/Combobox/Combobox.d.ts.map +1 -1
- package/dist/library/components/Combobox/Combobox.js +13 -12
- package/dist/library/components/Combobox/Combobox.js.map +1 -1
- package/dist/library/components/Combobox/comboboxStyles.d.ts.map +1 -1
- package/dist/library/components/Combobox/comboboxStyles.js +5 -2
- package/dist/library/components/Combobox/comboboxStyles.js.map +1 -1
- package/dist/library/components/Command/Command.d.ts +1 -4
- package/dist/library/components/Command/Command.d.ts.map +1 -1
- package/dist/library/components/Command/Command.js +2 -8
- package/dist/library/components/Command/Command.js.map +1 -1
- package/dist/library/components/ContextMenu/ContextMenu.d.ts.map +1 -1
- package/dist/library/components/ContextMenu/ContextMenu.js +2 -1
- package/dist/library/components/ContextMenu/ContextMenu.js.map +1 -1
- package/dist/library/components/Dialog/Dialog.d.ts +3 -0
- package/dist/library/components/Dialog/Dialog.d.ts.map +1 -1
- package/dist/library/components/Dialog/Dialog.js +8 -9
- package/dist/library/components/Dialog/Dialog.js.map +1 -1
- package/dist/library/components/Fieldset/Fieldset.d.ts +1 -1
- package/dist/library/components/Fieldset/Fieldset.d.ts.map +1 -1
- package/dist/library/components/Fieldset/Fieldset.js +2 -2
- package/dist/library/components/Fieldset/Fieldset.js.map +1 -1
- package/dist/library/components/FileInput/FileInput.d.ts +3 -1
- package/dist/library/components/FileInput/FileInput.d.ts.map +1 -1
- package/dist/library/components/FileInput/FileInput.js +5 -3
- package/dist/library/components/FileInput/FileInput.js.map +1 -1
- package/dist/library/components/Form/Form.d.ts.map +1 -1
- package/dist/library/components/Form/Form.js +12 -7
- package/dist/library/components/Form/Form.js.map +1 -1
- package/dist/library/components/HoverCard/HoverCard.d.ts +1 -0
- package/dist/library/components/HoverCard/HoverCard.d.ts.map +1 -1
- package/dist/library/components/HoverCard/HoverCard.js +1 -0
- package/dist/library/components/HoverCard/HoverCard.js.map +1 -1
- package/dist/library/components/Input/Input.d.ts +3 -1
- package/dist/library/components/Input/Input.d.ts.map +1 -1
- package/dist/library/components/Input/Input.js +6 -11
- package/dist/library/components/Input/Input.js.map +1 -1
- package/dist/library/components/InputGroup/InputGroup.d.ts.map +1 -1
- package/dist/library/components/InputGroup/InputGroup.js +2 -1
- package/dist/library/components/InputGroup/InputGroup.js.map +1 -1
- package/dist/library/components/Link/Link.d.ts +4 -2
- package/dist/library/components/Link/Link.d.ts.map +1 -1
- package/dist/library/components/Link/Link.js +6 -3
- package/dist/library/components/Link/Link.js.map +1 -1
- package/dist/library/components/Menu/Menu.d.ts +13 -3
- package/dist/library/components/Menu/Menu.d.ts.map +1 -1
- package/dist/library/components/Menu/Menu.js +23 -8
- package/dist/library/components/Menu/Menu.js.map +1 -1
- package/dist/library/components/Menubar/Menubar.d.ts.map +1 -1
- package/dist/library/components/Menubar/Menubar.js +1 -1
- package/dist/library/components/Menubar/Menubar.js.map +1 -1
- package/dist/library/components/NativeSelect/NativeSelect.d.ts.map +1 -1
- package/dist/library/components/NativeSelect/NativeSelect.js +2 -1
- package/dist/library/components/NativeSelect/NativeSelect.js.map +1 -1
- package/dist/library/components/NavLink/NavLink.d.ts.map +1 -1
- package/dist/library/components/NavLink/NavLink.js +5 -3
- package/dist/library/components/NavLink/NavLink.js.map +1 -1
- package/dist/library/components/NavigationMenu/NavigationMenu.d.ts +1 -1
- package/dist/library/components/NavigationMenu/NavigationMenu.d.ts.map +1 -1
- package/dist/library/components/NavigationMenu/NavigationMenu.js +10 -3
- package/dist/library/components/NavigationMenu/NavigationMenu.js.map +1 -1
- package/dist/library/components/NumberField/NumberField.d.ts.map +1 -1
- package/dist/library/components/NumberField/NumberField.js +1 -1
- package/dist/library/components/NumberField/NumberField.js.map +1 -1
- package/dist/library/components/OTPField/OTPField.d.ts.map +1 -1
- package/dist/library/components/OTPField/OTPField.js +2 -1
- package/dist/library/components/OTPField/OTPField.js.map +1 -1
- package/dist/library/components/Pagination/Pagination.d.ts +2 -1
- package/dist/library/components/Pagination/Pagination.d.ts.map +1 -1
- package/dist/library/components/Pagination/Pagination.js +4 -6
- package/dist/library/components/Pagination/Pagination.js.map +1 -1
- package/dist/library/components/Popover/Popover.d.ts.map +1 -1
- package/dist/library/components/Popover/Popover.js +4 -2
- package/dist/library/components/Popover/Popover.js.map +1 -1
- package/dist/library/components/RadioGroup/RadioGroup.d.ts +4 -2
- package/dist/library/components/RadioGroup/RadioGroup.d.ts.map +1 -1
- package/dist/library/components/RadioGroup/RadioGroup.js +9 -10
- package/dist/library/components/RadioGroup/RadioGroup.js.map +1 -1
- package/dist/library/components/Resizable/Resizable.d.ts.map +1 -1
- package/dist/library/components/Resizable/Resizable.js +2 -1
- package/dist/library/components/Resizable/Resizable.js.map +1 -1
- package/dist/library/components/ScrollArea/ScrollArea.d.ts.map +1 -1
- package/dist/library/components/ScrollArea/ScrollArea.js +2 -1
- package/dist/library/components/ScrollArea/ScrollArea.js.map +1 -1
- package/dist/library/components/Select/Select.d.ts +7 -0
- package/dist/library/components/Select/Select.d.ts.map +1 -1
- package/dist/library/components/Select/Select.js +11 -10
- package/dist/library/components/Select/Select.js.map +1 -1
- package/dist/library/components/Select/selectStyles.d.ts.map +1 -1
- package/dist/library/components/Select/selectStyles.js +3 -1
- package/dist/library/components/Select/selectStyles.js.map +1 -1
- package/dist/library/components/Slider/Slider.d.ts +3 -1
- package/dist/library/components/Slider/Slider.d.ts.map +1 -1
- package/dist/library/components/Slider/Slider.js +6 -8
- package/dist/library/components/Slider/Slider.js.map +1 -1
- package/dist/library/components/Switch/Switch.d.ts +3 -1
- package/dist/library/components/Switch/Switch.d.ts.map +1 -1
- package/dist/library/components/Switch/Switch.js +6 -7
- package/dist/library/components/Switch/Switch.js.map +1 -1
- package/dist/library/components/Table/Table.d.ts.map +1 -1
- package/dist/library/components/Table/Table.js +2 -1
- package/dist/library/components/Table/Table.js.map +1 -1
- package/dist/library/components/Tabs/Tabs.d.ts.map +1 -1
- package/dist/library/components/Tabs/Tabs.js +8 -6
- package/dist/library/components/Tabs/Tabs.js.map +1 -1
- package/dist/library/components/TagsInput/TagsInput.d.ts +3 -1
- package/dist/library/components/TagsInput/TagsInput.d.ts.map +1 -1
- package/dist/library/components/TagsInput/TagsInput.js +8 -5
- package/dist/library/components/TagsInput/TagsInput.js.map +1 -1
- package/dist/library/components/Textarea/Textarea.d.ts +3 -1
- package/dist/library/components/Textarea/Textarea.d.ts.map +1 -1
- package/dist/library/components/Textarea/Textarea.js +6 -7
- package/dist/library/components/Textarea/Textarea.js.map +1 -1
- package/dist/library/components/Toast/Toast.d.ts +2 -1
- package/dist/library/components/Toast/Toast.d.ts.map +1 -1
- package/dist/library/components/Toast/Toast.js +21 -8
- package/dist/library/components/Toast/Toast.js.map +1 -1
- package/dist/library/components/Tooltip/Tooltip.d.ts +1 -0
- package/dist/library/components/Tooltip/Tooltip.d.ts.map +1 -1
- package/dist/library/components/Tooltip/Tooltip.js +1 -1
- package/dist/library/components/Tooltip/Tooltip.js.map +1 -1
- package/dist/library/components/shared/actionStyles.d.ts.map +1 -1
- package/dist/library/components/shared/actionStyles.js +3 -1
- package/dist/library/components/shared/actionStyles.js.map +1 -1
- package/dist/library/components/shared/focusStyles.d.ts +13 -0
- package/dist/library/components/shared/focusStyles.d.ts.map +1 -0
- package/dist/library/components/shared/focusStyles.js +17 -0
- package/dist/library/components/shared/focusStyles.js.map +1 -0
- package/dist/library/index.d.ts +1 -1
- package/dist/library/index.d.ts.map +1 -1
- package/dist/library/index.js.map +1 -1
- package/dist/library/react/useToastTimer.js +1 -1
- package/dist/library/react/useToastTimer.js.map +1 -1
- package/dist/library/styles.css +1 -1
- package/dist/library/themes/components.d.ts +12 -0
- package/dist/library/themes/components.d.ts.map +1 -1
- package/dist/library/themes/components.js +15 -3
- package/dist/library/themes/components.js.map +1 -1
- package/docs/architecture.md +87 -73
- package/docs/theming.md +5 -0
- package/package.json +1 -1
- package/src/charts/Charts.tsx +5 -2
- package/src/components/AppShell/AppShell.tsx +9 -5
- package/src/components/Breadcrumb/Breadcrumb.tsx +5 -9
- package/src/components/Carousel/Carousel.tsx +8 -3
- package/src/components/Checkbox/Checkbox.tsx +9 -6
- package/src/components/CodeBlock/CodeBlock.tsx +2 -2
- package/src/components/Collapsible/Collapsible.tsx +3 -5
- package/src/components/Combobox/Combobox.tsx +71 -15
- package/src/components/Combobox/comboboxStyles.ts +5 -2
- package/src/components/Command/Command.tsx +2 -9
- package/src/components/ContextMenu/ContextMenu.tsx +2 -4
- package/src/components/Dialog/Dialog.tsx +29 -13
- package/src/components/Fieldset/Fieldset.tsx +3 -3
- package/src/components/FileInput/FileInput.tsx +8 -2
- package/src/components/Form/Form.tsx +10 -6
- package/src/components/HoverCard/HoverCard.tsx +5 -1
- package/src/components/Input/Input.tsx +13 -12
- package/src/components/InputGroup/InputGroup.tsx +4 -2
- package/src/components/Link/Link.tsx +9 -3
- package/src/components/Menu/Menu.tsx +51 -9
- package/src/components/Menubar/Menubar.tsx +1 -0
- package/src/components/NativeSelect/NativeSelect.tsx +3 -1
- package/src/components/NavLink/NavLink.tsx +8 -5
- package/src/components/NavigationMenu/NavigationMenu.tsx +14 -11
- package/src/components/NumberField/NumberField.tsx +1 -0
- package/src/components/OTPField/OTPField.tsx +4 -1
- package/src/components/Pagination/Pagination.tsx +5 -7
- package/src/components/Popover/Popover.tsx +4 -1
- package/src/components/RadioGroup/RadioGroup.tsx +13 -7
- package/src/components/Resizable/Resizable.tsx +4 -2
- package/src/components/ScrollArea/ScrollArea.tsx +2 -1
- package/src/components/Select/Select.tsx +27 -13
- package/src/components/Select/selectStyles.ts +3 -1
- package/src/components/Slider/Slider.tsx +8 -7
- package/src/components/Switch/Switch.tsx +8 -6
- package/src/components/Table/Table.tsx +3 -1
- package/src/components/Tabs/Tabs.tsx +8 -7
- package/src/components/TagsInput/TagsInput.tsx +10 -3
- package/src/components/Textarea/Textarea.tsx +8 -6
- package/src/components/Toast/Toast.tsx +26 -11
- package/src/components/Tooltip/Tooltip.tsx +2 -1
- package/src/components/shared/actionStyles.ts +3 -1
- package/src/components/shared/focusStyles.ts +28 -0
- package/src/index.ts +1 -0
- package/src/react/useToastTimer.ts +1 -1
- package/src/themes/components.ts +15 -3
|
@@ -56,8 +56,11 @@ function namedError(errors: FormErrors, name: string) {
|
|
|
56
56
|
function hasErrors(errors: FormErrors) {
|
|
57
57
|
return Boolean(errors.form || Object.values(errors.fields ?? {}).some(Boolean))
|
|
58
58
|
}
|
|
59
|
-
|
|
60
|
-
|
|
59
|
+
/** A validating control without a name (a compound family's visible input or JSON carrier) names its field with `data-form-name`. */
|
|
60
|
+
function fieldName(target: EventTarget | null) {
|
|
61
|
+
const control = target as Partial<HTMLInputElement> | null
|
|
62
|
+
if (typeof control?.name !== 'string') return ''
|
|
63
|
+
return control.name || control.getAttribute?.('data-form-name') || ''
|
|
61
64
|
}
|
|
62
65
|
function equalErrors(left: FormErrors, right: FormErrors) {
|
|
63
66
|
const entries = (errors: FormErrors) =>
|
|
@@ -116,7 +119,7 @@ export function Form({
|
|
|
116
119
|
!control.disabled &&
|
|
117
120
|
control.type !== 'hidden' &&
|
|
118
121
|
Boolean(
|
|
119
|
-
namedError(next, control
|
|
122
|
+
namedError(next, fieldName(control)) ||
|
|
120
123
|
(control.willValidate && !control.validity.valid) ||
|
|
121
124
|
control.getAttribute('aria-invalid') === 'true'
|
|
122
125
|
)
|
|
@@ -157,11 +160,11 @@ export function Form({
|
|
|
157
160
|
)}
|
|
158
161
|
onInput={event => {
|
|
159
162
|
onInput?.(event)
|
|
160
|
-
edited(
|
|
163
|
+
edited(fieldName(event.target))
|
|
161
164
|
}}
|
|
162
165
|
onChange={event => {
|
|
163
166
|
onChange?.(event)
|
|
164
|
-
edited(
|
|
167
|
+
edited(fieldName(event.target))
|
|
165
168
|
}}
|
|
166
169
|
onReset={event => {
|
|
167
170
|
onReset?.(event)
|
|
@@ -187,7 +190,8 @@ export function Form({
|
|
|
187
190
|
if (!(submitter as HTMLButtonElement | null)?.formNoValidate) {
|
|
188
191
|
for (const control of controls(form)) {
|
|
189
192
|
if (control.willValidate && !control.validity.valid) {
|
|
190
|
-
|
|
193
|
+
const name = fieldName(control)
|
|
194
|
+
if (name) nativeErrors[name] ??= control.validationMessage
|
|
191
195
|
else unnamedError ??= control.validationMessage
|
|
192
196
|
}
|
|
193
197
|
}
|
|
@@ -19,7 +19,10 @@ import { cn } from '../../cn.js'
|
|
|
19
19
|
|
|
20
20
|
export type HoverCardProps = PopoverProps & { openDelay?: number; closeDelay?: number }
|
|
21
21
|
export type HoverCardState = PopoverState
|
|
22
|
-
export type HoverCardRenderProps = Omit<LinkRenderProps, 'data-slot'> & {
|
|
22
|
+
export type HoverCardRenderProps = Omit<LinkRenderProps, 'data-slot'> & {
|
|
23
|
+
'data-slot': string
|
|
24
|
+
'data-state': 'open' | 'closed'
|
|
25
|
+
}
|
|
23
26
|
export type HoverCardTriggerProps = Omit<
|
|
24
27
|
LinkProps,
|
|
25
28
|
'href' | 'render' | 'aria-controls' | 'aria-expanded'
|
|
@@ -106,6 +109,7 @@ export function HoverCardTrigger({
|
|
|
106
109
|
render={resolved => {
|
|
107
110
|
const scoped: HoverCardRenderProps = {
|
|
108
111
|
...resolved,
|
|
112
|
+
'data-state': card.open ? 'open' : 'closed',
|
|
109
113
|
'data-slot':
|
|
110
114
|
joinIds('link', 'hover-card-trigger', props['data-slot']) ?? 'link hover-card-trigger'
|
|
111
115
|
}
|
|
@@ -3,11 +3,13 @@
|
|
|
3
3
|
import type { ComponentProps } from 'react'
|
|
4
4
|
import { cva } from 'class-variance-authority'
|
|
5
5
|
import { cn } from '../../cn.js'
|
|
6
|
+
import { joinIds } from '../../internal/ids.js'
|
|
6
7
|
import { controlBorderClass, controlMetrics } from '../shared/controlStyles.js'
|
|
7
8
|
import { useNativeOwner, type ValueOwner } from '../../react/useNativeOwner.js'
|
|
8
9
|
import type { ThemeStyle } from '../../themes/defineTheme.js'
|
|
9
10
|
import type { ControlSize } from '../../presentation.js'
|
|
10
11
|
import { useFieldControl } from '../Field/Field.js'
|
|
12
|
+
import { focusRingClass } from '../shared/focusStyles.js'
|
|
11
13
|
|
|
12
14
|
export const inputVariants = cva([
|
|
13
15
|
controlBorderClass,
|
|
@@ -27,11 +29,8 @@ export const inputVariants = cva([
|
|
|
27
29
|
'[corner-shape:var(--rad-input-corner-shape,var(--rad-control-corner-shape,round))]',
|
|
28
30
|
'[box-shadow:var(--rad-input-shadow,var(--rad-control-field-shadow,none))] [backdrop-filter:var(--rad-control-field-backdrop-filter,none)]',
|
|
29
31
|
'placeholder:[color:var(--rad-input-placeholder,var(--rad-color-placeholder,oklch(0.5_0.01_286)))]',
|
|
30
|
-
|
|
31
|
-
'focus-visible:[
|
|
32
|
-
'focus-visible:[outline-width:var(--rad-input-focus-width,var(--rad-focus-width,2px))]',
|
|
33
|
-
'focus-visible:[outline-offset:var(--rad-input-focus-offset,var(--rad-focus-offset,2px))]',
|
|
34
|
-
'focus-visible:[outline-style:var(--rad-input-focus-style,var(--rad-focus-style,solid))]',
|
|
32
|
+
focusRingClass,
|
|
33
|
+
'focus-visible:[--_rad-focus-color:var(--rad-input-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-input-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-input-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-input-focus-style)]',
|
|
35
34
|
'data-invalid:[border-color:var(--rad-input-invalid-border,var(--rad-color-invalid,oklch(0.56_0.19_25)))]',
|
|
36
35
|
'disabled:cursor-not-allowed',
|
|
37
36
|
'disabled:[background:var(--rad-input-disabled-background,var(--rad-color-disabled-background,oklch(0.96_0.005_286)))]',
|
|
@@ -45,6 +44,8 @@ export type InputProps = Omit<ComponentProps<'input'>, 'value' | 'defaultValue'
|
|
|
45
44
|
controlSize?: ControlSize
|
|
46
45
|
/** Applied to the native input, including caller-owned motion styles. */
|
|
47
46
|
style?: ThemeStyle
|
|
47
|
+
/** Additional composed identities; the input token is always retained. */
|
|
48
|
+
'data-slot'?: string
|
|
48
49
|
}
|
|
49
50
|
|
|
50
51
|
/** Native editing, selection, events and ref; Field supplies owned form relationships. */
|
|
@@ -71,6 +72,7 @@ export function InputRoot({
|
|
|
71
72
|
'aria-describedby': ariaDescribedBy,
|
|
72
73
|
'aria-invalid': ariaInvalid,
|
|
73
74
|
'aria-required': ariaRequired,
|
|
75
|
+
'data-slot': slot,
|
|
74
76
|
...props
|
|
75
77
|
}: InputProps & {
|
|
76
78
|
family?: 'tags-input' | 'otp-field' | 'input-group-input' | 'password-input' | 'number-field'
|
|
@@ -96,13 +98,12 @@ export function InputRoot({
|
|
|
96
98
|
required={nativeRequired === false ? false : control.required}
|
|
97
99
|
className={cn(inputVariants(), controlMetrics({ controlSize }), className)}
|
|
98
100
|
data-control-size={controlSize}
|
|
99
|
-
data-slot={
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
}
|
|
101
|
+
data-slot={joinIds(
|
|
102
|
+
'input',
|
|
103
|
+
family === 'password-input' || family === 'number-field' ? 'input-group-input' : undefined,
|
|
104
|
+
family,
|
|
105
|
+
slot
|
|
106
|
+
)}
|
|
106
107
|
type={type}
|
|
107
108
|
/>
|
|
108
109
|
)
|
|
@@ -8,6 +8,7 @@ import { controlBorderClass, controlMetrics } from '../shared/controlStyles.js'
|
|
|
8
8
|
import { joinIds } from '../../internal/ids.js'
|
|
9
9
|
import type { ControlSize } from '../../presentation.js'
|
|
10
10
|
import type { ThemeStyle } from '../../themes/defineTheme.js'
|
|
11
|
+
import { focusWithinRingClass } from '../shared/focusStyles.js'
|
|
11
12
|
|
|
12
13
|
const SizeContext = createContext<ControlSize | null>(null)
|
|
13
14
|
function useInputGroup() {
|
|
@@ -61,10 +62,11 @@ export function InputGroup({
|
|
|
61
62
|
'rounded-[var(--rad-input-group-radius,var(--rad-control-radius,0.5rem))] [corner-shape:var(--rad-control-corner-shape,round)] [border-width:var(--rad-input-group-border-width,var(--rad-control-border-width,1px))] [border-style:var(--rad-control-border-style,solid)] [box-shadow:var(--rad-control-field-shadow,none)] [backdrop-filter:var(--rad-control-field-backdrop-filter,none)] [border-color:var(--rad-input-group-border-color,var(--rad-control-field-border-color,var(--_rad-control-border)))]',
|
|
62
63
|
'bg-[var(--rad-input-group-background,var(--rad-control-field-background,var(--rad-color-surface,oklch(1_0_0))))] [color:var(--rad-input-group-color,var(--rad-color-muted-foreground,oklch(0.45_0.01_286)))]',
|
|
63
64
|
'font-[family-name:var(--rad-typography-roles-ui-body-family,system-ui,sans-serif)] text-[length:var(--_rad-control-font-size)] leading-[var(--rad-typography-roles-ui-body-line-height,1.5)]',
|
|
64
|
-
|
|
65
|
+
focusWithinRingClass,
|
|
66
|
+
'focus-within:[--_rad-focus-color:var(--rad-input-group-focus-color)] focus-within:[--_rad-focus-width:var(--rad-input-group-focus-width)] focus-within:[--_rad-focus-offset:var(--rad-input-group-focus-offset)] focus-within:[--_rad-focus-style:var(--rad-input-group-focus-style)]',
|
|
65
67
|
'has-[>[data-invalid]]:[border-color:var(--rad-input-group-invalid-border,var(--rad-color-invalid,oklch(0.56_0.19_25)))]',
|
|
66
68
|
'has-[>input:disabled]:cursor-not-allowed has-[>textarea:disabled]:cursor-not-allowed has-[>input:disabled]:bg-[var(--rad-color-disabled-background,oklch(0.96_0.005_286))] has-[>textarea:disabled]:bg-[var(--rad-color-disabled-background,oklch(0.96_0.005_286))]',
|
|
67
|
-
'forced-colors:border-[CanvasText] forced-colors:bg-[Canvas] forced-colors:text-[CanvasText]
|
|
69
|
+
'forced-colors:border-[CanvasText] forced-colors:bg-[Canvas] forced-colors:text-[CanvasText]',
|
|
68
70
|
className
|
|
69
71
|
)}
|
|
70
72
|
/>
|
|
@@ -3,14 +3,17 @@ import { cva, type VariantProps } from 'class-variance-authority'
|
|
|
3
3
|
import type { ButtonVariant, ControlSize, Tone } from '../../presentation.js'
|
|
4
4
|
import { actionTone, actionVariants } from '../shared/actionStyles.js'
|
|
5
5
|
import { cn } from '../../cn.js'
|
|
6
|
+
import { joinIds } from '../../internal/ids.js'
|
|
6
7
|
import type { ThemeStyle } from '../../themes/defineTheme.js'
|
|
8
|
+
import { focusRingClass } from '../shared/focusStyles.js'
|
|
7
9
|
|
|
8
10
|
const linkVariants = cva(
|
|
9
11
|
[
|
|
10
12
|
'[color:var(--_link-color)] [text-underline-offset:var(--rad-link-underline-offset,0.1875rem)]',
|
|
11
13
|
'transition-colors duration-[var(--rad-link-color-duration,var(--rad-motion-color-duration,150ms))]',
|
|
12
14
|
'hover:[color:var(--_link-hover)]',
|
|
13
|
-
|
|
15
|
+
focusRingClass,
|
|
16
|
+
'focus-visible:[--_rad-focus-color:var(--rad-link-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-link-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-link-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-link-focus-style)]',
|
|
14
17
|
'motion-reduce:transition-none'
|
|
15
18
|
],
|
|
16
19
|
{
|
|
@@ -34,7 +37,7 @@ export type LinkVariant = NonNullable<LinkVariants['variant']> | ButtonVariant
|
|
|
34
37
|
|
|
35
38
|
export type LinkRenderProps = Omit<ComponentProps<'a'>, 'style'> & {
|
|
36
39
|
style?: ThemeStyle
|
|
37
|
-
'data-slot':
|
|
40
|
+
'data-slot': string
|
|
38
41
|
'data-variant': LinkVariant
|
|
39
42
|
'data-tone': Tone
|
|
40
43
|
'data-control-size': ControlSize
|
|
@@ -42,6 +45,8 @@ export type LinkRenderProps = Omit<ComponentProps<'a'>, 'style'> & {
|
|
|
42
45
|
|
|
43
46
|
export type LinkProps = Omit<ComponentProps<'a'>, 'style'> & {
|
|
44
47
|
style?: ThemeStyle
|
|
48
|
+
/** Additional composed identities; the link token is always retained. */
|
|
49
|
+
'data-slot'?: string
|
|
45
50
|
/** Inline/subtle inherit text metrics; action treatments share Button's presentation. */
|
|
46
51
|
variant?: LinkVariant
|
|
47
52
|
/** Semantic palette, independent of treatment. */
|
|
@@ -65,6 +70,7 @@ export function Link({
|
|
|
65
70
|
target,
|
|
66
71
|
rel,
|
|
67
72
|
children,
|
|
73
|
+
'data-slot': slot,
|
|
68
74
|
...props
|
|
69
75
|
}: LinkProps) {
|
|
70
76
|
const anchorProps: LinkRenderProps = {
|
|
@@ -76,7 +82,7 @@ export function Link({
|
|
|
76
82
|
variant === 'inline' || variant === 'subtle'
|
|
77
83
|
? cn(actionTone({ tone }), linkVariants({ variant }), className)
|
|
78
84
|
: cn(actionVariants({ variant, tone, controlSize }), className),
|
|
79
|
-
'data-slot': 'link',
|
|
85
|
+
'data-slot': joinIds('link', slot) ?? 'link',
|
|
80
86
|
'data-variant': variant,
|
|
81
87
|
'data-tone': tone,
|
|
82
88
|
'data-control-size': controlSize,
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
useState,
|
|
11
11
|
type ComponentProps,
|
|
12
12
|
type MouseEvent,
|
|
13
|
+
type ReactElement,
|
|
13
14
|
type ReactNode,
|
|
14
15
|
type RefObject
|
|
15
16
|
} from 'react'
|
|
@@ -26,6 +27,7 @@ import {
|
|
|
26
27
|
type PopoverContentProps
|
|
27
28
|
} from '../Popover/Popover.js'
|
|
28
29
|
import type { ButtonProps, ButtonRenderProps } from '../Button/Button.js'
|
|
30
|
+
import type { Tone } from '../../presentation.js'
|
|
29
31
|
import type { DistributiveOmit, WithoutToggle } from '../../internal/types.js'
|
|
30
32
|
import { Separator, type SeparatorProps } from '../Separator/Separator.js'
|
|
31
33
|
import { useControllableState } from '../../react/useControllableState.js'
|
|
@@ -41,7 +43,13 @@ import { useComposedRefs } from '../../react/useComposedRefs.js'
|
|
|
41
43
|
|
|
42
44
|
export type MenuProps = PopoverProps
|
|
43
45
|
export type MenuState = PopoverState
|
|
44
|
-
|
|
46
|
+
/** Rows keep Button's host but none of its action presentation. */
|
|
47
|
+
export type MenuRenderProps = Omit<ButtonRenderProps, 'data-variant' | 'data-control-size'> & {
|
|
48
|
+
'data-disabled'?: ''
|
|
49
|
+
'data-selected'?: ''
|
|
50
|
+
}
|
|
51
|
+
/** A row's text color; actions stay neutral unless they warn or destroy. */
|
|
52
|
+
export type MenuItemTone = Exclude<Tone, 'accent'>
|
|
45
53
|
export type MenuPortalProps = { children?: ReactNode }
|
|
46
54
|
export type MenuTriggerProps = WithoutToggle<DistributiveOmit<ButtonProps, 'id' | 'aria-haspopup'>>
|
|
47
55
|
export type MenuContentProps = Omit<
|
|
@@ -49,8 +57,23 @@ export type MenuContentProps = Omit<
|
|
|
49
57
|
'role' | 'aria-labelledby' | 'aria-orientation' | 'tabIndex' | 'initialFocusRef'
|
|
50
58
|
>
|
|
51
59
|
export type MenuItemProps = WithoutToggle<
|
|
52
|
-
DistributiveOmit<
|
|
60
|
+
DistributiveOmit<
|
|
61
|
+
ButtonProps,
|
|
62
|
+
| 'role'
|
|
63
|
+
| 'tabIndex'
|
|
64
|
+
| 'aria-disabled'
|
|
65
|
+
| 'onSelect'
|
|
66
|
+
| 'render'
|
|
67
|
+
| 'variant'
|
|
68
|
+
| 'tone'
|
|
69
|
+
| 'controlSize'
|
|
70
|
+
| 'iconOnly'
|
|
71
|
+
| 'fullWidth'
|
|
72
|
+
>
|
|
53
73
|
> & {
|
|
74
|
+
render?: (props: MenuRenderProps) => ReactElement
|
|
75
|
+
/** Text color for warning and destructive rows; defaults to neutral. */
|
|
76
|
+
tone?: MenuItemTone
|
|
54
77
|
textValue?: string
|
|
55
78
|
closeOnSelect?: boolean
|
|
56
79
|
onSelect?: (event: MouseEvent<HTMLButtonElement>) => void
|
|
@@ -333,15 +356,26 @@ export function MenuContentRoot({
|
|
|
333
356
|
/>
|
|
334
357
|
)
|
|
335
358
|
}
|
|
359
|
+
// A toned row tints its text at rest and takes the tone's solid pair when highlighted,
|
|
360
|
+
// which stays readable where a theme inverts the item highlight.
|
|
361
|
+
const toneClass: Record<MenuItemTone, string | undefined> = {
|
|
362
|
+
neutral: undefined,
|
|
363
|
+
warning:
|
|
364
|
+
'[--_rad-menu-item-tone:var(--rad-menu-item-warning-color,color-mix(in_oklab,var(--rad-color-warning,oklch(0.8_0.14_78))_30%,var(--rad-color-foreground)))] [--_rad-menu-item-tone-background:var(--rad-color-warning,oklch(0.8_0.14_78))] [--_rad-menu-item-tone-foreground:var(--rad-color-warning-foreground,oklch(0.3_0.07_55))]',
|
|
365
|
+
danger:
|
|
366
|
+
'[--_rad-menu-item-tone:var(--rad-menu-item-danger-color,color-mix(in_oklab,var(--rad-color-danger,oklch(0.56_0.19_25))_65%,var(--rad-color-foreground)))] [--_rad-menu-item-tone-background:var(--rad-color-danger,oklch(0.56_0.19_25))] [--_rad-menu-item-tone-foreground:var(--rad-color-danger-foreground,oklch(0.99_0_0))]'
|
|
367
|
+
}
|
|
336
368
|
const menuItemClass = [
|
|
337
|
-
'relative box-border flex w-full min-w-0 cursor-default select-none items-center text-start [font:inherit] [color:inherit] bg-transparent border-0 outline-none',
|
|
369
|
+
'relative box-border flex w-full min-w-0 cursor-default select-none items-center text-start [font:inherit] [color:var(--_rad-menu-item-tone,inherit)] bg-transparent border-0 outline-none',
|
|
338
370
|
'[&>span:first-child]:min-w-0 [&>span:first-child]:flex-1',
|
|
339
371
|
'p-[var(--rad-menu-item-padding,0.625rem)] rounded-[var(--rad-menu-item-radius,var(--_rad-item-radius,var(--rad-control-radius,0.5rem)))] [corner-shape:var(--_rad-item-corner-shape,var(--rad-control-corner-shape,round))]',
|
|
340
372
|
'transition-colors duration-[var(--rad-motion-color-duration,150ms)] motion-reduce:transition-none',
|
|
341
|
-
|
|
342
|
-
|
|
373
|
+
// Keyboard focus moves between items like listbox options, so the highlighted row is the focus cue,
|
|
374
|
+
// drawn with the same item role and strength as Select and Combobox options. A toned row swaps in its tone pair.
|
|
375
|
+
'hover:bg-[var(--_rad-menu-item-tone-background,var(--rad-menu-item-focus-background,var(--rad-control-item-highlight-background,var(--rad-color-accent))))] focus:bg-[var(--_rad-menu-item-tone-background,var(--rad-menu-item-focus-background,var(--rad-control-item-highlight-background,var(--rad-color-accent))))]',
|
|
376
|
+
'hover:[color:var(--_rad-menu-item-tone-foreground,var(--rad-menu-item-focus-color,var(--rad-control-item-highlight-foreground,var(--rad-color-accent-foreground))))] focus:[color:var(--_rad-menu-item-tone-foreground,var(--rad-menu-item-focus-color,var(--rad-control-item-highlight-foreground,var(--rad-color-accent-foreground))))]',
|
|
343
377
|
'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',
|
|
344
|
-
'forced-colors:focus:bg-[Highlight] forced-colors:focus:text-[HighlightText] forced-colors:focus-visible:outline-
|
|
378
|
+
'forced-colors:focus:bg-[Highlight] forced-colors:focus:text-[HighlightText] forced-colors:focus-visible:outline-[length:var(--rad-focus-width,2px)] forced-colors:focus-visible:outline-offset-[calc(0px_-_var(--rad-focus-width,2px))] forced-colors:focus-visible:[outline-style:var(--rad-focus-style,solid)]'
|
|
345
379
|
].join(' ')
|
|
346
380
|
export function MenuItem(props: MenuItemProps) {
|
|
347
381
|
return (
|
|
@@ -357,6 +391,7 @@ function MenuItemRoot({
|
|
|
357
391
|
checkedValue,
|
|
358
392
|
closeOnSelect = true,
|
|
359
393
|
disabled = false,
|
|
394
|
+
tone = 'neutral',
|
|
360
395
|
textValue,
|
|
361
396
|
onSelect,
|
|
362
397
|
onClick,
|
|
@@ -385,8 +420,14 @@ function MenuItemRoot({
|
|
|
385
420
|
data-slot={joinIds('menu-item', props['data-slot'])}
|
|
386
421
|
data-text-value={textValue}
|
|
387
422
|
// A menu row plays the item role, so it takes none of Button's action look.
|
|
388
|
-
render={resolved => {
|
|
389
|
-
const native = {
|
|
423
|
+
render={({ 'data-variant': _variant, 'data-control-size': _controlSize, ...resolved }) => {
|
|
424
|
+
const native: MenuRenderProps = {
|
|
425
|
+
...resolved,
|
|
426
|
+
'data-tone': tone,
|
|
427
|
+
'data-disabled': disabled ? '' : undefined,
|
|
428
|
+
'data-selected': checkedValue === true ? '' : undefined,
|
|
429
|
+
className: cn(menuItemClass, toneClass[tone], className)
|
|
430
|
+
}
|
|
390
431
|
return render ? render(native) : <button {...native} />
|
|
391
432
|
}}
|
|
392
433
|
onClick={composeAction(onClick, onSelect, () => disabled)}
|
|
@@ -623,10 +664,11 @@ export function MenuSubTrigger({
|
|
|
623
664
|
aria-haspopup="menu"
|
|
624
665
|
aria-controls={menu.contentId}
|
|
625
666
|
aria-expanded={menu.open}
|
|
667
|
+
data-state={menu.open ? 'open' : 'closed'}
|
|
626
668
|
data-slot={joinIds('menu-sub-trigger', props['data-slot'])}
|
|
627
669
|
closeOnSelect={false}
|
|
628
670
|
className={cn(
|
|
629
|
-
'aria-expanded:bg-[var(--rad-menu-item-focus-background,var(--rad-control-item-highlight-background,color-mix(in_oklab,var(--rad-color-accent)_12%,var(--rad-color-surface))))] aria-expanded:[color:var(--rad-menu-item-focus-color,var(--rad-control-item-highlight-foreground,color-mix(in_oklab,var(--rad-color-accent)_25%,var(--rad-color-foreground))))]',
|
|
671
|
+
'aria-expanded:not-focus:bg-[var(--_rad-menu-item-tone-background,var(--rad-menu-item-focus-background,var(--rad-control-item-highlight-background,color-mix(in_oklab,var(--rad-color-accent)_12%,var(--rad-color-surface)))))] aria-expanded:not-focus:[color:var(--_rad-menu-item-tone-foreground,var(--rad-menu-item-focus-color,var(--rad-control-item-highlight-foreground,color-mix(in_oklab,var(--rad-color-accent)_25%,var(--rad-color-foreground)))))]',
|
|
630
672
|
className
|
|
631
673
|
)}
|
|
632
674
|
onSelect={event => {
|
|
@@ -8,6 +8,7 @@ import { joinIds } from '../../internal/ids.js'
|
|
|
8
8
|
import { useNativeOwner, type ValueOwner } from '../../react/useNativeOwner.js'
|
|
9
9
|
import type { ControlSize } from '../../presentation.js'
|
|
10
10
|
import type { ThemeStyle } from '../../themes/defineTheme.js'
|
|
11
|
+
import { focusRingClass } from '../shared/focusStyles.js'
|
|
11
12
|
|
|
12
13
|
export type NativeSelectProps = Omit<
|
|
13
14
|
ComponentProps<'select'>,
|
|
@@ -62,7 +63,8 @@ export function NativeSelect({
|
|
|
62
63
|
'border-[length:var(--rad-native-select-border-width,var(--rad-control-border-width,1px))] [border-style:var(--rad-native-select-border-style,var(--rad-control-border-style,solid))] [border-color:var(--rad-native-select-border-color,var(--rad-control-field-border-color,var(--_rad-control-border)))]',
|
|
63
64
|
'rounded-[var(--rad-native-select-radius,var(--rad-control-radius,0.5rem))] [corner-shape:var(--rad-native-select-corner-shape,var(--rad-control-corner-shape,round))]',
|
|
64
65
|
'[--_rad-native-select-shadow:var(--rad-native-select-shadow,var(--rad-control-field-shadow,none))] shadow-(--_rad-native-select-shadow) [backdrop-filter:var(--rad-control-field-backdrop-filter,none)]',
|
|
65
|
-
|
|
66
|
+
focusRingClass,
|
|
67
|
+
'focus-visible:[--_rad-focus-color:var(--rad-native-select-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-native-select-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-native-select-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-native-select-focus-style)]',
|
|
66
68
|
'data-invalid:[border-color:var(--rad-native-select-invalid-border,var(--rad-color-invalid))] disabled:cursor-not-allowed disabled:bg-[var(--rad-native-select-disabled-background,var(--rad-color-disabled-background))]',
|
|
67
69
|
'forced-colors:border-[CanvasText] forced-colors:bg-[Canvas] forced-colors:text-[CanvasText] forced-colors:disabled:text-[GrayText]',
|
|
68
70
|
className
|
|
@@ -18,6 +18,7 @@ import { cn } from '../../cn.js'
|
|
|
18
18
|
import { controlMetrics } from '../shared/controlStyles.js'
|
|
19
19
|
import { joinIds } from '../../internal/ids.js'
|
|
20
20
|
import type { ControlSize, PartStyle } from '../../presentation.js'
|
|
21
|
+
import { focusRingClass } from '../shared/focusStyles.js'
|
|
21
22
|
|
|
22
23
|
type LabelParts = { icon?: PartStyle; label?: PartStyle; description?: PartStyle }
|
|
23
24
|
type ContentProps = {
|
|
@@ -46,8 +47,9 @@ const itemClass = [
|
|
|
46
47
|
'gap-[var(--rad-nav-link-gap,0.5rem)] px-[var(--rad-nav-link-padding-inline,var(--_rad-control-padding))] py-[var(--rad-nav-link-padding-block,0.375rem)] rounded-[var(--rad-nav-link-radius,var(--rad-control-radius,0.5rem))] [corner-shape:var(--rad-control-corner-shape,round)]',
|
|
47
48
|
'font-[family-name:var(--rad-nav-link-font-family,var(--rad-typography-roles-ui-label-family,system-ui,sans-serif))] text-[length:var(--rad-nav-link-font-size,var(--_rad-control-font-size))] font-[number:var(--rad-nav-link-font-weight,var(--rad-typography-roles-ui-label-weight,550))] leading-[var(--rad-typography-roles-ui-label-line-height,1.4)]',
|
|
48
49
|
'[color:var(--rad-nav-link-color,var(--rad-color-foreground))] hover:[color:var(--rad-nav-link-color,var(--rad-color-foreground))] hover:bg-[var(--rad-nav-link-hover-background,var(--rad-color-neutral))]',
|
|
49
|
-
'
|
|
50
|
-
|
|
50
|
+
'forced-colors:bg-[Canvas] forced-colors:text-[CanvasText] forced-colors:hover:bg-[ButtonFace] forced-colors:hover:text-[CanvasText]',
|
|
51
|
+
focusRingClass,
|
|
52
|
+
'focus-visible:[--_rad-focus-color:var(--rad-nav-link-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-nav-link-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-nav-link-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-nav-link-focus-style)]'
|
|
51
53
|
]
|
|
52
54
|
function Content({ children, icon, description, parts }: ContentProps) {
|
|
53
55
|
return (
|
|
@@ -112,12 +114,13 @@ export function NavLink({
|
|
|
112
114
|
tone="neutral"
|
|
113
115
|
controlSize={controlSize}
|
|
114
116
|
aria-current={active ? 'page' : undefined}
|
|
117
|
+
data-selected={active ? '' : undefined}
|
|
115
118
|
className={cn(
|
|
116
119
|
controlMetrics({ controlSize }),
|
|
117
120
|
itemClass,
|
|
118
|
-
'border-s-[3px] border-s-transparent
|
|
119
|
-
'
|
|
120
|
-
'forced-colors:
|
|
121
|
+
'border-s-[3px] border-s-transparent data-selected:[border-inline-start-color:var(--rad-nav-link-indicator-color,var(--rad-control-selected-border-color,var(--rad-color-accent)))] data-selected:bg-[var(--rad-nav-link-active-background,var(--rad-control-selected-background,var(--rad-color-neutral)))] data-selected:[color:var(--rad-nav-link-active-color,var(--rad-control-selected-foreground,var(--rad-color-foreground)))] data-selected:[box-shadow:var(--rad-control-selected-shadow,none)] data-selected:font-[number:var(--rad-typography-heading-weight,600)]',
|
|
122
|
+
'data-selected:[&_[data-slot=nav-link-description]]:[color:inherit] data-selected:hover:bg-[var(--rad-nav-link-active-background,var(--rad-control-selected-background,var(--rad-color-neutral)))] data-selected:hover:[color:var(--rad-nav-link-active-color,var(--rad-control-selected-foreground,var(--rad-color-foreground)))]',
|
|
123
|
+
'forced-colors:data-selected:[border-inline-start-color:Highlight] forced-colors:data-selected:bg-[Highlight] forced-colors:data-selected:text-[HighlightText] forced-colors:data-selected:hover:bg-[Highlight] forced-colors:data-selected:hover:text-[HighlightText]',
|
|
121
124
|
className
|
|
122
125
|
)}
|
|
123
126
|
>
|
|
@@ -73,6 +73,7 @@ type Binding = NavigationMenuState & {
|
|
|
73
73
|
cancel: () => void
|
|
74
74
|
registerTrigger: (value: string, node: HTMLButtonElement | null) => void
|
|
75
75
|
registerPanel: (value: string, node: HTMLDivElement | null) => void
|
|
76
|
+
name: { 'aria-label'?: string; 'aria-labelledby'?: string }
|
|
76
77
|
}
|
|
77
78
|
const Context = createContext<Binding | null>(null)
|
|
78
79
|
export function useNavigationMenu(): NavigationMenuState | null {
|
|
@@ -243,6 +244,7 @@ export function NavigationMenu({
|
|
|
243
244
|
requestFocus,
|
|
244
245
|
registerTrigger,
|
|
245
246
|
registerPanel,
|
|
247
|
+
name: { 'aria-label': props['aria-label'], 'aria-labelledby': props['aria-labelledby'] },
|
|
246
248
|
ids: next => ({
|
|
247
249
|
trigger: `${id}-trigger-${items.findIndex(entry => entry.value === next)}`,
|
|
248
250
|
panel: `${id}-panel-${items.findIndex(entry => entry.value === next)}`
|
|
@@ -255,7 +257,7 @@ export function NavigationMenu({
|
|
|
255
257
|
{...{ role: undefined }}
|
|
256
258
|
data-slot={joinIds('navigation-menu', props['data-slot'])}
|
|
257
259
|
data-state={shown !== null ? 'open' : 'closed'}
|
|
258
|
-
data-disabled={disabled
|
|
260
|
+
data-disabled={disabled ? '' : undefined}
|
|
259
261
|
data-control-size={controlSize}
|
|
260
262
|
className={cn('relative max-w-full', className)}
|
|
261
263
|
onKeyDown={event => {
|
|
@@ -468,6 +470,7 @@ export function NavigationMenuLink({
|
|
|
468
470
|
variant={variant}
|
|
469
471
|
controlSize={controlSize ?? binding.controlSize}
|
|
470
472
|
aria-current={active ? 'page' : undefined}
|
|
473
|
+
data-selected={active ? '' : undefined}
|
|
471
474
|
onClick={composeAction(onClick, event => {
|
|
472
475
|
if (
|
|
473
476
|
event.button === 0 &&
|
|
@@ -521,14 +524,7 @@ export function NavigationMenuContent({
|
|
|
521
524
|
}
|
|
522
525
|
export type NavigationMenuViewportProps = Omit<
|
|
523
526
|
ComponentProps<'div'>,
|
|
524
|
-
| '
|
|
525
|
-
| 'hidden'
|
|
526
|
-
| 'inert'
|
|
527
|
-
| 'role'
|
|
528
|
-
| 'aria-label'
|
|
529
|
-
| 'aria-labelledby'
|
|
530
|
-
| 'contentEditable'
|
|
531
|
-
| 'dangerouslySetInnerHTML'
|
|
527
|
+
'style' | 'hidden' | 'inert' | 'role' | 'contentEditable' | 'dangerouslySetInnerHTML'
|
|
532
528
|
> & { style?: ThemeStyle; motion?: 'inherit' | 'off'; sideOffset?: number; 'data-slot'?: string }
|
|
533
529
|
export function NavigationMenuViewport({
|
|
534
530
|
ref,
|
|
@@ -617,12 +613,19 @@ export function NavigationMenuViewport({
|
|
|
617
613
|
})
|
|
618
614
|
const hover = () =>
|
|
619
615
|
binding.value === null ? undefined : binding.hover.current.get(binding.value)
|
|
616
|
+
// An open viewport is named by its trigger and a closed one by the menu, unless named here.
|
|
617
|
+
const name = (
|
|
618
|
+
props['aria-label'] || props['aria-labelledby']
|
|
619
|
+
? { 'aria-label': props['aria-label'], 'aria-labelledby': props['aria-labelledby'] }
|
|
620
|
+
: open
|
|
621
|
+
? { 'aria-labelledby': binding.ids(binding.visible!).trigger }
|
|
622
|
+
: binding.name
|
|
623
|
+
) as AccessibleName
|
|
620
624
|
return (
|
|
621
625
|
<ScrollArea
|
|
622
626
|
{...props}
|
|
623
627
|
ref={motionRef}
|
|
624
|
-
|
|
625
|
-
aria-labelledby={binding.visible === null ? undefined : binding.ids(binding.visible).trigger}
|
|
628
|
+
{...name}
|
|
626
629
|
hidden={!open}
|
|
627
630
|
inert={!open}
|
|
628
631
|
data-slot={joinIds('navigation-menu-viewport', props['data-slot'])}
|
|
@@ -9,6 +9,7 @@ import { useComposedRefs } from '../../react/useComposedRefs.js'
|
|
|
9
9
|
import { useNativeOwner, type ValueOwner } from '../../react/useNativeOwner.js'
|
|
10
10
|
import type { DistributiveOmit } from '../../internal/types.js'
|
|
11
11
|
import type { PartStyle } from '../../presentation.js'
|
|
12
|
+
import { activeRingClass } from '../shared/focusStyles.js'
|
|
12
13
|
|
|
13
14
|
export type OTPFieldMode = 'numeric' | 'alphanumeric'
|
|
14
15
|
export type OTPFieldProps = DistributiveOmit<
|
|
@@ -246,7 +247,9 @@ export function OTPField({
|
|
|
246
247
|
data-invalid={control['data-invalid']}
|
|
247
248
|
className={cn(
|
|
248
249
|
inputVariants(),
|
|
249
|
-
'pointer-events-none flex items-center justify-center px-0 group-has-[:disabled]/otp:opacity-60
|
|
250
|
+
'pointer-events-none flex items-center justify-center px-0 group-has-[:disabled]/otp:opacity-60',
|
|
251
|
+
activeRingClass,
|
|
252
|
+
'data-active:[--_rad-focus-color:var(--rad-input-focus-color)] data-active:[--_rad-focus-width:var(--rad-input-focus-width)] data-active:[--_rad-focus-offset:var(--rad-input-focus-offset)] data-active:[--_rad-focus-style:var(--rad-input-focus-style)]',
|
|
250
253
|
parts?.slot?.className
|
|
251
254
|
)}
|
|
252
255
|
style={parts?.slot?.style}
|
|
@@ -8,13 +8,13 @@ import {
|
|
|
8
8
|
import type { DistributiveOmit } from '../../internal/types.js'
|
|
9
9
|
import { cn } from '../../cn.js'
|
|
10
10
|
import { joinIds } from '../../internal/ids.js'
|
|
11
|
-
import { requireAccessibleName } from '../../internal/accessibleName.js'
|
|
11
|
+
import { requireAccessibleName, type AccessibleName } from '../../internal/accessibleName.js'
|
|
12
12
|
import type { ThemeStyle } from '../../themes/defineTheme.js'
|
|
13
13
|
type Part<Host extends 'nav' | 'ol' | 'li' | 'span'> = Omit<
|
|
14
14
|
ComponentProps<Host>,
|
|
15
15
|
'style' | 'role'
|
|
16
16
|
> & { style?: ThemeStyle; 'data-slot'?: string }
|
|
17
|
-
export type PaginationProps = Part<'nav'>
|
|
17
|
+
export type PaginationProps = Part<'nav'> & AccessibleName
|
|
18
18
|
export type PaginationListProps = Part<'ol'>
|
|
19
19
|
export type PaginationItemProps = Part<'li'>
|
|
20
20
|
export type PaginationLinkRenderProps = ComposedLinkRenderProps
|
|
@@ -29,15 +29,11 @@ export type PaginationEllipsisProps = Omit<Part<'span'>, 'aria-hidden' | 'tabInd
|
|
|
29
29
|
const itemClass =
|
|
30
30
|
'min-w-[var(--rad-pagination-item-min-width,2rem)] rounded-[var(--rad-pagination-radius,var(--rad-control-radius,0.5rem))]'
|
|
31
31
|
export function Pagination({ className, ...props }: PaginationProps) {
|
|
32
|
-
|
|
33
|
-
const label = props['aria-label'] ?? (labelledBy ? undefined : 'Pagination')
|
|
34
|
-
requireAccessibleName('Pagination', { 'aria-label': label, 'aria-labelledby': labelledBy })
|
|
32
|
+
requireAccessibleName('Pagination', props)
|
|
35
33
|
const nativeProps = { ...props, role: undefined }
|
|
36
34
|
return (
|
|
37
35
|
<nav
|
|
38
36
|
{...nativeProps}
|
|
39
|
-
aria-label={label}
|
|
40
|
-
aria-labelledby={labelledBy}
|
|
41
37
|
data-slot={joinIds('pagination', props['data-slot'])}
|
|
42
38
|
className={cn('min-w-0 max-w-full', className)}
|
|
43
39
|
/>
|
|
@@ -80,6 +76,7 @@ export function PaginationLink({
|
|
|
80
76
|
variant={variant}
|
|
81
77
|
tone={tone}
|
|
82
78
|
aria-current={current ? 'page' : undefined}
|
|
79
|
+
data-selected={current ? '' : undefined}
|
|
83
80
|
className={cn(itemClass, className)}
|
|
84
81
|
/>
|
|
85
82
|
)
|
|
@@ -119,6 +116,7 @@ export function PaginationButton({
|
|
|
119
116
|
variant={variant}
|
|
120
117
|
tone={tone}
|
|
121
118
|
aria-current={current ? 'page' : undefined}
|
|
119
|
+
data-selected={current ? '' : undefined}
|
|
122
120
|
data-slot={joinIds('pagination-button', props['data-slot'])}
|
|
123
121
|
className={cn(itemClass, className)}
|
|
124
122
|
/>
|
|
@@ -26,6 +26,7 @@ import type { ThemeStyle } from '../../themes/defineTheme.js'
|
|
|
26
26
|
import { scrollbarClass } from '../shared/scrollbarStyles.js'
|
|
27
27
|
|
|
28
28
|
export type { PopoverSide, PopoverAlign } from '../../internal/popover.js'
|
|
29
|
+
import { focusRingClass } from '../shared/focusStyles.js'
|
|
29
30
|
export type PopoverProps = StateOwner<'open', boolean> & {
|
|
30
31
|
onOpenChange?: (open: boolean) => void
|
|
31
32
|
children?: ReactNode
|
|
@@ -134,6 +135,7 @@ export function PopoverTrigger({ ref, onClick, ...props }: PopoverTriggerProps)
|
|
|
134
135
|
popoverTargetAction={undefined}
|
|
135
136
|
aria-controls={popover.contentId}
|
|
136
137
|
aria-expanded={popover.open}
|
|
138
|
+
data-state={popover.open ? 'open' : 'closed'}
|
|
137
139
|
data-slot={joinIds('popover-trigger', props['data-slot'])}
|
|
138
140
|
onClick={composeAction(onClick, () => popover.setOpen(!popover.open))}
|
|
139
141
|
/>
|
|
@@ -192,7 +194,8 @@ const surfaceClass = [
|
|
|
192
194
|
'[border-width:var(--rad-popover-border-width,var(--rad-surface-border-width,1px))] [border-style:var(--rad-popover-border-style,var(--rad-surface-border-style,solid))] [border-color:var(--rad-popover-border-color,var(--rad-color-border))]',
|
|
193
195
|
'bg-[var(--rad-popover-background,var(--rad-surface-overlay-background,var(--rad-color-surface,white)))] [color:var(--rad-popover-color,var(--rad-color-foreground))] [box-shadow:var(--rad-popover-shadow,var(--rad-surface-overlay-shadow,0_24px_64px_-16px_rgb(0_0_0/0.3)))] [backdrop-filter:var(--rad-popover-backdrop-filter,var(--rad-surface-backdrop-filter,none))]',
|
|
194
196
|
'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)]',
|
|
195
|
-
|
|
197
|
+
focusRingClass,
|
|
198
|
+
'focus-visible:[--_rad-focus-color:var(--rad-popover-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-popover-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-popover-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-popover-focus-style)]',
|
|
196
199
|
'transition-colors duration-[var(--rad-motion-color-duration,150ms)] motion-reduce:transition-none',
|
|
197
200
|
'forced-colors:border-[CanvasText] forced-colors:bg-[Canvas] forced-colors:text-[CanvasText]'
|
|
198
201
|
].join(' ')
|