Skip to content

Filter CSS-wide font keywords #698

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

Merged
chubes4 merged 1 commit into from
Jul 26, 2026
Merged

Filter CSS-wide font keywords #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion php-transformer/src/StaticSite/FontMaterialization/FontMaterializationPlanBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
final class FontMaterializationPlanBuilder
{
public const SCHEMA = 'blocks-engine/php-transformer/font-materialization-plan/v1';
private const CSS_WIDE_KEYWORDS = array('inherit', 'initial', 'revert', 'revert-layer', 'unset');

/**
* @param array<int,array<string,mixed>> $fontUsage
Expand Down Expand Up @@ -365,7 +366,10 @@ private function cssCustomProperties(string $css): array
*/
private function isInvalidFontFamily(string $family): bool
{
return str_contains($family, '(') || str_contains($family, ')') || str_starts_with($family, '--');
return str_contains($family, '(')
|| str_contains($family, ')')
|| str_starts_with($family, '--')
|| in_array(strtolower($family), self::CSS_WIDE_KEYWORDS, true);
}

/**
Expand Down
6 changes: 6 additions & 0 deletions php-transformer/tests/contract/run.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2571,9 +2571,15 @@ public function match(DOMElement $element, PatternContext $context): ?array
array('family' => 'Open Sans', 'weights' => array(400, 700)),
array('family' => 'Poppins', 'weights' => array(500)),
array('family' => 'Arial', 'weights' => array(400)),
array('family' => 'inherit', 'weights' => array(400)),
array('family' => 'INITIAL', 'weights' => array(400)),
array('family' => 'unset', 'weights' => array(400)),
array('family' => 'revert', 'weights' => array(400)),
array('family' => 'revert-layer', 'weights' => array(400)),
));
$assert('blocks-engine/php-transformer/font-materialization-plan/v1' === ($fontMaterializationPlan['schema'] ?? null), 'font materialization exposes schema');
$assert('@import url("https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Poppins:wght@500&display=swap");' === ($fontMaterializationPlan['css'] ?? null), 'font materialization builds deterministic google fonts css');
$assert(array('Open Sans', 'Poppins') === array_column($fontMaterializationPlan['fonts'] ?? array(), 'family'), 'font materialization excludes web-safe and CSS-wide family keywords');
$assert('assets/css/fonts.css' === ($fontMaterializationPlan['stylesheets'][0]['path'] ?? null), 'font materialization emits stylesheet asset plan');

$fontAwarePlan = ( new MaterializationPlanBuilder() )->fromCompiledSite(array(
Expand Down
Loading