Skip to content

Commit

Permalink
fix sheet animations
Browse files Browse the repository at this point in the history
  • Loading branch information
@thatgurkangurk
thatgurkangurk committed Jan 22, 2025
1 parent cf0cfe2 commit a8fe71a
Show file tree
Hide file tree
Showing 3 changed files with 164 additions and 143 deletions.
2 changes: 1 addition & 1 deletion src/app.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "~/styles/app.css";

export default function App() {
return (
<Router root={(props) => <Layout children={props.children} />}>
<Router root={Layout}>
<FileRoutes />
</Router>
);
Expand Down
304 changes: 162 additions & 142 deletions src/components/ui/sheet.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,172 +1,192 @@
import type { Component, ComponentProps, JSX, ValidComponent } from "solid-js"
import { splitProps } from "solid-js"
import * as SheetPrimitive from "@kobalte/core/dialog";
import type { PolymorphicProps } from "@kobalte/core/polymorphic";
import { cva, type VariantProps } from "class-variance-authority";
import type { Component, ComponentProps, JSX, ValidComponent } from "solid-js";
import { splitProps } from "solid-js";
import { cn } from "~/lib/utils";

import * as SheetPrimitive from "@kobalte/core/dialog"
import type { PolymorphicProps } from "@kobalte/core/polymorphic"
import { cva, type VariantProps } from "class-variance-authority"

import { cn } from "~/lib/utils"

const Sheet = SheetPrimitive.Root
const SheetTrigger = SheetPrimitive.Trigger
const SheetClose = SheetPrimitive.CloseButton
const Sheet = SheetPrimitive.Root;
const SheetTrigger = SheetPrimitive.Trigger;
const SheetClose = SheetPrimitive.CloseButton;

const portalVariants = cva("fixed inset-0 z-50 flex", {
variants: {
position: {
top: "items-start",
bottom: "items-end",
left: "justify-start",
right: "justify-end"
}
},
defaultVariants: { position: "right" }
})
variants: {
position: {
top: "items-start",
bottom: "items-end",
left: "justify-start",
right: "justify-end",
},
},
defaultVariants: { position: "right" },
});

type PortalProps = SheetPrimitive.DialogPortalProps & VariantProps<typeof portalVariants>
type PortalProps = SheetPrimitive.DialogPortalProps &
VariantProps<typeof portalVariants>;

const SheetPortal: Component<PortalProps> = (props) => {
const [local, others] = splitProps(props, ["position", "children"])
return (
<SheetPrimitive.Portal {...others}>
<div class={portalVariants({ position: local.position })}>{local.children}</div>
</SheetPrimitive.Portal>
)
}

type DialogOverlayProps<T extends ValidComponent = "div"> = SheetPrimitive.DialogOverlayProps<T> & {
class?: string | undefined
}
const [local, others] = splitProps(props, ["position", "children"]);
return (
<SheetPrimitive.Portal {...others}>
<div class={portalVariants({ position: local.position })}>
{local.children}
</div>
</SheetPrimitive.Portal>
);
};

type DialogOverlayProps<T extends ValidComponent = "div"> =
SheetPrimitive.DialogOverlayProps<T> & {
class?: string | undefined;
};

const SheetOverlay = <T extends ValidComponent = "div">(
props: PolymorphicProps<T, DialogOverlayProps<T>>
props: PolymorphicProps<T, DialogOverlayProps<T>>
) => {
const [local, others] = splitProps(props as DialogOverlayProps, ["class"])
return (
<SheetPrimitive.Overlay
class={cn(
"fixed inset-0 z-50 bg-black/80 data-[expanded=]:animate-in data-[closed=]:animate-out data-[closed=]:fade-out-0 data-[expanded=]:fade-in-0",
local.class
)}
{...others}
/>
)
}
const [local, others] = splitProps(props as DialogOverlayProps, ["class"]);
return (
<SheetPrimitive.Overlay
class={cn(
"fixed inset-0 z-50 bg-black/80 data-expanded:animate-in data-closed:animate-out data-closed:fade-out-0 data-expanded:fade-in-0",
local.class
)}
{...others}
/>
);
};

const sheetVariants = cva(
"fixed z-50 gap-4 bg-background p-6 shadow-lg transition ease-in-out data-[closed=]:duration-300 data-[expanded=]:duration-500 data-[expanded=]:animate-in data-[closed=]:animate-out",
{
variants: {
position: {
top: "inset-x-0 top-0 border-b data-[closed=]:slide-out-to-top data-[expanded=]:slide-in-from-top",
bottom:
"inset-x-0 bottom-0 border-t data-[closed=]:slide-out-to-bottom data-[expanded=]:slide-in-from-bottom",
left: "inset-y-0 left-0 h-full w-3/4 border-r data-[closed=]:slide-out-to-left data-[expanded]:slide-in-from-left sm:max-w-sm",
right:
"inset-y-0 right-0 h-full w-3/4 border-l data-[closed=]:slide-out-to-right data-[expanded=]:slide-in-from-right sm:max-w-sm"
}
},
defaultVariants: {
position: "right"
"fixed z-50 gap-4 bg-background p-6 shadow-lg transition ease-in-out data-closed:duration-300 data-expanded:duration-500 data-expanded:animate-in data-closed:animate-out",
{
variants: {
position: {
top: "inset-x-0 top-0 border-b data-closed:slide-out-to-top data-expanded:slide-in-from-top",
bottom: "inset-x-0 bottom-0 border-t data-closed:slide-out-to-bottom data-expanded:slide-in-from-bottom",
left: "inset-y-0 left-0 h-full w-3/4 border-r data-closed:slide-out-to-left data-expanded:slide-in-from-left sm:max-w-sm",
right: "inset-y-0 right-0 h-full w-3/4 border-l data-closed:slide-out-to-right data-expanded:slide-in-from-right sm:max-w-sm",
},
},
defaultVariants: {
position: "right",
},
}
}
)
);

