diff --git a/packages/syntax-core/src/Modal/FocusTrap.tsx b/packages/syntax-core/src/Modal/FocusTrap.tsx index dc74f7af..6ca18942 100644 --- a/packages/syntax-core/src/Modal/FocusTrap.tsx +++ b/packages/syntax-core/src/Modal/FocusTrap.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useRef, type ReactElement } from "react"; +import React, { useRef, type ReactElement, useLayoutEffect } from "react"; function queryFocusableAll(el: HTMLDivElement): NodeListOf { // Focusable, interactive elements that could possibly be in children @@ -39,7 +39,7 @@ export default function FocusTrap({ const elRef = useRef(null); const previouslyFocusedElRef = useRef(null); - useEffect(() => { + useLayoutEffect(() => { const { current: element } = elRef; // Focus the first child element among all the focusable, interactive elements within `children`