Merge pull request #163 from team-ppointer/refactor/native/161

b0nsu · web-flow · commit 0d270c501dcf · 2026-01-15T18:46:34.000+09:00
Refactor/native/161
diff --git a/apps/native/src/apis/controller/student/scrap/putUpdateScrapName.ts b/apps/native/src/apis/controller/student/scrap/putUpdateScrapName.ts
@@ -1,7 +1,11 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { client } from '@/apis/client';
 import { paths } from '@/types/api/schema';
-import { invalidateScrapSearchQueries, SCRAP_QUERY_KEYS } from './utils';
+import {
+  invalidateFolderScrapsQueries,
+  invalidateScrapMutationQueries,
+  SCRAP_QUERY_KEYS,
+} from './utils';
 
 type UpdateScrapNameRequest =
   paths['/api/student/scrap/{scrapId}/name']['put']['requestBody']['content']['application/json'];
@@ -34,8 +38,9 @@ export const useUpdateScrapName = () => {
       queryClient.invalidateQueries({
         queryKey: SCRAP_QUERY_KEYS.scrapDetail(scrapId),
       });
-      // 검색 결과 갱신
-      invalidateScrapSearchQueries(queryClient);
+      // 폴더 내 스크랩 목록, 최근 스크랩, 검색 결과 갱신
+      invalidateFolderScrapsQueries(queryClient);
+      invalidateScrapMutationQueries(queryClient);
     },
   });
 };
