Skip to content
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

Jump to bottom

List all the font families and font sizes from all the theme.json origins in the font picker #51488

Merged
merged 5 commits into from
Jun 15, 2023
Merged

List all the font families and font sizes from all the theme.json origins in the font picker #51488

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c85db3
List all the font families from all the theme.json origins in the fon…
matiasbenedetto Jun 14, 2023
38bebab
Merge branch 'trunk' into fix/51487
matiasbenedetto Jun 14, 2023
545e8d4
Merge branch 'trunk' into fix/51487
matiasbenedetto Jun 15, 2023
60049f7
avoid excluding data from other theme.json origins for font families …
matiasbenedetto Jun 15, 2023
bac3d72
ordering font families by name or slug in the font families selector
matiasbenedetto Jun 15, 2023
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
35 changes: 19 additions & 16 deletions packages/block-editor/src/components/global-styles/typography-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,22 @@ export function useHasTypographyPanel( settings ) {
function useHasFontSizeControl( settings ) {
const disableCustomFontSizes = ! settings?.typography?.customFontSize;
const fontSizesPerOrigin = settings?.typography?.fontSizes ?? {};
const fontSizes =
fontSizesPerOrigin?.custom ??
fontSizesPerOrigin?.theme ??
fontSizesPerOrigin.default;
const fontSizes = []
.concat( fontSizesPerOrigin?.custom ?? [] )
.concat( fontSizesPerOrigin?.theme ?? [] )
.concat( fontSizesPerOrigin.default ?? [] );
return !! fontSizes?.length || ! disableCustomFontSizes;
}

function useHasFontFamilyControl( settings ) {
const fontFamiliesPerOrigin = settings?.typography?.fontFamilies;
const fontFamilies =
fontFamiliesPerOrigin?.custom ??
fontFamiliesPerOrigin?.theme ??
fontFamiliesPerOrigin?.default;
const fontFamilies = []
.concat( fontFamiliesPerOrigin?.custom ?? [] )
.concat( fontFamiliesPerOrigin?.theme ?? [] )
.concat( fontFamiliesPerOrigin?.default ?? [] )
.sort( ( a, b ) =>
( a?.name || a?.slug ).localeCompare( b?.name || a?.slug )
);
return !! fontFamilies?.length;
}

Expand Down Expand Up @@ -153,10 +156,10 @@ export default function TypographyPanel( {
// Font Family
const hasFontFamilyEnabled = useHasFontFamilyControl( settings );
const fontFamiliesPerOrigin = settings?.typography?.fontFamilies;
const fontFamilies =
fontFamiliesPerOrigin?.custom ??
fontFamiliesPerOrigin?.theme ??
fontFamiliesPerOrigin?.default;
const fontFamilies = []
.concat( fontFamiliesPerOrigin?.custom ?? [] )
.concat( fontFamiliesPerOrigin?.theme ?? [] )
.concat( fontFamiliesPerOrigin?.default ?? [] );
const fontFamily = decodeValue( inheritedValue?.typography?.fontFamily );
const setFontFamily = ( newValue ) => {
const slug = fontFamilies?.find(
Expand All @@ -179,10 +182,10 @@ export default function TypographyPanel( {
const hasFontSizeEnabled = useHasFontSizeControl( settings );
const disableCustomFontSizes = ! settings?.typography?.customFontSize;
const fontSizesPerOrigin = settings?.typography?.fontSizes ?? {};
const fontSizes =
fontSizesPerOrigin?.custom ??
fontSizesPerOrigin?.theme ??
fontSizesPerOrigin.default;
const fontSizes = []
.concat( fontSizesPerOrigin?.custom ?? [] )
.concat( fontSizesPerOrigin?.theme ?? [] )
.concat( fontSizesPerOrigin.default ?? [] );
const fontSize = decodeValue( inheritedValue?.typography?.fontSize );
const setFontSize = ( newValue, metadata ) => {
const actualValue = !! metadata?.slug
Expand Down