Issue 59778/font family control error

[zeopix]

What?

Fixes error that breaks the block where the FontFamilyControl is used without fontFamilies specified. It now returns an array with custom and theme font families if present.

Why?

A Font Family selector without specifying fonts was a working feature and has been broken recently with the changes in the value of the fontFamily setting. - Issue 59778

How?

It just need an adjustment to merge custom fonts and theme fonts when selecting the setting.

Testing Instructions

1. Use a block that makes use of FontFamilyControl without specifying fontFamily, such as LanguageSwitcher from WPML, to take advantage of theme and custom fonts.
2. Add the block, click on "Font Family" control in the sidebar Block section.
3. Notice the block displays the current theme preconfigured fonts.
4. Add a custom font into the theme (Site Editor > Styles > Typography > Install Font).
5. Go to the block editor, check the new font is available.
6. Choose an old theme, like twenty-nineteen.
7. Go to block, notice the section is empty, but block is not broken as before.

Testing Instructions for Keyboard

-no ui changes-

[github-actions]

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

Unlinked Accounts

The following contributors have not linked their GitHub and WordPress.org accounts: @Molovicmilos, @gregWierzba.

Contributors, please read how to link your accounts to ensure your work is properly credited in WordPress releases.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Unlinked contributors: Molovicmilos, gregWierzba.

Co-authored-by: zeopix <[email protected]>
Co-authored-by: t-hamano <[email protected]>
Co-authored-by: Mamaduka <[email protected]>
Co-authored-by: annezazu <[email protected]>
Co-authored-by: matiasbenedetto <[email protected]>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

[github-actions]

👋 Thanks for your first Pull Request and for helping build the future of Gutenberg and WordPress, @zeopix! In case you missed it, we'd love to have you join us in our Slack community.

If you want to learn more about WordPress development in general, check out the Core Handbook full of helpful information.

[t-hamano]

Hi @zeopix,

Sorry for the late review.

The data obtained via useSettings may include three origins: default, theme, and custom. Therefore, we need to consider not only theme and custom, but also default.

I suggest reusing the logic of the mergeOrigins function and changing it as follows.

if ( ! fontFamilies ) {
	fontFamilies = [ 'default', 'theme', 'custom' ].flatMap(
		( key ) => blockLevelFontFamilies[ key ] ?? []
	);
}

Note: You may want to use the mergeOrigins() function itself, but that is not recommended. See the discussion starting with this comment for why.

Also, I would be happy if you could rebase this PR using the latest trunk.

[Mamaduka]

Hi, @zeopix

Do you have time to address the latest feedback?