fix: deactivation sequence, fixes #24

theKashey · Oct 1, 2019 · 32ed7d7 · benoitgrelard · Oct 1, 2019 · 32ed7d7
1 parent dae9a1c
commit 32ed7d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/example/app.tsx b/example/app.tsx
@@ -49,6 +49,8 @@ export default class App extends Component <{}, AppState> {
                   onClickOutside={toggle}
                   onEscapeKey={toggle}
                   shards={[this.toggleRef, this.scrollRef]}
+                  onActivation={() => console.log("activated")}
+                  onDeactivation={() => console.log("deactivated")}
                 >
                   Holala!!
                   <button onClick={()=>alert('ok')}>test inside event</button>

diff --git a/src/Effect.tsx b/src/Effect.tsx
@@ -23,7 +23,7 @@ export function Effect(
     onDeactivation,
     noIsolation
   }: EffectProps) {
-  const [activeNode, setActive] = useState<HTMLElement | null>(null);
+  const [activeNode, setActive] = useState<HTMLElement | null | undefined>(undefined);
 
   const lastEventTarget = useRef<EventTarget>(null);
 
@@ -71,12 +71,13 @@ export function Effect(
       if (onActivation) {
         onActivation(activeNode);
       }
-    } else {
-      if (onDeactivation) {
-        onDeactivation();
+      return () => {
+        if (onDeactivation) {
+          onDeactivation();
+        }
       }
     }
-  }, [activeNode]);
+  }, [!!activeNode]);
 
   useEffect(() => {
     let _undo = (): any => null;