Skip to content

Commit 8716a97

Browse files
committed
syncing
1 parent 45bb84b commit 8716a97

File tree

8 files changed

+117
-114
lines changed

8 files changed

+117
-114
lines changed

bun.lockb

-4.39 KB
Binary file not shown.

composer.lock

Lines changed: 89 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@inertiajs/react": "^2.0.0",
1515
"@release-it/bumper": "^6.0.1",
1616
"@release-it/conventional-changelog": "^9.0.4",
17-
"@types/react": "^19.0.2",
17+
"@types/react": "^19.0.4",
1818
"@types/react-dom": "^19.0.2",
1919
"@vitejs/plugin-react": "^4.3.4",
2020
"autoprefixer": "^10.4.20",
@@ -25,24 +25,24 @@
2525
"prettier-plugin-organize-imports": "^4.1.0",
2626
"prettier-plugin-tailwindcss": "^0.6.9",
2727
"release-it": "^17.11.0",
28-
"tailwindcss": "^4.0.0-beta.8",
29-
"typescript": "^5.7.2",
28+
"tailwindcss": "^4.0.0-beta.9",
29+
"typescript": "^5.7.3",
3030
"vite-plugin-watch": "^0.3.1"
3131
},
3232
"dependencies": {
33-
"@tailwindcss/vite": "^4.0.0-beta.8",
34-
"@types/node": "^22.10.2",
33+
"@tailwindcss/vite": "^4.0.0-beta.9",
34+
"@types/node": "^22.10.5",
3535
"clsx": "^2.1.1",
36-
"justd-icons": "^1.10.8",
37-
"motion": "^11.15.0",
36+
"justd-icons": "^1.10.18",
37+
"motion": "^11.16.4",
3838
"react": "^19.0.0",
3939
"react-aria-components": "^1.5.0",
4040
"react-dom": "^19.0.0",
4141
"sonner": "^1.7.1",
4242
"tailwind-merge": "^2.6.0",
4343
"tailwind-variants": "^0.3.0",
4444
"tailwindcss-animate": "^1.0.7",
45-
"vite": "^6.0.6"
45+
"vite": "^6.0.7"
4646
},
4747
"version": "1.3.8"
4848
}

