Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Font Library: Fix focus loss when update/install button is pressed #58364

Merged
merged 3 commits into from
Jan 30, 2024
Merged

Font Library: Fix focus loss when update/install button is pressed #58364

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f2fdd7
Font Library: Fix focus loss when update/install button is pressed
t-hamano Jan 28, 2024
2ca8232
Add undefined
t-hamano Jan 29, 2024
ff0c270
Merge branch 'trunk' into font-library/fix-focus-loss
t-hamano Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,10 @@ function FontCollection( { slug } ) {
notice={ notice }
handleBack={ !! selectedFont && handleUnselectFont }
footer={
fontsToInstall.length > 0 && (
<Footer handleInstall={ handleInstall } />
)
<Footer
handleInstall={ handleInstall }
isDisabled={ fontsToInstall.length === 0 }
/>
}
>
{ renderConfirmDialog && (
Expand Down Expand Up @@ -290,7 +291,7 @@ function FontCollection( { slug } ) {
);
}

function Footer( { handleInstall } ) {
function Footer( { handleInstall, isDisabled } ) {
const { isInstalling } = useContext( FontLibraryContext );

return (
Expand All @@ -299,7 +300,7 @@ function Footer( { handleInstall } ) {
variant="primary"
onClick={ handleInstall }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The button should be noop'ed when isDisabled || isInstalling

isBusy={ isInstalling }
disabled={ isInstalling }
aria-disabled={ isDisabled || isInstalling }
>
{ __( 'Install' ) }
</Button>
Expand Down
2 changes: 1 addition & 1 deletion packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ function Footer( { shouldDisplayDeleteButton, handleUninstallClick } ) {
) }
</div>
<Button
disabled={ ! fontFamiliesHasChanges }
aria-disabled={ ! fontFamiliesHasChanges }
variant="primary"
onClick={ saveFontFamilies }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The button should be noop'ed when ! fontFamiliesHasChanges

>
Expand Down
Loading