fix: Fix Dialog initial focus (#433)

.eslintrc.js

@@ -74,7 +74,9 @@ module.exports = {
       files: ["**/*.ts", "**/*.tsx"],
       parser: "@typescript-eslint/parser",
       parserOptions: {
-        project: "./tsconfig.json"
+        project: "./tsconfig.json",
+        // TODO: Temporary fix https://github.com/typescript-eslint/typescript-eslint/issues/890
+        createDefaultProgram: true
       },
       plugins: ["@typescript-eslint"],
       rules: {

packages/reakit-utils/src/tabbable.ts

@@ -154,3 +154,26 @@ export function focusPreviousTabbableIn<T extends Element>(
     previousTabbable.focus();
   }
 }
+
+function defaultIsActive(element: Element) {
+  return document.activeElement === element;
+}
+
+type ForceFocusOptions = FocusOptions & {
+  isActive?: typeof defaultIsActive;
+};
+
+export function forceFocus(
+  element: HTMLElement,
+  { isActive = defaultIsActive, preventScroll }: ForceFocusOptions = {}
+) {
+  if (isActive(element)) return -1;
+
+  element.focus({ preventScroll });
+
+  if (isActive(element)) return -1;
+
+  return requestAnimationFrame(() => {
+    element.focus({ preventScroll });
+  });
+}

packages/reakit/src/Dialog/__tests__/index-test.tsx

@@ -172,6 +172,64 @@ test("focus a given element when dialog opens and initialFocusRef is passed in",
   expect(button2).toHaveFocus();
 });
 
+test("focus a given element when dialog opens and initial focus has been manually set using React.useEffect", () => {
+  const Test = () => {
+    const dialog = useDialogState();
+    const ref = React.useRef<HTMLButtonElement>(null);
+
+    React.useEffect(() => {
+      if (dialog.visible && ref.current) {
+        ref.current.focus();
+      }
+    }, [dialog.visible]);
+
+    return (
+      <>
+        <DialogDisclosure {...dialog}>disclosure</DialogDisclosure>
+        <Dialog {...dialog} aria-label="dialog">
+          <button>button1</button>
+          <button ref={ref}>button2</button>
+        </Dialog>
+      </>
+    );
+  };
+  const { getByText } = render(<Test />);
+  const disclosure = getByText("disclosure");
+  const button2 = getByText("button2");
+  expect(document.body).toHaveFocus();
+  fireEvent.click(disclosure);
+  expect(button2).toHaveFocus();
+});
+
+test("focus a given element when dialog opens and initial focus has been manually set using autoFocus", () => {
+  const Test = () => {
+    const dialog = useDialogState();
+    return (
+      <>
+        <DialogDisclosure {...dialog}>disclosure</DialogDisclosure>
+        <Dialog {...dialog} aria-label="dialog">
+          {props =>
+            dialog.visible && (
+              <div {...props}>
+                <button>button1</button>
+                {/* eslint-disable-next-line jsx-a11y/no-autofocus */}
+                <button autoFocus>button2</button>
+              </div>
+            )
+          }
+        </Dialog>
+      </>
+    );
+  };
+  const { getByText } = render(<Test />);
+  const disclosure = getByText("disclosure");
+  expect(document.body).toHaveFocus();
+  expect(() => getByText("button2")).toThrow();
+  fireEvent.click(disclosure);
+  const button2 = getByText("button2");
+  expect(button2).toHaveFocus();
+});
+
 test("focus dialog itself if there is no tabbable descendant element", () => {
   const Test = () => {
     const dialog = useDialogState();

packages/reakit/src/Dialog/__utils/useDisableHoverOutside.ts

@@ -7,26 +7,18 @@ export function useDisableHoverOutside(
   nestedDialogs: Array<React.RefObject<HTMLElement>>,
   options: DialogOptions
 ) {
-  useEventListenerOutside(
-    portalRef,
-    { current: null },
-    nestedDialogs,
-    "mouseover",
-    event => {
-      event.stopPropagation();
-      event.preventDefault();
-    },
-    options.visible && options.modal
-  );
-  useEventListenerOutside(
-    portalRef,
-    { current: null },
-    nestedDialogs,
-    "mouseout",
-    event => {
-      event.stopPropagation();
-      event.preventDefault();
-    },
-    options.visible && options.modal
-  );
+  const useEvent = (eventType: string) =>
+    useEventListenerOutside(
+      portalRef,
+      { current: null },
+      nestedDialogs,
+      eventType,
+      event => {
+        event.stopPropagation();
+        event.preventDefault();
+      },
+      options.visible && options.modal
+    );
+  useEvent("mouseover");
+  useEvent("mouseout");
 }

packages/reakit/src/Dialog/__utils/useFocusOnHide.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { useUpdateEffect } from "reakit-utils/useUpdateEffect";
 import { warning } from "reakit-utils/warning";
-import { isTabbable } from "reakit-utils/tabbable";
+import { isTabbable, forceFocus } from "reakit-utils/tabbable";
 import { DialogOptions } from "../Dialog";
 
 export function useFocusOnHide(
@@ -33,7 +33,7 @@ export function useFocusOnHide(
       (disclosureRefs.current && disclosureRefs.current[0]);
 
     if (finalFocusRef) {
-      finalFocusRef.focus();
+      forceFocus(finalFocusRef);
     } else {
       warning(
         true,

packages/reakit/src/Dialog/__utils/useFocusOnShow.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { useUpdateEffect } from "reakit-utils/useUpdateEffect";
 import { warning } from "reakit-utils/warning";
-import { getFirstTabbableIn } from "reakit-utils/tabbable";
+import { getFirstTabbableIn, forceFocus } from "reakit-utils/tabbable";
 import { DialogOptions } from "../Dialog";
 
 export function useFocusOnShow(
@@ -37,16 +37,17 @@ export function useFocusOnShow(
       initialFocusRef.current.focus({ preventScroll: true });
     } else {
       const tabbable = getFirstTabbableIn(dialog, true);
+      const isActive = () => dialog.contains(document.activeElement);
       if (tabbable) {
-        tabbable.focus({ preventScroll: true });
+        forceFocus(tabbable, { preventScroll: true, isActive });
       } else {
-        dialog.focus({ preventScroll: true });
+        forceFocus(dialog, { preventScroll: true, isActive });
         warning(
           dialog.tabIndex === undefined || dialog.tabIndex < 0,
           "Dialog",
           "It's recommended to have at least one tabbable element inside dialog. The dialog element has been automatically focused.",
           "If this is the intended behavior, pass `tabIndex={0}` to the dialog element to disable this warning.",
-          "See https://reakit.io/docs/dialog"
+          "See https://reakit.io/docs/dialog/#initial-focus"
         );
       }
     }