resources/js/components/ui/button.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import { focusButtonStyles } from './primitive';
1010
const buttonStyles = tv({
1111
extend: focusButtonStyles,
1212
base: [
13-
'kbt32x relative flex items-center justify-center gap-x-2 border font-medium',
14-
'forced-colors:[--button-icon:ButtonText] forced-colors:data-hovered:[--button-icon:ButtonText]',
15-
'*:data-[slot=icon]:-mx-0.5 *:data-[slot=icon]:my-1 *:data-[slot=icon]:size-4 *:data-[slot=icon]:shrink-0 *:data-[slot=icon]:text-current/60'
13+
'kbt32x relative inline-flex items-center justify-center gap-x-2 border font-medium',
14+
'forced-colors:[--btn-icon:ButtonText] forced-colors:data-hovered:[--btn-icon:ButtonText]',
15+
'*:data-[slot=icon]:-mx-0.5 data-hovered:*:data-[slot=icon]:text-current/90 *:data-[slot=icon]:my-1 *:data-[slot=icon]:size-4 *:data-[slot=icon]:shrink-0 *:data-[slot=icon]:text-current/60 *:data-[slot=icon]:transition',
16+
'*:data-[slot=avatar]:-mx-0.5 *:data-[slot=avatar]:my-1 *:data-[slot=avatar]:*:size-4 *:data-[slot=avatar]:size-4 *:data-[slot=avatar]:shrink-0'
1617
],
1718
variants: {
1819
intent: {

resources/js/components/ui/dropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const dropdownItemStyles = tv({
1818
'group relative flex cursor-default select-none items-center gap-x-1.5 rounded-[calc(var(--radius-lg)-1px)] px-2.5 py-2 forced-color:text-[Highlight] text-base text-fg outline outline-0 forced-color-adjust-none sm:text-sm forced-colors:text-[LinkText]',
1919
'has-submenu:data-open:data-danger:bg-danger/20 has-submenu:data-open:data-danger:text-danger',
2020
'data-has-submenu:data-open:bg-accent data-has-submenu:data-open:text-accent-fg data-has-submenu:data-open:*:data-[slot=icon]:text-accent-fg data-has-submenu:data-open:*:[.text-muted-fg]:text-accent-fg',
21-
'**:data-[slot=avatar]:-mr-0.5 **:data-[slot=avatar]:size-6 sm:**:data-[slot=avatar]:size-5',
21+
'**:data-[slot=avatar]:-mr-0.5 **:data-[slot=avatar]:*:size-6 **:data-[slot=avatar]:size-6 sm:**:data-[slot=avatar]:*:size-5 sm:**:data-[slot=avatar]:size-5',
2222
'data-danger:**:data-[slot=icon]:text-danger/70 data-focused:**:data-[slot=icon]:text-accent-fg data-hovered:**:data-[slot=icon]:text-accent-fg **:data-[slot=icon]:size-4 **:data-[slot=icon]:shrink-0 **:data-[slot=icon]:text-muted-fg data-focused:data-danger:**:data-[slot=icon]:text-danger-fg',
2323
'data-[slot=menu-radio]:*:data-[slot=icon]:size-3',
2424
'forced-colors:**:data-[slot=icon]:text-[CanvasText] forced-colors:group-data-focused:**:data-[slot=icon]:text-[Canvas] '

resources/js/components/ui/modal.tsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const content = tv({
4747
}
4848
},
4949
defaultVariants: {
50-
size: 'lg'
50+
size: 'xl'
5151
}
5252
});
5353

@@ -57,11 +57,12 @@ const Modal = (props: DialogTriggerProps) => {
5757

5858
interface ModalContentProps
5959
extends Omit<React.ComponentProps<typeof Modal>, 'children'>,
60-
Omit<ModalOverlayProps, 'className'>,
60+
Omit<ModalOverlayProps, 'className' | 'children'>,
6161
VariantProps<typeof content> {
6262
'aria-label'?: DialogProps['aria-label'];
6363
'aria-labelledby'?: DialogProps['aria-labelledby'];
6464
role?: DialogProps['role'];
65+
children?: DialogProps['children'];
6566
closeButton?: boolean;
6667
isBlurred?: boolean;
6768
classNames?: {
@@ -103,12 +104,14 @@ const ModalContent = ({
103104
)}
104105
{...props}
105106
>
106-
{(values) => (
107-
<Dialog role={role}>
108-
{typeof children === 'function' ? children(values) : children}
109-
{closeButton && <Dialog.CloseIndicator isDismissable={_isDismissable} />}
110-
</Dialog>
111-
)}
107+
<Dialog role={role}>
108+
{(values) => (
109+
<>
110+
{typeof children === 'function' ? children(values) : children}
111+
{closeButton && <Dialog.CloseIndicator isDismissable={_isDismissable} />}
112+
</>
113+
)}
114+
</Dialog>
112115
</ModalPrimitive>
113116
</ModalOverlay>
114117
);

resources/js/components/ui/sheet.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ const contentStyles = tv({
5050
top: 'data-entering:slide-in-from-top data-exiting:slide-out-to-top inset-x-0 top-0 rounded-b-2xl border-b',
5151
bottom:
5252
'data-entering:slide-in-from-bottom data-exiting:slide-out-to-bottom inset-x-0 bottom-0 rounded-t-2xl border-t',
53-
left: 'data-entering:slide-in-from-left data-exiting:slide-out-to-left inset-y-0 left-0 h-auto w-[18rem] overflow-y-auto border-r sm:w-3/4 sm:w-[19rem] sm:max-w-xs',
53+
left: 'data-entering:slide-in-from-left data-exiting:slide-out-to-left inset-y-0 left-0 h-auto w-full max-w-xs overflow-y-auto border-r',
5454
right:
55-
'data-entering:slide-in-from-right data-exiting:slide-out-to-right inset-y-0 right-0 h-auto w-[18rem] overflow-y-auto border-l sm:w-3/4 sm:w-[19rem] sm:max-w-xs'
55+
'data-entering:slide-in-from-right data-exiting:slide-out-to-right inset-y-0 right-0 h-auto w-full max-w-xs overflow-y-auto border-l'
5656
},
5757
isFloat: {
5858
false: 'border-fg/20 dark:border-border',

resources/js/components/ui/table.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import { Checkbox } from './checkbox';
3131

3232
const table = tv({
3333
slots: {
34-
root: 'table w-full min-w-full caption-bottom border-spacing-0 text-sm outline-hidden **:data-drop-target:border **:data-drop-target:border-primary',
34+
root: 'table w-full min-w-full caption-bottom border-spacing-0 text-sm outline-hidden [--table-selected-bg:color-mix(in_oklab,var(--color-primary)_5%,white_90%)] **:data-drop-target:border **:data-drop-target:border-primary dark:[--table-selected-bg:color-mix(in_oklab,var(--color-primary)_25%,black_70%)]',
3535
header: 'x32 border-b',
36-
row: 'tr group relative cursor-default border-b text-fg/70 outline-hidden ring-primary data-selected:data-hovered:bg-subtle/50 data-selected:bg-subtle data-focus-visible:ring-1 data-focused:ring-0 dark:data-selected:data-hovered:bg-subtle/60',
36+
row: 'tr group relative cursor-default border-b bg-bg text-fg/70 outline-hidden ring-primary data-selected:data-hovered:bg-(--table-selected-bg)/70 data-selected:bg-(--table-selected-bg) data-focus-visible:ring-1 data-focused:ring-0 dark:data-selected:data-hovered:bg-[color-mix(in_oklab,var(--color-primary)_40%,black_60%)] dark:data-selected:data-hovered:bg-subtle/60',
3737
cellIcon:
3838
'grid size-[1.15rem] flex-none shrink-0 place-content-center rounded bg-secondary text-fg *:data-[slot=icon]:size-3.5 *:data-[slot=icon]:shrink-0 *:data-[slot=icon]:transition-transform *:data-[slot=icon]:duration-200',
3939
columnResizer: [

0 commit comments

Comments
 (0)