π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(photos):move-search-reset-to-navbar
Aswin Asoked32203b593f
diff --git a/web/apps/photos/src/components/SearchBar.tsx b/web/apps/photos/src/components/SearchBar.tsxindex 31e2df98af..171141c2d3 100644--- a/web/apps/photos/src/components/SearchBar.tsx+++ b/web/apps/photos/src/components/SearchBar.tsx@@ -72,6 +72,7 @@ export interface SearchBarProps {export const SearchBar: React.FC<SearchBarProps> = (props) => {const isSmallWidth = useIsSmallWidth();const [open, setOpen] = useState(false);+ const [searchResetKey, setSearchResetKey] = useState(0);const shortcut =typeof navigator !== "undefined" && /mac/i.test(navigator.userAgent)? "βK"@@ -79,6 +80,11 @@ export const SearchBar: React.FC<SearchBarProps> = (props) => {const showSearch = () => setOpen(true);const closeSearch = () => setOpen(false);+ const clearSearch = () => {+ props.onSelectSearchOption(undefined, { shouldExitSearchMode: true });+ setSearchResetKey((key) => key + 1);+ setOpen(false);+ };useEffect(() => {const handleKeyDown = (event: KeyboardEvent) => {@@ -94,6 +100,17 @@ export const SearchBar: React.FC<SearchBarProps> = (props) => {return (<>+ {props.isInSearchMode && (+ <Tooltip title={t("close")}>+ <IconButton+ aria-label={t("close")}+ onClick={clearSearch}+ sx={{ mr: "8px" }}+ >+ <CloseIcon />+ </IconButton>+ </Tooltip>+ )}<Tooltip title={`Search (${shortcut})`}><FocusVisibleButtoncolor="secondary"@@ -143,7 +160,12 @@ export const SearchBar: React.FC<SearchBarProps> = (props) => {},}}>- <SearchInput {...props} open={open} onClose={closeSearch} />+ <SearchInput+ key={searchResetKey}+ {...props}+ open={open}+ onClose={closeSearch}+ /></Dialog></ThemeProvider></>@@ -153,7 +175,6 @@ export const SearchBar: React.FC<SearchBarProps> = (props) => {const SearchInput: React.FC<SearchBarProps & { open: boolean; onClose: () => void }> = ({- isInSearchMode,onSelectSearchOption,onSelectPeople,onSelectPerson,@@ -325,12 +346,6 @@ const SearchInput: React.FC<return null;}}/>-- {isInSearchMode && (- <IconButton onClick={resetSearch}>- <CloseIcon />- </IconButton>- )}</SearchInputWrapper>);};