Skip to content

Detach ticket modal focus listener reliably #10608

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

Open
Tomeshwari-02 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Detach ticket modal focus listener reliably #10608

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
15 changes: 7 additions & 8 deletions src/components/common/QRTicket/QRTicketModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ export default function QRTicketModal({ isOpen, onClose, ticket }) {
useEffect(() => {
if (!isOpen || !modalRef.current) return;

const focusableElements = modalRef.current.querySelectorAll(
const modalNode = modalRef.current;
const focusableElements = modalNode.querySelectorAll(
'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])'
);

Expand All @@ -97,16 +98,14 @@ export default function QRTicketModal({ isOpen, onClose, ticket }) {
}
};

modalRef.current.addEventListener("keydown", handleFocusTrap);
modalNode.addEventListener("keydown", handleFocusTrap);
// Focus the modal automatically
modalRef.current.focus();
modalNode.focus();

return () => {
if (modalRef.current) {
modalRef.current.removeEventListener("keydown", handleFocusTrap);
}
modalNode.removeEventListener("keydown", handleFocusTrap);
};
}, [isOpen, handleFocusTrap]);
}, [isOpen]);

const handleShare = async () => {
const shareUrl = ticket?.qrValue || window.location.href;
Expand Down Expand Up @@ -269,4 +268,4 @@ function ShareIcon() {
<line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/>
</svg>
);
}
}
Loading