refactor: selected return 값 보장을 위한 타입 강제 변경 및 변수 네이밍 수정

ConceptBe · Apr 15, 2024 · a17eaaf · a17eaaf
1 parent 5b0bd8b
commit a17eaaf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/hooks/useCheckbox.ts b/src/hooks/useCheckbox.ts
@@ -2,6 +2,7 @@ import { ChangeEvent, useCallback, useState } from 'react';
 
 interface CheckboxItem {
   checked: boolean;
+  id: number;
   [key: string]: any;
 }
 
@@ -22,7 +23,7 @@ const getSelectedCheckboxValueId = <T extends Record<keyof T, CheckboxItem[]>>(
         .map((checkbox) => checkbox.id);
       return acc;
     },
-    new Object() as Record<keyof T, CheckboxItem[]>,
+    new Object() as Record<keyof T, number[]>,
   );
 
   return selectedCheckboxValue;
@@ -32,7 +33,7 @@ const useCheckbox = <T extends Record<keyof T, CheckboxItem[]>>(
   initialValue: T,
 ) => {
   const [checkboxValue, setCheckboxValue] = useState<T>(initialValue);
-  const selectedCheckboxId = getSelectedCheckboxValueId(checkboxValue);
+  const selectedCheckboxIds = getSelectedCheckboxValueId(checkboxValue);
 
   const onResetCheckbox = useCallback((checkboxKey: keyof T) => {
     setCheckboxValue((prev) => ({
@@ -74,7 +75,7 @@ const useCheckbox = <T extends Record<keyof T, CheckboxItem[]>>(
 
   return {
     checkboxValue,
-    selectedCheckboxId,
+    selectedCheckboxIds,
     setCheckboxValue,
     onChangeCheckbox,
     onResetCheckbox,

diff --git a/src/hooks/useRadio.ts b/src/hooks/useRadio.ts
@@ -2,6 +2,7 @@ import { ChangeEvent, useCallback, useState } from 'react';
 
 interface RadioItem {
   checked: boolean;
+  name: string;
   [key: string]: any;
 }
 
@@ -17,7 +18,7 @@ const getSelectedRadioValueName = <T extends Record<keyof T, RadioItem[]>>(
 
   const selectedRadioValue = radioValueKeys.reduce(
     (acc, key) => {
-      acc[key] = radioValue[key].find((radio) => radio.checked)?.name;
+      acc[key] = radioValue[key].find((radio) => radio.checked)?.name || '';
       return acc;
     },
     new Object() as Record<keyof T, string>,