@cognitap/radiant 0.0.77 → 0.0.79
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 +36 -2
- package/README.md +6 -3
- package/RELEASE_POLICY.md +8 -19
- package/dist/library/charts/Charts.d.ts.map +1 -1
- package/dist/library/charts/Charts.js +6 -2
- package/dist/library/charts/Charts.js.map +1 -1
- package/dist/library/components/Accordion/Accordion.js +1 -1
- package/dist/library/components/Accordion/Accordion.js.map +1 -1
- package/dist/library/components/Alert/Alert.js +1 -1
- package/dist/library/components/Alert/Alert.js.map +1 -1
- package/dist/library/components/AppShell/AppShell.d.ts.map +1 -1
- package/dist/library/components/AppShell/AppShell.js +7 -6
- package/dist/library/components/AppShell/AppShell.js.map +1 -1
- package/dist/library/components/AspectRatio/AspectRatio.js +1 -1
- package/dist/library/components/AspectRatio/AspectRatio.js.map +1 -1
- package/dist/library/components/Avatar/Avatar.js +1 -1
- package/dist/library/components/Avatar/Avatar.js.map +1 -1
- package/dist/library/components/Badge/Badge.js +1 -1
- package/dist/library/components/Badge/Badge.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 +5 -10
- package/dist/library/components/Breadcrumb/Breadcrumb.js.map +1 -1
- package/dist/library/components/Button/Button.js +1 -1
- package/dist/library/components/Button/Button.js.map +1 -1
- package/dist/library/components/ButtonGroup/ButtonGroup.js +1 -1
- package/dist/library/components/ButtonGroup/ButtonGroup.js.map +1 -1
- package/dist/library/components/Card/Card.js +1 -1
- package/dist/library/components/Card/Card.js.map +1 -1
- package/dist/library/components/Carousel/Carousel.d.ts.map +1 -1
- package/dist/library/components/Carousel/Carousel.js +11 -9
- 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 +8 -8
- package/dist/library/components/Checkbox/Checkbox.js.map +1 -1
- package/dist/library/components/CheckboxGroup/CheckboxGroup.js +1 -1
- package/dist/library/components/CheckboxGroup/CheckboxGroup.js.map +1 -1
- package/dist/library/components/CodeBlock/CodeBlock.js +3 -3
- 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 +4 -6
- 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 +14 -13
- 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 +3 -9
- 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 +3 -2
- 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 +9 -10
- package/dist/library/components/Dialog/Dialog.js.map +1 -1
- package/dist/library/components/Drawer/Drawer.js +1 -1
- package/dist/library/components/Drawer/Drawer.js.map +1 -1
- package/dist/library/components/EmptyState/EmptyState.js +1 -1
- package/dist/library/components/EmptyState/EmptyState.js.map +1 -1
- package/dist/library/components/Field/Field.js +1 -1
- package/dist/library/components/Field/Field.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 +3 -3
- 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 +6 -4
- 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 +16 -11
- 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 +2 -1
- package/dist/library/components/HoverCard/HoverCard.js.map +1 -1
- package/dist/library/components/InlineCode/InlineCode.js +1 -1
- package/dist/library/components/InlineCode/InlineCode.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 +7 -12
- 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 +3 -2
- package/dist/library/components/InputGroup/InputGroup.js.map +1 -1
- package/dist/library/components/Kbd/Kbd.js +1 -1
- package/dist/library/components/Kbd/Kbd.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 +7 -4
- 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 +24 -9
- 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 +2 -2
- package/dist/library/components/Menubar/Menubar.js.map +1 -1
- package/dist/library/components/Meter/Meter.js +1 -1
- package/dist/library/components/Meter/Meter.js.map +1 -1
- package/dist/library/components/NativeSelect/NativeSelect.d.ts.map +1 -1
- package/dist/library/components/NativeSelect/NativeSelect.js +3 -2
- 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 +6 -4
- 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 +11 -4
- 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 +2 -2
- 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 +3 -2
- 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 +5 -7
- package/dist/library/components/Pagination/Pagination.js.map +1 -1
- package/dist/library/components/PasswordInput/PasswordInput.js +1 -1
- package/dist/library/components/PasswordInput/PasswordInput.js.map +1 -1
- package/dist/library/components/Popover/Popover.d.ts.map +1 -1
- package/dist/library/components/Popover/Popover.js +5 -3
- package/dist/library/components/Popover/Popover.js.map +1 -1
- package/dist/library/components/Progress/Progress.js +1 -1
- package/dist/library/components/Progress/Progress.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 +10 -11
- 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 +3 -2
- 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 +3 -2
- 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 +12 -11
- 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/Separator/Separator.js +1 -1
- package/dist/library/components/Separator/Separator.js.map +1 -1
- package/dist/library/components/Skeleton/Skeleton.js +1 -1
- package/dist/library/components/Skeleton/Skeleton.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 +7 -9
- package/dist/library/components/Slider/Slider.js.map +1 -1
- package/dist/library/components/Spinner/Spinner.js +1 -1
- package/dist/library/components/Spinner/Spinner.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 +7 -8
- 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 +3 -2
- 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 +9 -7
- package/dist/library/components/Tabs/Tabs.js.map +1 -1
- package/dist/library/components/Tag/Tag.js +1 -1
- package/dist/library/components/Tag/Tag.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 +9 -6
- 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 +7 -8
- package/dist/library/components/Textarea/Textarea.js.map +1 -1
- package/dist/library/components/ThemeScope/ThemeScope.js +1 -1
- package/dist/library/components/ThemeScope/ThemeScope.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 +22 -9
- package/dist/library/components/Toast/Toast.js.map +1 -1
- package/dist/library/components/ToggleGroup/ToggleGroup.js +3 -1
- package/dist/library/components/ToggleGroup/ToggleGroup.js.map +1 -1
- package/dist/library/components/Toolbar/Toolbar.js +1 -1
- package/dist/library/components/Toolbar/Toolbar.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 +2 -2
- 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/motion/MotionLink.js +1 -1
- package/dist/library/motion/MotionLink.js.map +1 -1
- package/dist/library/react/useComboboxPopup.d.ts.map +1 -1
- package/dist/library/react/useComboboxPopup.js +45 -6
- package/dist/library/react/useComboboxPopup.js.map +1 -1
- package/dist/library/react/useRovingFocus.d.ts.map +1 -1
- package/dist/library/react/useRovingFocus.js +76 -11
- package/dist/library/react/useRovingFocus.js.map +1 -1
- package/dist/library/react/useToastTimer.d.ts.map +1 -1
- package/dist/library/react/useToastTimer.js +29 -10
- 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/accessibility.md +23 -111
- package/docs/architecture.md +48 -228
- package/docs/motion.md +65 -130
- package/docs/theming.md +51 -422
- package/package.json +21 -13
- package/src/charts/Charts.tsx +6 -3
- package/src/components/Accordion/Accordion.tsx +1 -1
- package/src/components/Alert/Alert.tsx +1 -1
- package/src/components/AppShell/AppShell.tsx +10 -6
- package/src/components/AspectRatio/AspectRatio.tsx +1 -1
- package/src/components/Avatar/Avatar.tsx +1 -1
- package/src/components/Badge/Badge.tsx +1 -1
- package/src/components/Breadcrumb/Breadcrumb.tsx +6 -10
- package/src/components/Button/Button.tsx +1 -1
- package/src/components/ButtonGroup/ButtonGroup.tsx +1 -1
- package/src/components/Card/Card.tsx +1 -1
- package/src/components/Carousel/Carousel.tsx +14 -9
- package/src/components/Checkbox/Checkbox.tsx +10 -7
- package/src/components/CheckboxGroup/CheckboxGroup.tsx +1 -1
- package/src/components/CodeBlock/CodeBlock.tsx +3 -3
- package/src/components/Collapsible/Collapsible.tsx +4 -6
- package/src/components/Combobox/Combobox.tsx +72 -16
- package/src/components/Combobox/comboboxStyles.ts +5 -2
- package/src/components/Command/Command.tsx +3 -10
- package/src/components/ContextMenu/ContextMenu.tsx +3 -5
- package/src/components/Dialog/Dialog.tsx +30 -14
- package/src/components/Drawer/Drawer.tsx +1 -1
- package/src/components/EmptyState/EmptyState.tsx +1 -1
- package/src/components/Field/Field.tsx +1 -1
- package/src/components/Fieldset/Fieldset.tsx +4 -4
- package/src/components/FileInput/FileInput.tsx +9 -3
- package/src/components/Form/Form.tsx +14 -10
- package/src/components/HoverCard/HoverCard.tsx +6 -2
- package/src/components/InlineCode/InlineCode.tsx +1 -1
- package/src/components/Input/Input.tsx +14 -13
- package/src/components/InputGroup/InputGroup.tsx +5 -3
- package/src/components/Kbd/Kbd.tsx +1 -1
- package/src/components/Link/Link.tsx +10 -4
- package/src/components/Menu/Menu.tsx +52 -10
- package/src/components/Menubar/Menubar.tsx +2 -1
- package/src/components/Meter/Meter.tsx +1 -1
- package/src/components/NativeSelect/NativeSelect.tsx +4 -2
- package/src/components/NavLink/NavLink.tsx +9 -6
- package/src/components/NavigationMenu/NavigationMenu.tsx +15 -12
- package/src/components/NumberField/NumberField.tsx +2 -1
- package/src/components/OTPField/OTPField.tsx +5 -2
- package/src/components/Pagination/Pagination.tsx +6 -8
- package/src/components/PasswordInput/PasswordInput.tsx +1 -1
- package/src/components/Popover/Popover.tsx +5 -2
- package/src/components/Progress/Progress.tsx +1 -1
- package/src/components/RadioGroup/RadioGroup.tsx +14 -8
- package/src/components/Resizable/Resizable.tsx +5 -3
- package/src/components/ScrollArea/ScrollArea.tsx +3 -2
- package/src/components/Select/Select.tsx +28 -14
- package/src/components/Select/selectStyles.ts +3 -1
- package/src/components/Separator/Separator.tsx +1 -1
- package/src/components/Skeleton/Skeleton.tsx +1 -1
- package/src/components/Slider/Slider.tsx +9 -8
- package/src/components/Spinner/Spinner.tsx +1 -1
- package/src/components/Switch/Switch.tsx +9 -7
- package/src/components/Table/Table.tsx +4 -2
- package/src/components/Tabs/Tabs.tsx +9 -8
- package/src/components/Tag/Tag.tsx +1 -1
- package/src/components/TagsInput/TagsInput.tsx +11 -4
- package/src/components/Textarea/Textarea.tsx +9 -7
- package/src/components/ThemeScope/ThemeScope.tsx +1 -1
- package/src/components/Toast/Toast.tsx +27 -12
- package/src/components/ToggleGroup/ToggleGroup.tsx +3 -1
- package/src/components/Toolbar/Toolbar.tsx +1 -1
- package/src/components/Tooltip/Tooltip.tsx +3 -2
- package/src/components/shared/actionStyles.ts +3 -1
- package/src/components/shared/focusStyles.ts +28 -0
- package/src/css.d.ts +2 -0
- package/src/index.ts +1 -0
- package/src/motion/MotionLink.tsx +1 -1
- package/src/react/useComboboxPopup.ts +38 -6
- package/src/react/useRovingFocus.ts +73 -8
- package/src/react/useToastTimer.ts +25 -10
- package/src/styles.d.ts +1 -0
- package/src/themes/baseline.css +1 -1
- package/src/themes/components.ts +15 -3
- package/src/typography.css +17 -12
- package/dist/library/cn.d.ts +0 -3
- package/dist/library/cn.d.ts.map +0 -1
- package/dist/library/cn.js +0 -370
- package/dist/library/cn.js.map +0 -1
- package/src/cn.ts +0 -372
|
@@ -25,7 +25,7 @@ import { validateTags } from '../../internal/tags.js'
|
|
|
25
25
|
import { useArrayFormBridge } from '../../react/useArrayFormBridge.js'
|
|
26
26
|
import { useField, useFieldControl } from '../Field/Field.js'
|
|
27
27
|
import type { DistributiveOmit, WithoutToggle } from '../../internal/types.js'
|
|
28
|
-
import { cn } from '
|
|
28
|
+
import { cn } from 'cn'
|
|
29
29
|
import { joinIds } from '../../internal/ids.js'
|
|
30
30
|
import { controlMetrics } from '../shared/controlStyles.js'
|
|
31
31
|
import {
|
|
@@ -153,7 +153,13 @@ export function useCommandParts() {
|
|
|
153
153
|
if (!box?.command) throw new Error('Command results must render inside Command.')
|
|
154
154
|
return box
|
|
155
155
|
}
|
|
156
|
-
function componentSlot(
|
|
156
|
+
function componentSlot(
|
|
157
|
+
multiple: boolean,
|
|
158
|
+
textMode: boolean,
|
|
159
|
+
name: string,
|
|
160
|
+
command = false,
|
|
161
|
+
slot?: string
|
|
162
|
+
) {
|
|
157
163
|
return (
|
|
158
164
|
joinIds(
|
|
159
165
|
name,
|
|
@@ -162,7 +168,8 @@ function componentSlot(multiple: boolean, textMode: boolean, name: string, comma
|
|
|
162
168
|
? name.replaceAll('combobox-', 'multi-select-')
|
|
163
169
|
: textMode
|
|
164
170
|
? name.replaceAll('combobox-', 'autocomplete-')
|
|
165
|
-
: undefined
|
|
171
|
+
: undefined,
|
|
172
|
+
slot
|
|
166
173
|
) ?? name
|
|
167
174
|
)
|
|
168
175
|
}
|
|
@@ -562,6 +569,7 @@ export function ComboboxRoot(
|
|
|
562
569
|
type="text"
|
|
563
570
|
className="sr-only"
|
|
564
571
|
data-slot="combobox-native multi-select-native"
|
|
572
|
+
data-form-name={name}
|
|
565
573
|
form={form}
|
|
566
574
|
disabled={disabled}
|
|
567
575
|
readOnly={readOnly}
|
|
@@ -627,7 +635,7 @@ export type ComboboxInputProps = Omit<
|
|
|
627
635
|
| 'aria-expanded'
|
|
628
636
|
| 'aria-autocomplete'
|
|
629
637
|
| 'aria-activedescendant'
|
|
630
|
-
> & { style?: ThemeStyle }
|
|
638
|
+
> & { style?: ThemeStyle; 'data-slot'?: string }
|
|
631
639
|
export function ComboboxInput({
|
|
632
640
|
className,
|
|
633
641
|
ref,
|
|
@@ -664,10 +672,17 @@ export function ComboboxInput({
|
|
|
664
672
|
controlMetrics({ controlSize: box.controlSize }),
|
|
665
673
|
className
|
|
666
674
|
)}
|
|
667
|
-
data-slot={componentSlot(
|
|
675
|
+
data-slot={componentSlot(
|
|
676
|
+
box.multiple,
|
|
677
|
+
!!box.textInput,
|
|
678
|
+
'combobox-input',
|
|
679
|
+
!!box.command,
|
|
680
|
+
props['data-slot']
|
|
681
|
+
)}
|
|
668
682
|
data-control-size={box.controlSize}
|
|
669
683
|
aria-autocomplete="list"
|
|
670
684
|
aria-expanded={box.open}
|
|
685
|
+
data-state={box.open ? 'open' : 'closed'}
|
|
671
686
|
aria-controls={box.open ? box.listId : undefined}
|
|
672
687
|
aria-activedescendant={box.open && box.active !== null ? box.optionId(box.active) : undefined}
|
|
673
688
|
onChange={event => {
|
|
@@ -829,7 +844,14 @@ export function ComboboxTrigger({
|
|
|
829
844
|
aria-label={props['aria-label'] ?? (box.textInput ? 'Show suggestions' : 'Show options')}
|
|
830
845
|
aria-controls={box.open ? box.listId : undefined}
|
|
831
846
|
aria-expanded={box.open}
|
|
832
|
-
data-
|
|
847
|
+
data-state={box.open ? 'open' : 'closed'}
|
|
848
|
+
data-slot={componentSlot(
|
|
849
|
+
box.multiple,
|
|
850
|
+
!!box.textInput,
|
|
851
|
+
'button combobox-trigger',
|
|
852
|
+
false,
|
|
853
|
+
props['data-slot']
|
|
854
|
+
)}
|
|
833
855
|
onPointerDown={event => {
|
|
834
856
|
onPointerDown?.(event)
|
|
835
857
|
if (!event.defaultPrevented) event.preventDefault()
|
|
@@ -897,7 +919,13 @@ export function ComboboxClear({
|
|
|
897
919
|
}}
|
|
898
920
|
tabIndex={box.multiple ? 0 : -1}
|
|
899
921
|
aria-label={props['aria-label'] ?? (box.textInput ? 'Clear text' : 'Clear selection')}
|
|
900
|
-
data-slot={componentSlot(
|
|
922
|
+
data-slot={componentSlot(
|
|
923
|
+
box.multiple,
|
|
924
|
+
!!box.textInput,
|
|
925
|
+
'button combobox-clear',
|
|
926
|
+
false,
|
|
927
|
+
props['data-slot']
|
|
928
|
+
)}
|
|
901
929
|
onPointerDown={event => {
|
|
902
930
|
onPointerDown?.(event)
|
|
903
931
|
if (!event.defaultPrevented) event.preventDefault()
|
|
@@ -937,6 +965,7 @@ export type ComboboxContentProps = Omit<
|
|
|
937
965
|
sideOffset?: number
|
|
938
966
|
collisionPadding?: number
|
|
939
967
|
motion?: 'inherit' | 'off'
|
|
968
|
+
'data-slot'?: string
|
|
940
969
|
}
|
|
941
970
|
export function ComboboxContent({
|
|
942
971
|
children,
|
|
@@ -960,7 +989,13 @@ export function ComboboxContent({
|
|
|
960
989
|
{...props}
|
|
961
990
|
ref={transitionRef}
|
|
962
991
|
popover="manual"
|
|
963
|
-
data-slot={componentSlot(
|
|
992
|
+
data-slot={componentSlot(
|
|
993
|
+
box.multiple,
|
|
994
|
+
!!box.textInput,
|
|
995
|
+
'combobox-content',
|
|
996
|
+
!!box.command,
|
|
997
|
+
props['data-slot']
|
|
998
|
+
)}
|
|
964
999
|
data-motion={motion}
|
|
965
1000
|
data-state={box.open ? 'open' : 'closed'}
|
|
966
1001
|
className={cn(
|
|
@@ -1021,14 +1056,14 @@ export function ComboboxInlineContent({
|
|
|
1021
1056
|
className,
|
|
1022
1057
|
ref,
|
|
1023
1058
|
...props
|
|
1024
|
-
}: Omit<ComponentProps<'div'>, 'style'> & { style?: ThemeStyle }) {
|
|
1059
|
+
}: Omit<ComponentProps<'div'>, 'style'> & { style?: ThemeStyle; 'data-slot'?: string }) {
|
|
1025
1060
|
const box = useCommandParts()
|
|
1026
1061
|
const contentRef = useComposedRefs(box.content, ref)
|
|
1027
1062
|
return (
|
|
1028
1063
|
<div
|
|
1029
1064
|
{...props}
|
|
1030
1065
|
ref={contentRef}
|
|
1031
|
-
data-slot=
|
|
1066
|
+
data-slot={joinIds('combobox-content', 'command-list', props['data-slot'])}
|
|
1032
1067
|
className={cn(
|
|
1033
1068
|
'flex min-h-0 min-w-0 flex-col overflow-hidden',
|
|
1034
1069
|
controlMetrics({ controlSize: box.controlSize }),
|
|
@@ -1047,7 +1082,7 @@ export function ComboboxInlineContent({
|
|
|
1047
1082
|
export type ComboboxItemProps = Omit<
|
|
1048
1083
|
ComponentProps<'div'>,
|
|
1049
1084
|
'style' | 'id' | 'role' | 'tabIndex'
|
|
1050
|
-
> & { value: string; style?: ThemeStyle }
|
|
1085
|
+
> & { value: string; style?: ThemeStyle; 'data-slot'?: string }
|
|
1051
1086
|
export function ComboboxItem({
|
|
1052
1087
|
value,
|
|
1053
1088
|
children,
|
|
@@ -1069,7 +1104,13 @@ export function ComboboxItem({
|
|
|
1069
1104
|
onKeyDown={props.onKeyDown}
|
|
1070
1105
|
aria-selected={box.multiple ? isItemOpen(box.value, value) : box.active === value}
|
|
1071
1106
|
aria-disabled={item.disabled || undefined}
|
|
1072
|
-
data-slot={componentSlot(
|
|
1107
|
+
data-slot={componentSlot(
|
|
1108
|
+
box.multiple,
|
|
1109
|
+
!!box.textInput,
|
|
1110
|
+
'combobox-item',
|
|
1111
|
+
!!box.command,
|
|
1112
|
+
props['data-slot']
|
|
1113
|
+
)}
|
|
1073
1114
|
data-value={value}
|
|
1074
1115
|
data-highlighted={box.active === value ? '' : undefined}
|
|
1075
1116
|
data-selected={isItemOpen(box.value, value) ? '' : undefined}
|
|
@@ -1105,6 +1146,7 @@ export function ComboboxItem({
|
|
|
1105
1146
|
}
|
|
1106
1147
|
export type ComboboxStatusProps = Omit<ComponentProps<'div'>, 'style' | 'role'> & {
|
|
1107
1148
|
style?: ThemeStyle
|
|
1149
|
+
'data-slot'?: string
|
|
1108
1150
|
}
|
|
1109
1151
|
export function ComboboxStatus({ children, className, ...props }: ComboboxStatusProps) {
|
|
1110
1152
|
const box = useComboboxContext()
|
|
@@ -1114,7 +1156,13 @@ export function ComboboxStatus({ children, className, ...props }: ComboboxStatus
|
|
|
1114
1156
|
role="status"
|
|
1115
1157
|
aria-live="polite"
|
|
1116
1158
|
aria-atomic="true"
|
|
1117
|
-
data-slot={componentSlot(
|
|
1159
|
+
data-slot={componentSlot(
|
|
1160
|
+
box.multiple,
|
|
1161
|
+
!!box.textInput,
|
|
1162
|
+
'combobox-status',
|
|
1163
|
+
!!box.command,
|
|
1164
|
+
props['data-slot']
|
|
1165
|
+
)}
|
|
1118
1166
|
className={cn('px-3 py-2 empty:hidden', className)}
|
|
1119
1167
|
>
|
|
1120
1168
|
{box.open ? (children ?? box.status) : null}
|
|
@@ -1124,14 +1172,22 @@ export function ComboboxStatus({ children, className, ...props }: ComboboxStatus
|
|
|
1124
1172
|
|
|
1125
1173
|
export type ComboboxTagsProps = Omit<ComponentProps<'div'>, 'children' | 'style'> & {
|
|
1126
1174
|
style?: ThemeStyle
|
|
1175
|
+
'data-slot'?: string
|
|
1176
|
+
/** Names each tag's removal Button from the option's text. */
|
|
1177
|
+
removeLabel?: (text: string) => string
|
|
1127
1178
|
}
|
|
1128
|
-
|
|
1179
|
+
const defaultRemoveLabel = (text: string) => `Remove ${text}`
|
|
1180
|
+
export function ComboboxTags({
|
|
1181
|
+
removeLabel = defaultRemoveLabel,
|
|
1182
|
+
className,
|
|
1183
|
+
...props
|
|
1184
|
+
}: ComboboxTagsProps) {
|
|
1129
1185
|
const box = useComboboxContext()
|
|
1130
1186
|
if (!box.multiple) throw new Error('ComboboxTags requires a multiple Combobox.')
|
|
1131
1187
|
return (
|
|
1132
1188
|
<div
|
|
1133
1189
|
{...props}
|
|
1134
|
-
data-slot=
|
|
1190
|
+
data-slot={joinIds('combobox-tags', 'multi-select-tags', props['data-slot'])}
|
|
1135
1191
|
className={cn(
|
|
1136
1192
|
'flex flex-wrap items-center gap-[var(--rad-multi-select-gap,0.5rem)] mb-[var(--rad-multi-select-gap,0.5rem)] empty:hidden',
|
|
1137
1193
|
className
|
|
@@ -1141,7 +1197,7 @@ export function ComboboxTags({ className, ...props }: ComboboxTagsProps) {
|
|
|
1141
1197
|
<Tag
|
|
1142
1198
|
key={item.value}
|
|
1143
1199
|
data-slot="multi-select-tag"
|
|
1144
|
-
removeLabel={
|
|
1200
|
+
removeLabel={removeLabel(textOf(item))}
|
|
1145
1201
|
disabled={box.disabled || box.readOnly}
|
|
1146
1202
|
onRemove={() => box.remove(item.value)}
|
|
1147
1203
|
>
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { controlBorderClass } from '../shared/controlStyles.js'
|
|
2
|
+
import { focusRingClass } from '../shared/focusStyles.js'
|
|
2
3
|
|
|
3
4
|
export const comboboxInputClass = [
|
|
4
5
|
controlBorderClass,
|
|
@@ -8,7 +9,8 @@ export const comboboxInputClass = [
|
|
|
8
9
|
'[color:var(--rad-combobox-color,var(--rad-color-foreground,oklch(0.21_0.006_286)))] bg-[var(--rad-combobox-background,var(--rad-control-field-background,var(--rad-color-surface,white)))]',
|
|
9
10
|
'[border-width:var(--rad-combobox-border-width,var(--rad-control-border-width,1px))] [border-style:var(--rad-combobox-border-style,var(--rad-control-border-style,solid))] [border-color:var(--rad-combobox-border-color,var(--rad-control-field-border-color,var(--_rad-control-border)))]',
|
|
10
11
|
'rounded-[var(--rad-combobox-radius,var(--rad-control-radius,0.5rem))] [corner-shape:var(--rad-combobox-corner-shape,var(--rad-control-corner-shape,round))] [box-shadow:var(--rad-combobox-shadow,var(--rad-control-field-shadow,none))] [backdrop-filter:var(--rad-control-field-backdrop-filter,none)]',
|
|
11
|
-
|
|
12
|
+
focusRingClass,
|
|
13
|
+
'focus-visible:[--_rad-focus-color:var(--rad-combobox-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-combobox-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-combobox-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-combobox-focus-style)]',
|
|
12
14
|
'data-invalid:[border-color:var(--rad-color-invalid)] placeholder:[color:var(--rad-combobox-placeholder,var(--rad-color-placeholder))] disabled:cursor-not-allowed disabled:bg-[var(--rad-color-disabled-background)]',
|
|
13
15
|
'forced-colors:border-[CanvasText] forced-colors:bg-[Canvas] forced-colors:text-[CanvasText] forced-colors:disabled:text-[GrayText]'
|
|
14
16
|
].join(' ')
|
|
@@ -39,6 +41,7 @@ export const comboboxItemClass = [
|
|
|
39
41
|
export const comboboxActionClass = [
|
|
40
42
|
'inline-flex shrink-0 items-center justify-center border-0 bg-transparent p-0 [font:inherit]',
|
|
41
43
|
'[color:var(--rad-combobox-color,var(--rad-color-foreground))] shadow-none cursor-pointer',
|
|
42
|
-
|
|
44
|
+
focusRingClass,
|
|
45
|
+
'focus-visible:[--_rad-focus-color:var(--rad-combobox-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-combobox-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-combobox-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-combobox-focus-style)]',
|
|
43
46
|
'disabled:cursor-not-allowed forced-colors:text-[CanvasText] forced-colors:disabled:text-[GrayText]'
|
|
44
47
|
].join(' ')
|
|
@@ -32,7 +32,7 @@ import type { StateOwner } from '../../react/useNativeOwner.js'
|
|
|
32
32
|
import { requireAccessibleName, type AccessibleName } from '../../internal/accessibleName.js'
|
|
33
33
|
import { WithoutField } from '../Field/Field.js'
|
|
34
34
|
import { Kbd, KbdGroup } from '../Kbd/Kbd.js'
|
|
35
|
-
import { cn } from '
|
|
35
|
+
import { cn } from 'cn'
|
|
36
36
|
import { itemGroupLabelClass } from '../shared/controlStyles.js'
|
|
37
37
|
import { useControllableState } from '../../react/useControllableState.js'
|
|
38
38
|
import type { ControlSize } from '../../presentation.js'
|
|
@@ -59,7 +59,7 @@ export type CommandContentProps = DialogContentProps
|
|
|
59
59
|
export type CommandTitleProps = DialogTitleProps
|
|
60
60
|
export type CommandDescriptionProps = DialogDescriptionProps
|
|
61
61
|
export type CommandInputProps = Omit<ComboboxInputProps, 'aria-label' | 'aria-labelledby'> &
|
|
62
|
-
|
|
62
|
+
AccessibleName
|
|
63
63
|
export type CommandListProps = Omit<ComponentProps<'div'>, 'style' | 'role' | 'id'> & {
|
|
64
64
|
style?: ThemeStyle
|
|
65
65
|
}
|
|
@@ -210,17 +210,10 @@ export function CommandDescription(props: CommandDescriptionProps) {
|
|
|
210
210
|
export function CommandInput({ className, ...props }: CommandInputProps) {
|
|
211
211
|
useCommandContext()
|
|
212
212
|
useCommandParts()
|
|
213
|
-
|
|
214
|
-
'aria-label': props['aria-labelledby']
|
|
215
|
-
? props['aria-label']
|
|
216
|
-
: (props['aria-label'] ?? 'Search commands'),
|
|
217
|
-
'aria-labelledby': props['aria-labelledby']
|
|
218
|
-
}
|
|
219
|
-
requireAccessibleName('CommandInput', name)
|
|
213
|
+
requireAccessibleName('CommandInput', props)
|
|
220
214
|
return (
|
|
221
215
|
<ComboboxInput
|
|
222
216
|
{...props}
|
|
223
|
-
{...name}
|
|
224
217
|
className={cn('shrink-0 pe-[var(--_rad-control-padding,1rem)]', className)}
|
|
225
218
|
/>
|
|
226
219
|
)
|
|
@@ -44,9 +44,10 @@ import {
|
|
|
44
44
|
import { usePopoverContext } from '../Popover/Popover.js'
|
|
45
45
|
import { requireAccessibleName, type AccessibleName } from '../../internal/accessibleName.js'
|
|
46
46
|
import { joinIds } from '../../internal/ids.js'
|
|
47
|
-
import { cn } from '
|
|
47
|
+
import { cn } from 'cn'
|
|
48
48
|
import { useComposedRefs } from '../../react/useComposedRefs.js'
|
|
49
49
|
import type { ThemeStyle } from '../../themes/defineTheme.js'
|
|
50
|
+
import { focusRingClass } from '../shared/focusStyles.js'
|
|
50
51
|
|
|
51
52
|
type Point = { x: number; y: number }
|
|
52
53
|
export type ContextMenuProps = MenuProps
|
|
@@ -160,10 +161,7 @@ export function ContextMenuTrigger({
|
|
|
160
161
|
data-state={menu.open ? 'open' : 'closed'}
|
|
161
162
|
aria-controls={menu.contentId}
|
|
162
163
|
data-slot={joinIds('context-menu-trigger', props['data-slot'])}
|
|
163
|
-
className={cn(
|
|
164
|
-
'focus-visible:outline-solid focus-visible:[outline-color:var(--rad-color-focus,oklch(0.55_0.13_255))] focus-visible:[outline-width:var(--rad-focus-width,2px)] focus-visible:[outline-offset:var(--rad-focus-offset,2px)] forced-colors:focus-visible:outline-[Highlight]',
|
|
165
|
-
className
|
|
166
|
-
)}
|
|
164
|
+
className={cn(focusRingClass, className)}
|
|
167
165
|
onContextMenu={event => {
|
|
168
166
|
onContextMenu?.(event)
|
|
169
167
|
if (event.defaultPrevented) return
|
|
@@ -6,7 +6,7 @@ import { cva } from 'class-variance-authority'
|
|
|
6
6
|
import { Button, type ButtonProps, type ButtonRenderProps } from '../Button/Button.js'
|
|
7
7
|
import { callerOwnsPress } from '../../motion/pressPolicy.js'
|
|
8
8
|
import { useTransitionHost } from '../../motion/host.js'
|
|
9
|
-
import { cn } from '
|
|
9
|
+
import { cn } from 'cn'
|
|
10
10
|
import { composeAction } from '../../internal/events.js'
|
|
11
11
|
import { joinIds } from '../../internal/ids.js'
|
|
12
12
|
import { useComposedRefs } from '../../react/useComposedRefs.js'
|
|
@@ -15,6 +15,7 @@ import type { StateOwner } from '../../react/useNativeOwner.js'
|
|
|
15
15
|
import type { WithoutToggle } from '../../internal/types.js'
|
|
16
16
|
import type { ThemeStyle } from '../../themes/defineTheme.js'
|
|
17
17
|
import { scrollbarClass } from '../shared/scrollbarStyles.js'
|
|
18
|
+
import { focusRingClass } from '../shared/focusStyles.js'
|
|
18
19
|
|
|
19
20
|
const colorMotionClass =
|
|
20
21
|
'transition-colors duration-[var(--rad-motion-color-duration,150ms)] motion-reduce:transition-none'
|
|
@@ -40,11 +41,8 @@ const dialogVariants = cva([
|
|
|
40
41
|
'[color:var(--rad-dialog-color,var(--rad-color-foreground,oklch(0.21_0.006_286)))]',
|
|
41
42
|
'[box-shadow:var(--rad-dialog-shadow,var(--rad-surface-overlay-shadow,0_24px_64px_-16px_rgb(0_0_0/0.3)))]',
|
|
42
43
|
'backdrop:[background:var(--rad-dialog-backdrop,var(--rad-surface-backdrop,rgb(0_0_0/0.45)))]',
|
|
43
|
-
|
|
44
|
-
'focus-visible:[
|
|
45
|
-
'focus-visible:[outline-width:var(--rad-dialog-focus-width,var(--rad-focus-width,2px))]',
|
|
46
|
-
'focus-visible:[outline-offset:var(--rad-dialog-focus-offset,var(--rad-focus-offset,2px))]',
|
|
47
|
-
'focus-visible:[outline-style:var(--rad-dialog-focus-style,var(--rad-focus-style,solid))]',
|
|
44
|
+
focusRingClass,
|
|
45
|
+
'focus-visible:[--_rad-focus-color:var(--rad-dialog-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-dialog-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-dialog-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-dialog-focus-style)]',
|
|
48
46
|
'forced-colors:border-[CanvasText] forced-colors:bg-[Canvas] forced-colors:text-[CanvasText]',
|
|
49
47
|
'forced-colors:backdrop:[background:CanvasText]'
|
|
50
48
|
])
|
|
@@ -100,11 +98,18 @@ export type DialogContentProps = Omit<ComponentProps<'dialog'>, 'open' | 'style'
|
|
|
100
98
|
style?: ThemeStyle
|
|
101
99
|
/** Opt-in MotionProvider presentation; native close and focus never wait for an exit. */
|
|
102
100
|
motion?: 'inherit' | 'off'
|
|
101
|
+
'data-slot'?: string
|
|
103
102
|
}
|
|
104
103
|
|
|
105
|
-
export type DialogTitleProps = Omit<ComponentProps<'h2'>, 'style'> & {
|
|
104
|
+
export type DialogTitleProps = Omit<ComponentProps<'h2'>, 'style'> & {
|
|
105
|
+
style?: ThemeStyle
|
|
106
|
+
'data-slot'?: string
|
|
107
|
+
}
|
|
106
108
|
|
|
107
|
-
export type DialogDescriptionProps = Omit<ComponentProps<'p'>, 'style'> & {
|
|
109
|
+
export type DialogDescriptionProps = Omit<ComponentProps<'p'>, 'style'> & {
|
|
110
|
+
style?: ThemeStyle
|
|
111
|
+
'data-slot'?: string
|
|
112
|
+
}
|
|
108
113
|
|
|
109
114
|
export type DialogCloseProps = DialogTriggerProps
|
|
110
115
|
|
|
@@ -198,7 +203,8 @@ function DialogAction({ action, ...props }: DialogTriggerProps & { action: 'open
|
|
|
198
203
|
? {
|
|
199
204
|
'aria-haspopup': 'dialog',
|
|
200
205
|
'aria-expanded': dialog.open,
|
|
201
|
-
'aria-controls': dialog.contentId
|
|
206
|
+
'aria-controls': dialog.contentId,
|
|
207
|
+
'data-state': dialog.open ? 'open' : 'closed'
|
|
202
208
|
}
|
|
203
209
|
: {}),
|
|
204
210
|
'data-slot': joinIds(
|
|
@@ -279,7 +285,11 @@ export function DialogContent({
|
|
|
279
285
|
aria-describedby={joinIds(dialog.descriptionId, props['aria-describedby'])}
|
|
280
286
|
aria-labelledby={props['aria-label'] ? props['aria-labelledby'] : dialog.titleId}
|
|
281
287
|
className={cn(dialogVariants(), className)}
|
|
282
|
-
data-slot={
|
|
288
|
+
data-slot={joinIds(
|
|
289
|
+
'dialog-content',
|
|
290
|
+
family === 'dialog' ? undefined : `${family}-content`,
|
|
291
|
+
props['data-slot']
|
|
292
|
+
)}
|
|
283
293
|
data-state={dialog.open ? 'open' : 'closed'}
|
|
284
294
|
id={dialog.contentId}
|
|
285
295
|
onCancel={event => {
|
|
@@ -313,7 +323,11 @@ export function DialogTitle({ className, children, ...props }: DialogTitleProps)
|
|
|
313
323
|
<h2
|
|
314
324
|
{...props}
|
|
315
325
|
className={cn(dialogTitleVariants(), className)}
|
|
316
|
-
data-slot={
|
|
326
|
+
data-slot={joinIds(
|
|
327
|
+
'dialog-title',
|
|
328
|
+
family === 'dialog' ? undefined : `${family}-title`,
|
|
329
|
+
props['data-slot']
|
|
330
|
+
)}
|
|
317
331
|
id={dialog.titleId}
|
|
318
332
|
>
|
|
319
333
|
{children}
|
|
@@ -328,9 +342,11 @@ export function DialogDescription({ className, ...props }: DialogDescriptionProp
|
|
|
328
342
|
<p
|
|
329
343
|
{...props}
|
|
330
344
|
className={cn(dialogDescriptionVariants(), className)}
|
|
331
|
-
data-slot={
|
|
332
|
-
|
|
333
|
-
|
|
345
|
+
data-slot={joinIds(
|
|
346
|
+
'dialog-description',
|
|
347
|
+
family === 'dialog' ? undefined : `${family}-description`,
|
|
348
|
+
props['data-slot']
|
|
349
|
+
)}
|
|
334
350
|
id={dialog.descriptionId}
|
|
335
351
|
/>
|
|
336
352
|
)
|
|
@@ -19,7 +19,7 @@ import {
|
|
|
19
19
|
type DialogTitleProps,
|
|
20
20
|
type DialogDescriptionProps
|
|
21
21
|
} from '../Dialog/Dialog.js'
|
|
22
|
-
import { cn } from '
|
|
22
|
+
import { cn } from 'cn'
|
|
23
23
|
import { composeAction } from '../../internal/events.js'
|
|
24
24
|
import { requireAccessibleName, type AccessibleName } from '../../internal/accessibleName.js'
|
|
25
25
|
import { joinIds } from '../../internal/ids.js'
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ComponentProps } from 'react'
|
|
2
2
|
import { cva, type VariantProps } from 'class-variance-authority'
|
|
3
|
-
import { cn } from '
|
|
3
|
+
import { cn } from 'cn'
|
|
4
4
|
import { joinIds } from '../../internal/ids.js'
|
|
5
5
|
import { headings, type HeadingLevel } from '../../internal/headings.js'
|
|
6
6
|
import { actionTone } from '../shared/actionStyles.js'
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import { createContext, useContext, useId } from 'react'
|
|
4
4
|
import type { ComponentProps, ReactNode } from 'react'
|
|
5
5
|
import { cva } from 'class-variance-authority'
|
|
6
|
-
import { cn } from '
|
|
6
|
+
import { cn } from 'cn'
|
|
7
7
|
import { joinIds } from '../../internal/ids.js'
|
|
8
8
|
import type { ThemeStyle } from '../../themes/defineTheme.js'
|
|
9
9
|
import type { PartStyle } from '../../presentation.js'
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ReactNode } from 'react'
|
|
2
2
|
import { Field, type FieldProps } from '../Field/Field.js'
|
|
3
|
-
import { cn } from '
|
|
3
|
+
import { cn } from 'cn'
|
|
4
4
|
import { joinIds } from '../../internal/ids.js'
|
|
5
5
|
import type { PartStyle } from '../../presentation.js'
|
|
6
6
|
export type FieldsetProps = Omit<
|
|
@@ -9,7 +9,7 @@ export type FieldsetProps = Omit<
|
|
|
9
9
|
> & {
|
|
10
10
|
/** Names the group; nested Fields keep their individual labels. */
|
|
11
11
|
legend: ReactNode
|
|
12
|
-
parts?: {
|
|
12
|
+
parts?: { label?: PartStyle; description?: PartStyle; error?: PartStyle }
|
|
13
13
|
}
|
|
14
14
|
/** Native grouping built on Field's existing relationships and disabled context. */
|
|
15
15
|
export function Fieldset({ legend, parts, className, ...props }: FieldsetProps) {
|
|
@@ -26,10 +26,10 @@ export function Fieldset({ legend, parts, className, ...props }: FieldsetProps)
|
|
|
26
26
|
)}
|
|
27
27
|
parts={{
|
|
28
28
|
label: {
|
|
29
|
-
...parts?.
|
|
29
|
+
...parts?.label,
|
|
30
30
|
className: cn(
|
|
31
31
|
'max-w-full mb-[var(--rad-fieldset-gap,var(--rad-spacing-group-gap,0.75rem))]',
|
|
32
|
-
parts?.
|
|
32
|
+
parts?.label?.className
|
|
33
33
|
)
|
|
34
34
|
},
|
|
35
35
|
description: parts?.description,
|
|
@@ -3,12 +3,14 @@
|
|
|
3
3
|
import type { ComponentProps } from 'react'
|
|
4
4
|
import { useEffect, useRef, useState } from 'react'
|
|
5
5
|
import { Button } from '../Button/Button.js'
|
|
6
|
-
import { cn } from '
|
|
6
|
+
import { cn } from 'cn'
|
|
7
|
+
import { joinIds } from '../../internal/ids.js'
|
|
7
8
|
import { controlMetrics } from '../shared/controlStyles.js'
|
|
8
9
|
import { useFieldControl } from '../Field/Field.js'
|
|
9
10
|
import { useComposedRefs } from '../../react/useComposedRefs.js'
|
|
10
11
|
import type { ControlSize, PartStyle } from '../../presentation.js'
|
|
11
12
|
import type { ThemeStyle } from '../../themes/defineTheme.js'
|
|
13
|
+
import { peerFocusRingClass } from '../shared/focusStyles.js'
|
|
12
14
|
|
|
13
15
|
export type FileInputProps = Omit<
|
|
14
16
|
ComponentProps<'input'>,
|
|
@@ -17,6 +19,8 @@ export type FileInputProps = Omit<
|
|
|
17
19
|
controlSize?: ControlSize
|
|
18
20
|
/** Applied to the native input. */
|
|
19
21
|
style?: ThemeStyle
|
|
22
|
+
/** Additional composed identities; the file-input token is always retained. */
|
|
23
|
+
'data-slot'?: string
|
|
20
24
|
/** Visible text of the choose action; defaults to "Choose file" or "Choose files". */
|
|
21
25
|
chooseLabel?: string
|
|
22
26
|
/** Shown while no file is chosen; defaults to "No file chosen" or "No files chosen". */
|
|
@@ -39,6 +43,7 @@ export function FileInput({
|
|
|
39
43
|
parts,
|
|
40
44
|
ref,
|
|
41
45
|
onChange,
|
|
46
|
+
'data-slot': slot,
|
|
42
47
|
...props
|
|
43
48
|
}: FileInputProps) {
|
|
44
49
|
const control = useFieldControl(props),
|
|
@@ -83,7 +88,7 @@ export function FileInput({
|
|
|
83
88
|
setChosen(names(event.currentTarget))
|
|
84
89
|
onChange?.(event)
|
|
85
90
|
}}
|
|
86
|
-
data-slot=
|
|
91
|
+
data-slot={joinIds('file-input', slot)}
|
|
87
92
|
data-control-size={controlSize}
|
|
88
93
|
className={cn(
|
|
89
94
|
'peer absolute inset-0 m-0 box-border size-full cursor-pointer p-0 opacity-0',
|
|
@@ -106,7 +111,8 @@ export function FileInput({
|
|
|
106
111
|
data-slot="file-input-trigger"
|
|
107
112
|
className={cn(
|
|
108
113
|
'relative',
|
|
109
|
-
|
|
114
|
+
peerFocusRingClass,
|
|
115
|
+
'peer-focus-visible:[--_rad-focus-color:var(--rad-button-focus-color)] peer-focus-visible:[--_rad-focus-width:var(--rad-button-focus-width)] peer-focus-visible:[--_rad-focus-offset:var(--rad-button-focus-offset)] peer-focus-visible:[--_rad-focus-style:var(--rad-button-focus-style)]',
|
|
110
116
|
'peer-data-invalid:[border-color:var(--rad-color-invalid,oklch(0.56_0.19_25))]',
|
|
111
117
|
parts?.trigger?.className
|
|
112
118
|
)}
|
|
@@ -4,7 +4,7 @@ import { createContext, useContext, useCallback, useEffect, useRef, useState } f
|
|
|
4
4
|
import type { ComponentProps, ReactNode } from 'react'
|
|
5
5
|
import { Field, type FieldProps } from '../Field/Field.js'
|
|
6
6
|
import { Alert, type AlertProps } from '../Alert/Alert.js'
|
|
7
|
-
import { cn } from '
|
|
7
|
+
import { cn } from 'cn'
|
|
8
8
|
import { joinIds } from '../../internal/ids.js'
|
|
9
9
|
import { useControllableState } from '../../react/useControllableState.js'
|
|
10
10
|
import type { StateOwner } from '../../react/useNativeOwner.js'
|
|
@@ -44,7 +44,7 @@ const FormContext = createContext<FormState | null>(null)
|
|
|
44
44
|
export function useForm(): FormState | null {
|
|
45
45
|
return useContext(FormContext)
|
|
46
46
|
}
|
|
47
|
-
function
|
|
47
|
+
function useRequiredForm() {
|
|
48
48
|
const state = useForm()
|
|
49
49
|
if (!state) throw new Error('Form parts must be inside Form.')
|
|
50
50
|
return state
|
|
@@ -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
|
}
|
|
@@ -234,7 +238,7 @@ export function Form({
|
|
|
234
238
|
export type FormFieldProps = DistributiveOmit<FieldProps, 'name'> & { name: string }
|
|
235
239
|
/** Name matches the real input's name; Field retains label and error relationships. */
|
|
236
240
|
export function FormField({ name, error, ...props }: FormFieldProps) {
|
|
237
|
-
const { errors } =
|
|
241
|
+
const { errors } = useRequiredForm()
|
|
238
242
|
return (
|
|
239
243
|
<Field
|
|
240
244
|
{...props}
|
|
@@ -245,7 +249,7 @@ export function FormField({ name, error, ...props }: FormFieldProps) {
|
|
|
245
249
|
}
|
|
246
250
|
export type FormErrorProps = Omit<AlertProps, 'children' | 'tabIndex'>
|
|
247
251
|
export function FormError(props: FormErrorProps) {
|
|
248
|
-
const { errors } =
|
|
252
|
+
const { errors } = useRequiredForm()
|
|
249
253
|
return errors.form ? (
|
|
250
254
|
<Alert
|
|
251
255
|
{...props}
|
|
@@ -15,11 +15,14 @@ import { useComposedRefs } from '../../react/useComposedRefs.js'
|
|
|
15
15
|
import { useHoverSurface } from '../../react/useHoverSurface.js'
|
|
16
16
|
import { composeAction } from '../../internal/events.js'
|
|
17
17
|
import { joinIds } from '../../internal/ids.js'
|
|
18
|
-
import { cn } from '
|
|
18
|
+
import { cn } from 'cn'
|
|
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
|
}
|