@@ -5,7 +5,7 @@ import { useTranslations } from 'next-intl';
55import dynamic from 'next/dynamic' ;
66import Image from 'next/image' ;
77import Link from 'next/link' ;
8- import { useContext , useEffect , useState , useRef } from 'react' ;
8+ import { useContext , useEffect , useState , useRef , ChangeEvent } from 'react' ;
99
1010import { Button } from '@/components/shared/Forms/Buttons/Buttons' ;
1111import SearchBar from '@/components/shared/SearchBar/SearchBar' ;
@@ -34,21 +34,22 @@ export default function Page({ params }: { params: { locale: string } }) {
3434 const [ dbUserSettings , setDbUserSettings ] = useState < IUserSettings | null > ( null ) ;
3535 const [ zoomLevel , setZoomLevel ] = useState ( 2 ) ;
3636 const [ locationError , setLocationError ] = useState < string | null > ( null ) ;
37+ const [ searchBarValue , setSearchBarValue ] = useState ( '' ) ;
3738 const [ searchQuery , setSearchQuery ] = useState < string > ( '' ) ;
3839 const [ isSearchClicked , setSearchClicked ] = useState ( false ) ;
3940 const [ searchResults , setSearchResults ] = useState < any [ ] > ( [ ] ) ;
40- const [ showPopup , setShowPopup ] = useState < boolean > ( false )
41+ const [ showPopup , setShowPopup ] = useState < boolean > ( false ) ;
4142
4243 const { isSigningInUser, currentUser, autoLoginUser, reload, setReload } = useContext ( AppContext ) ;
4344
4445 useEffect ( ( ) => {
4546 // clear previous map state when findme option is changed
46- if ( reload ) {
47+ if ( reload ) {
4748 sessionStorage . removeItem ( 'prevMapCenter' ) ;
4849 sessionStorage . removeItem ( 'prevMapZoom' ) ;
4950 }
50- setReload ( false )
51- setShowPopup ( false )
51+ setReload ( false ) ;
52+ setShowPopup ( false ) ;
5253 checkAndAutoLoginUser ( currentUser , autoLoginUser ) ;
5354
5455 const getUserSettingsData = async ( ) => {
@@ -61,7 +62,7 @@ export default function Page({ params }: { params: { locale: string } }) {
6162 const coordinates = {
6263 lat : data . search_map_center . coordinates [ 1 ] ,
6364 lng : data . search_map_center . coordinates [ 0 ] ,
64- }
65+ } ;
6566 setSearchCenter ( coordinates ) ;
6667 if ( coordinates . lat === 0 && coordinates . lng === 0 ) {
6768 setShowPopup ( true ) ;
@@ -70,14 +71,14 @@ export default function Page({ params }: { params: { locale: string } }) {
7071 } else {
7172 logger . warn ( 'User Settings not found.' ) ;
7273 setDbUserSettings ( null ) ;
73- setSearchCenter ( null )
74+ setSearchCenter ( null ) ;
7475 }
7576 } catch ( error ) {
7677 logger . error ( 'Error fetching user settings data:' , error ) ;
7778 }
7879 } ;
7980
80- getUserSettingsData ( ) ;
81+ getUserSettingsData ( ) ;
8182 } , [ currentUser , reload ] ) ;
8283
8384 useEffect ( ( ) => {
@@ -86,9 +87,8 @@ export default function Page({ params }: { params: { locale: string } }) {
8687 const loc = await userLocation ( dbUserSettings ) ;
8788 if ( loc ) {
8889 setSearchCenter ( { lat : loc [ 0 ] , lng : loc [ 1 ] } ) ;
89- }
90- else {
91- setSearchCenter ( null )
90+ } else {
91+ setSearchCenter ( null ) ;
9292 }
9393 }
9494 } ;
@@ -104,28 +104,29 @@ export default function Page({ params }: { params: { locale: string } }) {
104104 if ( loc ) {
105105 setSearchCenter ( { lat : loc [ 0 ] , lng : loc [ 1 ] } ) ;
106106 logger . info ( 'User location obtained successfully on button click:' , { location } ) ;
107- }
108- else {
109- setSearchCenter ( null )
107+ } else {
108+ setSearchCenter ( null ) ;
110109 }
111110 }
112111 } ;
113112
114113 // Handle search query update from SearchBar and associated results
115114 const handleSearch = async ( query : string ) => {
116- setSearchQuery ( query ) ;
117- setSearchClicked ( true ) ;
115+ if ( query ) {
116+ setSearchQuery ( query ) ;
117+ setSearchClicked ( true ) ;
118118
119- // Fetch sellers based on current map bounds and search query
120- try {
121- const mapInstance = mapRef . current ;
122- if ( mapInstance ) {
123- const bounds = mapInstance . getBounds ( ) ;
124- const results = await fetchSellers ( bounds , query ) ; // Use API to fetch sellers
125- setSearchResults ( results || [ ] ) ; // Update searchResults
119+ // Fetch sellers based on current map bounds and search query
120+ try {
121+ const mapInstance = mapRef . current ;
122+ if ( mapInstance ) {
123+ const bounds = mapInstance . getBounds ( ) ;
124+ const results = await fetchSellers ( bounds , query ) ; // Use API to fetch sellers
125+ setSearchResults ( results || [ ] ) ; // Update searchResults
126+ }
127+ } catch ( error ) {
128+ logger . error ( 'Failed to fetch sellers for search query.' , error ) ;
126129 }
127- } catch ( error ) {
128- logger . error ( 'Failed to fetch sellers for search query.' , error ) ;
129130 }
130131 } ;
131132
@@ -139,7 +140,14 @@ export default function Page({ params }: { params: { locale: string } }) {
139140 isSearchClicked = { isSearchClicked }
140141 searchResults = { searchResults || [ ] }
141142 />
142- < SearchBar page = { 'default' } onSearch = { handleSearch } />
143+ < SearchBar
144+ page = { 'default' }
145+ onSearch = { handleSearch }
146+ setSearchResults = { setSearchResults }
147+ setSearchQuery = { setSearchQuery }
148+ setSearchClicked = { setSearchClicked }
149+ isSearchClicked = { isSearchClicked }
150+ />
143151 < div className = "absolute bottom-8 z-10 right-0 left-0 m-auto pointer-events-none" >
144152 < div className = "w-[90%] lg:w-full lg:px-6 mx-auto flex items-center justify-between" >
145153 { /* Add Seller Button */ }
@@ -181,12 +189,14 @@ export default function Page({ params }: { params: { locale: string } }) {
181189 />
182190 </ div >
183191 </ div >
184- { showPopup && < ConfirmDialog
185- show = { setShowPopup }
186- onClose = { ( ) => setShowPopup ( false ) }
187- message = { t ( 'HOME.SEARCH_CENTER_DEFAULT_MESSAGE' ) }
188- url = { `/map-center?entryType=search` }
189- /> }
192+ { showPopup && (
193+ < ConfirmDialog
194+ show = { setShowPopup }
195+ onClose = { ( ) => setShowPopup ( false ) }
196+ message = { t ( 'HOME.SEARCH_CENTER_DEFAULT_MESSAGE' ) }
197+ url = { `/map-center?entryType=search` }
198+ />
199+ ) }
190200 </ div >
191201 </ >
192202 ) ;
0 commit comments