Font Library: Use Button's API to disable footer buttons (#58529)

WordPress · Feb 1, 2024 · afa8b5c · afa8b5c
1 parent ece4d7d
commit afa8b5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
@@ -298,11 +298,10 @@ function Footer( { handleInstall, isDisabled } ) {
 		<Flex justify="flex-end">
 			<Button
 				variant="primary"
-				onClick={
-					isDisabled || isInstalling ? undefined : handleInstall
-				}
+				onClick={ handleInstall }
 				isBusy={ isInstalling }
-				aria-disabled={ isDisabled || isInstalling }
+				disabled={ isDisabled || isInstalling }
+				__experimentalIsFocusable
 			>
 				{ __( 'Install' ) }
 			</Button>

diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js b/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
@@ -186,11 +186,10 @@ function Footer( { shouldDisplayDeleteButton, handleUninstallClick } ) {
 				) }
 			</div>
 			<Button
-				aria-disabled={ ! fontFamiliesHasChanges }
 				variant="primary"
-				onClick={
-					fontFamiliesHasChanges ? saveFontFamilies : undefined
-				}
+				onClick={ saveFontFamilies }
+				disabled={ ! fontFamiliesHasChanges }
+				__experimentalIsFocusable
 			>
 				{ __( 'Update' ) }
 			</Button>