From 2b07feb31630402a28ddf9ad76a9ec2769456e1a Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Thu, 1 Feb 2024 11:44:23 +0900
Subject: [PATCH] Font Library: Use Button's API to disable footer buttons

---
 .../global-styles/font-library-modal/font-collection.js    | 7 +++----
 .../global-styles/font-library-modal/installed-fonts.js    | 7 +++----
 2 files changed, 6 insertions(+), 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
index 9735ce1c35a4d..4a14ee245694b 100644
--- 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
index cbe9927187e82..73ff17f25b9a6 100644
--- 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>