chore: update functions

Author: Soare-Robert-Daniel

assets/src/dashboard/parts/connected/settings/Lazyload.js

@@ -127,7 +127,7 @@ const Lazyload = ({ settings, setSettings, setCanSave }) => {
 				setting.delete( slug );
 			}
 			console.log( setting );
-			updateValue( 'lazyload_type', Array.from( setting ).join( '|' ) );
+			updateValue( 'lazyload_type', Array.from( setting ).toSorted().join( '|' ) );
 		},
 		[ settings?.lazyload_type ]
 	);

inc/lazyload_replacer.php

@@ -449,22 +449,25 @@ public function can_lazyload_for( $url, $tag = '' ) {
 		if ( defined( 'OPTML_DISABLE_PNG_LAZYLOAD' ) && OPTML_DISABLE_PNG_LAZYLOAD ) {
 			return $type['ext'] !== 'png';
 		}
-		if ( $this->settings->is_lazyload_type_viewport() && Optml_Manager::instance()->page_profiler->is_in_all_viewports( $this->get_id_by_url( $url ) ) ) {
-			if ( OPTML_DEBUG ) {
-				do_action( 'optml_log', 'Lazyload skipped image is in all viewports ' . $url . '|' . $this->get_id_by_url( $url ) );
-			}
-			// collect ID for preload.
-			Links::add_id( $this->get_id_by_url( $url ), 'high' );
-			return false;
-		}
-		if ( $this->settings->is_lazyload_type_viewport() && Optml_Manager::instance()->page_profiler->is_lcp_image_in_all_viewports( $this->get_id_by_url( $url ) ) ) {
+
+		if ( $this->settings->is_lazyload_type_viewport() ) {
+			$is_in_all_viewports = Optml_Manager::instance()->page_profiler->is_in_all_viewports( $this->get_id_by_url( $url ) );
+			$is_lcp_image        = Optml_Manager::instance()->page_profiler->is_lcp_image_in_all_viewports( $this->get_id_by_url( $url ) );
+
 			if ( OPTML_DEBUG ) {
-				do_action( 'optml_log', 'Lazyload skipped image is LCP ' . $url . '|' . $this->get_id_by_url( $url ) );
+				if ( $is_in_all_viewports ) {
+					do_action( 'optml_log', 'Lazyload skipped image is in all viewports ' . $url . '|' . $this->get_id_by_url( $url ) );
+				} elseif ( $is_lcp_image ) {
+					do_action( 'optml_log', 'Lazyload skipped image is LCP ' . $url . '|' . $this->get_id_by_url( $url ) );
+				}
 			}
 
-			Links::add_id( $this->get_id_by_url( $url ), 'high' );
-			return false;
+			if ( $is_in_all_viewports || $is_lcp_image ) {
+				Links::add_id( $this->get_id_by_url( $url ), 'high' ); // collect ID for preload.
+				return false;
+			}
 		}
+
 		if ( $this->settings->is_lazyload_type_fixed() && Optml_Tag_Replacer::$lazyload_skipped_images < self::get_skip_lazyload_limit() ) {
 			return false;
 		}

inc/settings.php

@@ -292,7 +292,7 @@ public function parse_settings( $new_settings ) {
 					$sanitized_value = is_string( $value ) ? sanitize_text_field( $value ) : '';
 					break;
 				case 'lazyload_type':
-					$sanitized_value = $this->to_map_values( $value, [ 'fixed', 'viewport', 'all' ], 'fixed' );
+					$sanitized_value = $this->to_map_values( $value, [ 'fixed', 'viewport', 'all', 'fixed|viewport' ], 'fixed' );
 					break;
 				case 'compression_mode':
 					$sanitized_value = $this->to_map_values( $value, [ 'speed_optimized', 'quality_optimized', 'custom' ], 'custom' );
@@ -796,7 +796,7 @@ public function clear_cache( $type = '' ) {
 	 * @return bool
 	 */
 	public function is_lazyload_type_viewport() {
-		return $this->get( 'lazyload_type' ) === 'viewport';
+		return false !== strpos( $this->get( 'lazyload_type' ), 'viewport' );
 	}
 
 	/**
@@ -814,7 +814,7 @@ public function is_lazyload_type_all() {
 	 * @return bool
 	 */
 	public function is_lazyload_type_fixed() {
-		return $this->get( 'lazyload_type' ) === 'fixed';
+		return false !== strpos( $this->get( 'lazyload_type' ), 'fixed' );
 	}
 	/**
 	 * Utility to check if offload is enabled.

inc/tag_replacer.php

@@ -400,29 +400,34 @@ public function regular_tag_replace( $new_tag, $original_url, $new_url, $optml_a
 				$new_tag = $is_slashed ? str_replace( 'loading=\"lazy\"', 'loading=\"eager\"', $new_tag ) : str_replace( 'loading="lazy"', 'loading="eager"', $new_tag );
 			}
 		}
-		if ( $this->settings->is_lazyload_type_viewport() && Optml_Manager::instance()->page_profiler->is_in_all_viewports( $this->get_id_by_url( $original_url ) ) ) {
-			if ( OPTML_DEBUG ) {
-				do_action( 'optml_log', 'Adding preload priority for image ' . $original_url . '|' . $this->get_id_by_url( $original_url ) );
-			}
-			$new_tag = preg_replace( '/<img/im', $is_slashed ? '<img fetchpriority=\"high\"' : '<img fetchpriority="high"', $new_tag );
-			// collect ID for preload.
-			Links::add_id( $this->get_id_by_url( $original_url ), 'high' );
-		}
-		if ( $this->settings->is_lazyload_type_viewport() && Optml_Manager::instance()->page_profiler->is_lcp_image_in_all_viewports( $this->get_id_by_url( $original_url ) ) ) {
+
+		if ( $this->settings->is_lazyload_type_viewport() ) {
+			$is_in_all_viewports = Optml_Manager::instance()->page_profiler->is_in_all_viewports( $this->get_id_by_url( $original_url ) );
+			$is_lcp_image        = Optml_Manager::instance()->page_profiler->is_lcp_image_in_all_viewports( $this->get_id_by_url( $original_url ) );
+
 			if ( OPTML_DEBUG ) {
-				do_action( 'optml_log', 'Adding preload image is LCP ' . $original_url . '|' . $this->get_id_by_url( $original_url ) );
+				if ( $is_in_all_viewports ) {
+					do_action( 'optml_log', 'Adding preload priority for image ' . $original_url . '|' . $this->get_id_by_url( $original_url ) );
+				} elseif ( $is_lcp_image ) {
+					do_action( 'optml_log', 'Adding preload image is LCP ' . $original_url . '|' . $this->get_id_by_url( $original_url ) );
+				}
 			}
 
-			$new_tag = preg_replace( '/<img/im', $is_slashed ? '<img fetchpriority=\"high\"' : '<img fetchpriority="high"', $new_tag );
-			Links::add_id( $this->get_id_by_url( $original_url ), 'high' );
-		}
-		// // If the image is between the first images we add the fetchpriority attribute to improve the LCP.
-		if ( $this->settings->is_lazyload_type_fixed() && self::$lazyload_skipped_images < Optml_Lazyload_Replacer::get_skip_lazyload_limit() ) {
-			if ( strpos( $new_tag, 'fetchpriority=' ) === false ) {
+			if ( $is_in_all_viewports || $is_lcp_image ) {
 				$new_tag = preg_replace( '/<img/im', $is_slashed ? '<img fetchpriority=\"high\"' : '<img fetchpriority="high"', $new_tag );
+				Links::add_id( $this->get_id_by_url( $original_url ), 'high' ); // collect ID for preload.
 			}
 		}
 
+		// // If the image is between the first images we add the fetchpriority attribute to improve the LCP.
+		if (
+			$this->settings->is_lazyload_type_fixed() &&
+			self::$lazyload_skipped_images < Optml_Lazyload_Replacer::get_skip_lazyload_limit() &&
+			false === strpos( $new_tag, 'fetchpriority=' )
+		) {
+			$new_tag = preg_replace( '/<img/im', $is_slashed ? '<img fetchpriority=\"high\"' : '<img fetchpriority="high"', $new_tag );
+		}
+
 		++self::$lazyload_skipped_images;
 		return preg_replace( $pattern, $replace, $new_tag );
 	}