ensure button is also not enabled

johnstcn · johnstcn · commit a8ad515be27d · 2022-08-23T19:56:40.000Z
diff --git a/site/src/components/SettingsAccountForm/SettingsAccountForm.test.tsx b/site/src/components/SettingsAccountForm/SettingsAccountForm.test.tsx
@@ -30,6 +30,8 @@ describe("AccountForm", () => {
       // Then
       const el = await screen.findByLabelText("Username")
       expect(el).toBeEnabled()
+      const btn = await screen.findByRole("button")
+      expect(btn).toBeEnabled()
     })
   })
 
@@ -56,6 +58,8 @@ describe("AccountForm", () => {
       // Then
       const el = await screen.findByLabelText("Username")
       expect(el).toBeDisabled()
+      const btn = await screen.findByRole("button")
+      expect(btn).toBeDisabled()
     })
   })
 })
diff --git a/site/src/components/SettingsAccountForm/SettingsAccountForm.tsx b/site/src/components/SettingsAccountForm/SettingsAccountForm.tsx
@@ -64,6 +64,7 @@ export const AccountForm: FC<React.PropsWithChildren<AccountFormProps>> = ({
           <TextField
             {...getFieldHelpers("username")}
             onChange={onChangeTrimmed(form)}
+            aria-disabled={!editable}
             autoComplete="username"
             disabled={!editable}
             fullWidth
@@ -72,7 +73,13 @@ export const AccountForm: FC<React.PropsWithChildren<AccountFormProps>> = ({
           />
 
           <div>
-            <LoadingButton loading={isLoading} type="submit" variant="contained">
+            <LoadingButton
+              loading={isLoading}
+              aria-disabled={!editable}
+              disabled={!editable}
+              type="submit"
+              variant="contained"
+            >
               {isLoading ? "" : Language.updateSettings}
             </LoadingButton>
           </div>
