Skip to content

LG-3476: Use ref callback to initialize FullScreen modal focus trap #4200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aduth merged 1 commit into from
Sep 16, 2020
Merged

LG-3476: Use ref callback to initialize FullScreen modal focus trap #4200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions app/javascript/packages/document-capture/components/full-screen.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useRef, useEffect } from 'react';
import React, { useRef, useEffect, useCallback } from 'react';
import createFocusTrap from 'focus-trap';
import useI18n from '../hooks/use-i18n';
import useAsset from '../hooks/use-asset';
Expand Down Expand Up @@ -26,7 +26,6 @@ let activeInstances = 0;
function FullScreen({ onRequestClose = () => {}, children }) {
const { t } = useI18n();
const { getAssetPath } = useAsset();
const modalRef = useRef(/** @type {?HTMLDivElement} */ (null));
const trapRef = useRef(/** @type {?import('focus-trap').FocusTrap} */ (null));
const onRequestCloseRef = useRef(onRequestClose);
useEffect(() => {
Expand All @@ -35,13 +34,18 @@ function FullScreen({ onRequestClose = () => {}, children }) {
// to reference in the deactivation.
onRequestCloseRef.current = onRequestClose;
}, [onRequestClose]);
useEffect(() => {
if (modalRef.current) {
trapRef.current = createFocusTrap(modalRef.current, {

const setFocusTrapRef = useCallback((node) => {
if (trapRef.current) {
trapRef.current.deactivate();
}

if (node) {
trapRef.current = createFocusTrap(node, {
onDeactivate: () => onRequestCloseRef.current(),
});

trapRef.current.activate();
return trapRef.current.deactivate;
}
}, []);

Expand All @@ -58,7 +62,7 @@ function FullScreen({ onRequestClose = () => {}, children }) {
}, []);

return (
<div ref={modalRef} aria-modal="true" className="full-screen bg-white">
<div ref={setFocusTrapRef} aria-modal="true" className="full-screen bg-white">
<button
type="button"
aria-label={t('users.personal_key.close')}
Expand Down