release(minor): v3.1.0

### New Features
- Add “Random” Sort Option to Otter Posts Block  
- Add "from" setting for the Forms block  
- Ability to modify form subject dynamically  
- Allow tabs to have IDs so they can be linked and opened from an anchor  
- Allow disabling the Popup block  
- Display thumbnails in Live Search results  

### Improvements
- Otter Patterns Modal Improvements  
- Move AI icon to the end of the toolbar to avoid interfering with core functionality  
- Responsive settings — add 600 px and 960 px breakpoints  
- Make Dynamic Content less intrusive  
- A11y improvements in Sharing Icons Block  
- Add new ACF types support to the Posts Block  
- New User Experience Improvements  

### Bug Fixes
- Review block generating double schema markup  
- Popup block bypasses the Display Interval feature  
- Disabling Patterns Library doesn’t hide patterns  
- Letter-case overlap in the sidebar  
- Live Search shows incorrect prices for products  
- Popup template with form not rendering top padding correctly  
- General accessibility issues  
- Product Review block inside a Pattern not visible in the Review Comparison Table block  
- Menu Icons break the font of menu items  
- Select-field options not editable in Otter Blocks Form  
- Pagination with Posts block not working on the home page

Author: HardeepAsrani

composer.json

@@ -19,7 +19,7 @@
 		"dealerdirect/phpcodesniffer-composer-installer": "0.7.1",
 		"automattic/vipwpcs": "^1.0.0",
 		"phpunit/phpunit": "9.6.5",
-		"yoast/phpunit-polyfills": "^3.0",
+		"yoast/phpunit-polyfills": "^4.0",
 		"phpstan/phpstan": "^1.10",
 		"szepeviktor/phpstan-wordpress": "^1.3",
 		"php-stubs/woocommerce-stubs": "^9.1",
@@ -78,6 +78,6 @@
 		"wptt/webfont-loader": "^1.1",
 		"sabberworm/php-css-parser": "^8.4",
 		"stripe/stripe-php": "^15.3",
-		"enshrined/svg-sanitize": "^0.19.0"
+		"enshrined/svg-sanitize": "^0.21.0"
 	}
 }

composer.lock

