Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

refactor(ui): remove Radix Slot and use Base UI render composition

Andrejf6778ed445bf
diff --git a/apps/web/src/components/ui/button.tsx b/apps/web/src/components/ui/button.tsx
index 9207c0e46..cf0ab394b 100644
--- a/apps/web/src/components/ui/button.tsx
+++ b/apps/web/src/components/ui/button.tsx
@@ -3,7 +3,7 @@
import { mergeProps } from "@base-ui/react/merge-props";
import { useRender } from "@base-ui/react/use-render";
import { cva, type VariantProps } from "class-variance-authority";
-import type * as React from "react";
+import * as React from "react";
import { cn } from "@/lib/cn";
@@ -33,7 +33,7 @@ const buttonVariants = cva(
default:
"not-disabled:inset-shadow-[0_1px_--theme(--color-white/16%)] border-primary bg-primary text-primary-foreground shadow-primary/24 shadow-xs [:active,[data-pressed]]:inset-shadow-[0_1px_--theme(--color-black/8%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-primary/90",
destructive:
- "not-disabled:inset-shadow-[0_1px_--theme(--color-white/16%)] border-destructive bg-destructive shadow-destructive/24 shadow-xs [:active,[data-pressed]]:inset-shadow-[0_1px_--theme(--color-black/8%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-destructive/90",
+ "not-disabled:inset-shadow-[0_1px_--theme(--color-white/16%)] border-destructive bg-destructive text-white shadow-destructive/24 shadow-xs [:active,[data-pressed]]:inset-shadow-[0_1px_--theme(--color-black/8%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-destructive/90",
"destructive-outline":
"border-input bg-popover not-dark:bg-clip-padding text-destructive-foreground shadow-xs/5 not-disabled:not-active:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:not-disabled:before:shadow-[0_-1px_--theme(--color-white/2%)] dark:not-disabled:not-active:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:border-destructive/32 [:hover,[data-pressed]]:bg-destructive/4",
ghost:
@@ -49,11 +49,20 @@ const buttonVariants = cva(
);
interface ButtonProps extends useRender.ComponentProps<"button"> {
+ asChild?: boolean;
variant?: VariantProps<typeof buttonVariants>["variant"];
size?: VariantProps<typeof buttonVariants>["size"];
}
-function Button({ className, variant, size, render, ...props }: ButtonProps) {
+function Button({
+ asChild = false,
+ className,
+ children,
+ variant,
+ size,
+ render,
+ ...props
+}: ButtonProps) {
const typeValue: React.ButtonHTMLAttributes<HTMLButtonElement>["type"] =
render ? undefined : "button";
@@ -63,10 +72,16 @@ function Button({ className, variant, size, render, ...props }: ButtonProps) {
type: typeValue,
};
+ const resolvedRender =
+ asChild && React.isValidElement(children) ? children : render;
+
return useRender({
defaultTagName: "button",
- props: mergeProps<"button">(defaultProps, props),
- render,
+ props: mergeProps<"button">(defaultProps, {
+ ...props,
+ children: asChild ? undefined : children,
+ }),
+ render: resolvedRender,
});
}
diff --git a/apps/web/src/components/ui/collapsible.tsx b/apps/web/src/components/ui/collapsible.tsx
index f9a06529a..d086c6167 100644
--- a/apps/web/src/components/ui/collapsible.tsx
+++ b/apps/web/src/components/ui/collapsible.tsx
@@ -1,6 +1,7 @@
"use client";
import { Collapsible as CollapsiblePrimitive } from "@base-ui/react/collapsible";
+import * as React from "react";
import { cn } from "@/lib/cn";
@@ -9,19 +10,26 @@ function Collapsible({ ...props }: CollapsiblePrimitive.Root.Props) {
}
function CollapsibleTrigger({
+ asChild = false,
className,
+ children,
render,
nativeButton,
...props
-}: CollapsiblePrimitive.Trigger.Props) {
+}: CollapsiblePrimitive.Trigger.Props & { asChild?: boolean }) {
+ const resolvedRender =
+ asChild && React.isValidElement(children) ? children : render;
+
return (
<CollapsiblePrimitive.Trigger
className={cn("cursor-pointer", className)}
data-slot="collapsible-trigger"
nativeButton={render ? false : nativeButton}
- render={render}
+ render={resolvedRender}
{...props}
- />
+ >
+ {asChild ? undefined : children}
+ </CollapsiblePrimitive.Trigger>
);
}
diff --git a/apps/web/src/components/ui/dialog.tsx b/apps/web/src/components/ui/dialog.tsx
index 94cc96264..760c07f23 100644
--- a/apps/web/src/components/ui/dialog.tsx
+++ b/apps/web/src/components/ui/dialog.tsx
@@ -2,6 +2,7 @@
import { Dialog as DialogPrimitive } from "@base-ui/react/dialog";
import { XIcon } from "lucide-react";
+import * as React from "react";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import { cn } from "@/lib/cn";
@@ -12,12 +13,44 @@ const Dialog = DialogPrimitive.Root;
const DialogPortal = DialogPrimitive.Portal;
-function DialogTrigger(props: DialogPrimitive.Trigger.Props) {
- return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />;
+function DialogTrigger({
+ asChild = false,
+ children,
+ render,
+ ...props
+}: DialogPrimitive.Trigger.Props & { asChild?: boolean }) {
+ const resolvedRender =
+ asChild && React.isValidElement(children) ? children : render;
+
+ return (
+ <DialogPrimitive.Trigger
+ data-slot="dialog-trigger"
+ render={resolvedRender}
+ {...props}
+ >
+ {asChild ? undefined : children}
+ </DialogPrimitive.Trigger>
+ );
}
-function DialogClose(props: DialogPrimitive.Close.Props) {
- return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
+function DialogClose({
+ asChild = false,
+ children,
+ render,
+ ...props
+}: DialogPrimitive.Close.Props & { asChild?: boolean }) {
+ const resolvedRender =
+ asChild && React.isValidElement(children) ? children : render;
+
+ return (
+ <DialogPrimitive.Close
+ data-slot="dialog-close"
+ render={resolvedRender}
+ {...props}
+ >
+ {asChild ? undefined : children}
+ </DialogPrimitive.Close>
+ );
}
function DialogBackdrop({
@@ -132,7 +165,16 @@ function DialogFooter({
);
}
-function DialogTitle({ className, ...props }: DialogPrimitive.Title.Props) {
+function DialogTitle({
+ asChild = false,
+ className,
+ children,
+ render,
+ ...props
+}: DialogPrimitive.Title.Props & { asChild?: boolean }) {
+ const resolvedRender =
+ asChild && React.isValidElement(children) ? children : render;
+
return (
<DialogPrimitive.Title
className={cn(
@@ -140,8 +182,11 @@ function DialogTitle({ className, ...props }: DialogPrimitive.Title.Props) {
className,
)}
data-slot="dialog-title"
+ render={resolvedRender}
{...props}
- />
+ >
+ {asChild ? undefined : children}
+ </DialogPrimitive.Title>
);
}
diff --git a/apps/web/src/components/ui/kbd.tsx b/apps/web/src/components/ui/kbd.tsx
index cf103c9ef..97d754abc 100644
--- a/apps/web/src/components/ui/kbd.tsx
+++ b/apps/web/src/components/ui/kbd.tsx
@@ -29,15 +29,24 @@ function KbdSequence({
keys,
className,
description,
+ separator = "+",
}: {
keys: string[];
className?: string;
description?: string;
+ separator?: string;
}) {
return (
<KbdGroup aria-label={description} className={className}>
- {keys.map((key) => (
- <Kbd key={key}>{key}</Kbd>
+ {keys.map((key, index) => (
+ <span key={key} className="inline-flex items-center gap-1">
+ <Kbd>{key}</Kbd>
+ {separator && index < keys.length - 1 ? (
+ <span className="text-muted-foreground/72 text-xs">
+ {separator}
+ </span>
+ ) : null}
+ </span>
))}
</KbdGroup>
);
diff --git a/apps/web/src/components/ui/menu.tsx b/apps/web/src/components/ui/menu.tsx
index ea7084005..fa3ba00f2 100644
--- a/apps/web/src/components/ui/menu.tsx
+++ b/apps/web/src/components/ui/menu.tsx
@@ -2,7 +2,7 @@
import { Menu as MenuPrimitive } from "@base-ui/react/menu";
import { ChevronRightIcon } from "lucide-react";
-import type * as React from "react";
+import * as React from "react";
import { cn } from "@/lib/cn";
@@ -13,17 +13,23 @@ const Menu = MenuPrimitive.Root;
const MenuPortal = MenuPrimitive.Portal;
function MenuTrigger({
+ asChild = false,
className,
children,
+ render,
...props
-}: MenuPrimitive.Trigger.Props) {
+}: MenuPrimitive.Trigger.Props & { asChild?: boolean }) {
+ const resolvedRender =
+ asChild && React.isValidElement(children) ? children : render;
+
return (
<MenuPrimitive.Trigger
className={className}
data-slot="menu-trigger"
+ render={resolvedRender}
{...props}
>
- {children}
+ {asChild ? undefined : children}
</MenuPrimitive.Trigger>
);
}
diff --git a/apps/web/src/components/ui/popover.tsx b/apps/web/src/components/ui/popover.tsx
index ebd309160..1e573f47d 100644
--- a/apps/web/src/components/ui/popover.tsx
+++ b/apps/web/src/components/ui/popover.tsx
@@ -1,6 +1,7 @@
"use client";
import { Popover as PopoverPrimitive } from "@base-ui/react/popover";
+import * as React from "react";
import { cn } from "@/lib/cn";
@@ -9,17 +10,23 @@ const PopoverCreateHandle = PopoverPrimitive.createHandle;
const Popover = PopoverPrimitive.Root;
function PopoverTrigger({
+ asChild = false,
className,
children,
+ render,
...props
-}: PopoverPrimitive.Trigger.Props) {
+}: PopoverPrimitive.Trigger.Props & { asChild?: boolean }) {
+ const resolvedRender =
+ asChild && React.isValidElement(children) ? children : render;
+
return (
<PopoverPrimitive.Trigger
className={className}
data-slot="popover-trigger"
+ render={resolvedRender}
{...props}
>
- {children}
+ {asChild ? undefined : children}
</PopoverPrimitive.Trigger>
);
}
@@ -65,9 +72,9 @@ function PopoverPopup({
>
<PopoverPrimitive.Viewport
className={cn(
- "relative size-full max-h-(--available-height) overflow-clip px-(--viewport-inline-padding) py-4 [--viewport-inline-padding:--spacing(4)] has-data-[slot=calendar]:p-2 data-instant:transition-none **:data-current:data-ending-style:opacity-0 **:data-current:data-starting-style:opacity-0 **:data-previous:data-ending-style:opacity-0 **:data-previous:data-starting-style:opacity-0 **:data-current:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-previous:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-current:opacity-100 **:data-previous:opacity-100 **:data-current:transition-opacity **:data-previous:transition-opacity",
+ "relative size-full max-h-(--available-height) overflow-clip px-(--viewport-inline-padding) py-0.5 [--viewport-inline-padding:--spacing(1)] has-data-[slot=calendar]:p-2 data-instant:transition-none **:data-current:data-ending-style:opacity-0 **:data-current:data-starting-style:opacity-0 **:data-previous:data-ending-style:opacity-0 **:data-previous:data-starting-style:opacity-0 **:data-current:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-previous:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-current:opacity-100 **:data-previous:opacity-100 **:data-current:transition-opacity **:data-previous:transition-opacity",
tooltipStyle
- ? "py-1 [--viewport-inline-padding:--spacing(2)]"
+ ? "py-0.5 [--viewport-inline-padding:--spacing(1)]"
: "not-data-transitioning:overflow-y-auto",
)}
data-slot="popover-viewport"
diff --git a/apps/web/src/components/ui/preview-card.tsx b/apps/web/src/components/ui/preview-card.tsx
index 6c0f6f52e..ae77ef962 100644
--- a/apps/web/src/components/ui/preview-card.tsx
+++ b/apps/web/src/components/ui/preview-card.tsx
@@ -1,14 +1,40 @@
"use client";
import { PreviewCard as PreviewCardPrimitive } from "@base-ui/react/preview-card";
+import * as React from "react";
import { cn } from "@/lib/cn";
-const PreviewCard = PreviewCardPrimitive.Root;
+function PreviewCard({
+ closeDelay,
+ openDelay,
+ ...props
+}: PreviewCardPrimitive.Root.Props & {
+ openDelay?: number;
+ closeDelay?: number;
+}) {
+ void openDelay;
+ void closeDelay;
+ return <PreviewCardPrimitive.Root {...props} />;
+}
+
+function PreviewCardTrigger({
+ asChild = false,
+ children,
+ render,
+ ...props
+}: PreviewCardPrimitive.Trigger.Props & { asChild?: boolean }) {
+ const resolvedRender =
+ asChild && React.isValidElement(children) ? children : render;
-function PreviewCardTrigger({ ...props }: PreviewCardPrimitive.Trigger.Props) {
return (
- <PreviewCardPrimitive.Trigger data-slot="preview-card-trigger" {...props} />
+ <PreviewCardPrimitive.Trigger
+ data-slot="preview-card-trigger"
+ render={resolvedRender}
+ {...props}
+ >
+ {asChild ? undefined : children}
+ </PreviewCardPrimitive.Trigger>
);
}
@@ -16,11 +42,13 @@ function PreviewCardPopup({
className,
children,
align = "center",
+ side = "top",
sideOffset = 4,
anchor,
...props
}: PreviewCardPrimitive.Popup.Props & {
align?: PreviewCardPrimitive.Positioner.Props["align"];
+ side?: PreviewCardPrimitive.Positioner.Props["side"];
sideOffset?: PreviewCardPrimitive.Positioner.Props["sideOffset"];
anchor?: PreviewCardPrimitive.Positioner.Props["anchor"];
}) {
@@ -31,6 +59,7 @@ function PreviewCardPopup({
anchor={anchor}
className="z-50"
data-slot="preview-card-positioner"
+ side={side}
sideOffset={sideOffset}
>
<PreviewCardPrimitive.Popup
diff --git a/apps/web/src/components/ui/tooltip.tsx b/apps/web/src/components/ui/tooltip.tsx
index c0fb3d7c5..ee271d434 100644
--- a/apps/web/src/components/ui/tooltip.tsx
+++ b/apps/web/src/components/ui/tooltip.tsx
@@ -1,6 +1,7 @@
"use client";
import { Tooltip as TooltipPrimitive } from "@base-ui/react/tooltip";
+import * as React from "react";
import { cn } from "@/lib/cn";
@@ -10,8 +11,24 @@ const TooltipProvider = TooltipPrimitive.Provider;
const Tooltip = TooltipPrimitive.Root;
-function TooltipTrigger(props: TooltipPrimitive.Trigger.Props) {
- return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;
+function TooltipTrigger({
+ asChild = false,
+ children,
+ render,
+ ...props
+}: TooltipPrimitive.Trigger.Props & { asChild?: boolean }) {
+ const resolvedRender =
+ asChild && React.isValidElement(children) ? children : render;
+
+ return (
+ <TooltipPrimitive.Trigger
+ data-slot="tooltip-trigger"
+ render={resolvedRender}
+ {...props}
+ >
+ {asChild ? undefined : children}
+ </TooltipPrimitive.Trigger>
+ );
}
function TooltipPopup({