Skip to content

Commit

Permalink
Merge branch 'master' into fix/menu-open-on-hover
Browse files Browse the repository at this point in the history
  • Loading branch information
atomiks authored Dec 23, 2024
2 parents 4b26a80 + 1d2fdba commit e753d95
Show file tree
Hide file tree
Showing 100 changed files with 824 additions and 765 deletions.
2 changes: 1 addition & 1 deletion docs/reference/generated/form.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"props": {
"errors": {
"type": "Record<string, string | string[]>",
"description": "An object where the keys correspond to the `name` attribute of the form fields,\nand the values correspond to the erorr(s) related to that field."
"description": "An object where the keys correspond to the `name` attribute of the form fields,\nand the values correspond to the error(s) related to that field."
},
"onClearErrors": {
"type": "(errors) => void",
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/menu-arrow.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"data-side": {
"description": "Indicates which side the menu is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
}
},
"cssVariables": {}
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/menu-popup.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"data-side": {
"description": "Indicates which side the menu is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
},
"data-starting-style": {
"description": "Present when the menu is animating in."
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/menu-positioner.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
"data-side": {
"description": "Indicates which side the menu is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
}
},
"cssVariables": {
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/popover-arrow.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"data-side": {
"description": "Indicates which side the popup is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
}
},
"cssVariables": {}
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/popover-popup.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"data-side": {
"description": "Indicates which side the popup is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
},
"data-starting-style": {
"description": "Present when the popup is animating in."
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/popover-positioner.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
},
"data-side": {
"description": "Indicates which side the popup is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
}
},
"cssVariables": {
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/preview-card-arrow.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"data-side": {
"description": "Indicates which side the preview card is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
}
},
"cssVariables": {}
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/preview-card-popup.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"data-side": {
"description": "Indicates which side the preview card is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
},
"data-starting-style": {
"description": "Present when the preview card is animating in."
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/preview-card-positioner.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
},
"data-side": {
"description": "Indicates which side the preview card is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
}
},
"cssVariables": {
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/tooltip-arrow.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"data-side": {
"description": "Indicates which side the tooltip is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
}
},
"cssVariables": {}
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/tooltip-popup.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"data-side": {
"description": "Indicates which side the tooltip is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
},
"data-starting-style": {
"description": "Present when the tooltip is animating in."
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/generated/tooltip-positioner.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
},
"data-side": {
"description": "Indicates which side the tooltip is positioned relative to the trigger.",
"type": "'none' | 'top' | 'right' | 'bottom' | 'left'"
"type": "'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'"
}
},
"cssVariables": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ export default function ExampleAccordion() {
<Accordion.Root className="flex w-96 max-w-[calc(100vw-8rem)] flex-col justify-center text-gray-900">
<Accordion.Item className="border-b border-gray-200">
<Accordion.Header>
<Accordion.Trigger className="group flex w-full cursor-pointer items-baseline justify-between gap-4 py-2 text-left font-medium focus-visible:outline-2 focus-visible:outline-blue-800">
<Accordion.Trigger className="group flex w-full cursor-pointer items-baseline justify-between gap-4 py-2 text-left font-medium focus-visible:outline focus-visible:outline-2 focus-visible:outline-blue-800">
What is Base UI?
<PlusIcon className="mr-2 size-3 shrink-0 transition-all ease-out group-data-[panel-open]:scale-110 group-data-[panel-open]:rotate-45" />
</Accordion.Trigger>
</Accordion.Header>
<Accordion.Panel className="h-[var(--accordion-panel-height)] overflow-hidden text-base text-gray-600 transition-[height] ease-out [[data-starting-style],[data-ending-style]]:h-0">
<Accordion.Panel className="h-[var(--accordion-panel-height)] overflow-hidden text-base text-gray-600 transition-[height] ease-out data-[ending-style]:h-0 data-[starting-style]:h-0">
<div className="pb-3">
Base UI is a library of high-quality unstyled React components for design
systems and web apps.
Expand All @@ -21,12 +21,12 @@ export default function ExampleAccordion() {

<Accordion.Item className="border-b border-gray-200">
<Accordion.Header>
<Accordion.Trigger className="group flex w-full cursor-pointer items-baseline justify-between gap-4 py-2 text-left font-medium focus-visible:outline-2 focus-visible:outline-blue-800">
<Accordion.Trigger className="group flex w-full cursor-pointer items-baseline justify-between gap-4 py-2 text-left font-medium focus-visible:outline focus-visible:outline-2 focus-visible:outline-blue-800">
How do I get started?
<PlusIcon className="mr-2 size-3 shrink-0 transition-all ease-out group-data-[panel-open]:scale-110 group-data-[panel-open]:rotate-45" />
</Accordion.Trigger>
</Accordion.Header>
<Accordion.Panel className="h-[var(--accordion-panel-height)] overflow-hidden text-base text-gray-600 transition-[height] ease-out [[data-starting-style],[data-ending-style]]:h-0">
<Accordion.Panel className="h-[var(--accordion-panel-height)] overflow-hidden text-base text-gray-600 transition-[height] ease-out data-[ending-style]:h-0 data-[starting-style]:h-0">
<div className="pb-3">
Head to the “Quick start” guide in the docs. If you’ve used unstyled
libraries before, you’ll feel at home.
Expand All @@ -36,12 +36,12 @@ export default function ExampleAccordion() {

<Accordion.Item className="border-b border-gray-200">
<Accordion.Header>
<Accordion.Trigger className="group flex w-full cursor-pointer items-baseline justify-between gap-4 py-2 text-left font-medium focus-visible:outline-2 focus-visible:outline-blue-800">
<Accordion.Trigger className="group flex w-full cursor-pointer items-baseline justify-between gap-4 py-2 text-left font-medium focus-visible:outline focus-visible:outline-2 focus-visible:outline-blue-800">
Can I use it for my project?
<PlusIcon className="mr-2 size-3 shrink-0 transition-all ease-out group-data-[panel-open]:scale-110 group-data-[panel-open]:rotate-45" />
</Accordion.Trigger>
</Accordion.Header>
<Accordion.Panel className="h-[var(--accordion-panel-height)] overflow-hidden text-base text-gray-600 transition-[height] ease-out [[data-starting-style],[data-ending-style]]:h-0">
<Accordion.Panel className="h-[var(--accordion-panel-height)] overflow-hidden text-base text-gray-600 transition-[height] ease-out data-[ending-style]:h-0 data-[starting-style]:h-0">
<div className="pb-3">Of course! Base UI is free and open source.</div>
</Accordion.Panel>
</Accordion.Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ import { AlertDialog } from '@base-ui-components/react/alert-dialog';
export default function ExampleAlertDialog() {
return (
<AlertDialog.Root>
<AlertDialog.Trigger className="flex h-10 items-center justify-center rounded-md border border-gray-200 bg-gray-50 px-3.5 text-base font-medium text-red-800 select-none hover:bg-gray-100 focus-visible:outline-2 focus-visible:-outline-offset-1 focus-visible:outline-blue-800 active:bg-gray-100">
<AlertDialog.Trigger className="flex h-10 items-center justify-center rounded-md border border-gray-200 bg-gray-50 px-3.5 text-base font-medium text-red-800 select-none hover:bg-gray-100 focus-visible:outline focus-visible:outline-2 focus-visible:-outline-offset-1 focus-visible:outline-blue-800 active:bg-gray-100">
Discard draft
</AlertDialog.Trigger>
<AlertDialog.Portal>
<AlertDialog.Backdrop className="fixed inset-0 bg-black opacity-20 transition-all duration-150 dark:opacity-70 [[data-starting-style],[data-ending-style]]:opacity-0" />
<AlertDialog.Popup className="fixed top-1/2 left-1/2 -mt-8 w-96 max-w-[calc(100vw-3rem)] -translate-1/2 rounded-lg bg-gray-50 p-6 text-gray-900 outline outline-gray-200 transition-all duration-150 dark:outline-gray-300 [[data-starting-style],[data-ending-style]]:scale-90 [[data-starting-style],[data-ending-style]]:opacity-0">
<AlertDialog.Backdrop className="fixed inset-0 bg-black opacity-20 transition-all duration-150 data-[ending-style]:opacity-0 data-[starting-style]:opacity-0 dark:opacity-70" />
<AlertDialog.Popup className="fixed top-1/2 left-1/2 -mt-8 w-96 max-w-[calc(100vw-3rem)] -translate-x-1/2 -translate-y-1/2 rounded-lg bg-gray-50 p-6 text-gray-900 outline outline-1 outline-gray-200 transition-all duration-150 data-[ending-style]:scale-90 data-[ending-style]:opacity-0 data-[starting-style]:scale-90 data-[starting-style]:opacity-0 dark:outline-gray-300">
<AlertDialog.Title className="-mt-1.5 mb-1 text-lg font-medium">
Discard draft?
</AlertDialog.Title>
<AlertDialog.Description className="mb-6 text-base text-gray-600">
You can’t undo this action.
</AlertDialog.Description>
<div className="flex justify-end gap-4">
<AlertDialog.Close className="flex h-10 items-center justify-center rounded-md border border-gray-200 bg-gray-50 px-3.5 text-base font-medium text-gray-900 select-none hover:bg-gray-100 focus-visible:outline-2 focus-visible:-outline-offset-1 focus-visible:outline-blue-800 active:bg-gray-100">
<AlertDialog.Close className="flex h-10 items-center justify-center rounded-md border border-gray-200 bg-gray-50 px-3.5 text-base font-medium text-gray-900 select-none hover:bg-gray-100 focus-visible:outline focus-visible:outline-2 focus-visible:-outline-offset-1 focus-visible:outline-blue-800 active:bg-gray-100">
Cancel
</AlertDialog.Close>
<AlertDialog.Close className="flex h-10 items-center justify-center rounded-md border border-gray-200 bg-gray-50 px-3.5 text-base font-medium text-red-800 select-none hover:bg-gray-100 focus-visible:outline-2 focus-visible:-outline-offset-1 focus-visible:outline-blue-800 active:bg-gray-100">
<AlertDialog.Close className="flex h-10 items-center justify-center rounded-md border border-gray-200 bg-gray-50 px-3.5 text-base font-medium text-red-800 select-none hover:bg-gray-100 focus-visible:outline focus-visible:outline-2 focus-visible:-outline-offset-1 focus-visible:outline-blue-800 active:bg-gray-100">
Discard
</AlertDialog.Close>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function ExampleCheckboxGroup() {
<label className="flex items-center gap-2">
<Checkbox.Root
name="fuji-apple"
className="flex size-5 items-center justify-center rounded-sm outline-0 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-800 data-[checked]:bg-gray-900 data-[unchecked]:border data-[unchecked]:border-gray-300"
className="flex size-5 items-center justify-center rounded-sm outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-800 data-[checked]:bg-gray-900 data-[unchecked]:border data-[unchecked]:border-gray-300"
>
<Checkbox.Indicator className="flex text-gray-50 data-[unchecked]:hidden">
<CheckIcon className="size-3" />
Expand All @@ -28,7 +28,7 @@ export default function ExampleCheckboxGroup() {
<label className="flex items-center gap-2">
<Checkbox.Root
name="gala-apple"
className="flex size-5 items-center justify-center rounded-sm outline-0 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-800 data-[checked]:bg-gray-900 data-[unchecked]:border data-[unchecked]:border-gray-300"
className="flex size-5 items-center justify-center rounded-sm outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-800 data-[checked]:bg-gray-900 data-[unchecked]:border data-[unchecked]:border-gray-300"
>
<Checkbox.Indicator className="flex text-gray-50 data-[unchecked]:hidden">
<CheckIcon className="size-3" />
Expand All @@ -40,7 +40,7 @@ export default function ExampleCheckboxGroup() {
<label className="flex items-center gap-2">
<Checkbox.Root
name="granny-smith-apple"
className="flex size-5 items-center justify-center rounded-sm outline-0 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-800 data-[checked]:bg-gray-900 data-[unchecked]:border data-[unchecked]:border-gray-300"
className="flex size-5 items-center justify-center rounded-sm outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-800 data-[checked]:bg-gray-900 data-[unchecked]:border data-[unchecked]:border-gray-300"
>
<Checkbox.Indicator className="flex text-gray-50 data-[unchecked]:hidden">
<CheckIcon className="size-3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default function ExampleCheckbox() {
<label className="flex items-center gap-2 text-base text-gray-900">
<Checkbox.Root
defaultChecked
className="flex size-5 items-center justify-center rounded-sm outline-0 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-800 data-[checked]:bg-gray-900 data-[unchecked]:border data-[unchecked]:border-gray-300"
className="flex size-5 items-center justify-center rounded-sm outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-800 data-[checked]:bg-gray-900 data-[unchecked]:border data-[unchecked]:border-gray-300"
>
<Checkbox.Indicator className="flex text-gray-50 data-[unchecked]:hidden">
<CheckIcon className="size-3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { Collapsible } from '@base-ui-components/react/collapsible';
export default function ExampleCollapsible() {
return (
<Collapsible.Root className="flex min-h-36 w-56 flex-col justify-center text-gray-900">
<Collapsible.Trigger className="group flex items-center gap-2 rounded-sm bg-gray-100 px-2 py-1 text-sm font-medium hover:bg-gray-200 focus-visible:outline-2 focus-visible:outline-blue-800 active:bg-gray-200">
<Collapsible.Trigger className="group flex items-center gap-2 rounded-sm bg-gray-100 px-2 py-1 text-sm font-medium hover:bg-gray-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-blue-800 active:bg-gray-200">
<ChevronIcon className="size-3 transition-all ease-out group-data-[panel-open]:rotate-90" />
Recovery keys
</Collapsible.Trigger>
<Collapsible.Panel className="flex h-[var(--collapsible-panel-height)] flex-col justify-end overflow-hidden text-sm transition-all ease-out [[data-starting-style],[data-ending-style]]:h-0">
<Collapsible.Panel className="flex h-[var(--collapsible-panel-height)] flex-col justify-end overflow-hidden text-sm transition-all ease-out data-[ending-style]:h-0 data-[starting-style]:h-0">
<div className="mt-1 flex cursor-text flex-col gap-2 rounded-sm bg-gray-100 py-2 pl-7">
<div>alien-bean-pasta</div>
<div>wild-irish-burrito</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
font-size: 1rem;
font-weight: 500;
line-height: 1.5rem;
background-color: transparent;
color: var(--color-red);
border-radius: 0.25rem;
padding: 0.125rem 0.375rem;
Expand Down
Loading

0 comments on commit e753d95

Please sign in to comment.