From 04f898685d0bcee969f61a856bf3d165a5aaecab Mon Sep 17 00:00:00 2001
From: mmjjaa <96505287+mmjjaa@users.noreply.github.com>
Date: Fri, 3 Jan 2025 16:19:26 +0900
Subject: [PATCH] =?UTF-8?q?refactor=20:=20=20=EC=A7=80=EB=8F=84=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A6=AC=ED=8C=A9=ED=86=A0?=
 =?UTF-8?q?=EB=A7=81=20(#461)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* design : 주석 제거 및 디자인 변경경

* design : 지도 편지 작성 아이콘 위치 변경경

* refactor : 검색 로직 중복 제거
---
 .../MapLetterArchieveDetailContainer.tsx      |  1 -
 .../LetterInfoContainer.tsx                   |  2 +-
 .../SearchFullScreen/SearchFullScreen.tsx     | 71 +++++++++----------
 src/pages/Map/MapExplorerPage.tsx             | 20 +++---
 4 files changed, 41 insertions(+), 53 deletions(-)

diff --git a/src/components/LetterDetailPage/LetterDetailContainer/MapLetterArchieveDetailContainer/MapLetterArchieveDetailContainer.tsx b/src/components/LetterDetailPage/LetterDetailContainer/MapLetterArchieveDetailContainer/MapLetterArchieveDetailContainer.tsx
index 8c9cd9ce..d40c8558 100644
--- a/src/components/LetterDetailPage/LetterDetailContainer/MapLetterArchieveDetailContainer/MapLetterArchieveDetailContainer.tsx
+++ b/src/components/LetterDetailPage/LetterDetailContainer/MapLetterArchieveDetailContainer/MapLetterArchieveDetailContainer.tsx
@@ -33,7 +33,6 @@ export const MapLetterArchieveDetailContainer = () => {
         letterId:
             dataType === 'REPLY_LETTER' ? Number(replyLetterId || letterId) : 0
     });
