feat/3448 global font pairs #3449
Open
+2,124
−36
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🤖 Pull request artifacts
|
bfintal
requested changes
Feb 27, 2025
| @@ -282,6 +282,53 @@ public function register_global_settings() { | |||
| ) | |||
| ); | |||
|
|
|||
| register_setting( | |||
| 'stackable_global_settings', | |||
| 'stackable_font_pair_name', | |||
There was a problem hiding this comment.
I suggest we change this name to something more descriptive to what it is for:
Suggested change
| 'stackable_font_pair_name', | |
| 'stackable_selected_font_pair', |
|
|
||
| useEffect( () => { | ||
| fetchSettings().then( response => { | ||
| // Get settings. | ||
| setTypographySettings( ( head( response.stackable_global_typography ) ) || {} ) | ||
| setApplySettingsTo( response.stackable_global_typography_apply_to || 'blocks-stackable-native' ) | ||
| setCustomFontPairs( response.stackable_custom_font_pairs || [] ) |
There was a problem hiding this comment.
We'll need to move this out of free
Comment on lines
+275
to
+300
| const headingStyles = fontPair.value?.find( val => val.selector === 'h1' )?.styles | ||
| const paragraphStyles = fontPair.value?.find( val => val.selector === 'p' )?.styles | ||
| if ( headingStyles?.fontFamily ) { | ||
| loadGoogleFont( headingStyles.fontFamily ) | ||
| } | ||
| if ( paragraphStyles?.fontFamily ) { | ||
| loadGoogleFont( paragraphStyles.fontFamily ) | ||
| } | ||
| const label = ( | ||
| <div> | ||
| <span | ||
| style={ omit( { ...headingStyles }, [ 'fontSize', 'lineHeight' ] ) } | ||
| className="ugb-global-settings-font-pair__label" | ||
| > | ||
| { headingStyles?.fontFamily ?? 'Theme Heading Default' } | ||
| </span> | ||
| <span | ||
| style={ omit( { ...paragraphStyles }, [ 'fontSize', 'lineHeight' ] ) } | ||
| className="ugb-global-settings-font-pair__sub-label" | ||
| > | ||
| { paragraphStyles?.fontFamily ?? 'Theme Body Default' } | ||
| </span> | ||
| </div> | ||
| ) | ||
|
|
||
| const className = classNames( { 'ugb-global-settings-font-pair__selected': selectedFontPairName === fontPair.name } ) |
There was a problem hiding this comment.
I recommend moving this all inside the FontPairPicker component, then adding the necessary props to it:
<FontPairPicker
// ...
isSelected={ selectedFontPairName === fontPair.name }
headingFontFamily={ headingStyles?.fontFamily }
bodyFontFamily={ paragraphStyles?.fontFamily }
/>| </div> | ||
|
|
||
| <div className="ugb-global-settings-font-pair__container" ref={ fontPairContainerRef }> | ||
| { allFontPairs.map( fontPair => { |
There was a problem hiding this comment.
Instead of mapping through allFontPairs and updating the list, you can just output 3 times:
- For the default font pair
Custom font pairs - this can be anuse alternative method belowapplyFilters( 'stackable.global-settings.typography.font-pairs.custom', null, selectedFontPairName )- All other preset font pairs
There was a problem hiding this comment.
Alternative
// Near the top
const CustomPicker = applyFilters( 'stackable.global-settings.typography.font-pairs.customPicker', Fragment )
// Render the custom font pair pickers
<CustomPicker
isSelected={ selectedFontPairName === fontPair.name }
headingFontFamily={ headingStyles?.fontFamily }
bodyFontFamily={ paragraphStyles?.fontFamily }
/>In premium:
const CustomFontPairsPicker = props => {
const [ customFontPairs, setCustomFontPairs ] = setState( [] )
useEffect( () => {
// Load all custom font pairs
const customFontPairs = []
}, [] )
return customFontPairs.map( fontPair => {
return <FontPairPicker
// ...pass stuff
/>
}
}
addFilter( 'stackable.global-settings.typography.font-pairs.customPicker', 'stackable/global-settings/font-pairs', CustomFontPairsPicker )
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #3448