type DialogContentProps<T extends ValidComponent = "div"> = SheetPrimitive.DialogContentProps<T> &
VariantProps<typeof sheetVariants> & { class?: string | undefined; children?: JSX.Element }
type DialogContentProps<T extends ValidComponent = "div"> =
SheetPrimitive.DialogContentProps<T> &
VariantProps<typeof sheetVariants> & {
class?: string | undefined;
children?: JSX.Element;
};

const SheetContent = <T extends ValidComponent = "div">(
props: PolymorphicProps<T, DialogContentProps<T>>
props: PolymorphicProps<T, DialogContentProps<T>>
) => {
const [local, others] = splitProps(props as DialogContentProps, ["position", "class", "children"])
return (
<SheetPortal position={local.position}>
<SheetOverlay />
<SheetPrimitive.Content
class={cn(
sheetVariants({ position: local.position }),
local.class,
"max-h-screen overflow-y-auto"
)}
{...others}
>
{local.children}
<SheetPrimitive.CloseButton class="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="size-4"
>
<path d="M18 6l-12 12" />
<path d="M6 6l12 12" />
</svg>
<span class="sr-only">Close</span>
</SheetPrimitive.CloseButton>
</SheetPrimitive.Content>
</SheetPortal>
)
}
const [local, others] = splitProps(props as DialogContentProps, [
"position",
"class",
"children",
]);
return (
<SheetPortal position={local.position}>
<SheetOverlay />
<SheetPrimitive.Content
class={cn(
sheetVariants({ position: local.position }),
local.class,
"max-h-screen overflow-y-auto"
)}
{...others}
>
{local.children}
<SheetPrimitive.CloseButton class="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="size-4"
>
<path d="M18 6l-12 12" />
<path d="M6 6l12 12" />
</svg>
<span class="sr-only">Close</span>
</SheetPrimitive.CloseButton>
</SheetPrimitive.Content>
</SheetPortal>
);
};

const SheetHeader: Component<ComponentProps<"div">> = (props) => {
const [local, others] = splitProps(props, ["class"])
return (
<div class={cn("flex flex-col space-y-2 text-center sm:text-left", local.class)} {...others} />
)
}
const [local, others] = splitProps(props, ["class"]);
return (
<div
class={cn(
"flex flex-col space-y-2 text-center sm:text-left",
local.class
)}
{...others}
/>
);
};

const SheetFooter: Component<ComponentProps<"div">> = (props) => {
const [local, others] = splitProps(props, ["class"])
return (
<div
class={cn("flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", local.class)}
{...others}
/>
)
}

type DialogTitleProps<T extends ValidComponent = "h2"> = SheetPrimitive.DialogTitleProps<T> & {
class?: string | undefined
}
const [local, others] = splitProps(props, ["class"]);
return (
<div
class={cn(
"flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
local.class
)}
{...others}
/>
);
};

type DialogTitleProps<T extends ValidComponent = "h2"> =
SheetPrimitive.DialogTitleProps<T> & {
class?: string | undefined;
};

const SheetTitle = <T extends ValidComponent = "h2">(
props: PolymorphicProps<T, DialogTitleProps<T>>
props: PolymorphicProps<T, DialogTitleProps<T>>
) => {
const [local, others] = splitProps(props as DialogTitleProps, ["class"])
return (
<SheetPrimitive.Title
class={cn("text-lg font-semibold text-foreground", local.class)}
{...others}
/>
)
}
const [local, others] = splitProps(props as DialogTitleProps, ["class"]);
return (
<SheetPrimitive.Title
class={cn("text-lg font-semibold text-foreground", local.class)}
{...others}
/>
);
};

type DialogDescriptionProps<T extends ValidComponent = "p"> =
SheetPrimitive.DialogDescriptionProps<T> & { class?: string | undefined }
SheetPrimitive.DialogDescriptionProps<T> & { class?: string | undefined };

const SheetDescription = <T extends ValidComponent = "p">(
props: PolymorphicProps<T, DialogDescriptionProps<T>>
props: PolymorphicProps<T, DialogDescriptionProps<T>>
) => {
const [local, others] = splitProps(props as DialogDescriptionProps, ["class"])
return (
<SheetPrimitive.Description
class={cn("text-sm text-muted-foreground", local.class)}
{...others}
/>
)
}
const [local, others] = splitProps(props as DialogDescriptionProps, [
"class",
]);
return (
<SheetPrimitive.Description
class={cn("text-sm text-muted-foreground", local.class)}
{...others}
/>
);
};

export {
Sheet,
SheetTrigger,
SheetClose,
SheetContent,
SheetHeader,
SheetFooter,
SheetTitle,
SheetDescription
}
Sheet,
SheetTrigger,
SheetClose,
SheetContent,
SheetHeader,
SheetFooter,
SheetTitle,
SheetDescription,
};
1 change: 1 addition & 0 deletions src/styles/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
height: var(--kb-accordion-content-height);
}
}

@keyframes accordion-up {
from {
height: var(--kb-accordion-content-height);
Expand Down

0 comments on commit a8fe71a

Please sign in to comment.