merge

Author: tildezero

entrypoints/components/common/dropdown.tsx

@@ -33,6 +33,7 @@ export const DropdownHeader = forwardRef<
 
   const { isOpen, toggleDropdown } = context;
 
+<<<<<<< HEAD
   return (
     <HStack
       ref={ref}
@@ -61,6 +62,32 @@ export const DropdownHeader = forwardRef<
       </span>
     </HStack>
   );
+=======
+	return (
+		<HStack
+			ref={ref}
+			fill
+			x="between"
+			y="middle"
+			className={cn("cursor-pointer", className)}
+			onClick={toggleDropdown}
+			{...rest}
+		>
+			{children}
+			<span
+				className={cn(
+					"transition-transform duration-200 w-[20px] px-2 display-flex items-center justify-center"
+				)}
+			>
+				{isOpen ? (
+					<CaretUpIcon className="w-4 h-4" />
+				) : (
+					<CaretDownIcon className="w-4 h-4" />
+				)}
+			</span>
+		</HStack>
+	);
+>>>>>>> c512e8325e6688f06430691391a5ba907631316e
 });
 
 DropdownHeader.displayName = "DropdownHeader";
@@ -83,22 +110,40 @@ export const DropdownContent = forwardRef<
     return null;
   }
 
+<<<<<<< HEAD
   return (
     <div ref={ref} className={cn("mt-2 p-3", className)} {...rest}>
       {children}
     </div>
   );
+=======
+	return (
+		<div ref={ref} className={className} {...rest}>
+			{children}
+		</div>
+	);
+>>>>>>> c512e8325e6688f06430691391a5ba907631316e
 });
 
 DropdownContent.displayName = "DropdownContent";
 
 // Main Dropdown Component
 const Dropdown = forwardRef<
+<<<<<<< HEAD
   HTMLDivElement,
   React.HTMLAttributes<HTMLDivElement>
 >((props, ref) => {
   const { children, ...rest } = props;
   const [isOpen, setIsOpen] = useState(false);
+=======
+	HTMLDivElement,
+	React.HTMLAttributes<HTMLDivElement> & {
+		gap?: number;
+	}
+>((props, ref) => {
+	const { children, gap, ...rest } = props;
+	const [isOpen, setIsOpen] = useState(false);
+>>>>>>> c512e8325e6688f06430691391a5ba907631316e
 
   const toggleDropdown = () => {
     setIsOpen(!isOpen);
@@ -118,6 +163,7 @@ const Dropdown = forwardRef<
     }
   });
 
+<<<<<<< HEAD
   return (
     <DropdownContext.Provider value={{ isOpen, toggleDropdown }}>
       <Container ref={ref} {...rest}>
@@ -128,6 +174,18 @@ const Dropdown = forwardRef<
       </Container>
     </DropdownContext.Provider>
   );
+=======
+	return (
+		<DropdownContext.Provider value={{ isOpen, toggleDropdown }}>
+			<Container ref={ref} {...rest}>
+				<VStack fill gap={gap}>
+					{headerChild}
+					{contentChild}
+				</VStack>
+			</Container>
+		</DropdownContext.Provider>
+	);
+>>>>>>> c512e8325e6688f06430691391a5ba907631316e
 });
 
 Dropdown.displayName = "Dropdown";