Fixed a bug, which prevented some filtering to be triggered. Fixed a …

…bug, which triggered content to be rendered twice.
ransome1 · Feb 25, 2024 · 73184a7 · 73184a7
1 parent 645d5f3
commit 73184a7
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -147,7 +147,7 @@
     "webpack-merge": "^5.9.0"
   },
   "build": {
-    "buildVersion": "39",
+    "buildVersion": "41",
     "asar": true,
     "asarUnpack": "**\\*.{node,dll}",
     "files": [

diff --git a/release/app/package.json b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "synopsis": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "keywords": [

diff --git a/src/__tests__/__mock__/todo.txt b/src/__tests__/__mock__/todo.txt
@@ -3,5 +3,5 @@
 x (C) 2025-12-08 2023-12-01 test2 +testProject1 @testContext due:2023-01-01
 (A) 2023-06-24 test3 +testProject6 @testContext6 due:2023-12-03
 (C) 2025-12-06 test3 +testProject3 @testContext due:2023-01-03
-(C) 2025-12-05 test3 +testProject2 @testContext due:2023-01-05
+(C) 2025-12-05 test3 +testProject2 @testContext due:2025-01-05
 (C) 2025-12-07 test3 +testProject4 @testContext due:2023-01-04
diff --git a/src/main/modules/Filters/Filters.tsx b/src/main/modules/Filters/Filters.tsx
@@ -1,5 +1,9 @@
 function applyFilters(todoObjects: TodoObject[], filters: Filters | null): TodoObject[] {
   return todoObjects.map((todoObject: TodoObject) => {
+    if (!todoObject.visible) {
+      return todoObject;
+    }
+
     const isVisible = Object.entries(filters || {}).every(([key, filterArray]: [string, Filter[]]) => {
       if (filterArray.length === 0) {
         return true;

diff --git a/src/main/modules/ProcessDataRequest/ProcessDataRequest.tsx b/src/main/modules/ProcessDataRequest/ProcessDataRequest.tsx
@@ -24,12 +24,14 @@ async function processDataRequest(search?: string): Promise<void> {
   const fileContent = await readFileContent(activeFile.todoFilePath, activeFile.todoFileBookmark);
   let todoObjects: TodoObject[] | [] = await createTodoObjects(fileContent);
   todoObjects = handleTodoObjectsDates(todoObjects);
-  todoObjects = handleCompletedTodoObjects(todoObjects);
+  todoObjects = handleCompletedTodoObjects(todoObjects);  
 
   updateAttributes(todoObjects, sorting, true);
 
   if(!showHidden) todoObjects = handleHiddenTodoObjects(todoObjects);
+
   if(filters) todoObjects = applyFilters(todoObjects, filters);
+
   if(searchString) todoObjects = applySearchString(searchString, todoObjects);
 
   updateAttributes(todoObjects, sorting, false);

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
@@ -42,7 +42,7 @@ const App = () => {
   const [snackBarContent, setSnackBarContent] = useState<string | null>(null);
   const [snackBarSeverity, setSnackBarSeverity] = useState<AlertColor | undefined>();
   const [dialogOpen, setDialogOpen] = useState<boolean>(false);
-  const [searchString, setSearchString] = useState<string>('');
+  const [searchString, setSearchString] = useState<string | null>(null);
   const [todoObjects, setTodoObjects] = useState<TodoObject[] | null>(null);
   const [todoObject, setTodoObject] = useState<TodoObject | null>(null);
   const [attributeFields, setAttributeFields] = useState<TodoObject | null>(null);

diff --git a/src/renderer/Header/Search/Search.tsx b/src/renderer/Header/Search/Search.tsx
@@ -118,7 +118,7 @@ const SearchComponent: React.FC<SearchComponentProps> = memo(({
             freeSolo
             autoHighlight
             open={isAutocompleteOpen}
-            inputValue={searchString}      
+            inputValue={searchString || ''}      
             options={searchFilters}
             onBlur={() => setIsAutocompleteOpen(false)}
             filterOptions={filterOptions}