From f8e0e8cdcb0fc5264444a186537c47414f4a7a27 Mon Sep 17 00:00:00 2001
From: "bfintal@gmail.com" <>
Date: Wed, 22 Oct 2025 23:36:53 +0800
Subject: [PATCH 1/2] feat: added enqueue_frontend_assets_for_content static
 function

---
 src/compatibility/ewww.php |  2 +-
 src/init.php               | 77 +++++++++++++++++++++++++++-----------
 src/lightbox/index.php     |  2 +-
 3 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/src/compatibility/ewww.php b/src/compatibility/ewww.php
index e536a16077..7c7a73b764 100644
--- a/src/compatibility/ewww.php
+++ b/src/compatibility/ewww.php
@@ -6,7 +6,7 @@
 }
 
 if ( ! function_exists( 'stackable_load_image_optimizer_polyfill_frontend_script' ) ) {
-	function stackable_load_image_optimizer_polyfill_frontend_script( $block_content, $block ) {
+	function stackable_load_image_optimizer_polyfill_frontend_script( $block_content ) {
 		// If Easy IO setting is activated for EWWW Image Optimizer, dynamic images becomes blurry.
 		// Load the script to fix the issue.
 		if ( ! is_admin() ) {
diff --git a/src/init.php b/src/init.php
index ab886cb39e..47af91431d 100644
--- a/src/init.php
+++ b/src/init.php
@@ -20,14 +20,14 @@ class Stackable_Init {
 		 * Holds the scripts which are already enqueued, to ensure we only do it once per script.
 		 * @var Array
 		 */
-		public $scripts_loaded = array();
+		public static $scripts_loaded = array();
 
 		/**
 		 * Enqueue the frontend scripts, ensures we only do it once.
 		 *
 		 * @var boolean
 		 */
-		public $is_main_script_loaded = false;
+		public static $is_main_script_loaded = false;
 
 		/**
 		 * Add our hooks.
@@ -81,9 +81,9 @@ function __construct() {
 		 * @return void
 		 */
 		public function maybe_force_css_load() {
-			if ( ! $this->is_main_script_loaded && apply_filters( 'stackable_force_css_load', false ) ) {
-				$this->block_enqueue_frontend_assets();
-				$this->is_main_script_loaded = true;
+			if ( ! self::$is_main_script_loaded && apply_filters( 'stackable_force_css_load', false ) ) {
+				self::block_enqueue_frontend_assets();
+				self::$is_main_script_loaded = true;
 			}
 		}
 
@@ -92,7 +92,7 @@ public function maybe_force_css_load() {
 		 *
 		 * @since 0.1
 		 */
-		public function register_frontend_assets() {
+		public static function register_frontend_assets() {
 			// Frontend block styles.
 			wp_register_style(
 				'ugb-style-css',
@@ -171,7 +171,7 @@ public function register_frontend_assets() {
 		 */
 		public function load_frontend_scripts_conditionally_head() {
 			// Only do this in the frontend.
-			if ( $this->is_main_script_loaded ) {
+			if ( self::$is_main_script_loaded ) {
 				return;
 			}
 
@@ -186,8 +186,8 @@ public function load_frontend_scripts_conditionally_head() {
 						stripos( $post->post_content, 'stk-highlight' ) !==  false
 					) {
 						// Enqueue our main scripts and styles.
-						$this->block_enqueue_frontend_assets();
-						$this->is_main_script_loaded = true;
+						self::block_enqueue_frontend_assets();
+						self::$is_main_script_loaded = true;
 					}
 				}
 			}
@@ -216,12 +216,12 @@ public function load_frontend_scripts_conditionally( $block_content, $block ) {
 
 			// Load our main frontend scripts if there's a Stackable block
 			// loaded in the frontend.
-			if ( ! $this->is_main_script_loaded && ! is_admin() ) {
+			if ( ! self::$is_main_script_loaded && ! is_admin() ) {
 				if ( strpos( $block_content, '<!-- wp:stackable/' ) !== false ||
-					 strpos( $block_content, 'stk-highlight' ) !== false
+					strpos( $block_content, 'stk-highlight' ) !== false
 				) {
-					$this->block_enqueue_frontend_assets();
-					$this->is_main_script_loaded = true;
+					self::block_enqueue_frontend_assets();
+					self::$is_main_script_loaded = true;
 				}
 			}
 
@@ -231,21 +231,21 @@ public function load_frontend_scripts_conditionally( $block_content, $block ) {
 			}
 
 			// Load our main frontend scripts if not yet loaded.
-			if ( ! $this->is_main_script_loaded && ! is_admin() ) {
-				$this->block_enqueue_frontend_assets();
-				$this->is_main_script_loaded = true;
+			if ( ! self::$is_main_script_loaded && ! is_admin() ) {
+				self::block_enqueue_frontend_assets();
+				self::$is_main_script_loaded = true;
 			}
 
 			// Enqueue the block script once.
-			if ( ! isset( $this->scripts_loaded[ $block['blockName'] ] ) ) {
+			if ( ! isset( self::$scripts_loaded[ $block['blockName'] ] ) ) {
 				$stackable_block = substr( $block['blockName'], 10 );
 				do_action( 'stackable/' . $stackable_block . '/enqueue_scripts' );
-				$this->scripts_loaded[ $block['blockName'] ] = true;
+				self::$scripts_loaded[ $block['blockName'] ] = true;
 			}
 
 			// Check whether the current block needs to enqueue some scripts.
 			// This gets called across all the blocks.
-			do_action( 'stackable/enqueue_scripts', $block_content, $block );
+			do_action( 'stackable/enqueue_scripts', $block_content );
 
 			return $block_content;
 		}
@@ -255,8 +255,8 @@ public function load_frontend_scripts_conditionally( $block_content, $block ) {
 		 *
 		 * @since 2.17.2
 		 */
-		public function block_enqueue_frontend_assets() {
-			$this->register_frontend_assets();
+		public static function block_enqueue_frontend_assets() {
+			self::register_frontend_assets();
 			wp_enqueue_style( 'ugb-style-css' );
 			if ( is_frontend() ) {
 				wp_enqueue_style( 'ugb-block-style-inheritance-nodep' );
@@ -266,6 +266,41 @@ public function block_enqueue_frontend_assets() {
 			do_action( 'stackable_block_enqueue_frontend_assets' );
 		}
 
+		/**
+		 * Enqueue frontend scripts and styles for a given post content.
+		 *
+		 * @param string $post_content The post content.
+		 * @return void
+		 */
+		public static function enqueue_frontend_assets_for_content( $post_content ) {
+			// If a Stackable block is present in the post content, enqueue the frontend assets.
+			if ( ! self::$is_main_script_loaded && ! is_admin() ) {
+				if ( stripos( $post_content, '<!-- wp:stackable/' ) !==  false ) {
+					self::block_enqueue_frontend_assets();
+					self::$is_main_script_loaded = true;
+				}
+			}
+
+			// Gather all the unique Stackable blocks and load all the block scripts once.
+			// Gather all the "<!-- wp:stackable/BLOCK_NAME"
+			preg_match_all( '/<!-- wp:stackable\/([a-zA-Z_-]+)/', $post_content, $stackable_blocks );
+			// Go through each unique block name.
+			foreach ( $stackable_blocks[1] as $_block_name ) {
+				// Clean up the block name, trailing "-" from the end since it may have "--" in the end if the post content is compressed.
+				$block_name = trim( $_block_name, '-' );
+
+				// Enqueue the block script once.
+				if ( ! isset( self::$scripts_loaded[ $block_name ] ) ) {
+					do_action( 'stackable/' . $block_name . '/enqueue_scripts' );
+					self::$scripts_loaded[ $block_name ] = true;
+				}
+			}
+
+			// Check whether the current block needs to enqueue some scripts.
+			// This gets called across all the blocks.
+			do_action( 'stackable/enqueue_scripts', $post_content );
+		}
+
 		/**
 		 * Enqueue CodeMirror separately. This originally was enqueued in
 		 * `register_block_editor_assets`, but we want to enqueue this only when
diff --git a/src/lightbox/index.php b/src/lightbox/index.php
index 6bd9200997..ae13248e74 100644
--- a/src/lightbox/index.php
+++ b/src/lightbox/index.php
@@ -10,7 +10,7 @@
 }
 
 if ( ! function_exists( 'stackable_load_lightbox_frontend_script' ) ) {
-	function stackable_load_lightbox_frontend_script( $block_content, $block ) {
+	function stackable_load_lightbox_frontend_script( $block_content ) {
 		if ( strpos( $block_content, 'stk--has-lightbox' ) !== false ) {
 			wp_enqueue_script(
 				'stk-frontend-image-lightbox',

From 4fa88716ee2199e4c19e525b9f00ec1a4a117c1d Mon Sep 17 00:00:00 2001
From: "bfintal@gmail.com" <>
Date: Thu, 23 Oct 2025 20:23:05 +0800
Subject: [PATCH 2/2] removed number of arguments in hooks

---
 src/compatibility/ewww.php | 2 +-
 src/lightbox/index.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compatibility/ewww.php b/src/compatibility/ewww.php
index 7c7a73b764..d045d98064 100644
--- a/src/compatibility/ewww.php
+++ b/src/compatibility/ewww.php
@@ -26,7 +26,7 @@ function stackable_load_image_optimizer_polyfill_frontend_script( $block_content
 	function stackable_ewww_image_optimzer_plugin_checker() {
 		if ( ! is_admin() && defined( 'EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE' ) ) {
 			// Load the script in the frontend if EWWW Image Optimizer is active.
-			add_action( 'stackable/enqueue_scripts', 'stackable_load_image_optimizer_polyfill_frontend_script', 10, 2 );
+			add_action( 'stackable/enqueue_scripts', 'stackable_load_image_optimizer_polyfill_frontend_script' );
 		}
 	}
 
diff --git a/src/lightbox/index.php b/src/lightbox/index.php
index ae13248e74..416ac7287d 100644
--- a/src/lightbox/index.php
+++ b/src/lightbox/index.php
@@ -32,6 +32,6 @@ function stackable_load_lightbox_frontend_script( $block_content ) {
 	}
 
 	if ( ! is_admin() ) {
-		add_action( 'stackable/enqueue_scripts', 'stackable_load_lightbox_frontend_script', 10, 2 );
+		add_action( 'stackable/enqueue_scripts', 'stackable_load_lightbox_frontend_script' );
 	}
 }