chore: upgrade to react 19 beta and next 14 canary

This commit is contained in:
2024-05-19 14:53:00 +02:00
parent fe429295ef
commit 63e0be09e6
65 changed files with 2626 additions and 1898 deletions

View File

@@ -1,22 +1,22 @@
"use client";
import * as React from "react";
import { ComponentProps } from "react";
import * as SelectPrimitive from "@radix-ui/react-select";
import { cn } from "@/lib/style";
import * as icons from "@/components/icons";
import { Indicator } from "@/components/indicator";
export type Props = React.ComponentPropsWithoutRef<typeof SelectPrimitive.Root>;
export type Props = ComponentProps<typeof SelectPrimitive.Root>;
export const { Root, Group, Value } = SelectPrimitive;
export const Trigger = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
>(({ className, children, ...props }, ref) => (
export const Trigger = ({
className,
children,
...props
}: ComponentProps<typeof SelectPrimitive.Trigger>) => (
<SelectPrimitive.Trigger
{...{ ref }}
className={cn(
"flex h-9 items-center justify-between rounded-md border bg-select px-2.5 py-1.5",
"placeholder:text-muted-foreground",
@@ -28,19 +28,20 @@ export const Trigger = React.forwardRef<
>
{children}
<SelectPrimitive.Icon asChild>
<icons.ChevronDown className="h-4 w-4 opacity-50" />
<icons.ChevronDown className="size-4 opacity-50" />
</SelectPrimitive.Icon>
</SelectPrimitive.Trigger>
));
Trigger.displayName = SelectPrimitive.Trigger.displayName;
);
export const Content = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
>(({ className, children, position = "popper", ...props }, ref) => (
export const Content = ({
className,
children,
position = "popper",
...props
}: ComponentProps<typeof SelectPrimitive.Content>) => (
<SelectPrimitive.Portal>
<SelectPrimitive.Content
{...{ ref, position }}
position={position}
className={cn(
"relative z-50 overflow-hidden rounded-md border bg-select-content text-select-content-foreground shadow-md animate-in fade-in-80",
position === "popper" && "translate-y-1",
@@ -59,27 +60,18 @@ export const Content = React.forwardRef<
</SelectPrimitive.Viewport>
</SelectPrimitive.Content>
</SelectPrimitive.Portal>
));
Content.displayName = SelectPrimitive.Content.displayName;
);
export const Label = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Label>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
>(({ className, ...props }, ref) => (
<SelectPrimitive.Label
{...{ ref }}
className={cn("py-1.5 pl-8 pr-2 font-semibold", className)}
{...props}
/>
));
Label.displayName = SelectPrimitive.Label.displayName;
export const Label = ({ className, ...props }: ComponentProps<typeof SelectPrimitive.Label>) => (
<SelectPrimitive.Label className={cn("py-1.5 pl-8 pr-2 font-semibold", className)} {...props} />
);
export const Item = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
>(({ className, children, ...props }, ref) => (
export const Item = ({
className,
children,
...props
}: ComponentProps<typeof SelectPrimitive.Item>) => (
<SelectPrimitive.Item
{...{ ref }}
className={cn(
"relative flex w-full cursor-default select-none items-center rounded-sm px-2.5 py-1.5 outline-none",
"hover:bg-select-item-hover",
@@ -96,17 +88,11 @@ export const Item = React.forwardRef<
</span>
<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
</SelectPrimitive.Item>
));
Item.displayName = SelectPrimitive.Item.displayName;
);
export const Separator = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Separator>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
>(({ className, ...props }, ref) => (
<SelectPrimitive.Separator
{...{ ref }}
className={cn("-mx-1 my-1 h-px bg-muted", className)}
{...props}
/>
));
Separator.displayName = SelectPrimitive.Separator.displayName;
export const Separator = ({
className,
...props
}: ComponentProps<typeof SelectPrimitive.Separator>) => (
<SelectPrimitive.Separator className={cn("-mx-1 my-1 h-px bg-muted", className)} {...props} />
);