fix: dropdownId useDropDownState에서 삭제, 따로 넘겨주기

GDSC-Hongik · Aug 24, 2024 · 8a35707 · 8a35707
1 parent 66c0d39
commit 8a35707
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/packages/wow-ui/src/components/DropDown/context/DropDownContext.ts b/packages/wow-ui/src/components/DropDown/context/DropDownContext.ts
@@ -3,9 +3,9 @@ import { createContext } from "react";
 import type useDropDownState from "../../../hooks/useDropDownState";
 import useSafeContext from "../../../hooks/useSafeContext";
 
-export const DropDownContext = createContext<ReturnType<
-  typeof useDropDownState
-> | null>(null);
+export const DropDownContext = createContext<
+  (ReturnType<typeof useDropDownState> & { dropdownId: string }) | null
+>(null);
 
 export const useDropDownContext = () => {
   const context = useSafeContext(DropDownContext);

diff --git a/packages/wow-ui/src/components/DropDown/index.tsx b/packages/wow-ui/src/components/DropDown/index.tsx
@@ -97,11 +97,10 @@ const DropDown = ({
     value,
     defaultValue,
     onChange,
-    dropdownId,
   });
 
   return (
-    <DropDownContext.Provider value={dropdownState}>
+    <DropDownContext.Provider value={{ ...dropdownState, dropdownId }}>
       <CollectionProvider>
         <DropDownWrapper hasCustomTrigger={!!trigger} {...rest}>
           <DropDownTrigger

diff --git a/packages/wow-ui/src/hooks/useDropDownState.ts b/packages/wow-ui/src/hooks/useDropDownState.ts
@@ -8,14 +8,12 @@ interface DropDownStateProps {
     selectedValue: string;
     selectedText: ReactNode;
   }) => void;
-  dropdownId?: string;
 }
 
 const useDropDownState = ({
   value,
   defaultValue,
   onChange,
-  dropdownId,
 }: DropDownStateProps) => {
   const [selectedValue, setSelectedValue] = useState("");
   const [open, setOpen] = useState(false);
@@ -47,7 +45,6 @@ const useDropDownState = ({
     focusedValue,
     setFocusedValue,
     handleSelect,
-    dropdownId,
   };
 };