feat: added isActive to useFilter

schummar · Oct 21, 2022 · 20cd080 · 20cd080
1 parent e189121
commit 20cd080
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/components/filterControl.tsx b/src/components/filterControl.tsx
@@ -1,9 +1,12 @@
-import React, { createContext, useCallback, useState } from 'react';
+import { createContext, useMemo, useState } from 'react';
 import { useTheme } from '../hooks/useTheme';
 import { useCssVariables } from '../theme/useCssVariables';
 import { useColumnContext, useTableContext } from './table';
 
-export const FilterControlContext = createContext((): void => void 0);
+export const FilterControlContext = createContext({
+  isActive: false,
+  close: (): void => void 0,
+});
 
 export function FilterControl<T>(): JSX.Element | null {
   const table = useTableContext<T>();
@@ -34,14 +37,18 @@ export function FilterControl<T>(): JSX.Element | null {
     });
   }
 
-  const close = useCallback(function () {
-    setAnchor(null);
-  }, []);
+  const context = useMemo(
+    () => ({
+      isActive: !!anchor,
+      close: () => setAnchor(null),
+    }),
+    [!!anchor],
+  );
 
   if (!filter) return null;
 
   return (
-    <FilterControlContext.Provider value={close}>
+    <FilterControlContext.Provider value={context}>
       <div
         onClick={(e) => setAnchor(e.currentTarget)}
         onContextMenu={(e) => {

diff --git a/src/hooks/useFilter.ts b/src/hooks/useFilter.ts
@@ -77,10 +77,12 @@ export function useFilter<T, V, F, S extends SerializableValue>(impl: FilterImpl
 
   useEffect(() => delayedUpdate.flush(), [delayedUpdate]);
 
+  const context = useContext(FilterControlContext);
+
   return {
     value: dirtyValue ?? value,
     onChange,
-    close: useContext(FilterControlContext),
     filterBy: filterBy ?? ((x) => x as unknown as F | F[]),
+    ...context,
   };
 }