← All changes | includes/classes/css-generator.php +118 -48 2.10.0 → 2.13.1 View file →

		@@ -5,11 +5,11 @@
5	5	exit;
6	6	}
7	7
8	8	use ABlocks\Classes\AssetsGenerator;
	9	+use ABlocks\Classes\FontStack;
9	10
10	11	class CssGenerator {
11		- private $font_category;
12	12	private $custom_css = '';
13	13	private $parent_class;
14	14	private $class_styles = [];
15	15
		@@ -21,9 +21,8 @@
21	21	if ( isset( $attributes['_custom_css'] ) ) {
22	22	$this->custom_css = $attributes['_custom_css'];
23	23	}
24	24
25		- $this->font_category = include ABLOCKS_BLOCKS_DIR_PATH . 'fonts.php';
26	25
27	26	// Alert - don't touch here
28	27	if ( isset( $attributes['_margin'] ) ) { // check has advanced tab or not
29	28	$this->add_class_styles(
		@@ -29,9 +28,12 @@
29	28	$this->add_class_styles(
30	29	'{{WRAPPER}}',
31	30	BlockGlobal::get_wrapper_css( $attributes ),
32	31	BlockGlobal::get_wrapper_css( $attributes, 'Tablet' ),
33		- BlockGlobal::get_wrapper_css( $attributes, 'Mobile' )
	32	+ BlockGlobal::get_wrapper_css( $attributes, 'Mobile' ),
	33	+ $this->custom_device_map( function ( $device ) use ( $attributes ) {
	34	+ return BlockGlobal::get_wrapper_css( $attributes, $device );
	35	+ } )
34	36	);
35	37	$this->add_class_styles(
36	38	'{{WRAPPER}}:hover',
37	39	BlockGlobal::get_wrapper_hover_css( $attributes ),
		@@ -53,22 +55,76 @@
53	55	$this->add_class_styles(
54	56	'{{WRAPPER}} > .ablocks-block-container',
55	57	BlockGlobal::get_container_css( $attributes ),
56	58	BlockGlobal::get_container_css( $attributes, 'Tablet' ),
57		- BlockGlobal::get_container_css( $attributes, 'Mobile' )
	59	+ BlockGlobal::get_container_css( $attributes, 'Mobile' ),
	60	+ $this->custom_device_map( function ( $device ) use ( $attributes ) {
	61	+ return BlockGlobal::get_container_css( $attributes, $device );
	62	+ } )
58	63	);
59	64	}//end if
60	65	}
61	66
62		- public function add_class_styles( $class_name, $desktop_styles, $tablet_styles = [], $mobile_styles = [] ) {
	67	+ public function add_class_styles( $class_name, $desktop_styles, $tablet_styles = [], $mobile_styles = [], $responsive_styles = [] ) {
63	68	$this->class_styles[] = [
64	69	'class_name' => $class_name,
65	70	'desktop_styles' => $desktop_styles,
66	71	'tablet_styles' => $tablet_styles,
67		- 'mobile_styles' => $mobile_styles
	72	+ 'mobile_styles' => $mobile_styles,
	73	+ 'responsive_styles' => $responsive_styles,
68	74	];
69	75	}
70	76
	77	+ /**
	78	+ * Custom-breakpoint style map from a per-device builder (excludes the
	79	+ * built-in Tablet/Mobile so the standard path is untouched).
	80	+ */
	81	+ public function custom_device_map( $builder ) {
	82	+ $map = [];
	83	+
	84	+ // Nothing to build when the site registers no custom breakpoints — and
	85	+ // running the phantom probe anyway is not free: it hands every control a
	86	+ // device suffix that has no stored keys, which is what made controls that
	87	+ // read `$value[ 'x' . $device ]` unguarded spray "Undefined array key
	88	+ // …___ablocksphantom___" notices on every page under WP_DEBUG.
	89	+ $custom_devices = [];
	90	+ foreach ( \ABlocks\Helper::get_responsive_devices() as $d ) {
	91	+ if ( $d['width'] <= 0 || 'Tablet' === $d['id'] || 'Mobile' === $d['id'] ) {
	92	+ continue;
	93	+ }
	94	+ $custom_devices[] = $d;
	95	+ }
	96	+ if ( empty( $custom_devices ) ) {
	97	+ return $map;
	98	+ }
	99	+
	100	+ // Subtract a "phantom" baseline (builder run against a value-less suffix)
	101	+ // so controls that only default Tablet/Mobile don't leak phantom
	102	+ // declarations into custom breakpoints. Leaves only real overrides.
	103	+ $phantom = (array) call_user_func( $builder, '__ablocksphantom__' );
	104	+ foreach ( $custom_devices as $d ) {
	105	+ if ( $d['width'] <= 0 || 'Tablet' === $d['id'] || 'Mobile' === $d['id'] ) {
	106	+ continue;
	107	+ }
	108	+ $actual = (array) call_user_func( $builder, $d['suffix'] );
	109	+ $real = [];
	110	+ foreach ( $actual as $prop => $val ) {
	111	+ if ( ! array_key_exists( $prop, $phantom ) || $phantom[ $prop ] !== $val ) {
	112	+ $real[ $prop ] = $val;
	113	+ }
	114	+ }
	115	+ if ( ! empty( $real ) ) {
	116	+ $map[ $d['suffix'] ] = [
	117	+ 'width' => (int) $d['width'],
	118	+ 'min' => isset( $d['min'] ) ? (int) $d['min'] : 0,
	119	+ 'max' => isset( $d['max'] ) ? (int) $d['max'] : (int) $d['width'],
	120	+ 'styles' => $real,
	121	+ ];
	122	+ }
	123	+ }
	124	+ return $map;
	125	+ }
	126	+
71	127	public function generate_css() {
72	128	$css_output = '';
73	129
74	130	foreach ( $this->class_styles as $class_style ) {
		@@ -95,18 +151,50 @@
95	151
96	152	// Always add desktop CSS
97	153	$addToCssBlocks( '', '', $desktop_css );
98	154
99		- // Only add tablet CSS if it differs from desktop
100		- if ( $tablet_raw !== $desktop_raw ) {
101		- $addToCssBlocks( 'tablet', $this->get_breakpoint( 'tablet' ), $tablet_css );
	155	+ if ( empty( $class_style['responsive_styles'] ) ) {
	156	+ // Standard path (no custom breakpoints) — unchanged output.
	157	+ if ( $tablet_raw !== $desktop_raw ) {
	158	+ $addToCssBlocks( 'tablet', $this->get_breakpoint( 'tablet' ), $tablet_css );
	159	+ }
	160	+ if ( $mobile_raw !== $tablet_raw ) {
	161	+ $addToCssBlocks( 'mobile', $this->get_breakpoint( 'mobile' ), $mobile_css );
	162	+ }
	163	+ } else {
	164	+ // Custom breakpoints present: emit every breakpoint width-descending
	165	+ // (narrowest last so it wins), each deduped against desktop.
	166	+ $bp_defaults = \ABlocks\Helper::get_breakpoints();
	167	+ $bp_list = [
	168	+ [ 'width' => $bp_defaults['tablet'], 'min' => 0, 'max' => $bp_defaults['tablet'], 'styles' => $class_style['tablet_styles'] ],
	169	+ [ 'width' => $bp_defaults['mobile'], 'min' => 0, 'max' => $bp_defaults['mobile'], 'styles' => $class_style['mobile_styles'] ],
	170	+ ];
	171	+ foreach ( $class_style['responsive_styles'] as $bp ) {
	172	+ $bp_list[] = [
	173	+ 'width' => (int) $bp['width'],
	174	+ 'min' => isset( $bp['min'] ) ? (int) $bp['min'] : 0,
	175	+ 'max' => isset( $bp['max'] ) ? (int) $bp['max'] : (int) $bp['width'],
	176	+ 'styles' => $bp['styles'],
	177	+ ];
	178	+ }
	179	+ usort( $bp_list, function ( $a, $b ) {
	180	+ return (int) $b['width'] - (int) $a['width'];
	181	+ } );
	182	+ foreach ( $bp_list as $bp ) {
	183	+ $bp_styles = $this->filter_responsive_styles( $desktop_styles, $bp['styles'] );
	184	+ $bp_raw = $this->generate_css_for_media_query( 'bp', $bp_styles );
	185	+ if ( $bp_raw === $desktop_raw || '' === trim( $bp_raw ) ) {
	186	+ continue;
	187	+ }
	188	+ $bp_css = AssetsGenerator::minify_css( $bp_raw );
	189	+ $media = \ABlocks\Helper::breakpoint_media_condition( $bp['min'], $bp['max'] );
	190	+ if ( '' === $bp_css || '' === $media ) {
	191	+ continue;
	192	+ }
	193	+ $css_blocks[] = "@media screen and $media {\n$parent_selector {\n$bp_css\n}\n}";
	194	+ }
102	195	}
103	196
104		- // Only add mobile CSS if it differs from desktop AND tablet
105		- if ( $mobile_raw !== $tablet_raw ) {
106		- $addToCssBlocks( 'mobile', $this->get_breakpoint( 'mobile' ), $mobile_css );
107		- }
108		-
109	197	$css_output .= implode( "\n\n", $css_blocks ) . "\n\n";
110	198	}//end foreach
111	199
112	200	$css_output .= $this->get_custom_css();
		@@ -121,8 +209,12 @@
121	209	return '';
122	210	}
123	211	$css_string = implode("\n", array_map(
124	212	function ( $property, $value ) {
	213	+ // See Helper::esc_css_value(): these values come from block
	214	+ // attributes and land inside an inline <style> element.
	215	+ $property = \ABlocks\Helper::esc_css_value( $property );
	216	+ $value = \ABlocks\Helper::esc_css_value( $value );
125	217	return "$property: $value;";
126	218	},
127	219	array_keys( $styles ),
128	220	$styles
		@@ -131,13 +223,14 @@
131	223	return $css_string . "\n";
132	224	}
133	225
134	226	public function get_breakpoint( $media_query ) {
	227	+ $bp = \ABlocks\Helper::get_breakpoints();
135	228	switch ( $media_query ) {
136	229	case 'tablet':
137		- return '800px';
	230	+ return $bp['tablet'] . 'px';
138	231	case 'mobile':
139		- return '480px';
	232	+ return $bp['mobile'] . 'px';
140	233	default:
141	234	return '1200px';
142	235	}
143	236	}
		@@ -153,15 +246,17 @@
153	246
154	247	$styles = [];
155	248
156	249	foreach ( $base_styles as $prop => $value ) {
157		- if ( 'font-family' === $prop && isset( $this->font_category[ $value ] ) ) {
158		- $value = $this->get_font_family_css( $value, $this->font_category[ $value ] );
	250	+ if ( 'font-family' === $prop ) {
	251	+ // Safety net for styles that bypass the Typography control and set a
	252	+ // bare family name directly. FontStack leaves finished values alone.
	253	+ $value = FontStack::build( $value );
159	254	}
160	255	// Trim value to avoid whitespace-only entries
161	256	$trimmed = trim( $value );
162	257	// // Remove if empty, or if it matches only a unit (like 'px', '%', 'em') without any number
163		- if ( $trimmed === '' || preg_match( '/^(px|em|rem|vh|vw|vmin|vmax|cm|mm|in|pt|pc|%)$/i', $trimmed ) ) {
	258	+ if ( $trimmed === '' || preg_match( '/^(px|em|rem|vh|vw|vmin|vmax|cm|mm|in|pt|pc|%|s|ms|deg|fr|ch|ex)$/i', $trimmed ) ) {
164	259	continue;
165	260	}
166	261
167	262	$styles[ $prop ] = $trimmed;
		@@ -180,9 +275,9 @@
180	275	foreach ( $responsive_styles as $prop => $value ) {
181	276	$trimmed = trim( $value );
182	277
183	278	// // Remove if empty, or if it matches only a unit (like 'px', '%', 'em') without any number
184		- if ( $trimmed === '' || preg_match( '/^(px|em|rem|vh|vw|vmin|vmax|cm|mm|in|pt|pc|%)$/i', $trimmed ) ) {
	279	+ if ( $trimmed === '' || preg_match( '/^(px|em|rem|vh|vw|vmin|vmax|cm|mm|in|pt|pc|%|s|ms|deg|fr|ch|ex)$/i', $trimmed ) ) {
185	280	continue;
186	281	}
187	282
188	283	// Only include if the value is different from base styles
		@@ -194,35 +289,10 @@
194	289	return $difference;
195	290	}
196	291
197	292
198		- public function get_font_family_css( string $font_name, string $category ): string {
199		- // Quote font name if it contains spaces
200		- if ( strpos( $font_name, ' ' ) !== false ) {
201		- $font_name = '"' . $font_name . '"';
202		- }
203		-
204		- // Map category to fallback
205		- switch ( $category ) {
206		- case 'serif':
207		- $fallback = 'serif';
208		- break;
209		- case 'sans-serif':
210		- $fallback = 'sans-serif';
211		- break;
212		- case 'monospace':
213		- $fallback = 'monospace';
214		- break;
215		- case 'display':
216		- $fallback = 'sans-serif';
217		- break;
218		- case 'handwriting':
219		- $fallback = 'cursive';
220		- break;
221		- default:
222		- $fallback = 'sans-serif';
223		- }
224		-
225		- return $font_name . ', ' . $fallback;
	293	+ public function get_font_family_css( string $font_name, string $category = '' ): string {
	294	+ // Kept for back-compat; the stack is built centrally now.
	295	+ return FontStack::build( $font_name );
226	296	}
227	297	}
228	298