diff --git a/web/src/components/ui/collapsible.tsx b/web/src/components/ui/collapsible.tsx index a23e7a281..2b5b07882 100644 --- a/web/src/components/ui/collapsible.tsx +++ b/web/src/components/ui/collapsible.tsx @@ -1,9 +1,28 @@ -import * as CollapsiblePrimitive from "@radix-ui/react-collapsible" +import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"; +import * as React from "react"; -const Collapsible = CollapsiblePrimitive.Root +import { cn } from "@/lib/utils"; -const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger +const Collapsible = CollapsiblePrimitive.Root; -const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent +const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger; -export { Collapsible, CollapsibleTrigger, CollapsibleContent } +const CollapsibleContent = React.forwardRef< + React.ComponentRef, + React.ComponentPropsWithoutRef +>(({ className, children, ...props }, ref) => ( + + {children} + +)); +CollapsibleContent.displayName = + CollapsiblePrimitive.CollapsibleContent.displayName; + +export { Collapsible, CollapsibleTrigger, CollapsibleContent }; diff --git a/web/tailwind.config.cjs b/web/tailwind.config.cjs index 81eee070c..cfd738d6e 100644 --- a/web/tailwind.config.cjs +++ b/web/tailwind.config.cjs @@ -40,6 +40,8 @@ module.exports = { animation: { "accordion-down": "accordion-down 0.2s ease-out", "accordion-up": "accordion-up 0.2s ease-out", + "collapsible-down": "collapsible-down 0.2s ease-out", + "collapsible-up": "collapsible-up 0.2s ease-out", move: "move 3s ease-in-out infinite", scale1: "scale1 3s ease-in-out infinite", scale2: "scale2 3s ease-in-out infinite", @@ -148,6 +150,14 @@ module.exports = { from: { height: "var(--radix-accordion-content-height)" }, to: { height: 0 }, }, + "collapsible-down": { + from: { height: "0px" }, + to: { height: "var(--radix-collapsible-content-height)" }, + }, + "collapsible-up": { + from: { height: "var(--radix-collapsible-content-height)" }, + to: { height: "0px" }, + }, move: { "50%": { left: "calc(100% - 7px)" }, },