Skip to content

Issue 59778/font family control error #59846

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

Open
zeopix wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

Issue 59778/font family control error #59846

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ac28cf
[issue-59778] Font family control error when no fontFamilies are spec…
zeopix Mar 13, 2024
7038c76
[issue-59778] Fix Font Family control error when theme does not suppo…
zeopix Mar 13, 2024
81a433c
JS Code standard.
zeopix Mar 13, 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
Next Next commit
[issue-59778] Font family control error when no fontFamilies are spec… 
…ified.
  • Loading branch information
@zeopix
zeopix authored Mar 13, 2024
commit 4ac28cfda8b68a7d8ff4fe1129d1592e16ae068a
7 changes: 6 additions & 1 deletion packages/block-editor/src/components/font-family/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ export default function FontFamilyControl( {
} ) {
const [ blockLevelFontFamilies ] = useSettings( 'typography.fontFamilies' );
if ( ! fontFamilies ) {
fontFamilies = blockLevelFontFamilies;
const { theme, custom } = blockLevelFontFamilies;
fontFamilies = theme !== undefined ? theme : [];
if ( custom !== undefined ) {
fontFamilies = [ ...fontFamilies, ...custom ];
}

}

if ( ! fontFamilies || fontFamilies.length === 0 ) {
Expand Down