-    console.log(replyLetterId);
 
     useEffect(() => {
         const error = mapError || replyError;
diff --git a/src/components/MapPage/LetterInfoContainer/LetterInfoContainer.tsx b/src/components/MapPage/LetterInfoContainer/LetterInfoContainer.tsx
index 1779e3aa..3e530d71 100644
--- a/src/components/MapPage/LetterInfoContainer/LetterInfoContainer.tsx
+++ b/src/components/MapPage/LetterInfoContainer/LetterInfoContainer.tsx
@@ -28,7 +28,7 @@ export const LetterInfoContainer = ({
     return (
         <div className="flex flex-col w-[330px] bg-white border rounded-lg p-4 shadow-md">
             <div className="flex gap-4 mb-4">
-                <div className="p-2 bg-gray-100 rounded-md w-20 h-20">
+                <div className="p-2 bg-gray-100 rounded-full w-20 h-20">
                     <BottleLetter Letter={Letter} />
                 </div>
                 <div className="flex flex-col h-20">
diff --git a/src/components/MapPage/SearchFullScreen/SearchFullScreen.tsx b/src/components/MapPage/SearchFullScreen/SearchFullScreen.tsx
index 89e33099..9c353061 100644
--- a/src/components/MapPage/SearchFullScreen/SearchFullScreen.tsx
+++ b/src/components/MapPage/SearchFullScreen/SearchFullScreen.tsx
@@ -32,10 +32,12 @@ export const SearchFullScreen = ({
         loadRecentSearches();
     }, [loadRecentSearches]);
 
-    const onBackClick = () => {
-        clearSearchedLocation();
-        onClose();
-    };
+    useEffect(() => {
+        if (isOpen && inputRef.current) {
+            inputRef.current.focus();
+        }
+    }, [isOpen]);
+
     const onSearchClick = () => {
         const searchTerm = inputRef.current?.value.trim();
         if (searchTerm) {
@@ -45,14 +47,12 @@ export const SearchFullScreen = ({
     };
 
     const onKeyDown = (e: KeyboardEvent<HTMLInputElement>) => {
-        const searchTerm = inputRef.current?.value?.trim() || '';
-        if (e.key === 'Enter' && searchTerm !== '') {
-            saveSearchTerm(searchTerm);
-            onClose();
+        if (e.key === 'Enter') {
+            onSearchClick();
         }
     };
 
-    const onTermsClick = (searchTerm: string) => {
+    const onTermClick = (searchTerm: string) => {
         if (inputRef.current) {
             inputRef.current.value = searchTerm;
             saveSearchTerm(searchTerm);
@@ -63,22 +63,19 @@ export const SearchFullScreen = ({
         }
     };
 
-    useEffect(() => {
-        if (inputRef.current) {
-            inputRef.current.focus();
-        }
-    }, [isOpen]);
-
-    if (!isOpen) {
-        return null;
-    }
-
     const isInputNotEmpty = inputRef.current?.value.trim() !== '';
 
+    if (!isOpen) return null;
+
     return (
         <div className="mx-auto min-w-[375px] max-w-[475px]">
             <div className="flex items-center justify-between w-full h-12 pl-3 pr-4 border-b">
-                <BackButton onClick={onBackClick} />
+                <BackButton
+                    onClick={() => {
+                        clearSearchedLocation();
+                        onClose();
+                    }}
+                />
                 <input
                     ref={inputRef}
                     type="text"
@@ -113,28 +110,24 @@ export const SearchFullScreen = ({
                         <RelatedSearchTermsList
                             key={index}
                             place={related}
-                            onClick={() => onTermsClick(related)}
+                            onClick={() => onTermClick(related)}
+                        />
+                    ))
+                ) : recentSearches.length > 0 ? (
+                    recentSearches.map((history, index) => (
+                        <SearchHistoryList
+                            key={index}
+                            place={history.place}
+                            date={history.date}
+                            index={index}
+                            onDelete={deleteSearchTerm}
+                            onClick={() => onTermClick(history.place)}
                         />
                     ))
                 ) : (
-                    <>
-                        {recentSearches.length > 0 ? (
-                            recentSearches.map((history, index) => (
-                                <SearchHistoryList
-                                    key={index}
-                                    place={history.place}
-                                    date={history.date}
-                                    index={index}
-                                    onDelete={deleteSearchTerm}
-                                    onClick={() => onTermsClick(history.place)}
-                                />
-                            ))
-                        ) : (
-                            <p className="mt-16 text-sm text-gray-500 flex-center">
-                                최근 검색어 내역이 없습니다.
-                            </p>
-                        )}
-                    </>
+                    <p className="mt-16 text-sm text-gray-500 flex-center">
+                        최근 검색어 내역이 없습니다.
+                    </p>
                 )}
             </div>
         </div>
diff --git a/src/pages/Map/MapExplorerPage.tsx b/src/pages/Map/MapExplorerPage.tsx
index 13563fab..c7bee803 100644
--- a/src/pages/Map/MapExplorerPage.tsx
+++ b/src/pages/Map/MapExplorerPage.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { LetterInfoContainer } from '@/components/MapPage/LetterInfoContainer/LetterInfoContainer';
 import { NavigateContainer } from '@/components/MapPage/NavigateContainer/NavigateContainer';
 import { MaplibreWithSearch } from '@/components/MapPage/Maplibre/MaplibreWithSearch';
-import { HiOutlinePencilAlt } from 'react-icons/hi';
+import { PiPencilSimpleLine } from 'react-icons/pi';
 import { useSelectedLetterStore } from '@/stores/useSelectedLetterStore';
 import { NavLink } from 'react-router-dom';
 import { SearchFullScreen } from '@/components/MapPage/SearchFullScreen/SearchFullScreen';
@@ -51,7 +51,7 @@ const MapExplorerPage = () => {
         setQuery(event.target.value);
     };
 
-    const CreateBtnStyle = `text-sample-blue absolute gap-2 p-2 transform -translate-x-12 flex-center bottom-[5rem] translate-y-7 left-[46%] bg-white  w-52 rounded-2xl`;
+    const CreateBtnStyle = `text-sample-blue absolute p-2 transform translate-x-64 flex-center bottom-[5rem] translate-y-7 bg-white w-10 rounded-2xl`;
 
     return (
         <div className="h-full">
@@ -86,19 +86,17 @@ const MapExplorerPage = () => {
                                 {searchedLocation ? (
                                     <NavLink
                                         to={`/letter/map/:${searchedLocation.lat}/:${searchedLocation.lon}/create`}
-                                        className={CreateBtnStyle}
+                                        className={`mb-32 ml-8 ${CreateBtnStyle}`}
                                     >
-                                        <HiOutlinePencilAlt />
-                                        지도 편지 작성하기
+                                        <PiPencilSimpleLine />
                                     </NavLink>
                                 ) : (
                                     <NavLink
                                         to={'/letter/create'}
-                                        className={`cursor-not-allowed mb-36 ${CreateBtnStyle}`}
+                                        className={`cursor-not-allowed transform translate-x-72 mb-32 ${CreateBtnStyle}`}
                                         onClick={(e) => e.preventDefault()}
                                     >
-                                        <HiOutlinePencilAlt />
-                                        지도 편지 작성하기
+                                        <PiPencilSimpleLine />
                                     </NavLink>
                                 )}
                                 <LetterInfoContainer
@@ -119,8 +117,7 @@ const MapExplorerPage = () => {
                                         to={`/letter/map/:${searchedLocation.lat}/:${searchedLocation.lon}/create`}
                                         className={CreateBtnStyle}
                                     >
-                                        <HiOutlinePencilAlt />
-                                        지도 편지 작성하기
+                                        <PiPencilSimpleLine />
                                     </NavLink>
                                 ) : (
                                     <NavLink
@@ -128,8 +125,7 @@ const MapExplorerPage = () => {
                                         className={`cursor-not-allowed ${CreateBtnStyle}`}
                                         onClick={(e) => e.preventDefault()}
                                     >
-                                        <HiOutlinePencilAlt />
-                                        지도 편지 작성하기
+                                        <PiPencilSimpleLine />
                                     </NavLink>
                                 )}
                                 <NavigateContainer