-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #81 from Weaverse/stephen-dev
Update drawer and search for two type
- Loading branch information
Showing
9 changed files
with
277 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| import {useThemeSettings} from '@weaverse/hydrogen'; | ||
| import {Drawer, useDrawer} from '../Drawer'; | ||
| import {IconSearch} from '../Icon'; | ||
| import { SearchTypeHeader } from '../predictive-search/PredictiveSearch/SearchHeader/SearchTypeHeader'; | ||
| import { SearchTypeDrawer } from '../predictive-search/PredictiveSearch/SearchDrawer/SearchTypeDrawer'; | ||
| import { useEffect, useState } from 'react'; | ||
|
|
||
| type TypeOpenFrom = 'top' | 'right' | 'left'; | ||
|
|
||
| export function SearchToggle({isOpenDrawerHearder}: {isOpenDrawerHearder?: boolean}) { | ||
| const {isOpen, closeDrawer, openDrawer} = useDrawer(); | ||
| let settings = useThemeSettings(); | ||
| const [searchType, setSearchType] = useState(settings?.searchType); | ||
| const [openFrom, setOpenFrom] = useState<TypeOpenFrom>( | ||
| searchType === 'headerSearch' ? 'top' : 'right' | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| const handleResize = () => { | ||
| if (window.innerWidth <= 1280) { | ||
| setSearchType('drawerSearch'); | ||
| setOpenFrom('left'); | ||
| } else { | ||
| setSearchType(settings?.searchType); | ||
| if (settings?.searchType === 'drawerSearch' && isOpenDrawerHearder) { | ||
| setOpenFrom('left'); | ||
| } else { | ||
| setOpenFrom(settings?.searchType === 'headerSearch' ? 'top' : 'right'); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| window.addEventListener('resize', handleResize); | ||
| handleResize(); | ||
|
|
||
| return () => window.removeEventListener('resize', handleResize); | ||
| }, [settings?.searchType, isOpenDrawerHearder]); | ||
| return ( | ||
| <> | ||
| <button | ||
| onClick={openDrawer} | ||
| className="relative flex h-6 w-6 items-center justify-center focus:ring-primary/5" | ||
| > | ||
| <IconSearch className="h-6 w-6 !font-extralight" /> | ||
| </button> | ||
| <Drawer | ||
| open={isOpen} | ||
| onClose={closeDrawer} | ||
| openFrom={openFrom} | ||
| heading="Search" | ||
| isForm="search" | ||
| > | ||
| {searchType === 'headerSearch' && <SearchTypeHeader isOpen={isOpen} />} | ||
| {searchType === 'drawerSearch' && <SearchTypeDrawer isOpen={isOpen} />} | ||
| </Drawer> | ||
| </> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
app/components/predictive-search/PredictiveSearch/SearchHeader/SearchTypeHeader.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import {IconSearch} from '~/components/Icon'; | ||
| import {Input} from '~/components/Input'; | ||
| import {PredictiveSearchForm} from '../../SearchForm'; | ||
| import { SearchTypeHeaderResults } from './SearchTypeHeaderResults'; | ||
|
|
||
| interface PredictiveSearchProps { | ||
| // Predictive search props | ||
| isOpen?: boolean; | ||
| } | ||
|
|
||
| export function SearchTypeHeader(props: PredictiveSearchProps) { | ||
| let {isOpen} = props; | ||
| return ( | ||
| <div className="relative border-t border-bar-subtle"> | ||
| <PredictiveSearchForm> | ||
| {({fetchResults, inputRef}) => ( | ||
| <div className="mx-auto w-full max-w-[560px] p-6"> | ||
| <Input | ||
| name="q" | ||
| onChange={fetchResults} | ||
| onFocus={fetchResults} | ||
| onClear={fetchResults} | ||
| placeholder="Enter a keyword" | ||
| ref={inputRef} | ||
| className="rounded border-2" | ||
| prefixElement={ | ||
| <button type="submit" className="cursor-pointer"> | ||
| <IconSearch | ||
| className="h-6 w-6 opacity-55" | ||
| viewBox="0 0 24 24" | ||
| /> | ||
| </button> | ||
| } | ||
| autoFocus={true} | ||
| /> | ||
| </div> | ||
| )} | ||
| </PredictiveSearchForm> | ||
| {isOpen && <SearchTypeHeaderResults />} | ||
| </div> | ||
| ); | ||
| } |
Oops, something went wrong.