@@ -129,7 +129,7 @@ public function enqueue_editor_assets() {
 	 * @access  public
 	 */
 	public function enqueue_block_frontend_assets() {
-		if ( function_exists( 'is_amp_endpoint' ) && is_amp_endpoint() ) {
+		if ( did_action( 'parse_request' ) && function_exists( 'amp_is_request' ) && amp_is_request() ) {
 			self::$can_load_frontend = false;
 		}
 

inc/class-blocks-animation.php

@@ -51,6 +51,7 @@ public function init() {
 		add_filter( 'themeisle_sdk_blackfriday_data', array( $this, 'add_black_friday_data' ) );
 
 		add_action( 'parse_query', array( $this, 'pagination_support' ) );
+		add_filter( 'rest_post_collection_params', array( $this, 'add_random_orderby_param' ) );
 	}
 
 	/**
@@ -630,6 +631,21 @@ public function add_black_friday_data( $configs ) {
 		return $configs;
 	}
 
+	/**
+	 * Add random orderby parameter to REST API.
+	 *
+	 * @param array $params REST API parameters.
+	 *
+	 * @return array Modified parameters.
+	 */
+	public function add_random_orderby_param( $params ) {
+		if ( isset( $params['orderby'] ) ) {
+			$params['orderby']['enum'][] = 'rand';
+		}
+
+		return $params;
+	}
+
 	/**
 	 * Singleton method.
 	 *

inc/class-main.php

@@ -8,7 +8,9 @@
 namespace ThemeIsle\GutenbergBlocks;
 
 use ThemeIsle\GutenbergBlocks\Main, ThemeIsle\GutenbergBlocks\Pro, ThemeIsle\GutenbergBlocks\Plugins\Stripe_API;
+use ThemeIsle\GutenbergBlocks\Plugins\Dashboard;
 use ThemeIsle\GutenbergBlocks\Plugins\LimitedOffers;
+use ThemeIsle\GutenbergBlocks\Plugins\Template_Cloud;
 
 /**
  * Class Registration.
@@ -292,10 +294,14 @@ public function enqueue_block_editor_assets() {
 				'isRTL'                   => is_rtl(),
 				'highlightDynamicText'    => get_option( 'themeisle_blocks_settings_highlight_dynamic', true ),
 				'hasOpenAiKey'            => ! empty( get_option( 'themeisle_open_ai_api_key' ) ),
+				'hasPatternSources'       => Template_Cloud::has_used_pattern_sources(),
 			)
 		);
 
 		wp_enqueue_style( 'otter-editor', OTTER_BLOCKS_URL . 'build/blocks/editor.css', array( 'wp-edit-blocks', 'font-awesome-5', 'font-awesome-4-shims' ), $asset_file['version'] );
+
+		add_filter( 'themeisle-sdk/survey/' . OTTER_PRODUCT_SLUG, array( Dashboard::class, 'get_survey_metadata' ), 10, 2 );
+		do_action( 'themeisle_internal_page', OTTER_PRODUCT_SLUG, 'editor' );
 	}
 
 	/**
@@ -441,7 +447,7 @@ function( $block ) {
 			}
 		}
 
-		if ( ( function_exists( 'is_amp_endpoint' ) && is_amp_endpoint() ) || is_admin() ) {
+		if ( ( did_action( 'parse_request' ) && function_exists( 'amp_is_request' ) && amp_is_request() ) || is_admin() ) {
 			return;
 		}
 
@@ -615,6 +621,8 @@ function() {
 				'themeisleGutenbergSlider',
 				array(
 					'isRTL' => is_rtl(),
+					'next'  => __( 'Next Slide', 'otter-blocks' ),
+					'prev'  => __( 'Previous Slide', 'otter-blocks' ),
 				)
 			);
 		}
@@ -942,7 +950,7 @@ public function subscribe_fa( $block_content, $block ) {
 				self::$is_fa_loaded = true;
 
 				// See the src/blocks/plugins/menu-icons/inline.css file for where this comes from.
-				$styles = '.fab.wp-block-navigation-item,.far.wp-block-navigation-item,.fas.wp-block-navigation-item{-moz-osx-font-smoothing:inherit;-webkit-font-smoothing:inherit;font-weight:inherit}.fab.wp-block-navigation-item:before,.far.wp-block-navigation-item:before,.fas.wp-block-navigation-item:before{font-family:Font Awesome\ 5 Free;margin-right:5px}.fab.wp-block-navigation-item:before,.far.wp-block-navigation-item:before{font-weight:400;padding-right:5px}.fas.wp-block-navigation-item:before{font-weight:900;padding-right:5px}.fab.wp-block-navigation-item:before{font-family:Font Awesome\ 5 Brands}';
+				$styles = '.fab.wp-block-navigation-item,.far.wp-block-navigation-item,.fas.wp-block-navigation-item{-moz-osx-font-smoothing:inherit;-webkit-font-smoothing:inherit;font-weight:inherit;font-family: inherit}.fab.wp-block-navigation-item:before,.far.wp-block-navigation-item:before,.fas.wp-block-navigation-item:before{font-family:Font Awesome\ 5 Free;margin-right:5px}.fab.wp-block-navigation-item:before,.far.wp-block-navigation-item:before{font-weight:400;padding-right:5px}.fas.wp-block-navigation-item:before{font-weight:900;padding-right:5px}.fab.wp-block-navigation-item:before{font-family:Font Awesome\ 5 Brands}';
 
 				wp_add_inline_style( 'font-awesome-5', $styles );
 				return $block_content;
@@ -976,7 +984,7 @@ public function subscribe_fa( $block_content, $block ) {
 	 * @since 2.0.5
 	 */
 	public function load_sticky( $block_content, $block ) {
-		if ( ( function_exists( 'is_amp_endpoint' ) && is_amp_endpoint() ) || self::$scripts_loaded['sticky'] ) {
+		if ( ( did_action( 'parse_request' ) && function_exists( 'amp_is_request' ) && amp_is_request() ) || self::$scripts_loaded['sticky'] ) {
 			return $block_content;
 		}
 

inc/class-registration.php

@@ -32,6 +32,7 @@ public function init() {
 		add_action( 'rest_api_init', array( $this, 'autoload_block_classes' ) );
 		add_action( 'before_delete_post', array( __CLASS__, 'delete_css_file' ) );
 		add_action( 'customize_save_after', array( $this, 'customize_save_after' ) );
+		add_action( 'rest_after_insert_wp_block', array( $this, 'insert_pattern' ), 10, 3 );
 		add_filter( 'customize_dynamic_partial_args', array( $this, 'customize_dynamic_partial_args' ), 10, 2 );
 	}
 
@@ -568,6 +569,22 @@ public static function mark_review_block_metadata( $post_id ) {
 		}
 	}
 
+	/**
+	 * Action to run after inserting a pattern.
+	 * 
+	 * @param \WP_Post         $post The post object.
+	 * @param \WP_REST_Request $request The request object.
+	 * @param bool             $creating Whether the post is being created.
+	 * @access public
+	 */
+	public function insert_pattern( $post, $request, $creating ) {
+		// Generate CSS for the inserted pattern.
+		self::generate_css_file( $post->ID );
+
+		// Mark the post as having a review block if applicable.
+		self::mark_review_block_metadata( $post->ID );
+	}
+
 	/**
 	 * The instance method for the static class.
 	 * Defines and returns the instance of the static class.

inc/css/class-css-handler.php

@@ -93,6 +93,13 @@ class Form_Settings_Data {
 	 */
 	private $from_name;
 
+	/**
+	 * The email of the sender.
+	 *
+	 * @var string|null
+	 */
+	private $from_email;
+
 	/**
 	 * The CC recipients.
 	 *
@@ -233,6 +240,9 @@ public static function get_form_setting_from_wordpress_options( $form_option ) {
 				if ( isset( $form['fromName'] ) ) {
 					$integration->set_from_name( $form['fromName'] );
 				}
+				if ( isset( $form['fromEmail'] ) ) {
+					$integration->set_from_email( $form['fromEmail'] );
+				}
 				if ( isset( $form['cc'] ) ) {
 					$integration->set_cc( $form['cc'] );
 				}
@@ -419,6 +429,16 @@ public function has_from_name() {
 		return isset( $this->from_name ) && '' !== $this->from_name;
 	}
 
+	/**
+	 * Check if it has the from_email set.
+	 *
+	 * @return bool
+	 * @since 2.0.3
+	 */
+	public function has_from_email() {
+		return isset( $this->from_email ) && '' !== $this->from_email && filter_var( $this->from_email, FILTER_VALIDATE_EMAIL ) !== false;
+	}
+
 	/**
 	 * Check if it has an autoresponder.
 	 *
@@ -615,6 +635,30 @@ public function set_from_name( $from_name ) {
 		return $this;
 	}
 
+	/**
+	 * Get the email of the sender.
+	 *
+	 * @return string
+	 */
+	public function get_from_email() {
+		return $this->from_email;
+	}
+
+	/**
+	 * Set the email of the sender.
+	 *
+	 * @param string $from_email The email of the sender.
+	 * @return Form_Settings_Data
+	 */
+	public function set_from_email( $from_email ) {
+		if ( filter_var( $from_email, FILTER_VALIDATE_EMAIL ) !== false ) {
+			$this->from_email = $from_email;
+		} else {
+			$this->from_email = '';
+		}
+		return $this;
+	}
+
 	/**
 	 * Get the email cc.
 	 *

inc/integrations/class-form-settings-data.php

@@ -9,6 +9,7 @@
 
 use ThemeIsle\GutenbergBlocks\Pro;
 use ThemeIsle\GutenbergBlocks\Plugins\FSE_Onboarding;
+use ThemeIsle\GutenbergBlocks\Plugins\Template_Cloud;
 
 /**
  * Class Dashboard
@@ -28,15 +29,16 @@ class Dashboard {
 	public function init() {
 		add_action( 'admin_menu', array( $this, 'register_menu_page' ) );
 		add_action( 'admin_init', array( $this, 'maybe_redirect' ) );
-		add_action( 'admin_head', array( $this, 'form_submission_elements' ) );
+		add_action( 'admin_head', array( $this, 'survey_elements' ) );
+		add_action( 'admin_notices', array( $this, 'form_submission_elements' ), 30 );
 		add_action( 'admin_head', array( $this, 'add_inline_css' ) );
 
 		$form_options = get_option( 'themeisle_blocks_form_emails' );
 		if ( ! empty( $form_options ) ) {
 			add_action( 'wp_dashboard_setup', array( $this, 'form_submissions_widget' ) );
 		}
 
-		add_filter( 'themeisle-sdk/survey/' . OTTER_PRODUCT_SLUG, array( $this, 'get_survey_metadata' ), 10, 2 );
+		add_filter( 'themeisle-sdk/survey/' . OTTER_PRODUCT_SLUG, array( __CLASS__, 'get_survey_metadata' ), 10, 2 );
 	}
 
 	/**
@@ -241,11 +243,13 @@ public function get_dashboard_data() {
 			'assetsPath'             => OTTER_BLOCKS_URL . 'assets/',
 			'stylesExist'            => is_dir( $basedir ) || boolval( get_transient( 'otter_animations_parsed' ) ),
 			'hasPro'                 => Pro::is_pro_installed(),
+			'otterPage'              => tsdk_translate_link( tsdk_utmify( 'https://themeisle.com/plugins/otter-blocks/', 'welcome', 'admin' ) ),
 			'upgradeLink'            => tsdk_translate_link( tsdk_utmify( Pro::get_url(), 'options', Pro::get_reference() ) ),
 			'upgradeLinkFromTc'      => tsdk_utmify( Pro::get_url(), 'templatecloud' ),
 			'tcUpgradeLink'          => tsdk_utmify( 'https://themeisle.com/plugins/templates-cloud/', 'templatecloud', 'otter-blocks' ),
 			'tcDocs'                 => 'https://docs.themeisle.com/article/2191-templates-cloud-collections',
 			'docsLink'               => Pro::get_docs_url(),
+			'newPageUrl'             => esc_url( admin_url( 'post-new.php?post_type=page' ) ),
 			'showFeedbackNotice'     => $this->should_show_feedback_notice(),
 			'deal'                   => ! Pro::is_pro_installed() ? $offer->get_localized_data() : array(),
 			'hasOnboarding'          => false !== get_theme_support( FSE_Onboarding::SUPPORT_KEY ),
@@ -278,6 +282,7 @@ public function get_dashboard_data() {
 				)
 			),
 			'neveInstalled'          => defined( 'NEVE_VERSION' ),
+			'hasPatternSources'      => Template_Cloud::has_used_pattern_sources(),
 		);
 
 		$global_data = apply_filters( 'otter_dashboard_data', $global_data );
@@ -313,24 +318,34 @@ public function maybe_redirect() {
 		}
 
 		update_option( 'themeisle_blocks_settings_redirect', false );
-		wp_safe_redirect( admin_url( 'admin.php?page=otter' ) );
+		wp_safe_redirect( admin_url( 'admin.php?page=otter&welcome=true' ) );
 		exit;
 	}
 
+	/**
+	 * Add elements for the survey.
+	 *
+	 * @return void
+	 */
+	public function survey_elements() {
+		$screen = get_current_screen();
+
+		if ( 'edit-otter_form_record' === $screen->id ) {
+			do_action( 'themeisle_internal_page', OTTER_PRODUCT_SLUG, 'form-submissions' );
+		}
+	}
+
 	/**
 	 * Add elements for Form Block submission page.
 	 *
 	 * @return void
 	 */
 	public function form_submission_elements() {
 		$screen = get_current_screen();
+
 		if ( 'edit-otter_form_record' === $screen->id || 'otter-blocks_page_form-submissions-free' === $screen->id ) {
 			$this->the_otter_banner();
 		}
-		
-		if ( 'edit-otter_form_record' === $screen->id ) {
-			do_action( 'themeisle_internal_page', OTTER_PRODUCT_SLUG, 'form-submissions' );
-		}
 	}
 
 	/**
@@ -761,17 +776,16 @@ public function form_submissions_widget_content() {
 	 * 
 	 * @return array The data in Frombricks format.
 	 */
-	public function get_survey_metadata( $data, $page_slug ) {
-		$dash_data = $this->get_dashboard_data();
-		
-		$install_days_number = $dash_data['days_since_install'];
+	public static function get_survey_metadata( $data, $page_slug ) {
+		$dash_data           = apply_filters( 'otter_dashboard_data', array() );
+		$install_days_number = intval( ( time() - get_option( 'otter_blocks_install', time() ) ) / DAY_IN_SECONDS );
 
 		$data = array(
 			'environmentId' => 'clp9hqm8c1osfdl2ixwd0k0iz',
 			'attributes'    => array(
 				'install_days_number' => $install_days_number,
 				'plan'                => isset( $dash_data['license'], $dash_data['license']['type'] ) ? $dash_data['license']['type'] : 'free',
-				'freeVersion'         => $dash_data['version'],
+				'freeVersion'         => OTTER_BLOCKS_VERSION,
 			),
 		);
 

inc/plugins/class-dashboard.php

@@ -525,11 +525,10 @@ public function get_archive_description( $data ) {
 		$description = get_the_archive_description();
 
 		if ( empty( $description ) ) {
-			$default     = isset( $data['default'] ) ? esc_html( $data['default'] ) : '';
-			$description = $default;
+			$description = isset( $data['default'] ) ? esc_html( $data['default'] ) : '';
 		}
 
-		return $description;
+		return wp_strip_all_tags( $description );
 	}
 
 	/**
@@ -630,7 +629,7 @@ public function apply_link( $data ) {
 			'<a href="%s" %s>%s</a>',
 			esc_url( $link ),
 			$attrs,
-			esc_html( $data['text'] )
+			wp_kses_post( $data['text'] )
 		);
 
 		return $value;

inc/plugins/class-dynamic-content.php

@@ -324,6 +324,9 @@ function ( $item ) {
 							if ( isset( $item['fromName'] ) ) {
 								$item['fromName'] = sanitize_text_field( $item['fromName'] );
 							}
+							if ( isset( $item['fromEmail'] ) ) {
+								$item['fromEmail'] = sanitize_email( $item['fromEmail'] );
+							}
 							if ( isset( $item['cc'] ) ) {
 								$item['cc'] = sanitize_text_field( $item['cc'] );
 							}
@@ -389,6 +392,9 @@ function ( $item ) {
 								'fromName'                => array(
 									'type' => 'string',
 								),
+								'fromEmail'               => array(
+									'type' => 'string',
+								),
 								'redirectLink'            => array(
 									'type' => 'string',
 								),