Fixed a bug, where previously entered search string was ignored

ransome1 · Dec 18, 2023 · 4049ed9 · 4049ed9
1 parent 3a4f0ee
commit 4049ed9
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 15 deletions.
diff --git a/flatpak/com.github.ransome1.sleek.appdata.xml b/flatpak/com.github.ransome1.sleek.appdata.xml
@@ -9,7 +9,7 @@
   <developer_name>Robin Ahle</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="2.0.4-rc.2" date="2023-12-16"/>
+    <release version="2.0.4-rc.2" date="2023-12-18"/>
   </releases>
   <url type="homepage">https://github.com/ransome1/sleek</url>
   <url type="contact">https://github.com/ransome1/sleek/issues</url>

diff --git a/src/main/config.tsx b/src/main/config.tsx
@@ -99,15 +99,15 @@ if(!fs.existsSync(customStylesPath)) {
 
 filterStorage.onDidAnyChange(async () => {
   try {
-    await processDataRequest('')
+    await processDataRequest()
   } catch(error) {
     console.error(error);
   }
 });
 
 configStorage.onDidAnyChange(async () => {
   try {
-    await processDataRequest('')
+    await processDataRequest()
   } catch(error) {
     console.error(error);
   }

diff --git a/src/main/modules/File/Watcher.tsx b/src/main/modules/File/Watcher.tsx
@@ -23,8 +23,7 @@ function createFileWatcher(files: FileObject[]): void {
     })
     .on('change', async (file) => {
       console.log(`File ${file} has been changed`);
-
-      await processDataRequest('');
+      await processDataRequest();
     })
     .on('unlink', (file) => {
       console.log(`FileWatcher.ts: FileObject ${file} has been unlinked`);

diff --git a/src/main/modules/Menu.tsx b/src/main/modules/Menu.tsx
@@ -17,7 +17,6 @@ function createMenu(files: FileObject[]) {
           label: 'About',
           click: async () => {
             const options = {
-              type: 'info',
               title: 'About sleek',
               message: `sleek v${app.getVersion()}`,
               detail: description,

diff --git a/src/main/modules/ProcessDataRequest/ProcessDataRequest.tsx b/src/main/modules/ProcessDataRequest/ProcessDataRequest.tsx
@@ -13,7 +13,16 @@ const headers: HeadersObject = {
   completedTodoObjects: 0,
 };
 
-async function processDataRequest(searchString: string): Promise<void> {
+let searchString;
+
+async function processDataRequest(search: string): Promise<void> {
+
+  if(search) {
+    searchString = search;
+  } else if(search === '') {
+    searchString = '';
+  }
+
   const activeFile: FileObject | null = getActiveFile();
   if(!activeFile) {
     throw new Error('No active file');

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
@@ -34,7 +34,7 @@ const App = () => {
   const [searchString, setSearchString] = useState<string>('');
   const [flattenedTodoObjects, setTodoObjects] = useState<TodoObject[] | null>(null);
   const [todoObject, setTodoObject] = useState<TodoObject | null>(null);
-  const [headers, setHeaders] = useState<Headers | null>(null);
+  const [headers, setHeaders] = useState<HeadersObject | null>(null);
   const [filters, setFilters] = useState<Filters | null>(null);
   const [attributes, setAttributes] = useState<Attributes | null>(null);
   const [sorting, setSorting] = useState<Sorting>(store.get('sorting') || null);
@@ -304,6 +304,7 @@ const App = () => {
                   isSearchOpen={isSearchOpen}
                   setIsSearchOpen={setIsSearchOpen}
                   searchFieldRef={searchFieldRef}
+                  setTextFieldValue={setTextFieldValue}
                 />
                 <ToolBar
                   isSearchOpen={isSearchOpen}

diff --git a/src/renderer/Search.tsx b/src/renderer/Search.tsx
@@ -9,11 +9,12 @@ const { ipcRenderer } = window.api;
 
 interface Props extends WithTranslation {
   headers: HeadersObject;
-  searchString: string | null;
+  searchString: string;
   setSearchString: (searchString: string) => void;
   isSearchOpen: boolean;
   setIsSearchOpen: (isSearchOpen: boolean) => void;
   searchFieldRef: React.RefObject<HTMLInputElement>;
+  setTextFieldValue: React.RefObject<string>;
   t: typeof i18n.t;
 }
 
@@ -24,11 +25,11 @@ const Search: React.FC<Props> = memo(({
   isSearchOpen,
   setIsSearchOpen,
   searchFieldRef,
+  setTextFieldValue,
   t,
 }) => {
   const handleInput = (event: ChangeEvent<HTMLInputElement>) => {
-    const searchString = event.target.value;
-    setSearchString(searchString);
+    setSearchString(event.target.value);
   };
 
   const handleAddTodo = () => {
@@ -57,13 +58,14 @@ const Search: React.FC<Props> = memo(({
   });
 
   useEffect(() => {
-    if(searchString === null) return;
-    let delayedSearch: NodeJS.Timeout;
+
+    if(!searchString) setTextFieldValue('')
+
     const handleSearch = () => {
       ipcRenderer.send('requestData', searchString);
     };
 
-    delayedSearch = setTimeout(handleSearch, 200);
+    const delayedSearch: NodeJS.Timeout = setTimeout(handleSearch, 200);
 
     return () => {
       clearTimeout(delayedSearch);
@@ -91,7 +93,7 @@ const Search: React.FC<Props> = memo(({
             variant='outlined'
             placeholder={`${t('search.visibleTodos')} ${headers.visibleObjects}`}
             inputRef={searchFieldRef}
-            value={searchString === null ? '' : searchString}
+            value={searchString}
             onChange={handleInput}
             InputProps={{
               endAdornment: (

diff --git a/src/types.ts → src/types.tsx b/src/types.ts → src/types.tsx