Make selector for theme spacing values more generic

WordPress · Apr 9, 2021 · f6668f7 · f6668f7
1 parent 24ffb30
commit f6668f7
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/packages/edit-site/src/components/sidebar/spacing-panel.js b/packages/edit-site/src/components/sidebar/spacing-panel.js
@@ -68,21 +68,24 @@ function filterValuesBySides( values, sides ) {
 	return filteredValues;
 }
 
-export default function SpacingPanel( { context, getStyle, setStyle } ) {
-	const { name } = context;
-	const showPaddingControl = useHasPadding( context );
-	const units = useCustomUnits( { contextName: name } );
-
-	const paddingValues = getStyle( name, 'padding' );
-	const themePaddingValues = useSelect(
+function useThemeValues( name, feature ) {
+	return useSelect(
 		( select ) => {
 			const baseStyles = select( editSiteStore ).getSettings()
 				.__experimentalGlobalStylesBaseStyles;
-			return baseStyles?.styles?.[ name ]?.spacing?.padding;
+			return baseStyles?.styles?.[ name ]?.spacing?.[ feature ];
 		},
-		[ name ]
+		[ name, feature ]
 	);
+}
 
+export default function SpacingPanel( { context, getStyle, setStyle } ) {
+	const { name } = context;
+	const showPaddingControl = useHasPadding( context );
+	const units = useCustomUnits( { contextName: name } );
+
+	const paddingValues = getStyle( name, 'padding' );
+	const themePaddingValues = useThemeValues( name, 'padding' );
 	const paddingSides = useCustomSides( name, 'padding' );
 
 	const setPaddingValues = ( newPaddingValues ) => {