TagSpaces is an offline, open source, document manager with tagging support
Clear search query after location or folder change (#2371)
Stanimirdf4ab3f35be4
diff --git a/src/renderer/components/FolderContainer.tsx b/src/renderer/components/FolderContainer.tsxindex 3bf208211..79662da66 100644--- a/src/renderer/components/FolderContainer.tsx+++ b/src/renderer/components/FolderContainer.tsx@@ -306,7 +306,7 @@ function FolderContainer(props: Props) {)}{isSearchMode ? (/* todo rethink if open props is needed */- <SearchBox open={isSearchMode} />+ <SearchBox />) : (<><divdiff --git a/src/renderer/components/SearchAutocomplete.tsx b/src/renderer/components/SearchAutocomplete.tsxindex 7c10067f8..42e04b88e 100644--- a/src/renderer/components/SearchAutocomplete.tsx+++ b/src/renderer/components/SearchAutocomplete.tsx@@ -76,7 +76,7 @@ import { actions as AppActions, AppDispatch } from '../reducers/app';interface Props {style?: any;- open: boolean;+ //open: boolean;setAnchorSearch: (el: HTMLButtonElement) => void;}@@ -93,6 +93,7 @@ function SearchAutocomplete(props: Props) {openCurrentDirectory,searchQuery,setSearchQuery,+ isSearchMode,} = useDirectoryContentContext();const { tempSearchQuery, setTempSearchQuery } = useSearchQueryContext();const { openHistoryItem } = useBrowserHistoryContext();@@ -112,7 +113,7 @@ function SearchAutocomplete(props: Props) {const openLinkDispatch = (link, options) => openLink(link, options);- const { open, setAnchorSearch } = props;+ const { setAnchorSearch } = props;const [openSavedSearches, setOpenSavedSearches] =useState<null | HTMLElement>(null);const searchOptions = useRef<Array<SearchOptionType>>(getSearchOptions());@@ -1193,7 +1194,7 @@ function SearchAutocomplete(props: Props) {}}- if (!open) {+ if (!isSearchMode) {return null;}diff --git a/src/renderer/components/SearchBox.tsx b/src/renderer/components/SearchBox.tsxindex be37e2e1f..12177e9f2 100644--- a/src/renderer/components/SearchBox.tsx+++ b/src/renderer/components/SearchBox.tsx@@ -20,20 +20,22 @@ import React, { useState } from 'react';import Popover from '@mui/material/Popover';import SearchPopover from '-/components/SearchPopover';import SearchAutocomplete from '-/components/SearchAutocomplete';+import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';interface Props {- open: boolean;+ //open: boolean;}function SearchBox(props: Props) {+ const { isSearchMode } = useDirectoryContentContext();const [anchorSearch, setAnchorSearch] = useState<HTMLButtonElement | null>(null,);return (<>- <SearchAutocomplete open={props.open} setAnchorSearch={setAnchorSearch} />- {props.open && (+ <SearchAutocomplete setAnchorSearch={setAnchorSearch} />+ {isSearchMode && (<Popoveropen={Boolean(anchorSearch)}anchorEl={anchorSearch}diff --git a/src/renderer/hooks/DirectoryContentContextProvider.tsx b/src/renderer/hooks/DirectoryContentContextProvider.tsxindex 5f9043f31..8253dfe5c 100644--- a/src/renderer/hooks/DirectoryContentContextProvider.tsx+++ b/src/renderer/hooks/DirectoryContentContextProvider.tsx@@ -38,10 +38,10 @@ import {cleanMetaData,executePromisesInBatches,instanceId,+ mergeByPath,mergeFsEntryMeta,resolveRelativePath,updateFsEntries,- mergeByPath,} from '-/services/utils-io';import { TS } from '-/tagspaces.namespace';import { CommonLocation } from '-/utils/CommonLocation';@@ -661,8 +661,11 @@ export const DirectoryContentContextProvider = ({}function enterSearchMode() {- isSearchMode.current = true;- forceUpdate();+ searchQuery.current = {};+ if (!isSearchMode.current) {+ isSearchMode.current = true;+ forceUpdate();+ }}function setSearchResults(searchResults: TS.FileSystemEntry[]) {diff --git a/src/renderer/hooks/SearchQueryContextProvider.tsx b/src/renderer/hooks/SearchQueryContextProvider.tsxindex 28bd117fb..f23133bbb 100644--- a/src/renderer/hooks/SearchQueryContextProvider.tsx+++ b/src/renderer/hooks/SearchQueryContextProvider.tsx@@ -74,9 +74,9 @@ export const SearchQueryContextProvider = ({useEffect(() => {if (searchQuery && Object.keys(searchQuery).length > 0) {tempSearchQuery.current = { ...searchQuery };- } /* else {+ } else {tempSearchQuery.current = {};- }*/+ }forceUpdate();}, [searchQuery]);