Inlining locators

Dismissing Styles Welcome Guide :D
WordPress · Jun 17, 2022 · d151bd1 · d151bd1
1 parent ac04ff0
commit d151bd1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 75 deletions.
diff --git a/packages/style-engine/src/styles/elements/index.ts b/packages/style-engine/src/styles/elements/index.ts
diff --git a/packages/style-engine/src/styles/index.ts b/packages/style-engine/src/styles/index.ts
@@ -2,13 +2,7 @@
  * Internal dependencies
  */
 import color from './color';
-import elements from './elements';
 import spacing from './spacing';
 import typography from './typography';
 
-export const styleDefinitions = [
-	...color,
-	...elements,
-	...spacing,
-	...typography,
-];
+export const styleDefinitions = [ ...color, ...spacing, ...typography ];
diff --git a/packages/style-engine/src/test/index.js b/packages/style-engine/src/test/index.js
@@ -75,18 +75,29 @@ describe( 'generate', () => {
 	it( 'should parse preset values', () => {
 		expect(
 			generate( {
+				color: {
+					text: 'var:preset|color|ham-sandwich',
+				},
+				spacing: { margin: '3px' },
+			} )
+		).toEqual(
+			'color: var(--wp--preset--color--ham-sandwich); margin: 3px;'
+		);
+	} );
+
+	it( 'should use top-level styles and ignore elements object when specifying a selector', () => {
+		expect(
+			generate( {
+				spacing: { padding: '10px', margin: '12px' },
 				elements: {
 					link: {
 						color: {
-							text: 'var:preset|color|ham-sandwich',
+							text: 'peachpuff',
 						},
-						spacing: { margin: '3px' },
 					},
 				},
 			} )
-		).toEqual(
-			'color: var(--wp--preset--color--ham-sandwich); margin: 3px;'
-		);
+		).toEqual( 'margin: 12px; padding: 10px;' );
 	} );
 } );
 
@@ -235,21 +246,17 @@ describe( 'getCSSRules', () => {
 		] );
 	} );
 
-	it( 'should handle styles for elements with CSS vars', () => {
+	it( 'should handle styles with CSS vars', () => {
 		expect(
 			getCSSRules(
 				{
-					elements: {
-						link: {
-							color: {
-								text: 'var:preset|color|bomba-picante',
-							},
-							spacing: { padding: '11px' },
-						},
+					color: {
+						text: 'var:preset|color|bomba-picante',
 					},
+					spacing: { padding: '11px' },
 				},
 				{
-					selector: '.some-selector',
+					selector: '.some-selector a',
 				}
 			)
 		).toEqual( [