← All changes | includes/controls/range.php +43 -69 2.11.1 → 2.14.0 View file →

		@@ -105,59 +105,24 @@
105	105	}
106	106	return $css;
107	107	}
108	108
109		- // ✅ Get values per device
110		- $desktop_key = $args['attributeObjectKey'];
111		- $tablet_key = $args['attributeObjectKey'] . 'Tablet';
112		- $mobile_key = $args['attributeObjectKey'] . 'Mobile';
	109	+ // ✅ Resolve value by device and inheritance: the device's own value, then
	110	+ // its declared default (defaultValue / defaultValueTablet / …Mobile), then
	111	+ // the same for each containing wider device — custom breakpoints included.
	112	+ // Mirrors getCSS() in src/controls/range/helper.js.
	113	+ $device_defaults = [
	114	+ '' => $args['defaultValue'],
	115	+ 'Tablet' => $args['defaultValueTablet'],
	116	+ 'Mobile' => $args['defaultValueMobile'],
	117	+ ];
	118	+ $device_value = self::resolve( $args['device'], function ( $suffix ) use ( $value, $args, $device_defaults ) {
	119	+ $stored = self::get_filled_value( $value, $args['attributeObjectKey'] . $suffix );
	120	+ return Helper::has_responsive_value( $stored ) ? $stored : ( $device_defaults[ $suffix ] ?? '' );
	121	+ } );
113	122
114		- $desktop_val = ! empty( $value[ $desktop_key ] ) ? $value[ $desktop_key ] : '';
115		- $tablet_val = ! empty( $value[ $tablet_key ] ) ? $value[ $tablet_key ] : '';
116		- $mobile_val = ! empty( $value[ $mobile_key ] ) ? $value[ $mobile_key ] : '';
117		-
118		- $device_value = '';
119		-
120		- switch ( $args['device'] ) {
121		- case 'Mobile':
122		- if ( $mobile_val !== '' ) {
123		- $device_value = $mobile_val;
124		- } elseif ( $args['defaultValueMobile'] !== '' ) {
125		- $device_value = $args['defaultValueMobile'];
126		- } elseif ( $tablet_val !== '' ) {
127		- $device_value = $tablet_val;
128		- } elseif ( $args['defaultValueTablet'] !== '' ) {
129		- $device_value = $args['defaultValueTablet'];
130		- } elseif ( $desktop_val !== '' ) {
131		- $device_value = $desktop_val;
132		- } else {
133		- $device_value = $args['defaultValue'];
134		- }
135		- break;
136		-
137		- case 'Tablet':
138		- if ( $tablet_val !== '' ) {
139		- $device_value = $tablet_val;
140		- } elseif ( $args['defaultValueTablet'] !== '' ) {
141		- $device_value = $args['defaultValueTablet'];
142		- } elseif ( $desktop_val !== '' ) {
143		- $device_value = $desktop_val;
144		- } else {
145		- $device_value = $args['defaultValue'];
146		- }
147		- break;
148		-
149		- default: // Desktop
150		- if ( $desktop_val !== '' ) {
151		- $device_value = $desktop_val;
152		- } else {
153		- $device_value = $args['defaultValue'];
154		- }
155		- break;
156		- }//end switch
157		-
158	123	// ✅ If value exists, apply unit and return
159		- if ( $device_value !== '' ) {
	124	+ if ( Helper::has_responsive_value( $device_value ) ) {
160	125	$unit = self::get_unit( [
161	126	'attributeValue' => $value,
162	127	'attributeObjectKey' => $args['attributeObjectKey'],
163	128	'unitDefaultValue' => $args['unitDefaultValue'],
		@@ -176,30 +141,39 @@
176	141	}
177	142
178	143
179	144	public static function get_unit( $args ) {
180		- $defaultUnit = $args['unitDefaultValue'];
181		- $value = $args['attributeValue'];
182		- $device = $args['device'];
183		- $keyPrefix = $args['attributeObjectKey'] . 'Unit';
	145	+ $key_prefix = $args['attributeObjectKey'] . 'Unit';
	146	+ $value = $args['attributeValue'];
	147	+ $unit = self::resolve( $args['device'], function ( $suffix ) use ( $value, $key_prefix ) {
	148	+ return self::get_filled_value( $value, $key_prefix . $suffix );
	149	+ } );
	150	+ return Helper::has_responsive_value( $unit ) ? $unit : $args['unitDefaultValue'];
	151	+ }
184	152
185		- // Retrieve units with fallback to default
186		- $unitDesktop = Helper::get_array_value( $value, $keyPrefix, $defaultUnit ); // Desktop
187		- $unitTablet = Helper::get_array_value( $value, $keyPrefix . 'Tablet', $unitDesktop ); // Tablet inherits from Desktop
188		- $unitMobile = Helper::get_array_value( $value, $keyPrefix . 'Mobile', $unitTablet ); // Mobile inherits from Tablet
189		-
190		- // Return the appropriate unit based on the device
191		- if ( '' === $device ) {
192		- return $unitDesktop; // Desktop
	153	+ /**
	154	+ * The device's own value, else the nearest containing wider device's (see
	155	+ * Helper::get_responsive_ancestors()), as read by $read_at( $suffix ).
	156	+ * Returns null when nothing is set.
	157	+ */
	158	+ private static function resolve( $device, $read_at ) {
	159	+ $target = 'Desktop' === $device ? '' : (string) $device;
	160	+ foreach ( array_merge( [ $target ], Helper::get_responsive_ancestors( $target ) ) as $suffix ) {
	161	+ $v = $read_at( $suffix );
	162	+ if ( Helper::has_responsive_value( $v ) ) {
	163	+ return $v;
	164	+ }
193	165	}
	166	+ return null;
	167	+ }
194	168
195		- if ( 'Tablet' === $device ) {
196		- return $unitTablet; // Tablet
	169	+ /**
	170	+ * A stored responsive member, or '' when it is missing, null or an empty
	171	+ * string. Unlike empty(), a 0 value is kept.
	172	+ */
	173	+ private static function get_filled_value( $value, $key ) {
	174	+ if ( ! is_array( $value ) || ! isset( $value[ $key ] ) || is_array( $value[ $key ] ) || '' === (string) $value[ $key ] ) {
	175	+ return '';
197	176	}
198		-
199		- if ( 'Mobile' === $device ) {
200		- return $unitMobile; // Mobile
201		- }
202		-
203		- return $defaultUnit; // Default fallback
	177	+ return $value[ $key ];
204	178	}
205	179	}