← All changes | includes/controls/range.php +47 -70 2.8.0 → 2.14.0 View file →

		@@ -96,65 +96,33 @@
96	96	if ( ! $args['isResponsive'] && ! $args['hasUnit'] ) {
97	97	if ( $args['property'] === 'value' ) {
98	98	$css['value'] = $value;
99	99	$css['valueUnit'] = $args['unitDefaultValue'];
100		- } else {
	100	+ } elseif ( '' !== (string) $value ) {
	101	+ // Skip when there's no value — otherwise we emit the unit alone
	102	+ // (e.g. "transition-duration:s"), invalid CSS that bloats every
	103	+ // block's generated stylesheet.
101	104	$css[ $args['property'] ] = $value . $args['unitDefaultValue'];
102	105	}
103	106	return $css;
104	107	}
105	108
106		- // ✅ Get values per device
107		- $desktop_key = $args['attributeObjectKey'];
108		- $tablet_key = $args['attributeObjectKey'] . 'Tablet';
109		- $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	+ } );
110	122
111		- $desktop_val = ! empty( $value[ $desktop_key ] ) ? $value[ $desktop_key ] : '';
112		- $tablet_val = ! empty( $value[ $tablet_key ] ) ? $value[ $tablet_key ] : '';
113		- $mobile_val = ! empty( $value[ $mobile_key ] ) ? $value[ $mobile_key ] : '';
114		-
115		- $device_value = '';
116		-
117		- switch ( $args['device'] ) {
118		- case 'Mobile':
119		- if ( $mobile_val !== '' ) {
120		- $device_value = $mobile_val;
121		- } elseif ( $args['defaultValueMobile'] !== '' ) {
122		- $device_value = $args['defaultValueMobile'];
123		- } elseif ( $tablet_val !== '' ) {
124		- $device_value = $tablet_val;
125		- } elseif ( $args['defaultValueTablet'] !== '' ) {
126		- $device_value = $args['defaultValueTablet'];
127		- } elseif ( $desktop_val !== '' ) {
128		- $device_value = $desktop_val;
129		- } else {
130		- $device_value = $args['defaultValue'];
131		- }
132		- break;
133		-
134		- case 'Tablet':
135		- if ( $tablet_val !== '' ) {
136		- $device_value = $tablet_val;
137		- } elseif ( $args['defaultValueTablet'] !== '' ) {
138		- $device_value = $args['defaultValueTablet'];
139		- } elseif ( $desktop_val !== '' ) {
140		- $device_value = $desktop_val;
141		- } else {
142		- $device_value = $args['defaultValue'];
143		- }
144		- break;
145		-
146		- default: // Desktop
147		- if ( $desktop_val !== '' ) {
148		- $device_value = $desktop_val;
149		- } else {
150		- $device_value = $args['defaultValue'];
151		- }
152		- break;
153		- }//end switch
154		-
155	123	// ✅ If value exists, apply unit and return
156		- if ( $device_value !== '' ) {
	124	+ if ( Helper::has_responsive_value( $device_value ) ) {
157	125	$unit = self::get_unit( [
158	126	'attributeValue' => $value,
159	127	'attributeObjectKey' => $args['attributeObjectKey'],
160	128	'unitDefaultValue' => $args['unitDefaultValue'],
		@@ -173,30 +141,39 @@
173	141	}
174	142
175	143
176	144	public static function get_unit( $args ) {
177		- $defaultUnit = $args['unitDefaultValue'];
178		- $value = $args['attributeValue'];
179		- $device = $args['device'];
180		- $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	+ }
181	152
182		- // Retrieve units with fallback to default
183		- $unitDesktop = Helper::get_array_value( $value, $keyPrefix, $defaultUnit ); // Desktop
184		- $unitTablet = Helper::get_array_value( $value, $keyPrefix . 'Tablet', $unitDesktop ); // Tablet inherits from Desktop
185		- $unitMobile = Helper::get_array_value( $value, $keyPrefix . 'Mobile', $unitTablet ); // Mobile inherits from Tablet
186		-
187		- // Return the appropriate unit based on the device
188		- if ( '' === $device ) {
189		- 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	+ }
190	165	}
	166	+ return null;
	167	+ }
191	168
192		- if ( 'Tablet' === $device ) {
193		- 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 '';
194	176	}
195		-
196		- if ( 'Mobile' === $device ) {
197		- return $unitMobile; // Mobile
198		- }
199		-
200		- return $defaultUnit; // Default fallback
	177	+ return $value[ $key ];
201	178	}
202	179	}