Skip to content

fix(tokens): review the generation of utility-classes #30498

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
merged 11 commits into from
Jun 24, 2025
Merged

fix(tokens): review the generation of utility-classes #30498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f6e1262
update classes generation
BenOsodrac Jun 18, 2025
2191f63
fix body background on ionic theme
BenOsodrac Jun 18, 2025
0674ea0
Merge branch 'next' into ROU-11897
BenOsodrac Jun 18, 2025
83ab16a
chore(): add updated snapshots
Ionitron Jun 18, 2025
a0d2bed
update tests background color
BenOsodrac Jun 20, 2025
58c859a
chore(): add updated snapshots
Ionitron Jun 20, 2025
992abbf
Merge branch 'next' into ROU-11897
BenOsodrac Jun 23, 2025
e98c9f3
fix accordion background shape test
BenOsodrac Jun 23, 2025
3e3bfb6
Revert "chore(): add updated snapshots"
BenOsodrac Jun 23, 2025
dba6b03
Revert "chore(): add updated snapshots"
BenOsodrac Jun 23, 2025
b587681
chore(): add updated snapshots
Ionitron Jun 23, 2025
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
23 changes: 18 additions & 5 deletions core/scripts/tokens/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,12 @@ function generateTypographyOutput(prop, propName, isVariable) {

// Generates a color based css utility-class from a color Design Token structure
function generateColorUtilityClasses(prop, className) {
return `.${variablesPrefix}-${className} {\n color: $${variablesPrefix}-${prop.name};\n}
.${variablesPrefix}-background-${className} {\n background-color: $${variablesPrefix}-${prop.name};\n}`;
const isBg = className.includes('bg');
const cssProp = isBg ? 'background-color' : 'color';
return `.${variablesPrefix}-${className} {
--${cssProp}: $${variablesPrefix}-${prop.name};
${cssProp}: $${variablesPrefix}-${prop.name};
}`;
}

// Generates margin and padding utility classes to match the token-agnostic
Expand Down Expand Up @@ -264,7 +268,10 @@ function generateSpaceUtilityClasses(prop, className) {

// Generates a valid box-shadow value from a shadow Design Token structure
function generateRadiusUtilityClasses(propName) {
return `.${variablesPrefix}-${propName} {\n border-radius: $${variablesPrefix}-${propName};\n}`;
return `.${variablesPrefix}-${propName} {
--border-radius: $${variablesPrefix}-${propName};
border-radius: $${variablesPrefix}-${propName};
}`;
}

// Generates a border based css utility-class from a font Design Token structure
Expand All @@ -282,7 +289,10 @@ function generateBorderUtilityClasses(prop, propName) {
default:
attribute = 'border-color';
}
return `.${variablesPrefix}-${propName} {\n ${attribute}: $${variablesPrefix}-${propName};\n}`;
return `.${variablesPrefix}-${propName} {
--${attribute}: $${variablesPrefix}-${propName};
${attribute}: $${variablesPrefix}-${propName};
}`;
}

// Generates a font based css utility-class from a font Design Token structure
Expand All @@ -292,7 +302,10 @@ function generateFontUtilityClasses(prop, propName) {

// Generates a valid box-shadow value from a shadow Design Token structure
function generateShadowUtilityClasses(propName) {
return `.${variablesPrefix}-${propName} {\n box-shadow: $${variablesPrefix}-${propName};\n}`;
return `.${variablesPrefix}-${propName} {
--box-shadow: $${variablesPrefix}-${propName};
box-shadow: $${variablesPrefix}-${propName};
}`;
}

// Generates a utility class for a given token category and name
Expand Down
8 changes: 4 additions & 4 deletions core/src/components/accordion-group/test/expand/accordion-group.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ config, screens
<style>
/* Background styles to show the border radius */
:root {
background: #ccc7c7;
--background: #ccc7c7;
}
</style>
<ion-accordion-group>
Expand Down Expand Up @@ -48,7 +48,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ config, screens
<style>
/* Background styles to show the border radius */
:root {
background: #ccc7c7;
--background: #ccc7c7;
}
</style>
<ion-accordion-group value="first">
Expand Down Expand Up @@ -88,7 +88,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ config, screens
<style>
/* Background styles to show the border radius */
:root {
background: #ccc7c7;
--background: #ccc7c7;
}
</style>
<ion-accordion-group expand="inset">
Expand Down Expand Up @@ -126,7 +126,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ config, screens
<style>
/* Background styles to show the border radius */
:root {
background: #ccc7c7;
--background: #ccc7c7;
}
</style>
<ion-accordion-group value="first" expand="inset">
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/accordion-group/test/shape/accordion-group.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ config, screens
<style>
/* Background styles to show the border radius */
:root {
background: #222;
--background: #222;
}
</style>

Expand Down
2 changes: 1 addition & 1 deletion core/src/components/accordion/test/shape/accordion.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ config, screens
<style>
/* Background styles to show the border radius */
:root {
background: #222;
--background: #222;
}
</style>

Expand Down
4 changes: 2 additions & 2 deletions core/src/components/progress-bar/test/shape/progress-bar.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ title, screensh
`
<style>
:root {
background: #ccc7c7;
--background: #ccc7c7;
}

.container {
Expand All @@ -33,7 +33,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ title, screensh
`
<style>
:root {
background: #ccc7c7;
--background: #ccc7c7;
}

.container {
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/searchbar/test/shape/searchbar.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ title, screensh
<style>
/* Background styles to show the border radius */
:root {
background: #000;
--background: #000;
}
</style>

Expand Down
2 changes: 1 addition & 1 deletion core/src/components/tab-bar/test/basic/tab-bar.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ configs({ modes: ['ionic-md', 'md', 'ios'] }).forEach(({ title, screenshot, conf
`
<style>
:root {
background: #ccc7c7;
--background: #ccc7c7;
}
</style>

Expand Down
Binary file modified ...ar.e2e.ts-snapshots/tab-bar-default-ionic-md-ltr-light-Mobile-Firefox-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ar.e2e.ts-snapshots/tab-bar-default-ionic-md-rtl-light-Mobile-Firefox-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../basic/tab-bar.e2e.ts-snapshots/tab-bar-default-ios-ltr-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../basic/tab-bar.e2e.ts-snapshots/tab-bar-default-ios-rtl-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions core/src/components/tab-bar/test/shape/tab-bar.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ title, screensh
`
<style>
:root {
background: #ccc7c7;
--background: #ccc7c7;
}
</style>

Expand Down Expand Up @@ -49,7 +49,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ title, screensh
`
<style>
:root {
background: #ccc7c7;
--background: #ccc7c7;
}
</style>

Expand Down Expand Up @@ -85,7 +85,7 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ title, screensh
`
<style>
:root {
background: #ccc7c7;
--background: #ccc7c7;
}
</style>

Expand Down
2 changes: 1 addition & 1 deletion core/src/css/ionic/core.ionic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ html {
}

body {
background: var(--ion-background-color);
background: var(--ion-background-color, #{globals.$ion-bg-body});
color: var(--ion-text-color);
}

Expand Down
Loading
Loading