improve performance

Author: kaeizen

src/dynamic-breakpoints.php

@@ -25,6 +25,7 @@ class Stackable_Dynamic_Breakpoints {
 
 		// Holds the value of the saved or default breakpoints
 		private $dynamic_breakpoints = false;
+		private $has_custom_breakpoints = false;
 
 		/**
 		 * Add our hooks.
@@ -35,6 +36,9 @@ function __construct() {
 			add_action( 'rest_api_init', array( $this, 'register_settings' ) );
 
 			if ( is_frontend() ) {
+				// Get the dynamic breakpoints after the theme has loaded.
+				add_action( 'after_setup_theme', array( $this, 'get_dynamic_breakpoints' ) );
+
 				// Add a filter for replacing shortcut media queries before the breakpoint adjustment.
 				add_filter( 'stackable_frontend_css', array( $this, 'replace_shortcut_media_queries' ), 9 );
 
@@ -78,7 +82,7 @@ public function get_dynamic_breakpoints() {
 			}
 
 			$this->dynamic_breakpoints = $breakpoints;
-			return $this->dynamic_breakpoints;
+			$this->has_custom_breakpoints = ! empty( $breakpoints['tablet'] ) || ! empty( $breakpoints['mobile'] );
 		}
 
 		/**
@@ -135,18 +139,18 @@ public function sanitize_array_setting( $input ) {
 			return ! is_array( $input ) ? array( array() ) : $input;
 		}
 
-		/**
-		 * True if there are any custom breakpoints assigned by the user.
-		 *
-		 * @return boolean
-		 */
-		public function has_custom_breakpoints() {
-			$breakpoints = $this->dynamic_breakpoints;
-			if ( $breakpoints == false ) {
-				$breakpoints = $this->get_dynamic_breakpoints();
-			}
-			return ! empty( $breakpoints['tablet'] ) || ! empty( $breakpoints['mobile'] );
-		}
+		// /**
+		//  * True if there are any custom breakpoints assigned by the user.
+		//  *
+		//  * @return boolean
+		//  */
+		// public function has_custom_breakpoints( $count = 2 ) {
+		// 	$breakpoints = $this->dynamic_breakpoints;
+		// 	if ( $breakpoints === false ) {
+		// 		$this->get_dynamic_breakpoints( $count );
+		// 	}
+		// 	return $this->has_dynamic_breakpoints;
+		// }
 
 		/**
 		 * Replace shortcut media queries in the given CSS.
@@ -168,7 +172,7 @@ public function replace_shortcut_media_queries( $css ) {
 		 * @return String adjusted CSS
 		 */
 		public function adjust_breakpoints( $css ) {
-			if ( ! $this->has_custom_breakpoints() ) {
+			if ( ! $this->has_custom_breakpoints ) {
 				return $css;
 			}
 
@@ -226,7 +230,7 @@ public function adjust_breakpoints( $css ) {
 		 * @return void
 		 */
 		public function enqueue_adjusted_responsive_css() {
-			if ( ! $this->has_custom_breakpoints() ) {
+			if ( ! $this->has_custom_breakpoints ) {
 				return;
 			}
 
@@ -245,7 +249,7 @@ public function enqueue_adjusted_responsive_css() {
 		 * @return void
 		 */
 		public function adjust_block_styles( $block_content, $block ) {
-			if ( ! $this->has_custom_breakpoints() ) {
+			if ( ! $this->has_custom_breakpoints ) {
 				return $block_content;
 			}
 

src/global-settings.php

@@ -73,7 +73,9 @@ function __construct() {
 				$typography = get_option( 'stackable_global_typography' );
 				if ( ! empty( $typography ) && is_array( $typography ) ) {
 					$this->force_typography = get_option( 'stackable_global_force_typography' );
-					add_action( 'after_setup_theme', array( $this, 'typography_parse_global_styles' ) );
+					// Add a priority of 11 to ensure this runs after getting the dynamic breakpoints
+					// So that we can correctly adjust the breakpoints if needed.
+					add_action( 'after_setup_theme', array( $this, 'typography_parse_global_styles' ), 11 );
 				}
 
 				// For some native blocks, add a note that they're core blocks.