Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-25 02:57:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug with ref

Browse source 
When using a ref in an effect, you need to use a state ref, otherwise the binding happens too early.
This commit is contained in:
Jordan Eldredge 2019-05-06 22:22:13 -07:00
parent e5f6edf602
commit bd1999778d
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
js/components/FocusTarget.tsx
View file

@ -1,4 +1,4 @@
import React, { useCallback, useRef, useEffect } from "react";
import React, { useCallback, useState, useEffect } from "react";
import { WindowId, AppState, Dispatch } from "../types";
import * as Actions from "../actionCreators";
import * as Selectors from "../selectors";
@ -28,39 +28,37 @@ function FocusTarget(props: Props) {
}
}, [windowId, focusedWindowId, setFocus]);
const ref = useRef<HTMLDivElement>(null);
const [ref, setRef] = useState<HTMLDivElement | null>(null);
useEffect(() => {
const { current } = ref;
if (current == null || onKeyDown == null) {
if (ref == null || onKeyDown == null) {
return;
}
current.addEventListener("keydown", onKeyDown);
return () => current.removeEventListener("keydown", onKeyDown);
}, [onKeyDown, windowId, focusedWindowId]);
ref.addEventListener("keydown", onKeyDown);
return () => ref.removeEventListener("keydown", onKeyDown);
}, [onKeyDown, windowId, focusedWindowId, ref]);
useEffect(() => {
const { current } = ref;
if (current == null || windowId !== focusedWindowId) {
if (ref == null || windowId !== focusedWindowId) {
return;
}
// I give up. I can't figure out how to type this.
const out: EventListener = (e: any) => {
if (!(e.currentTarget as Element).contains(e.relatedTarget as Element)) {
current.focus();
if (e.relatedTarget == null) {
ref.focus();
}
};
// https://github.com/facebook/react/issues/6410
// React does not implement focusout. In this case we prefer focusout to
// blur because it gets triggered when a child with focus unmounts.
current.addEventListener("focusout", out);
return () => current.removeEventListener("focusout", out);
}, [windowId, focusedWindowId]);
ref.addEventListener("focusout", out);
return () => ref.removeEventListener("focusout", out);
}, [windowId, focusedWindowId, ref]);
return (
<div
ref={ref}
ref={setRef}
onMouseDown={focusHandler}
onFocus={focusHandler}
tabIndex={-1}