Skip to content

Commit a5e6f19

Browse files
committed
fix: style of button should use getFontFamily util
1 parent 124b9d3 commit a5e6f19

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/components/font-pair-picker/index.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import { BaseControl, Button } from '~stackable/components'
88
*/
99
import { i18n } from 'stackable'
1010
import classNames from 'classnames'
11-
import { loadGoogleFont } from '~stackable/util'
11+
import {
12+
loadGoogleFont, getFontFamilyLabel, getFontFamily,
13+
} from '~stackable/util'
1214
import { omit } from 'lodash'
1315

1416
/**
@@ -26,19 +28,23 @@ const FontPairPicker = props => {
2628
loadGoogleFont( paragraphStyles.fontFamily )
2729
}
2830

31+
// Use the font family value for styling the buttons
32+
const headingFontFamilyValue = getFontFamily( headingStyles.fontFamily ).replace( /"/g, '' ) || ''
33+
const paragraphFontFamilyValue = getFontFamily( paragraphStyles.fontFamily ).replace( /"/g, '' ) || ''
34+
2935
const label = (
3036
<div>
3137
<span
32-
style={ omit( { ...headingStyles }, [ 'fontSize', 'lineHeight' ] ) }
38+
style={ omit( { ...headingStyles, fontFamily: headingFontFamilyValue }, [ 'fontSize', 'lineHeight' ] ) }
3339
className="ugb-global-settings-font-pair__label"
3440
>
35-
{ headingStyles?.fontFamily ? headingStyles.fontFamily : __( 'Default Heading', i18n ) }
41+
{ headingStyles?.fontFamily ? getFontFamilyLabel( headingStyles.fontFamily ) : __( 'Default Heading', i18n ) }
3642
</span>
3743
<span
38-
style={ omit( { ...paragraphStyles }, [ 'fontSize', 'lineHeight' ] ) }
44+
style={ omit( { ...paragraphStyles, fontFamily: paragraphFontFamilyValue }, [ 'fontSize', 'lineHeight' ] ) }
3945
className="ugb-global-settings-font-pair__sub-label"
4046
>
41-
{ paragraphStyles?.fontFamily ? paragraphStyles?.fontFamily : __( 'Default Body', i18n ) }
47+
{ paragraphStyles?.fontFamily ? getFontFamilyLabel( paragraphStyles?.fontFamily ) : __( 'Default Body', i18n ) }
4248
</span>
4349
</div>
4450
)

0 commit comments

Comments
 (0)