Skip to content
Merged
Changes from all commits
Commits
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
45 changes: 42 additions & 3 deletions packages/global-styles-ui/src/font-library/installed-fonts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
} from '@wordpress/components';
import { useEntityRecord, store as coreStore } from '@wordpress/core-data';
import { useSelect } from '@wordpress/data';
import { useContext, useEffect, useState } from '@wordpress/element';
import { useContext, useEffect, useMemo, useState } from '@wordpress/element';
import { __, _x, sprintf, isRTL } from '@wordpress/i18n';
import { chevronLeft, chevronRight } from '@wordpress/icons';
import type {
Expand All @@ -42,6 +42,34 @@ import {
} from './utils';
import { useSetting } from '../hooks';

/**
* Comparison key for font families. Sorts families by slug and faces
* by style+weight so order differences don't produce false positives.
*
* @param fontFamilies Font families record keyed by source (e.g. "theme", "custom").
*/
function getFontFamiliesKey(
fontFamilies: Record< string, FontFamilyPreset[] > | undefined
): string {
if ( ! fontFamilies ) {
return '';
}
const normalized: Record< string, unknown[] > = {};
for ( const source of Object.keys( fontFamilies ).sort() ) {
normalized[ source ] = ( fontFamilies[ source ] ?? [] )
.map( ( family ) => ( {
slug: family.slug,
fontFace: ( family.fontFace ?? [] )
.map(
( face ) => `${ face.fontStyle }-${ face.fontWeight }`
)
.sort(),
} ) )
.sort( ( a, b ) => a.slug.localeCompare( b.slug ) );
}
return JSON.stringify( normalized );
}

function InstalledFonts() {
const {
baseCustomFonts,
Expand Down Expand Up @@ -75,8 +103,19 @@ function InstalledFonts() {
'globalStyles',
globalStylesId
);
const fontFamiliesHasChanges =
!! globalStyles?.edits?.settings?.typography?.fontFamilies;
const editedFontFamilies =
globalStyles?.edits?.settings?.typography?.fontFamilies;
const savedFontFamilies =
globalStyles?.record?.settings?.typography?.fontFamilies;
const fontFamiliesHasChanges = useMemo( () => {
if ( editedFontFamilies === undefined ) {
return false;
}
return (
getFontFamiliesKey( editedFontFamilies ) !==
getFontFamiliesKey( savedFontFamilies )
);
}, [ editedFontFamilies, savedFontFamilies ] );

const themeFonts = fontFamilies?.theme
? fontFamilies.theme
Expand Down
Loading