Global Styles: Rename settings & userSettings props to value & …

…`inheritedValue` respectively in ImageSettingsPanel (#54593) * Rename `settings` & `userSettings` props to `value` & `inheritedValue` respectively in ImageSettingsPanel * Rename parameters in useHasImageSettingsPanel hook --------- Co-authored-by: Ricardo Artemio Morales <[email protected]>
WordPress · Sep 19, 2023 · f3a6ff1 · f3a6ff1
1 parent c103a65
commit f3a6ff1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/packages/block-editor/src/components/global-styles/image-settings-panel.js b/packages/block-editor/src/components/global-styles/image-settings-panel.js
@@ -8,21 +8,21 @@ import {
 } from '@wordpress/components';
 import { __, _x } from '@wordpress/i18n';
 
-export function useHasImageSettingsPanel( name, settings, userSettings ) {
-	// Note: If lightbox userSettings exists, that means
-	// they were defined via the Global Styles UI and
-	// will NOT be a boolean value or contain the `allowEditing`
-	// property, so we should show the settings panel in those cases.
+export function useHasImageSettingsPanel( name, value, inheritedValue ) {
+	// Note: If lightbox `value` exists, that means it was
+	// defined via the the Global Styles UI and will NOT
+	// be a boolean value or contain the `allowEditing` property,
+	// so we should show the settings panel in those cases.
 	return (
-		( name === 'core/image' && settings?.lightbox?.allowEditing ) ||
-		!! userSettings?.lightbox
+		( name === 'core/image' && inheritedValue?.lightbox?.allowEditing ) ||
+		!! value?.lightbox
 	);
 }
 
 export default function ImageSettingsPanel( {
 	onChange,
-	userSettings,
-	settings,
+	value,
+	inheritedValue,
 	panelId,
 } ) {
 	const resetLightbox = () => {
@@ -37,8 +37,8 @@ export default function ImageSettingsPanel( {
 
 	let lightboxChecked = false;
 
-	if ( settings?.lightbox?.enabled ) {
-		lightboxChecked = settings.lightbox.enabled;
+	if ( inheritedValue?.lightbox?.enabled ) {
+		lightboxChecked = inheritedValue.lightbox.enabled;
 	}
 
 	return (
@@ -53,7 +53,7 @@ export default function ImageSettingsPanel( {
 					// contains the core/theme values for the lightbox and we want to show the
 					// "RESET" button ONLY when the user has explicitly set a value in the
 					// Global Styles.
-					hasValue={ () => !! userSettings?.lightbox }
+					hasValue={ () => !! value?.lightbox }
 					label={ __( 'Expand on Click' ) }
 					onDeselect={ resetLightbox }
 					isShownByDefault={ true }

diff --git a/packages/edit-site/src/components/global-styles/screen-block.js b/packages/edit-site/src/components/global-styles/screen-block.js
@@ -118,8 +118,8 @@ function ScreenBlock( { name, variation } ) {
 	const hasFiltersPanel = useHasFiltersPanel( settings );
 	const hasImageSettingsPanel = useHasImageSettingsPanel(
 		name,
-		settings,
-		userSettings
+		userSettings,
+		settings
 	);
 	const hasVariationsPanel = !! blockVariations?.length && ! variation;
 	const { canEditCSS } = useSelect( ( select ) => {
@@ -297,8 +297,8 @@ function ScreenBlock( { name, variation } ) {
 			{ hasImageSettingsPanel && (
 				<ImageSettingsPanel
 					onChange={ onChangeLightbox }
-					userSettings={ userSettings }
-					settings={ settings }
+					value={ userSettings }
+					inheritedValue={ settings }
 				/>
 			) }