@wordpress/theme 0.2.1-next.dc3f6d3c1.0 → 0.3.1-next.8b30e05b0.0

package/src/stories/index.story.tsx

@@ -18,6 +18,7 @@ import {
  * Internal dependencies
  */
 import { ThemeProvider } from '../theme-provider';
+import '../prebuilt/css/design-tokens.css';
 
 const meta: Meta< typeof ThemeProvider > = {
 	title: 'Design System/Theme Provider',
@@ -198,10 +199,10 @@ export const WithPicker: StoryObj< typeof ThemeProvider > = {
 	},
 };
 
-const NestingDebug = ( { bg = '', primary = '' } ) => (
+const NestingDebug = ( { bg = '', primary = '', density = '' } ) => (
 	<div
 		style={ {
-			padding: '0.25rem',
+			padding: 'var(--wpds-dimension-padding-surface-sm)',
 			color: 'var(--wpds-color-fg-content-neutral)',
 			backgroundColor: 'var(--wpds-color-bg-surface-neutral)',
 			display: 'flex',
@@ -210,13 +211,13 @@ const NestingDebug = ( { bg = '', primary = '' } ) => (
 			gap: '1rem',
 		} }
 	>
-		<pre>
-			bg: { bg } | primary: { primary }
+		<pre style={ { margin: 0 } }>
+			bg: { bg } | primary: { primary } | density: { density }
 		</pre>
 		<span
 			style={ {
 				display: 'inline-block',
-				padding: '0.25rem',
+				padding: 'var(--wpds-dimension-padding-surface-xs)',
 				borderRadius: '0.25rem',
 				backgroundColor:
 					'var(--wpds-color-bg-interactive-brand-strong)',
@@ -229,7 +230,7 @@ const NestingDebug = ( { bg = '', primary = '' } ) => (
 			style={ {
 				display: 'inline-block',
 				marginInlineStart: '0.25rem',
-				padding: '0.25rem',
+				padding: 'var(--wpds-dimension-padding-surface-xs)',
 				borderRadius: '0.25rem',
 				backgroundColor:
 					'var(--wpds-color-bg-interactive-brand-weak-disabled)',
@@ -245,27 +246,39 @@ export const NestingAndInheriting: StoryObj< typeof ThemeProvider > = {
 	render: () => {
 		return (
 			<ThemeProvider>
-				<NestingDebug bg="inherit (root)" primary="inherit (root)" />
+				<NestingDebug
+					bg="inherit (root)"
+					primary="inherit (root)"
+					density="inherit (root)"
+				/>
 				<div style={ { paddingInlineStart: '1rem' } }>
 					<ThemeProvider
 						color={ {
 							bg: '#1e1e1e',
 						} }
+						density="compact"
 					>
-						<NestingDebug bg="#1e1e1e" primary="inherit (root)" />
+						<NestingDebug
+							bg="#1e1e1e"
+							primary="inherit (root)"
+							density="compact"
+						/>
 						<div style={ { paddingInlineStart: '1rem' } }>
 							<ThemeProvider>
 								<NestingDebug
 									bg="inherit (#1e1e1e)"
 									primary="inherit (root)"
+									density="inherit (compact)"
 								/>
 								<div style={ { paddingInlineStart: '1rem' } }>
 									<ThemeProvider
 										color={ { primary: 'hotpink' } }
+										density="default"
 									>
 										<NestingDebug
 											bg="inherit (#1e1e1e)"
 											primary="hotpink"
+											density="default"
 										/>
 										<div
 											style={ {
@@ -278,6 +291,7 @@ export const NestingAndInheriting: StoryObj< typeof ThemeProvider > = {
 												<NestingDebug
 													bg="#f8f8f8"
 													primary="inherit (hotpink)"
+													density="inherit (default)"
 												/>
 											</ThemeProvider>
 										</div>
@@ -397,7 +411,7 @@ export const AcrossIframes: StoryObj< typeof ThemeProvider > = {
 				<span
 					style={ {
 						display: 'inline-block',
-						padding: '0.25rem',
+						padding: 'var(--wpds-dimension-padding-surface-xs)',
 						borderRadius: '0.25rem',
 						backgroundColor:
 							'var(--wpds-color-bg-interactive-brand-strong)',

package/src/theme-provider.tsx

@@ -49,6 +49,7 @@ export const ThemeProvider = ( {
 	children,
 	color = {},
 	isRoot = false,
+	density,
 }: ThemeProviderProps ) => {
 	const instanceId = useId();
 
@@ -76,6 +77,7 @@ export const ThemeProvider = ( {
 			<div
 				data-wpds-theme-provider-id={ instanceId }
 				data-wpds-root-provider={ isRoot }
+				data-wpds-density={ density }
 				className={ styles.root }
 			>
 				<ThemeContext.Provider value={ contextValue }>

package/src/types.ts

@@ -23,6 +23,15 @@ export interface ThemeProviderSettings {
 		 */
 		bg?: string;
 	};
+
+	/**
+	 * The density of the theme. If left unspecified, the theme inherits from
+	 * the density of the closest `ThemeProvider`, or uses the default density
+	 * if there is no inherited density.
+	 *
+	 * @default undefined
+	 */
+	density?: undefined | 'default' | 'compact' | 'comfortable';
 }
 
 export interface ThemeProviderProps extends ThemeProviderSettings {

package/terrazzo.config.ts

@@ -40,6 +40,27 @@ export default defineConfig( {
 				makeCSSVar( `wpds.${ publicTokenId( token.id ) }` ),
 			baseSelector: ':root',
 			modeSelectors: [
+				{
+					tokens: [ 'dimension.*' ],
+					mode: '.',
+					selectors: [
+						"[data-wpds-theme-provider-id][data-wpds-density='default']",
+					],
+				},
+				{
+					tokens: [ 'dimension.*' ],
+					mode: 'compact',
+					selectors: [
+						"[data-wpds-theme-provider-id][data-wpds-density='compact']",
+					],
+				},
+				{
+					tokens: [ 'dimension.*' ],
+					mode: 'comfortable',
+					selectors: [
+						"[data-wpds-theme-provider-id][data-wpds-density='comfortable']",
+					],
+				},
 				{
 					mode: 'high-dpi',
 					selectors: [

package/tokens/dimension.json

@@ -52,21 +52,55 @@
 			},
 			"padding": {
 				"surface": {
-					"x-small": {
-						"$value": "{dimension.primitive.space.20}",
-						"$description": "Extra small spacing for surfaces"
+					"2xs": {
+						"$value": "{dimension.primitive.space.10}",
+						"$description": "2x extra small spacing for surfaces",
+						"$extensions": {
+							"mode": {
+								"compact": "{dimension.primitive.space.10}",
+								"comfortable": "{dimension.primitive.space.20}"
+							}
+						}
 					},
-					"small": {
-						"$value": "{dimension.primitive.space.30}",
-						"$description": "Small spacing for surfaces"
+					"xs": {
+						"$value": "{dimension.primitive.space.20}",
+						"$description": "Extra small spacing for surfaces",
+						"$extensions": {
+							"mode": {
+								"compact": "{dimension.primitive.space.10}",
+								"comfortable": "{dimension.primitive.space.30}"
+							}
+						}
 					},
-					"medium": {
+					"sm": {
 						"$value": "{dimension.primitive.space.40}",
-						"$description": "Medium spacing for surfaces"
+						"$description": "Small spacing for surfaces",
+						"$extensions": {
+							"mode": {
+								"compact": "{dimension.primitive.space.30}",
+								"comfortable": "{dimension.primitive.space.50}"
+							}
+						}
 					},
-					"large": {
+					"md": {
 						"$value": "{dimension.primitive.space.60}",
-						"$description": "Large spacing for surfaces"
+						"$description": "Medium spacing for surfaces",
+						"$extensions": {
+							"mode": {
+								"compact": "{dimension.primitive.space.50}",
+								"comfortable": "{dimension.primitive.space.70}"
+							}
+						}
+					},
+					"lg": {
+						"$value": "{dimension.primitive.space.70}",
+						"$description": "Large spacing for surfaces",
+						"$extensions": {
+							"mode": {
+								"compact": "{dimension.primitive.space.60}",
+								"comfortable": "{dimension.primitive.space.80}"
+							}
+						}
 					}
 				}
 			}