← All changes | includes/assets.php +326 -42 2.8.1 → 2.14.0 View file →

		@@ -8,13 +8,19 @@
8	8	use ABlocks\Classes\FileUpload;
9	9	use ABlocks\Classes\AssetsGenerator;
10	10	use ABlocks\Classes\RegisterScripts;
11	11	use ABlocks\Classes\GlobalCssGenerator;
	12	+use ABlocks\Classes\GlobalClasses;
	13	+use ABlocks\Classes\AtomicStyles;
12	14	use ABlocks\Classes\FontLoadLocally;
13	15	use ABlocks\Admin\Menu;
14	16	use ABlocks\Helper;
15	17
16	18	class Assets {
	19	+
	20	+ /** Records which plugin version last generated the page stylesheets. */
	21	+ const BUILD_OPTION = 'ablocks_assets_build';
	22	+
17	23	public $current_page_template_part = [];
18	24	public $current_page_blocks = [];
19	25	private $FileUpload;
20	26	private $current_page_slug = '';
		@@ -26,9 +32,10 @@
26	32	add_action( 'admin_enqueue_scripts', [ $self, 'dashboard_scripts' ], 10 );
27	33	add_action( 'admin_enqueue_scripts', [ $self, 'demo_importer_scripts' ], 10 );
28	34	add_action( 'enqueue_block_assets', [ $self, 'block_editor_assets' ] );
29	35	add_action( 'enqueue_block_assets', [ $self, 'register_scripts' ] );
30		- add_action( 'wp_enqueue_scripts', [ $self, 'front_end_google_fonts' ], 999 );
	36	+ // Frontend fonts are now emitted by core via CoreFontRegistry (theme.json
	37	+ // @font-face) with a Google Fonts fallback. See docs/FONT-MANAGEMENT-PLAN.md.
31	38
32	39	add_action( 'wp_enqueue_scripts', [ $self, 'enqueue_frontend_assets' ], 99 );
33	40	// Global CSS
34	41	add_action( 'wp_enqueue_block_assets', [ $self, 'global_css_variable' ] );
		@@ -34,8 +41,9 @@
34	41	add_action( 'wp_enqueue_block_assets', [ $self, 'global_css_variable' ] );
35	42	add_action( 'wp_enqueue_scripts', [ $self, 'global_css_variable' ] );
36	43	add_action( 'enqueue_block_editor_assets', [ $self, 'global_css_variable' ] );
37	44	add_action( 'enqueue_block_editor_assets', [ $self, 'add_editor_inline_css' ] );
	45	+ add_action( 'enqueue_block_editor_assets', [ $self, 'editor_google_fonts' ] );
38	46
39	47	// Detect page
40	48	add_action( 'wp', array( $self, 'detect_page' ) );
41	49
		@@ -104,18 +112,32 @@
104	112	'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ),
105	113	'is_pro' => (bool) Helper::is_active_ablocks_pro(),
106	114	'is_archive' => (bool) is_archive(),
107	115	'archive_post_type' => $this->get_current_archive_post_type(),
	116	+ // Responsive breakpoint widths (px) shared with the JS CSS generators
	117	+ // and the block editor so media queries match the frontend.
	118	+ 'breakpoints' => Helper::get_breakpoints(),
	119	+ // Ordered device list (Desktop + built-ins + custom breakpoints) for
	120	+ // the atomic block's responsive device switcher. Widest-first, so
	121	+ // the editor and the frontend agree on breakpoint precedence.
	122	+ 'responsive_devices' => Helper::get_responsive_devices(),
	123	+ // Whether breakpoint queries overlap (cascade) or are exclusive
	124	+ // bands (strict). The editor preview builds matching queries.
	125	+ 'breakpoint_mode' => Helper::get_breakpoint_mode(),
108	126	];
109	127	}
110	128
111	129	public function get_localize_dashboard_data() {
112		- if ( ! current_user_can( 'manage_options' ) ) {
	130	+ // Anyone permitted to reach an aBlocks screen needs the nonce, or the
	131	+ // dashboard loads and then 403s on every request it makes.
	132	+ if ( ! current_user_can( Permissions::ACCESS ) ) {
113	133	return $this->get_localize_script_data();
114	134	}
115	135	return array_merge($this->get_localize_script_data(), [
116	136	'nonce' => wp_create_nonce( 'wp_rest' ),
117	137	'ablocks_nonce' => wp_create_nonce( 'ablocks_nonce' ),
	138	+ 'permissions' => Permissions::for_user(),
	139	+ 'is_admin_user' => Permissions::is_real_admin(),
118	140	]);
119	141	}
120	142	public function get_localize_editor_data() {
121	143	if ( ! current_user_can( 'edit_posts' ) ) {
		@@ -126,14 +148,51 @@
126	148	'ablocks_nonce' => wp_create_nonce( 'ablocks_nonce' ),
127	149	]);
128	150	}
129	151	public function get_localize_frontend_data() {
130		- return array_merge($this->get_localize_script_data(), [
	152	+ $data = array_merge($this->get_localize_script_data(), [
131	153	'nonce' => wp_create_nonce( 'wp_rest' ),
132	154	'ablocks_nonce' => wp_create_nonce( 'ablocks_nonce' ),
133	155	]);
	156	+ // The absolute server path is only meaningful to admin-side code; on the
	157	+ // frontend it would publish the filesystem layout in page source. No
	158	+ // frontend script reads it (it is re-exported but never consumed).
	159	+ unset( $data['plugin_root_path'] );
	160	+ return $data;
134	161	}
135	162
	163	+ /**
	164	+ * Whether the frontend ABlocksGlobal payload has been attached this request.
	165	+ *
	166	+ * @var bool
	167	+ */
	168	+ private static $globals_localized = false;
	169	+
	170	+ /**
	171	+ * Attach the frontend ABlocksGlobal payload to the shared data-only
	172	+ * `ablocks-globals` handle, at most once per request.
	173	+ *
	174	+ * Previously each per-block script handle localized its own copy, so a page
	175	+ * using N block types printed N identical `var ABlocksGlobal = {...}` blocks
	176	+ * (and called wp_create_nonce() N times). Every aBlocks frontend script now
	177	+ * depends on `ablocks-globals`, so WP prints the object once, before any
	178	+ * consumer, in both asset-generation modes.
	179	+ */
	180	+ public static function localize_globals_once() {
	181	+ if ( self::$globals_localized ) {
	182	+ return;
	183	+ }
	184	+ self::$globals_localized = true;
	185	+ // Self-register so callers never depend on RegisterScripts having run
	186	+ // first — theme-builder templates and block render callbacks fire on
	187	+ // different hooks, and a missing handle would drop the payload silently.
	188	+ if ( ! wp_script_is( 'ablocks-globals', 'registered' ) ) {
	189	+ wp_register_script( 'ablocks-globals', false, array(), ABLOCKS_VERSION, array() );
	190	+ }
	191	+ $self = new self();
	192	+ wp_localize_script( 'ablocks-globals', 'ABlocksGlobal', $self->get_localize_frontend_data() );
	193	+ }
	194	+
136	195	public function get_dashboard_localize_script_data() {
137	196	$menu = new Menu();
138	197	$args = array(
139	198	'menu' => wp_json_encode( Helper::get_admin_menu_list() ),
		@@ -146,8 +205,11 @@
146	205	'enabled_block_copy_paste_style' => (bool) Helper::get_settings( 'enabled_block_copy_paste_style', false ),
147	206	'enabled_load_google_font_locally' => (bool) Helper::get_settings( 'enabled_load_google_font_locally', false ),
148	207	'enabled_only_selected_fonts' => (bool) Helper::get_settings( 'enabled_only_selected_fonts', false ),
149	208	'selected_fonts' => (array) Helper::get_settings( 'selected_fonts', [] ),
	209	+ 'font_metric_fallback' => (bool) Helper::get_settings( 'font_metric_fallback', true ),
	210	+ // Global typography picks from the same list the editor offers.
	211	+ 'theme_fonts' => \ABlocks\Classes\FontStack::get_theme_font_families(),
150	212	],
151	213	'is_gutenberg_editor' => Helper::is_gutenberg_editor(),
152	214	'is_fse_theme' => Helper::is_fse_theme(),
153	215	'third_party_plugin_status' => [
		@@ -154,8 +216,11 @@
154	216	'academy_lms' => Helper::is_active_academy(),
155	217	'storeengine' => Helper::is_active_storeengine(),
156	218	'wp_map_block' => Helper::is_active_wp_map_block(),
157	219	'easy_content_manager' => Helper::is_active_easy_content_manager(),
	220	+ 'zencommunity' => Helper::is_active_zencommunity(),
	221	+ 'gemboards' => Helper::is_active_gemboards(),
	222	+ 'quizpress' => Helper::is_active_quizpress(),
158	223	]
159	224	);
160	225	return apply_filters(
161	226	'ablocks/assets/dashboard_scripts_data',
		@@ -177,13 +242,24 @@
177	242	'enabled_block_copy_paste_style' => (bool) Helper::get_settings( 'enabled_block_copy_paste_style', false ),
178	243	'enabled_load_google_font_locally' => (bool) Helper::get_settings( 'enabled_load_google_font_locally', false ),
179	244	'enabled_only_selected_fonts' => (bool) Helper::get_settings( 'enabled_only_selected_fonts', false ),
180	245	'selected_fonts' => (array) Helper::get_settings( 'selected_fonts', [] ),
	246	+ // Design system lock — the editor hides the custom pickers when these
	247	+ // are on, leaving only the global presets.
	248	+ 'lock_global_typography' => (bool) Helper::get_settings( 'lock_global_typography', false ),
	249	+ 'lock_global_typography_strict' => (bool) Helper::get_settings( 'lock_global_typography_strict', false ),
	250	+ 'lock_global_colors' => (bool) Helper::get_settings( 'lock_global_colors', false ),
181	251	'frontend_dashboard_page' => (int) Helper::get_settings( 'frontend_dashboard_page' ),
182	252	'global_color' => (array) Helper::get_settings( 'global_color', [] ),
183	253	'global_typography' => (array) Helper::get_settings( 'global_typography', [] ),
184	254	'global_typography_list' => wp_list_pluck( Helper::get_settings( 'global_typography', [] ), 'value', 'id' ),
185	255	'global_font_family_fallback' => (string) Helper::get_settings( 'global_font_family_fallback', 'Sans-serif' ),
	256	+ // Editor paste — see includes/api/paste-controller.php.
	257	+ 'paste_google_docs' => (bool) Helper::get_settings( 'paste_google_docs', true ),
	258	+ 'paste_convert_webp' => (bool) Helper::get_settings( 'paste_convert_webp', true ),
	259	+ // Theme.json + Font Library families, so uploaded/theme fonts are
	260	+ // selectable next to the Google catalog.
	261	+ 'theme_fonts' => \ABlocks\Classes\FontStack::get_theme_font_families(),
186	262	],
187	263	'is_gutenberg_editor' => Helper::is_gutenberg_editor(),
188	264	'has_required_block_attribute_migration' => get_option( 'ablocks_has_required_block_attribute_migration' ),
189	265	'third_party_plugin_status' => [
		@@ -190,11 +266,16 @@
190	266	'academy_lms' => Helper::is_active_academy(),
191	267	'storeengine' => Helper::is_active_storeengine(),
192	268	'wp_map_block' => Helper::is_active_wp_map_block(),
193	269	'quizpress' => Helper::is_active_quizpress(),
	270	+ 'easy_content_manager' => Helper::is_active_easy_content_manager(),
194	271	],
195	272	'blocks_status' => $ablocks_blocks,
196		- 'post_types' => $post_types
	273	+ 'post_types' => $post_types,
	274	+ // What this user may do inside the editor. Read by
	275	+ // src/utils/permissions.js to hide controls they cannot use.
	276	+ 'permissions' => Permissions::for_user(),
	277	+ 'is_admin_user' => Permissions::is_real_admin(),
197	278	);
198	279	return apply_filters(
199	280	'ablocks/assets/editor_scripts_data',
200	281	array_merge(
		@@ -303,44 +384,28 @@
303	384	wp_localize_script( 'ablocks-demo-import-scripts', 'ABlocksGlobal', $this->get_dashboard_localize_script_data() );
304	385	wp_set_script_translations( 'ablocks-demo-import-scripts', 'ablocks', ABLOCKS_ROOT_DIR_PATH . 'languages' );
305	386	}
306	387
307		- public function web_fonts_url( $font ) {
308		- $font_url = '';
309		- if ( 'off' !== _x( 'on', 'Google font: on or off', 'ablocks' ) ) {
310		- $font_url = add_query_arg( 'family', rawurlencode( $font ), '//fonts.googleapis.com/css' );
	388	+ public function build_google_fonts_url( array $fonts ): string {
	389	+ $family_strings = [];
	390	+ foreach ( $fonts as $family => $weights ) {
	391	+ $family_encoded = str_replace( ' ', '+', $family );
	392	+ $weights = array_unique( array_map( 'strval', (array) $weights ) );
	393	+ sort( $weights );
	394	+ $family_strings[] = ! empty( $weights ) ? $family_encoded . ':wght@' . implode( ';', $weights ) : $family_encoded;
311	395	}
312		- return $font_url;
	396	+ return '//fonts.googleapis.com/css2?family=' . implode( '&family=', $family_strings ) . '&display=swap';
313	397	}
314	398
315		- public function front_end_google_fonts() {
316		- global $ablocks_fonts;
317		- if ( empty( $ablocks_fonts ) || ! is_array( $ablocks_fonts ) ) {
318		- return false;
	399	+ public function web_fonts_url( $font ) {
	400	+ if ( 'off' === _x( 'on', 'Google font: on or off', 'ablocks' ) ) {
	401	+ return '';
319	402	}
	403	+ return '//fonts.googleapis.com/css2?family=' . $font;
	404	+ }
320	405
321		- if ( Helper::get_settings( 'enabled_load_google_font_locally', false ) ) {
322		- $FontLoadLocally = new FontLoadLocally();
323		- $FontLoadLocally->enqueue_fonts( $ablocks_fonts ); // Attempt to load local fonts (fallback inside method)
324		- } else {
325		- $font_families = [];
326		- foreach ( $ablocks_fonts as $family => $weights ) {
327		- $font_family_string = $family;
328		- $total_weights = count( $weights );
329	406
330		- if ( $total_weights > 0 ) {
331		- $font_family_string .= ':wght@' . implode( ';', $weights );
332		- }
333	407
334		- $font_families[] = $font_family_string;
335		- }
336		- // Generate the URL using the web_fonts_url method
337		- $google_fonts_url = $this->web_fonts_url( implode( '|', $font_families ) ) . '&display=swap';
338		- wp_register_style( 'ablocks-frontend-google-fonts', esc_url( $google_fonts_url ), array(), ABLOCKS_VERSION );
339		- }
340		- }
341		-
342		-
343	408	public function block_editor_assets() {
344	409	if ( is_admin() ) {
345	410	wp_enqueue_style( 'ablocks-editor-font-awesome', ABLOCKS_ASSETS_URL . 'library/font-awesome/css/all.min.css', array(), ABLOCKS_VERSION, 'all' );
346	411	wp_enqueue_style( 'ablocks-editor-fonts', $this->web_fonts_url( 'Roboto:ital,wght@0,300;0,400;0,500;0,700;1,300&display=swap' ), array(), ABLOCKS_VERSION );
		@@ -375,12 +440,69 @@
375	440
376	441	if ( $this->current_page_slug ) {
377	442	// Enqueue google fonts
378	443	wp_enqueue_style( 'ablocks-frontend-google-fonts' );
379		- wp_enqueue_style( 'ablocks-blocks-combine-style', $this->FileUpload->get_file_url( $this->current_page_slug . '.min.css' ), array(), filemtime( $this->FileUpload->get_file_path( $this->current_page_slug . '.min.css' ) ), 'all' );
380	444
381		- wp_enqueue_script( 'ablocks-blocks-combine-script', $this->FileUpload->get_file_url( $this->current_page_slug . '.min.js' ), array(), filemtime( $this->FileUpload->get_file_path( $this->current_page_slug . '.min.js' ) ), true, [ 'strategy' => $script_loading_strategy ] );
382		- wp_localize_script( 'ablocks-blocks-combine-script', 'ABlocksGlobal', $this->get_localize_frontend_data() );
	445	+ $css_path = $this->FileUpload->get_file_path( $this->current_page_slug . '.min.css' );
	446	+
	447	+ // Performance Suite — inline the page CSS when it's small enough to
	448	+ // avoid a render-blocking request; fall back to a normal <link> above
	449	+ // the threshold. Opt-in via perf_inline_css.
	450	+ $inline_css = (bool) apply_filters(
	451	+ 'ablocks/perf/perf_inline_css',
	452	+ (bool) Helper::get_settings( 'perf_inline_css', true )
	453	+ );
	454	+ $inline_max = (int) apply_filters( 'ablocks/perf/inline_css_max_bytes', 50 * 1024 );
	455	+ $css_size = file_exists( $css_path ) ? (int) filesize( $css_path ) : 0;
	456	+
	457	+ if ( $inline_css && $css_size > 0 && $css_size <= $inline_max ) {
	458	+ wp_register_style( 'ablocks-blocks-combine-style', false, array(), ABLOCKS_VERSION );
	459	+ wp_enqueue_style( 'ablocks-blocks-combine-style' );
	460	+ // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
	461	+ wp_add_inline_style( 'ablocks-blocks-combine-style', (string) file_get_contents( $css_path ) );
	462	+ } else {
	463	+ wp_enqueue_style( 'ablocks-blocks-combine-style', $this->FileUpload->get_file_url( $this->current_page_slug . '.min.css' ), array(), filemtime( $css_path ), 'all' );
	464	+
	465	+ // Performance Suite — when the page stylesheet is too large to inline,
	466	+ // load it non-blocking (media="print" + onload swap) so it no longer
	467	+ // delays first paint. Opt-in via perf_async_css (default off: a too-
	468	+ // aggressive critical set risks FOUC, so promote after QA). Editors
	469	+ // viewing the frontend are bypassed so previews render immediately.
	470	+ $async_css = (bool) apply_filters(
	471	+ 'ablocks/perf/perf_async_css',
	472	+ (bool) Helper::get_settings( 'perf_async_css', false )
	473	+ );
	474	+ // Critical CSS — inline the above-the-fold/structural subset in
	475	+ // <head> and load the full stylesheet non-blocking. This is a
	476	+ // stronger form of async (it prevents the FOUC async alone can
	477	+ // cause), so enabling it implies async delivery of the full file.
	478	+ $critical_css = (bool) apply_filters(
	479	+ 'ablocks/perf/perf_critical_css',
	480	+ (bool) Helper::get_settings( 'perf_critical_css', false )
	481	+ );
	482	+ $bypass_for_editor = is_user_logged_in() && current_user_can( 'edit_posts' )
	483	+ && (bool) apply_filters( 'ablocks/perf/bypass_optimizations_for_editors', true );
	484	+
	485	+ if ( ( $async_css || $critical_css ) && ! $bypass_for_editor ) {
	486	+ // Before deferring the full stylesheet, always inline the
	487	+ // layout-critical CSS so the page paints with correct box
	488	+ // sizes and never reflows when the deferred file loads. The
	489	+ // split is property-based: the deferred remainder is cosmetic
	490	+ // only (colors, shadows, hover states), so it cannot cause a
	491	+ // layout shift (CLS). This makes async delivery safe.
	492	+ // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
	493	+ list( $critical ) = \ABlocks\Classes\CriticalCss::split( (string) file_get_contents( $css_path ) );
	494	+ if ( '' !== trim( (string) $critical ) ) {
	495	+ wp_register_style( 'ablocks-critical-css', false, array(), ABLOCKS_VERSION );
	496	+ wp_enqueue_style( 'ablocks-critical-css' );
	497	+ wp_add_inline_style( 'ablocks-critical-css', $critical );
	498	+ }
	499	+ add_filter( 'style_loader_tag', [ $this, 'async_combined_style_tag' ], 20, 2 );
	500	+ }
	501	+ }
	502	+
	503	+ wp_enqueue_script( 'ablocks-blocks-combine-script', $this->FileUpload->get_file_url( $this->current_page_slug . '.min.js' ), array( 'ablocks-globals' ), filemtime( $this->FileUpload->get_file_path( $this->current_page_slug . '.min.js' ) ), true, [ 'strategy' => $script_loading_strategy ] );
	504	+ self::localize_globals_once();
383	505	wp_set_script_translations( 'ablocks-blocks-combine-script', 'ablocks', ABLOCKS_ROOT_DIR_PATH . 'languages' );
384	506	} else {
385	507	// fallback if assets not available
386	508	add_filter( 'ablocks/is_allow_block_inline_assets', '__return_true' );
		@@ -386,8 +508,31 @@
386	508	add_filter( 'ablocks/is_allow_block_inline_assets', '__return_true' );
387	509	}
388	510	}
389	511
	512	+ /**
	513	+ * Rewrite the combined page stylesheet <link> so it loads without blocking
	514	+ * render: fetch as media="print", then flip to media="all" on load, with a
	515	+ * <noscript> fallback for JS-disabled clients. Only touches the aBlocks
	516	+ * combined handle — third-party stylesheets are left untouched.
	517	+ */
	518	+ public function async_combined_style_tag( $tag, $handle ) {
	519	+ if ( 'ablocks-blocks-combine-style' !== $handle ) {
	520	+ return $tag;
	521	+ }
	522	+ $async_tag = preg_replace(
	523	+ [ "/media=(['\"])[^'\"]*\\1/", '/>$/', '/\/>$/' ],
	524	+ [ 'media="print" onload="this.media=\'all\'"', '>', '/>' ],
	525	+ trim( $tag )
	526	+ );
	527	+ // Guarantee the print/onload attributes even if the original tag had no media.
	528	+ if ( strpos( $async_tag, 'onload=' ) === false ) {
	529	+ $async_tag = str_replace( '<link ', '<link media="print" onload="this.media=\'all\'" ', $async_tag );
	530	+ }
	531	+ $noscript = '<noscript>' . $tag . '</noscript>';
	532	+ return $async_tag . "\n" . $noscript;
	533	+ }
	534	+
390	535	public function regenerate_missing_assets() {
391	536	if ( $this->is_assets_generated() ) {
392	537	return;
393	538	}
		@@ -429,9 +574,20 @@
429	574	$register_scripts = RegisterScripts::get_register_scripts();
430	575	foreach ( $register_scripts as $register_handler => $register_script ) {
431	576	if ( isset( $register_script['dependencies'] ) ) {
432	577	$dependencies = include $register_script['dependencies'];
433		- $register_script['deps'] = $dependencies['dependencies'];
	578	+ // Merge rather than overwrite: the generated asset.php only knows
	579	+ // about build-time (@wordpress/*) dependencies, so replacing the
	580	+ // declared list would silently drop hand-declared handles such as
	581	+ // ablocks-globals.
	582	+ $register_script['deps'] = array_values(
	583	+ array_unique(
	584	+ array_merge(
	585	+ isset( $register_script['deps'] ) ? (array) $register_script['deps'] : array(),
	586	+ $dependencies['dependencies']
	587	+ )
	588	+ )
	589	+ );
434	590	$register_script['ver'] = $dependencies['version'];
435	591	}
436	592	wp_register_script(
437	593	$register_handler,
		@@ -439,14 +595,19 @@
439	595	$register_script['deps'],
440	596	$register_script['ver'],
441	597	$register_script['args']
442	598	);
443		- }
	599	+ }//end foreach
444	600	}
445	601	public function global_css_variable() {
446	602	wp_register_style( 'ablocks-editor-global-styles', false, array(), ABLOCKS_VERSION );
447	603	wp_enqueue_style( 'ablocks-editor-global-styles' );
448	604
	605	+ // The :root variables only change when global settings change, so cache
	606	+ // the generated string and rebuild it on settings save (see Blocks
	607	+ // ::clear_global_css_cache) instead of looping settings on every request.
	608	+ $css = get_transient( 'ablocks_global_css_vars' );
	609	+ if ( false === $css ) {
449	610	$container_padding = Helper::get_settings( 'container_padding', 10 ) . 'px';
450	611	$css = ":root, body .editor-styles-wrapper {\n";
451	612	$css .= " --ablocks-container-padding: $container_padding;\n";
452	613
		@@ -466,9 +627,17 @@
466	627	$value = $typography->value;
467	628
468	629	// Desktop values
469	630	if ( ! empty( $value->fontFamily ) ) {
470		- $css .= " --ablocks-{$id}-font-family: {$value->fontFamily};\n";
	631	+ // Every consumer of this variable drops it straight into
	632	+ // font-family, so it has to carry the whole stack.
	633	+ $font_stack = \ABlocks\Classes\FontStack::build(
	634	+ $value->fontFamily,
	635	+ isset( $value->fontFallback ) ? $value->fontFallback : ''
	636	+ );
	637	+ if ( '' !== $font_stack ) {
	638	+ $css .= " --ablocks-{$id}-font-family: {$font_stack};\n";
	639	+ }
471	640	}
472	641	if ( ! empty( $value->weight ) ) {
473	642	$css .= " --ablocks-{$id}-weight: {$value->weight};\n";
474	643	}
		@@ -536,8 +705,10 @@
536	705	}//end if
537	706	}//end foreach
538	707
539	708	$css .= "}\n";
	709	+ set_transient( 'ablocks_global_css_vars', $css, DAY_IN_SECONDS );
	710	+ }
540	711
541	712	if ( ! is_admin() && ! Helper::is_gutenberg_editor() ) {
542	713	$css .= $this->get_common_css();
543	714	}
		@@ -544,8 +715,31 @@
544	715	wp_add_inline_style( 'ablocks-editor-global-styles', $css );
545	716	wp_add_inline_style( 'ablocks-common-style', $css );
546	717	}
547	718
	719	+ public function editor_google_fonts() {
	720	+ // Load the fonts already used by the post being edited (plus globals) so
	721	+ // existing content previews correctly on editor load. Live selections are
	722	+ // handled client-side by the typography control.
	723	+ $fonts = \ABlocks\Classes\FontCollector::get_global_fonts();
	724	+
	725	+ $post_id = 0;
	726	+ if ( function_exists( 'get_the_ID' ) && get_the_ID() ) {
	727	+ $post_id = (int) get_the_ID();
	728	+ } elseif ( isset( $_GET['post'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	729	+ $post_id = absint( $_GET['post'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	730	+ }
	731	+ if ( $post_id ) {
	732	+ $fonts = \ABlocks\Classes\FontCollector::merge( $fonts, \ABlocks\Classes\FontCollector::get_post_fonts( $post_id ) );
	733	+ }
	734	+
	735	+ if ( empty( $fonts ) ) {
	736	+ return;
	737	+ }
	738	+ $url = $this->build_google_fonts_url( $fonts );
	739	+ wp_enqueue_style( 'ablocks-editor-google-fonts', $url, array(), null );
	740	+ }
	741	+
548	742	public function add_editor_inline_css() {
549	743	$custom_css = $this->get_common_css( '.editor-styles-wrapper ' );
550	744	add_theme_support( 'editor-styles' );
551	745	add_editor_style();
		@@ -643,23 +837,113 @@
643	837
644	838	public function is_assets_generated() {
645	839	$file_name = $this->current_page_slug;
646	840	$css_file_path = $this->FileUpload->get_file_path( $file_name . '.min.css' );
647		- return file_exists( $css_file_path );
	841	+
	842	+ if ( ! file_exists( $css_file_path ) ) {
	843	+ return false;
	844	+ }
	845	+
	846	+ // The file embeds the global-class CSS this page needs, so editing a
	847	+ // class has to make every generated stylesheet stale. Comparing the
	848	+ // file's mtime against the library's change stamp rebuilds them lazily,
	849	+ // one page at a time on next visit, without stamping a revision into
	850	+ // every file name (which the per-post delete in Blocks relies on).
	851	+ //
	852	+ // Strictly greater, not >=: mtime has one-second resolution, so a file
	853	+ // written in the same second as a class edit is indistinguishable from
	854	+ // one written just after it. Treating that tie as stale costs one extra
	855	+ // regeneration; treating it as fresh would serve the old CSS until the
	856	+ // next edit.
	857	+ return filemtime( $css_file_path ) > max(
	858	+ GlobalClasses::get_revision(),
	859	+ self::build_revision()
	860	+ );
648	861	}
649	862
	863	+ /**
	864	+ * When this plugin's own CSS last changed, as a timestamp.
	865	+ *
	866	+ * The generated file bakes in each block's static stylesheet (see
	867	+ * AssetsGenerator, which concatenates get_static_css() into it), so a CSS
	868	+ * fix shipped in an update reached nobody whose pages were generated before
	869	+ * it: the file still existed, still parsed, and nothing about it looked
	870	+ * stale, so it was served unchanged forever. Verified by planting a
	871	+ * stylesheet carrying the previous release's rules — it survived every
	872	+ * subsequent page load untouched. That is why a fix could land in the
	873	+ * editor, which loads each block's style.css directly, and never appear on
	874	+ * the front end.
	875	+ *
	876	+ * Keyed on the version rather than a file scan: it is one option read on
	877	+ * the common path, and every shipped CSS change comes with a version bump.
	878	+ * Each page then rebuilds once, on its next visit, exactly the way a
	879	+ * global-class edit already makes them rebuild.
	880	+ *
	881	+ * @return int Timestamp of the running version's first request.
	882	+ */
	883	+ public static function build_revision() {
	884	+ $stamp = get_option( self::BUILD_OPTION );
	885	+
	886	+ // The compiler's output revision is part of the key, so an emission
	887	+ // change stales every baked page even without a version bump. See
	888	+ // AtomicStyles::OUTPUT_REVISION.
	889	+ $build = ABLOCKS_VERSION . '+' . AtomicStyles::OUTPUT_REVISION;
	890	+
	891	+ if (
	892	+ is_array( $stamp ) &&
	893	+ isset( $stamp['version'], $stamp['time'] ) &&
	894	+ $build === $stamp['version']
	895	+ ) {
	896	+ return (int) $stamp['time'];
	897	+ }
	898	+
	899	+ $now = time();
	900	+ update_option(
	901	+ self::BUILD_OPTION,
	902	+ [
	903	+ 'version' => $build,
	904	+ 'time' => $now,
	905	+ ],
	906	+ true
	907	+ );
	908	+
	909	+ return $now;
	910	+ }
	911	+
650	912	public function set_current_page_template_part( $content, $block ) {
651	913	if ( ! isset( $block['blockName'] ) && is_array( $block ) ) {
652	914	foreach ( $block as $block_item ) {
653		- if ( ! empty( $block_item['blockName'] ) && strpos( $block_item['blockName'], 'ablocks/' ) !== false ) {
	915	+ if ( $this->is_page_asset_block( $block_item ) ) {
654	916	$this->current_page_blocks[] = $block_item;
655	917	}
656	918	}
657	919	}
658		- if ( ! empty( $block['blockName'] ) && strpos( $block['blockName'], 'ablocks/' ) !== false ) {
	920	+ if ( $this->is_page_asset_block( $block ) ) {
659	921	$this->current_page_blocks[] = $block;
660	922	}
661	923	return $content;
	924	+ }
	925	+
	926	+ /**
	927	+ * Whether a top-level block contributes to the page's generated assets.
	928	+ *
	929	+ * A synced pattern counts too: AssetsGenerator::recursive_block_parser()
	930	+ * already expands its reference. Collecting only `ablocks/*` names left a
	931	+ * page whose content is just a pattern with no combined CSS/JS at all — so a
	932	+ * Loop Filter placed from a pattern rendered unstyled and did nothing when
	933	+ * clicked.
	934	+ *
	935	+ * @param mixed $block Parsed block.
	936	+ * @return bool
	937	+ */
	938	+ private function is_page_asset_block( $block ) {
	939	+ if ( ! is_array( $block ) || empty( $block['blockName'] ) ) {
	940	+ return false;
	941	+ }
	942	+ if ( 'core/block' === $block['blockName'] ) {
	943	+ return ! empty( $block['attrs']['ref'] );
	944	+ }
	945	+ return strpos( $block['blockName'], 'ablocks/' ) !== false;
662	946	}
663	947
664	948	public function set_theme_builder_locations( $args ) {
665	949	$this->theme_builder_locations = $args;