diff --git a/apps/native/src/features/student/menu/screens/info/edit/EditPhoneNumberScreen.tsx b/apps/native/src/features/student/menu/screens/info/edit/EditPhoneNumberScreen.tsx
@@ -46,7 +46,6 @@ const EditPhoneNumberScreen = () => {
   }, [isCodeSent, timer]);
 
   const handleSendCode = async () => {
-    console.log('Send verification code to:', phoneNumber);
     try {
       const response = await postPhoneSend(phoneNumber);
       if (response.data?.success) {
@@ -79,8 +78,8 @@ const EditPhoneNumberScreen = () => {
   };
 
   const handleVerify = async () => {
-    if (!verificationCode || verificationCode.length !== 4) {
-      showToast('error', '인증번호 4자리를 입력해주세요.');
+    if (!verificationCode || verificationCode.length !== 6) {
+      showToast('error', '인증번호 6자리를 입력해주세요.');
       return;
     }
 
@@ -121,6 +120,13 @@ const EditPhoneNumberScreen = () => {
     return `${minutes}:${secs.toString().padStart(2, '0')}`;
   };
 
+  const handlePhoneNumberChange = (text: string) => {
+    const phoneRegex = /^[0-9]*$/;
+    if (phoneRegex.test(text) && text.length <= 11) {
+      setPhoneNumber(text);
+    }
+  };
+
   return (
     <KeyboardAvoidingView
       className='w-full flex-1'
@@ -147,7 +153,7 @@ const EditPhoneNumberScreen = () => {
                 <View className='flex-row items-center gap-[10px]'>
                   <TextInput
                     value={phoneNumber}
-                    onChangeText={setPhoneNumber}
+                    onChangeText={handlePhoneNumberChange}
                     placeholder='01012345678'
                     placeholderTextColor={colors['gray-600']}
                     keyboardType='phone-pad'
@@ -169,6 +175,7 @@ const EditPhoneNumberScreen = () => {
                   </View>
                 )}
               </View>
+              {/* <View className='gap-[10px]'>
               <View className='gap-[6px]'>
                 <Text className='text-14m  text-gray-900'>통신사</Text>
                 <View className='relative'>
@@ -183,7 +190,7 @@ const EditPhoneNumberScreen = () => {
                     <ChevronDown color={colors['gray-900']} size={20} />
                   </Pressable>
                 </View>
-              </View>
+              </View> */}
             </View>
 
             {isCodeSent && (
@@ -193,9 +200,9 @@ const EditPhoneNumberScreen = () => {
                   <TextInput
                     value={verificationCode}
                     onChangeText={setVerificationCode}
-                    placeholder='인증번호 4자리'
+                    placeholder='인증번호 6자리'
                     keyboardType='number-pad'
-                    maxLength={4}
+                    maxLength={6}
                     className='text-16r h-[48px] w-full rounded-[10px] border border-gray-300 bg-white px-4 py-[11px] pr-[60px] text-black'
                   />
                   <View
@@ -215,10 +222,11 @@ const EditPhoneNumberScreen = () => {
         </ScrollView>
 
         <SafeAreaView edges={['bottom']} className='mb-[10px]'>
-          {!isCodeSent ? (
+          {!isCodeSent || timer == 0 ? (
             <Pressable
               onPress={handleSendCode}
-              className='bg-primary-500 items-center rounded-[8px] px-[12px] py-[10px]'>
+              disabled={phoneNumber.length !== 11}
+              className={`bg-primary-500 items-center rounded-[8px] px-[12px] py-[10px] ${phoneNumber.length !== 11 ? 'opacity-50' : ''}`}>
               <Text className='text-16m text-white'>인증번호 받기</Text>
             </Pressable>
           ) : (
@@ -231,7 +239,7 @@ const EditPhoneNumberScreen = () => {
         </SafeAreaView>
       </Container>
 
-      <Modal visible={carrierModalVisible} transparent animationType='fade'>
+      {/* <Modal visible={carrierModalVisible} transparent animationType='fade'>
         <View className='flex-1 justify-end bg-black/20'>
           <Pressable className='flex-1' onPress={() => setCarrierModalVisible(false)} />
           <View className='rounded-t-[24px] bg-white px-[24px] pb-[32px] pt-[20px]'>
@@ -249,7 +257,7 @@ const EditPhoneNumberScreen = () => {
             ))}
           </View>
         </View>
-      </Modal>
+      </Modal> */}
     </KeyboardAvoidingView>
   );
 };
diff --git a/apps/native/src/features/student/scrap/components/Header/ScrapDetailHeader.tsx b/apps/native/src/features/student/scrap/components/Header/ScrapDetailHeader.tsx
@@ -65,12 +65,13 @@ export const ScrapDetailHeader = ({
           }
           children={(close) => (
             <TooltipContainer
-              height='h-[88px]'
+              height=''
               header={
                 <View className='h-[32px] w-[216px] rounded-[6px] bg-gray-300 px-[6px] py-1'>
                   <TextInput
                     ref={textInputRef}
-                    className='text-16m items-center justify-center text-black'
+                    className='text-16m flex-1 text-black'
+                    style={{ lineHeight: 20, paddingVertical: 0 }}
                     numberOfLines={1}
                     value={localName}
                     placeholder='스크랩 이름'
@@ -118,7 +119,7 @@ export const ScrapDetailHeader = ({
           )}></TooltipPopover>
       </View>
       <Pressable onPress={onMessagePress}>
-        <MessageCircleMore size={24} color={'#FFF'} />
+        {/* 미구현 <MessageCircleMore size={24} color={'#FFF'} />` */}
       </Pressable>
     </View>
   );
diff --git a/apps/native/src/features/student/scrap/components/Header/SearchScrapHeader.tsx b/apps/native/src/features/student/scrap/components/Header/SearchScrapHeader.tsx
@@ -25,16 +25,15 @@ const SearchScrapHeader = ({
           <TextInput
             className='text-18m flex-1 text-black'
             placeholder='스크랩 제목을 검색하세요.'
+            style={{ lineHeight: 27 }}
             multiline={false}
             textAlignVertical='center'
             placeholderTextColor={colors['gray-500']}
-            allowFontScaling={false}
             numberOfLines={1}
             value={query}
             returnKeyType='search'
             onSubmitEditing={onSubmitEditing}
             onChangeText={setQuery}
-            onEndEditing={() => {}}
           />
           {query.length > 0 && (
             <Pressable
diff --git a/apps/native/src/features/student/scrap/components/Modal/CreateFolderModal.tsx b/apps/native/src/features/student/scrap/components/Modal/CreateFolderModal.tsx
@@ -14,6 +14,7 @@ export const CreateFolderModal = () => {
     useScrapModal();
   const [folderName, setFolderName] = useState('');
   const [selectedImage, setSelectedImage] = useState<ImagePicker.ImagePickerAsset | null>(null);
+  const [isCreating, setIsCreating] = useState(false);
   const { mutateAsync: createFolder } = useCreateFolder();
   const { mutateAsync: uploadFile } = useUploadFile();
 
@@ -41,11 +42,17 @@ export const CreateFolderModal = () => {
   };
 
   const handleCreate = async () => {
+    if (isCreating) {
+      return;
+    }
+
     if (!folderName.trim()) {
       showToast('error', '폴더 이름을 입력해주세요.');
       return;
     }
 
+    setIsCreating(true);
+
     try {
       let thumbnailImageId: number | undefined;
 
@@ -63,12 +70,14 @@ export const CreateFolderModal = () => {
         thumbnailImageId,
       });
 
+      closeCreateFolderModal();
       showToast('success', '폴더가 추가되었습니다.');
       refetchFolders?.();
       refetchScraps?.();
-      closeCreateFolderModal();
     } catch (error) {
       showToast('error', '폴더 추가에 실패했습니다.');
+    } finally {
+      setIsCreating(false);
     }
   };
 
@@ -100,10 +109,11 @@ export const CreateFolderModal = () => {
                 </View>
               )}
             </Pressable>
-            <View className='w-full rounded-[8px] border border-gray-400 bg-white px-3 py-2'>
+            <View className='h-[40px] w-full rounded-[8px] border border-gray-400 bg-white px-3 py-2'>
               <TextInput
                 className='text-16sb text-black'
                 placeholder='제목없음'
+                style={{ lineHeight: 20, paddingVertical: 0 }}
                 placeholderTextColor={colors['gray-500']}
                 value={folderName}
                 onChangeText={setFolderName}
diff --git a/apps/native/src/features/student/scrap/components/Tooltip/ScrapItemTooltip.tsx b/apps/native/src/features/student/scrap/components/Tooltip/ScrapItemTooltip.tsx
@@ -164,12 +164,13 @@ export const ScrapItemTooltip = ({ props, onClose, onMovePress }: ScrapItemToolt
 
   return (
     <TooltipContainer
-      height='h-[176px]'
+      height=''
       header={
-        <View className='h-[32px] w-[216px] rounded-[6px] bg-gray-300 px-[6px] py-1'>
+        <View className='h-[32px] w-full rounded-[6px] bg-gray-300 px-[6px] py-1'>
           <TextInput
-            className='text-16m items-center justify-center text-black'
+            className='text-16m flex-1 text-black'
             numberOfLines={1}
+            style={{ lineHeight: 20, paddingVertical: 0 }}
             value={text}
             onChangeText={setText}
             onEndEditing={async () => {
diff --git a/apps/native/src/features/student/scrap/components/Tooltip/TooltipMenuItem.tsx b/apps/native/src/features/student/scrap/components/Tooltip/TooltipMenuItem.tsx
@@ -38,7 +38,7 @@ export const TooltipMenuItem = ({
 }: TooltipMenuItemProps) => {
   return (
     <Pressable
-      className={`flex-1 flex-row items-center gap-2 pl-4 pr-[26px] ${
+      className={`flex-1 flex-row items-center gap-2 py-2.5 pl-4 pr-[26px] ${
         !isLastItem ? 'border-b-[0.5px] border-gray-500' : ''
       }`}
       onPress={onPress}>
diff --git a/apps/native/src/features/student/scrap/hooks/useHandwritingManager.ts b/apps/native/src/features/student/scrap/hooks/useHandwritingManager.ts
@@ -40,49 +40,54 @@ export function useHandwritingManager({
   // 저장하기 함수
   const handleSave = useCallback(
     (isAutoSave = false) => {
-      if (!canvasRef.current) return;
+      if (!canvasRef.current) return Promise.resolve(false);
 
       const strokes = canvasRef.current.getStrokes();
       const texts = canvasRef.current.getTexts();
 
       try {
         const base64Data = encodeHandwritingData(strokes || [], texts || []);
 
-        // 변경사항이 없으면 저장하지 않음
+        // 변경사항 없으면 저장 안 함
         if (base64Data === lastSavedDataRef.current) {
           if (!isAutoSave) {
             Alert.alert('알림', '변경사항이 없습니다.');
           }
-          return;
+          return Promise.resolve(true);
         }
 
-        updateHandwriting(
-          {
-            scrapId,
-            request: { data: base64Data },
-          },
-          {
-            onSuccess: () => {
-              lastSavedDataRef.current = base64Data;
-              onSaveSuccess?.();
-              if (!isAutoSave) {
-                Alert.alert('성공', '필기가 저장되었습니다.');
-              }
+        return new Promise<boolean>((resolve) => {
+          updateHandwriting(
+            {
+              scrapId,
+              request: { data: base64Data },
             },
-            onError: (error) => {
-              console.error('필기 저장 실패:', error);
-              onSaveError?.();
-              if (!isAutoSave) {
-                Alert.alert('오류', '필기 저장에 실패했습니다.');
-              }
-            },
-          }
-        );
+            {
+              onSuccess: () => {
+                lastSavedDataRef.current = base64Data;
+                onSaveSuccess?.();
+                if (!isAutoSave) {
+                  Alert.alert('성공', '필기가 저장되었습니다.');
+                }
+                resolve(true);
+              },
+              onError: (error) => {
+                console.error('필기 저장 실패:', error);
+                onSaveError?.();
+                if (!isAutoSave) {
+                  Alert.alert('오류', '필기 저장에 실패했습니다.');
+                }
+                resolve(false);
+              },
+            }
+          );
+        });
       } catch (error) {
         console.error('필기 데이터 변환 실패:', error);
         if (!isAutoSave) {
           Alert.alert('오류', '필기 데이터 변환에 실패했습니다.');
         }
+        return Promise.resolve(false);
       }
     },
     [scrapId, canvasRef, updateHandwriting, onSaveSuccess, onSaveError]
diff --git a/apps/native/src/features/student/scrap/screens/ScrapDetailScreen.tsx b/apps/native/src/features/student/scrap/screens/ScrapDetailScreen.tsx
