refactor : itemMap 객체에서 변경

GDSC-Hongik · Jul 28, 2024 · 6440016 · 6440016
1 parent 6ca0434
commit 6440016
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/packages/scripts/generateBuildConfig.ts b/packages/scripts/generateBuildConfig.ts
@@ -24,6 +24,7 @@ const excludedComponents = [
   "DropDownTrigger",
   "DropDownWrapper",
   "CollectionContext",
+  "DropDownOptionList",
 ];
 
 const getFilteredComponentFiles = async (directoryPath: string) => {

diff --git a/packages/wow-ui/src/components/DropDown/DropDownOption.tsx b/packages/wow-ui/src/components/DropDown/DropDownOption.tsx
@@ -5,7 +5,8 @@ import { styled } from "@styled-system/jsx";
 import type { ReactNode } from "react";
 import { forwardRef, useCallback, useEffect } from "react";
 
-import { useDropDownContext } from "../../components/DropDown/context/DropDownContext";
+import { useDropDownContext } from "@/components/DropDown/context/DropDownContext";
+
 import { useCollection } from "./context/CollectionContext";
 
 /**
@@ -39,8 +40,8 @@ const DropDownOption = forwardRef<HTMLLIElement, DropDownOptionProps>(
 
     useEffect(() => {
       const currentItem = itemMap.get(value);
-      if (!currentItem || currentItem.text !== text) {
-        itemMap.set(value, { text });
+      if (!currentItem || currentItem !== text) {
+        itemMap.set(value, text);
       }
     }, [itemMap, value, text]);
 

diff --git a/packages/wow-ui/src/components/DropDown/DropDownOptionList.tsx b/packages/wow-ui/src/components/DropDown/DropDownOptionList.tsx
@@ -55,7 +55,7 @@ export const DropDownOptionList = ({
         updateFocusedValue(-1);
         event.preventDefault();
       } else if (key === "Enter" && focusedValue !== null) {
-        handleSelect(focusedValue, itemMap.get(focusedValue)?.text);
+        handleSelect(focusedValue, itemMap.get(focusedValue));
         event.preventDefault();
       }
     },

diff --git a/packages/wow-ui/src/components/DropDown/DropDownTrigger.tsx b/packages/wow-ui/src/components/DropDown/DropDownTrigger.tsx
@@ -6,8 +6,9 @@ import type { KeyboardEvent } from "react";
 import { cloneElement, useCallback } from "react";
 import { DownArrow } from "wowds-icons";
 
-import type { DropDownProps } from "../../components/DropDown";
-import { useDropDownContext } from "../../components/DropDown/context/DropDownContext";
+import type { DropDownProps } from "@/components/DropDown";
+import { useDropDownContext } from "@/components/DropDown/context/DropDownContext";
+
 import { useCollection } from "./context/CollectionContext";
 
 interface DropDownTriggerProps {
@@ -27,7 +28,7 @@ const DropDownTrigger = ({
   const { open, selectedValue, setOpen, setFocusedValue } =
     useDropDownContext();
 
-  const selectedText = itemMap.get(selectedValue)?.text;
+  const selectedText = itemMap.get(selectedValue);
 
   const toggleDropdown = useCallback(() => {
     setOpen((prevOpen) => {

diff --git a/packages/wow-ui/src/components/DropDown/DropDownWrapper.tsx b/packages/wow-ui/src/components/DropDown/DropDownWrapper.tsx
@@ -1,8 +1,9 @@
 import { Flex } from "@styled-system/jsx";
 import { type PropsWithChildren, useCallback, useRef } from "react";
 
-import type { DropDownProps } from "../../components/DropDown";
-import useClickOutside from "../../hooks/useClickOutside";
+import type { DropDownProps } from "@/components/DropDown";
+import useClickOutside from "@/hooks/useClickOutside";
+
 import { useDropDownContext } from "./context/DropDownContext";
 
 interface DropDownWrapperProps extends PropsWithChildren {

diff --git a/packages/wow-ui/src/components/DropDown/context/CollectionContext.tsx b/packages/wow-ui/src/components/DropDown/context/CollectionContext.tsx
@@ -1,15 +1,15 @@
 import type { PropsWithChildren, ReactNode } from "react";
 import { createContext, useMemo } from "react";
 
-import useSafeContext from "../../../hooks/useSafeContext";
+import useSafeContext from "@/hooks/useSafeContext";
 
 type ItemData = {
   value: string;
   text: ReactNode;
 };
 
 type ContextValue = {
-  itemMap: Map<ItemData["value"], { text: ItemData["text"] }>;
+  itemMap: Map<ItemData["value"], ItemData["text"]>;
 };
 
 const CollectionContext = createContext<ContextValue | null>(null);
@@ -21,7 +21,7 @@ export const useCollectionContext = () => {
 
 export const CollectionProvider = ({ children }: PropsWithChildren) => {
   const itemMap = useMemo(
-    () => new Map<ItemData["value"], { text: ItemData["text"] }>(),
+    () => new Map<ItemData["value"], ItemData["text"]>(),
     []
   );
 

diff --git a/packages/wow-ui/src/components/DropDown/index.tsx b/packages/wow-ui/src/components/DropDown/index.tsx
@@ -8,10 +8,11 @@ import type {
 } from "react";
 import { useId } from "react";
 
-import { DropDownContext } from "../../components/DropDown/context/DropDownContext";
-import { DropDownOptionList } from "../../components/DropDown/DropDownOptionList";
-import DropDownTrigger from "../../components/DropDown/DropDownTrigger";
-import useDropDownState from "../../hooks/useDropDownState";
+import { DropDownContext } from "@/components/DropDown/context/DropDownContext";
+import { DropDownOptionList } from "@/components/DropDown/DropDownOptionList";
+import DropDownTrigger from "@/components/DropDown/DropDownTrigger";
+import useDropDownState from "@/hooks/useDropDownState";
+
 import { CollectionProvider } from "./context/CollectionContext";
 import { DropDownWrapper } from "./DropDownWrapper";
 export interface DropDownWithTriggerProps extends PropsWithChildren {