update search component
This commit is contained in:
parent
d833501d8a
commit
3f1d8e195f
|
@ -1,5 +1,5 @@
|
||||||
import { SearchButton } from './searchButton';
|
import { SearchButton } from './searchButton';
|
||||||
import React from 'react';
|
import React, { useState } from 'react';
|
||||||
import { Collection } from 'types/collection';
|
import { Collection } from 'types/collection';
|
||||||
|
|
||||||
import { EnteFile } from 'types/file';
|
import { EnteFile } from 'types/file';
|
||||||
|
@ -8,22 +8,22 @@ import SearchInput from './searchInput';
|
||||||
import { UpdateSearch } from 'types/search';
|
import { UpdateSearch } from 'types/search';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
isOpen: boolean;
|
|
||||||
isFirstFetch: boolean;
|
isFirstFetch: boolean;
|
||||||
setOpen: (value: boolean) => void;
|
|
||||||
updateSearch: UpdateSearch;
|
updateSearch: UpdateSearch;
|
||||||
collections: Collection[];
|
collections: Collection[];
|
||||||
setActiveCollection: (id: number) => void;
|
setActiveCollection: (id: number) => void;
|
||||||
files: EnteFile[];
|
files: EnteFile[];
|
||||||
}
|
}
|
||||||
export default function SearchBar({ isFirstFetch, ...props }: Props) {
|
export default function SearchBar({ isFirstFetch, ...props }: Props) {
|
||||||
const showSearchInput = () => props.setOpen(true);
|
const [isOpen, setIsOpen] = useState(false);
|
||||||
|
const showSearchInput = () => setIsOpen(true);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SearchBarWrapper>
|
<SearchBarWrapper>
|
||||||
<SearchInput {...props} />
|
<SearchInput {...props} isOpen={isOpen} setOpen={setIsOpen} />
|
||||||
<SearchButton
|
<SearchButton
|
||||||
isFirstFetch={isFirstFetch}
|
isFirstFetch={isFirstFetch}
|
||||||
show={!props.isOpen}
|
show={!isOpen}
|
||||||
openSearchInput={showSearchInput}
|
openSearchInput={showSearchInput}
|
||||||
/>
|
/>
|
||||||
</SearchBarWrapper>
|
</SearchBarWrapper>
|
||||||
|
|
|
@ -15,7 +15,6 @@ interface Iprops {
|
||||||
isFirstFetch: boolean;
|
isFirstFetch: boolean;
|
||||||
openUploader: () => void;
|
openUploader: () => void;
|
||||||
isInSearchMode: boolean;
|
isInSearchMode: boolean;
|
||||||
setIsInSearchMode: (value: boolean) => void;
|
|
||||||
collections: Collection[];
|
collections: Collection[];
|
||||||
files: EnteFile[];
|
files: EnteFile[];
|
||||||
setActiveCollection: (id: number) => void;
|
setActiveCollection: (id: number) => void;
|
||||||
|
@ -26,7 +25,6 @@ export function GalleryNavbar({
|
||||||
isFirstFetch,
|
isFirstFetch,
|
||||||
openUploader,
|
openUploader,
|
||||||
isInSearchMode,
|
isInSearchMode,
|
||||||
setIsInSearchMode,
|
|
||||||
collections,
|
collections,
|
||||||
files,
|
files,
|
||||||
setActiveCollection,
|
setActiveCollection,
|
||||||
|
@ -42,8 +40,6 @@ export function GalleryNavbar({
|
||||||
</FluidContainer>
|
</FluidContainer>
|
||||||
) : (
|
) : (
|
||||||
<SearchBar
|
<SearchBar
|
||||||
isOpen={isInSearchMode}
|
|
||||||
setOpen={setIsInSearchMode}
|
|
||||||
isFirstFetch={isFirstFetch}
|
isFirstFetch={isFirstFetch}
|
||||||
collections={collections}
|
collections={collections}
|
||||||
files={getNonTrashedUniqueUserFiles(files)}
|
files={getNonTrashedUniqueUserFiles(files)}
|
||||||
|
|
|
@ -524,6 +524,7 @@ export default function Gallery() {
|
||||||
setActiveCollection(ALL_SECTION);
|
setActiveCollection(ALL_SECTION);
|
||||||
setSearch(newSearch);
|
setSearch(newSearch);
|
||||||
setSetSearchResultSummary(summary);
|
setSetSearchResultSummary(summary);
|
||||||
|
setIsInSearchMode(!!newSearch);
|
||||||
};
|
};
|
||||||
|
|
||||||
const closeCollectionSelector = (closeBtnClick?: boolean) => {
|
const closeCollectionSelector = (closeBtnClick?: boolean) => {
|
||||||
|
@ -652,7 +653,6 @@ export default function Gallery() {
|
||||||
isFirstFetch={isFirstFetch}
|
isFirstFetch={isFirstFetch}
|
||||||
openUploader={openUploader}
|
openUploader={openUploader}
|
||||||
isInSearchMode={isInSearchMode}
|
isInSearchMode={isInSearchMode}
|
||||||
setIsInSearchMode={setIsInSearchMode}
|
|
||||||
collections={collections}
|
collections={collections}
|
||||||
files={getNonTrashedUniqueUserFiles(files)}
|
files={getNonTrashedUniqueUserFiles(files)}
|
||||||
setActiveCollection={setActiveCollection}
|
setActiveCollection={setActiveCollection}
|
||||||
|
|
Loading…
Reference in a new issue