Update Astra theme from 4.11.11 to 4.11.12

Author: bitpoke-bot

wp-content/themes/astra/admin/assets/build/dashboard-app-rtl.css

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-element', 'wp-i18n'), 'version' => 'ae53d0bbac37b1791551');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-element', 'wp-i18n'), 'version' => '2486d8225887455a321f');

wp-content/themes/astra/admin/assets/build/dashboard-app.asset.php

@@ -43,11 +43,12 @@ const handleGetAstraPro = (
 	const spinnerHTML = disableSpinner ? '' : getSpinner();
 	const buttonHTML =
 		spinnerPosition === 'right'
-			? `<span class="button-text">${astra_admin.plugin_activating_text}</span>${spinnerHTML}`
-			: `${spinnerHTML}<span class="button-text">${astra_admin.plugin_activating_text}</span>`;
+			? `<span class="px-1 button-text">${astra_admin.plugin_activating_text}</span>${spinnerHTML}`
+			: `${spinnerHTML}<span class="px-1 button-text">${astra_admin.plugin_activating_text}</span>`;
 
-	e.target.innerHTML = DOMPurify.sanitize( buttonHTML );
-	e.target.disabled = true;
+	const button = e.target?.closest( 'button' );
+	button.innerHTML = DOMPurify.sanitize( buttonHTML );
+	button.disabled = true;
 
 	const formData = new window.FormData();
 	formData.append( 'action', 'astra_recommended_plugin_activate' );
@@ -124,7 +125,7 @@ const getAstraProTitleFreePage = () => {
  */
 const getSpinner = () => {
 	return `
-		<svg class="animate-spin installer-spinner ml-2 inline-block align-middle" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" width="16" height="16">
+		<svg class="animate-spin installer-spinner ml-1 inline-block align-middle" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" width="16" height="16">
 			<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
 			<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
 		</svg>

wp-content/themes/astra/admin/assets/build/dashboard-app.css

@@ -166,11 +166,89 @@ public function add_astra_analytics_data( $stats_data ) {
 			'preloading_local_fonts'       => isset( $admin_dashboard_settings['preload_local_fonts'] ) && $admin_dashboard_settings['preload_local_fonts'] ? 'yes' : 'no',
 		);
 
+		// Add onboarding analytics data.
+		self::add_astra_onboarding_analytics_data( $astra_stats );
+
 		$stats_data['plugin_data']['astra'] = array_merge_recursive( $stats_data['plugin_data']['astra'], $astra_stats );
 
 		return $stats_data;
 	}
 
+	/**
+	 * Add Astra onboarding analytics data.
+	 *
+	 * @param array $astra_stats Reference to the astra stats data.
+	 *
+	 * @since 4.11.12
+	 * @return array
+	 */
+	public static function add_astra_onboarding_analytics_data( &$astra_stats ) {
+		// Get onboarding analytics data from option.
+		/** @psalm-suppress UndefinedClass */
+		$option_name     = is_callable( '\One_Onboarding\Core\Register::get_option_name' )
+			? \One_Onboarding\Core\Register::get_option_name( 'astra' )
+			: 'astra_onboarding';
+		$onboarding_data = get_option( $option_name, array() );
+
+		// Return if no onboarding data.
+		if ( empty( $onboarding_data ) || ! is_array( $onboarding_data ) ) {
+			return;
+		}
+
+		// Process skipped screens.
+		if ( isset( $onboarding_data['screens'] ) && is_array( $onboarding_data['screens'] ) ) {
+			// Determine the last screen.
+			$last_screen = isset( $onboarding_data['completion_screen'] ) ? $onboarding_data['completion_screen'] : 'done';
+
+			// Transform the screen keys to their descriptive names.
+			$skipped_screens = array();
+			foreach ( $onboarding_data['screens'] as $screen ) {
+				if ( ! isset( $screen['id'] ) ) {
+					continue;
+				}
+
+				$screen_id = $screen['id'];
+
+				// Break if we've reached the last screen.
+				if ( $screen_id === $last_screen ) {
+					break;
+				}
+
+				$skipped = isset( $screen['skipped'] ) ? $screen['skipped'] : $screen_id !== $last_screen;
+				if ( $skipped ) {
+					$skipped_screens[] = $screen_id;
+				}
+			}
+
+			// Add the skipped screens as an array.
+			$astra_stats['onboarding_skipped_screens'] = $skipped_screens;
+		}
+
+		// Process pro features.
+		if ( isset( $onboarding_data['pro_features'] ) && is_array( $onboarding_data['pro_features'] ) ) {
+			$astra_stats['onboarding_selected_pro_features'] = $onboarding_data['pro_features'];
+		}
+
+		// Process selected starter templates builder.
+		$astra_stats['onboarding_selected_st_builder'] = isset( $onboarding_data['starter_templates_builder'] ) ? $onboarding_data['starter_templates_builder'] : '';
+
+		// Process selected addons
+		if ( isset( $onboarding_data['selected_addons'] ) && is_array( $onboarding_data['selected_addons'] ) ) {
+			$astra_stats['onboarding_selected_addons'] = $onboarding_data['selected_addons'];
+		}
+
+		// Onboarding Completion Status.
+		$astra_stats['boolean_values']['onboarding_completed'] = isset( $onboarding_data['completion_screen'] ) && ! empty( $onboarding_data['completion_screen'] );
+		if ( $astra_stats['boolean_values']['onboarding_completed'] ) {
+			$astra_stats['onboarding_completion_screen'] = isset( $onboarding_data['completion_screen'] ) ? $onboarding_data['completion_screen'] : '';
+		}
+
+		// Onboarding Exit Status.
+		if ( isset( $onboarding_data['exited_early'] ) ) {
+			$astra_stats['boolean_values']['onboarding_exited_early'] = (bool) $onboarding_data['exited_early'];
+		}
+	}
+
 	/**
 	 * Initiator.
 	 *

wp-content/themes/astra/admin/assets/build/dashboard-app.js

@@ -228,16 +228,20 @@ astScrollToTopHandler = function ( masthead, astScrollTop ) {
 		buttons.forEach(button => {
 			if (allToggled) {
 				button.classList.remove('toggled');
+				button.setAttribute('aria-expanded', 'false');
 			} else {
 				button.classList.add('toggled');
+				button.setAttribute('aria-expanded', 'true');
 			}
 		});
 	}
 
 	document.addEventListener('click', function (e) {
 		const button = e.target.closest('.menu-toggle');
-		if (button) {
+		if (button && mobileHeaderType === 'dropdown') {
 			button.classList.toggle('toggled');
+			const isToggled = button.classList.contains('toggled');
+			button.setAttribute('aria-expanded', isToggled ? 'true' : 'false');
 			syncToggledClass();
 		}
 	});
@@ -328,6 +332,7 @@ astScrollToTopHandler = function ( masthead, astScrollTop ) {
 		for ( var item = 0;  item < popupTrigger.length; item++ ) {
 
 			popupTrigger[item].classList.remove( 'toggled' );
+			popupTrigger[item].setAttribute('aria-expanded', 'false');
 
 			popupTrigger[item].style.display = 'flex';
 		}
@@ -420,6 +425,7 @@ astScrollToTopHandler = function ( masthead, astScrollTop ) {
 				// Open the Popup when click on trigger
 				popupTriggerMobile[ item ].removeEventListener( 'click', popupTriggerClick );
 				popupTriggerMobile[ item ].addEventListener( 'click', function(event) {
+					event.currentTarget.setAttribute('aria-expanded', 'true');
 					popupTriggerClick(event);
 					const menu = document.querySelector('.ast-mobile-popup-drawer.active');
 					if (!menu) {
@@ -432,7 +438,10 @@ astScrollToTopHandler = function ( masthead, astScrollTop ) {
 				popupTriggerDesktop[ item ].removeEventListener( 'click', astraNavMenuToggle, false );
 				// Open the Popup when click on trigger
 				popupTriggerDesktop[ item ].removeEventListener( 'click', popupTriggerClick );
-				popupTriggerDesktop[ item ].addEventListener( 'click', popupTriggerClick, false );
+				popupTriggerDesktop[ item ].addEventListener( 'click', function(event) {
+					event.currentTarget.setAttribute('aria-expanded', 'true');
+					popupTriggerClick(event);
+				}, false );
 				popupTriggerDesktop[ item ].trigger_type = 'desktop';
 			}
 
@@ -569,7 +578,7 @@ astScrollToTopHandler = function ( masthead, astScrollTop ) {
 		}
 	}
 
-	window.addEventListener( 'load', function() {
+	document.addEventListener( 'DOMContentLoaded', function() {
 		init();
 	} );
 	document.addEventListener( 'astLayoutWidthChanged', function() {
@@ -981,7 +990,9 @@ astScrollToTopHandler = function ( masthead, astScrollTop ) {
 
 		// Hide menu toggle button if menu is empty and return early.
 		if (!menu) {
-			button.style.display = 'none';
+			if (!button.classList.contains('custom-logo-link')) {
+				button.style.display = 'none';
+			}
 			return;
 		}