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

Style engine: kebab case preset slugs in the editor #44406

Merged
merged 1 commit into from
Sep 23, 2022
Merged

Style engine: kebab case preset slugs in the editor #44406

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
10 changes: 5 additions & 5 deletions packages/style-engine/phpunit/style-engine-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,28 +363,28 @@ public function data_wp_style_engine_get_styles() {
'spacing' => array(
'margin' => array(
'left' => 'var:preset|spacing|10',
'right' => 'var:preset|spacing|20',
'right' => 'var:preset|spacing|3XL',
'top' => '1rem',
'bottom' => '1rem',
),
'padding' => array(
'left' => 'var:preset|spacing|30',
'right' => 'var:preset|spacing|40',
'right' => 'var:preset|spacing|3XL',
'top' => '14px',
'bottom' => '14px',
),
),
),
'options' => array(),
'expected_output' => array(
'css' => 'padding-left:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--40);padding-top:14px;padding-bottom:14px;margin-left:var(--wp--preset--spacing--10);margin-right:var(--wp--preset--spacing--20);margin-top:1rem;margin-bottom:1rem;',
'css' => 'padding-left:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--3-xl);padding-top:14px;padding-bottom:14px;margin-left:var(--wp--preset--spacing--10);margin-right:var(--wp--preset--spacing--3-xl);margin-top:1rem;margin-bottom:1rem;',
'declarations' => array(
'padding-left' => 'var(--wp--preset--spacing--30)',
'padding-right' => 'var(--wp--preset--spacing--40)',
'padding-right' => 'var(--wp--preset--spacing--3-xl)',
'padding-top' => '14px',
'padding-bottom' => '14px',
'margin-left' => 'var(--wp--preset--spacing--10)',
'margin-right' => 'var(--wp--preset--spacing--20)',
'margin-right' => 'var(--wp--preset--spacing--3-xl)',
'margin-top' => '1rem',
'margin-bottom' => '1rem',
),
Expand Down
3 changes: 2 additions & 1 deletion packages/style-engine/src/styles/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* External dependencies
*/
import { get } from 'lodash';
import { get, kebabCase } from 'lodash';

/**
* Internal dependencies
Expand Down Expand Up @@ -119,6 +119,7 @@ export function getCSSVarFromStyleValue( styleValue: string ): string {
const variable = styleValue
.slice( VARIABLE_REFERENCE_PREFIX.length )
.split( VARIABLE_PATH_SEPARATOR_TOKEN_ATTRIBUTE )
.map( ( presetVariable ) => kebabCase( presetVariable ) )
.join( VARIABLE_PATH_SEPARATOR_TOKEN_STYLE );
return `var(--wp--${ variable })`;
}
Expand Down
13 changes: 13 additions & 0 deletions packages/style-engine/src/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,19 @@ describe( 'generate', () => {
);
} );

it( 'should parse preset values and kebab-case the slug', () => {
expect(
compileCSS( {
color: {
text: 'var:preset|font-size|h1',
},
spacing: { margin: { top: 'var:preset|spacing|3XL' } },
} )
).toEqual(
'color: var(--wp--preset--font-size--h-1); margin-top: var(--wp--preset--spacing--3-xl);'
);
} );

it( 'should parse border rules', () => {
expect(
compileCSS( {
Expand Down
27 changes: 26 additions & 1 deletion packages/style-engine/src/test/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,42 @@
/**
* Internal dependencies
*/
import { camelCaseJoin, upperFirst } from '../styles/utils';
import {
camelCaseJoin,
getCSSVarFromStyleValue,
upperFirst,
} from '../styles/utils';

describe( 'utils', () => {
describe( 'upperFirst()', () => {
it( 'should return an string with a capitalized first letter', () => {
expect( upperFirst( 'toontown' ) ).toEqual( 'Toontown' );
} );
} );

describe( 'camelCaseJoin()', () => {
it( 'should return a camelCase string', () => {
expect( camelCaseJoin( [ 'toon', 'town' ] ) ).toEqual( 'toonTown' );
} );
} );

describe( 'getCSSVarFromStyleValue()', () => {
it( 'should return a compiled CSS var', () => {
expect(
getCSSVarFromStyleValue( 'var:preset|color|yellow-bun' )
).toEqual( 'var(--wp--preset--color--yellow-bun)' );
} );

it( 'should kebab case numbers', () => {
expect(
getCSSVarFromStyleValue( 'var:preset|font-size|h1' )
).toEqual( 'var(--wp--preset--font-size--h-1)' );
} );

it( 'should kebab case camel case', () => {
expect(
getCSSVarFromStyleValue( 'var:preset|color|heavenlyBlue' )
).toEqual( 'var(--wp--preset--color--heavenly-blue)' );
} );
} );
} );