Improveing default filters

RoamJS · Mar 15, 2022 · fec4449 · fec4449
1 parent 0e34bcc
commit fec4449
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 39 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,6 +17,6 @@
   "dependencies": {
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "roamjs-components": "^0.52.6"
+    "roamjs-components": "^0.52.8"
   }
 }
diff --git a/src/components/ResultsView.tsx b/src/components/ResultsView.tsx
@@ -63,13 +63,15 @@ const ResultHeader = ({
   setActiveSort,
   filters,
   setFilters,
+  initialFilter,
 }: {
   c: string;
   results: Result[];
   activeSort: Sorts;
   setActiveSort: (s: Sorts) => void;
   filters: Filters;
   setFilters: (f: Filters) => void;
+  initialFilter: Filters[string];
 }) => {
   const filterData = useMemo(
     () => ({
@@ -121,6 +123,7 @@ const ResultHeader = ({
           )}
           <Filter
             data={filterData}
+            initialValue={initialFilter}
             onChange={(newFilters) =>
               setFilters({ ...filters, [c]: newFilters })
             }
@@ -506,42 +509,39 @@ const ResultsView = ({
             />
           </Tooltip>
         </div>
-        {sortedResults.length ? (
-          <HTMLTable
-            style={{
-              maxHeight: "400px",
-              overflowY: "scroll",
-              width: "100%",
-              tableLayout: "fixed",
-            }}
-            striped
-            interactive
-            bordered
-          >
-            <thead>
-              <tr>
-                {columns.map((c) => (
-                  <ResultHeader
-                    key={c}
-                    c={c}
-                    results={results}
-                    activeSort={activeSort}
-                    setActiveSort={setActiveSort}
-                    filters={filters}
-                    setFilters={setFilters}
-                  />
-                ))}
-              </tr>
-            </thead>
-            <tbody>
-              {sortedResults.map((r) => (
-                <ResultView key={r.uid} r={r} colSpan={columns.length} />
+        <HTMLTable
+          style={{
+            maxHeight: "400px",
+            overflowY: "scroll",
+            width: "100%",
+            tableLayout: "fixed",
+          }}
+          striped
+          interactive
+          bordered
+        >
+          <thead>
+            <tr>
+              {columns.map((c) => (
+                <ResultHeader
+                  key={c}
+                  c={c}
+                  results={results}
+                  activeSort={activeSort}
+                  setActiveSort={setActiveSort}
+                  filters={filters}
+                  setFilters={setFilters}
+                  initialFilter={savedFiltedData[c]}
+                />
               ))}
-            </tbody>
-          </HTMLTable>
-        ) : (
-          <div>No Results</div>
-        )}
+            </tr>
+          </thead>
+          <tbody>
+            {sortedResults.map((r) => (
+              <ResultView key={r.uid} r={r} colSpan={columns.length} />
+            ))}
+          </tbody>
+        </HTMLTable>
       </div>
     </div>
   );