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.

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 error installing system fonts #54713

Merged
merged 1 commit into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function CollectionFontDetails( {
handleToggleVariant={ handleToggleVariant }
selected={ isFontFontFaceInOutline(
font.slug,
face,
font.fontFace ? face : null, // If the font has no fontFace, we want to check if the font is in the outline
fontToInstallOutline
) }
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,14 +281,16 @@ function FontLibraryProvider( { children } ) {
} );
// Add custom fonts to the browser.
fontsToAdd.forEach( ( font ) => {
font.fontFace.forEach( ( face ) => {
// Load font faces just in the iframe because they already are in the document.
loadFontFaceInBrowser(
face,
getDisplaySrcFromFontFace( face.src ),
'iframe'
);
} );
if ( font.fontFace ) {
font.fontFace.forEach( ( face ) => {
// Load font faces just in the iframe because they already are in the document.
loadFontFaceInBrowser(
face,
getDisplaySrcFromFontFace( face.src ),
'iframe'
);
} );
}
} );
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export function getFontsOutline( fonts ) {
}

export function isFontFontFaceInOutline( slug, face, outline ) {
return (
outline[ slug ]?.[ `${ face.fontStyle }-${ face.fontWeight }` ] || false
);
if ( ! face ) {
return !! outline[ slug ];
}
return !! outline[ slug ]?.[ `${ face.fontStyle }-${ face.fontWeight }` ];
}
Loading