First round of PR review fixes

coinbase · Jan 17, 2025 · 87ed441 · 87ed441
1 parent 8d7d49f
commit 87ed441
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/src/internal/primitives/Dialog.test.tsx b/src/internal/primitives/Dialog.test.tsx
@@ -52,9 +52,9 @@ describe('Dialog', () => {
     render(
       <Dialog
         isOpen={true}
-        ariaLabel="Test Dialog"
-        ariaDescribedby="dialog-desc"
-        ariaLabelledby="dialog-title"
+        aria-label="Test Dialog"
+        aria-describedby="dialog-desc"
+        aria-labelledby="dialog-title"
         onClose={() => {}}
       >
         <div>Dialog content</div>

diff --git a/src/internal/primitives/Dialog.tsx b/src/internal/primitives/Dialog.tsx
@@ -11,9 +11,9 @@ type DialogProps = {
   isOpen?: boolean;
   onClose?: () => void;
   modal?: boolean;
-  ariaLabel?: string;
-  ariaLabelledby?: string;
-  ariaDescribedby?: string;
+  'aria-label'?: string;
+  'aria-labelledby'?: string;
+  'aria-describedby'?: string;
 };
 
 /**
@@ -28,9 +28,9 @@ export function Dialog({
   isOpen,
   modal = true,
   onClose,
-  ariaLabel,
-  ariaLabelledby,
-  ariaDescribedby,
+  'aria-label': ariaLabel,
+  'aria-labelledby': ariaLabelledby,
+  'aria-describedby': ariaDescribedby,
 }: DialogProps) {
   const componentTheme = useTheme();
   const dialogRef = useRef<HTMLDivElement>(null);

diff --git a/src/internal/primitives/FocusTrap.tsx b/src/internal/primitives/FocusTrap.tsx
@@ -2,7 +2,7 @@ import type React from 'react';
 import { useEffect, useRef } from 'react';
 
 const FOCUSABLE_ELEMENTS_SELECTOR =
-  'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])';
+  'button:not([disabled]), [href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])';
 
 interface FocusTrapProps {
   active?: boolean;

diff --git a/src/wallet/components/ConnectWallet.tsx b/src/wallet/components/ConnectWallet.tsx
@@ -109,9 +109,7 @@ export function ConnectWallet({
             }}
             text={text}
           />
-          {isModalOpen && (
-            <WalletModal isOpen={true} onClose={handleCloseConnectModal} />
-          )}
+          <WalletModal isOpen={isModalOpen} onClose={handleCloseConnectModal} />
         </div>
       );
     }

diff --git a/src/wallet/components/WalletModal.tsx b/src/wallet/components/WalletModal.tsx
@@ -120,6 +120,7 @@ export function WalletModal({
             border.default,
             'absolute top-4 right-4',
             'flex items-center justify-center p-1',
+            'bg-current',
             'transition-colors duration-200',
           )}
           aria-label="Close modal"