simplify the conditionals to turn off autorfocus

transcend-io · Dec 6, 2024 · 570d7e9 · 570d7e9
1 parent ac4a659
commit 570d7e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/Main.tsx b/src/components/Main.tsx
@@ -77,7 +77,7 @@ export function Main({
   const dialogRef = useRef<HTMLDivElement>(null);
   useEffect(() => {
     if (!isViewStateClosed(viewState) && dialogRef.current) {
-      const shouldAutofocus = !config?.autofocus || config?.autofocus === 'on';
+      const shouldAutofocus = config?.autofocus !== 'off';
       // This setTimeout was necessary for the api triggered states, (DoNotSell|OptOut)Disclosure
       setTimeout(() => {
         if (dialogRef.current && shouldAutofocus) {

diff --git a/src/hooks/useViewState.ts b/src/hooks/useViewState.ts
@@ -137,7 +137,7 @@ export function useViewState({
            * very difficult to interact with. We create an element with maximum focus priority and
            * focus it so that when we delete it the user will be at the start of the focus order
            * just like if they had freshly loaded the page. */
-          const shouldFocus = !autofocus || autofocus === 'on';
+          const shouldFocus = autofocus !== 'off';
           if (savedActiveElement !== null && shouldFocus) {
             savedActiveElement.focus();
           } else {