Client: update getters in GS provider

WordPress · Apr 15, 2021 · ef78b66 · ef78b66
1 parent 4838111
commit ef78b66
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/packages/edit-site/src/components/editor/global-styles-provider.js b/packages/edit-site/src/components/editor/global-styles-provider.js
@@ -172,8 +172,13 @@ export default function GlobalStylesProvider( { children, baseStyles } ) {
 				name: ROOT_BLOCK_NAME,
 			},
 			contexts,
-			getSetting: ( context, path ) =>
-				get( userStyles?.settings?.[ context ], path ),
+			getSetting: ( context, path ) => {
+				const fullPath =
+					context === ROOT_BLOCK_NAME
+						? path
+						: `blocks.${ context }.${ path }`;
+				get( userStyles?.settings, fullPath );
+			},
 			setSetting: ( context, path, newValue ) => {
 				const newContent = { ...userStyles };
 				let contextSettings = newContent?.settings?.[ context ];
@@ -188,10 +193,13 @@ export default function GlobalStylesProvider( { children, baseStyles } ) {
 				const styleOrigin =
 					'user' === origin ? userStyles : mergedStyles;
 
-				const value = get(
-					styleOrigin?.styles?.[ context ],
-					STYLE_PROPERTY[ propertyName ].value
-				);
+				const path = STYLE_PROPERTY[ propertyName ].value;
+				const fullPath =
+					context === ROOT_BLOCK_NAME
+						? path
+						: `blocks.${ context }.${ path }`;
+
+				const value = get( styleOrigin?.styles, fullPath );
 				return getValueFromVariable( mergedStyles, context, value );
 			},
 			setStyle: ( context, propertyName, newValue ) => {