diff --git a/packages/edit-site/src/components/global-styles/screen-typography.js b/packages/edit-site/src/components/global-styles/screen-typography.js index 2a895b68fa717f..f76dc6fb381004 100644 --- a/packages/edit-site/src/components/global-styles/screen-typography.js +++ b/packages/edit-site/src/components/global-styles/screen-typography.js @@ -3,6 +3,8 @@ */ import { __ } from '@wordpress/i18n'; import { __experimentalVStack as VStack } from '@wordpress/components'; +import { store as editorStore } from '@wordpress/editor'; +import { useSelect } from '@wordpress/data'; /** * Internal dependencies @@ -12,6 +14,12 @@ import FontFamilies from './font-families'; import ScreenHeader from './header'; function ScreenTypography() { + const fontLibraryEnabled = useSelect( + ( select ) => + select( editorStore ).getEditorSettings().fontLibraryEnabled, + [] + ); + return ( <>
- { ! window.__experimentalDisableFontLibrary && ( - - ) } + { fontLibraryEnabled && }
diff --git a/packages/editor/src/store/defaults.js b/packages/editor/src/store/defaults.js index 686888f91de3d5..485b65d24d3ad3 100644 --- a/packages/editor/src/store/defaults.js +++ b/packages/editor/src/store/defaults.js @@ -10,6 +10,7 @@ import { SETTINGS_DEFAULTS } from '@wordpress/block-editor'; * @property {boolean} richEditingEnabled Whether rich editing is enabled or not * @property {boolean} codeEditingEnabled Whether code editing is enabled or not * @property {boolean} enableCustomFields Whether the WordPress custom fields are enabled or not. + * @property {boolean} fontLibraryEnabled Whether the font library is enabled or not. * true = the user has opted to show the Custom Fields panel at the bottom of the editor. * false = the user has opted to hide the Custom Fields panel at the bottom of the editor. * undefined = the current environment does not support Custom Fields, so the option toggle in Preferences -> Panels to enable the Custom Fields panel is not displayed. @@ -27,5 +28,6 @@ export const EDITOR_SETTINGS_DEFAULTS = { richEditingEnabled: true, codeEditingEnabled: true, enableCustomFields: undefined, + fontLibraryEnabled: true, defaultRenderingMode: 'post-only', };