Invert #4755 (#4874)

ianstormtaylor · Mar 9, 2022 · 4d28948 · 4d28948
1 parent 1356f2a
commit 4d28948
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/packages/slate-react/src/components/slate.tsx b/packages/slate-react/src/components/slate.tsx
@@ -69,15 +69,13 @@ export const Slate = (props: {
   })
 
   useIsomorphicLayoutEffect(() => {
-    const fn = () => {
-      setTimeout(() => {
-        if (unmountRef.current) {
-          return
-        }
-        setIsFocused(ReactEditor.isFocused(editor))
-      }, 0)
-    }
+    const fn = () => setIsFocused(ReactEditor.isFocused(editor))
     document.addEventListener('focus', fn, true)
+    return () => document.removeEventListener('focus', fn, true)
+  }, [])
+
+  useIsomorphicLayoutEffect(() => {
+    const fn = () => setIsFocused(ReactEditor.isFocused(editor))
     document.addEventListener('blur', fn, true)
     return () => {
       document.removeEventListener('focus', fn, true)