Merge branch 'release/2.33.1'

CHANGES.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.33.1 (2/7/24)
+* Added: [Developers] Add entry-grid order to the editor CSS.
+* Added: New `has-z-index-2` helper class along with the existing `has-z-index-1`, `has-z-index-0`, and `has-z-index--1` classes.
+* Changed: Update ACF to 6.2.6.1.
+* Fixed: The `font_size` param on `[mai_menu]` shortcode was not working correctly for custom values.
+* Fixed: Negative margin on nested elements was not overlapping correctly in some configurations.
+* Fixed: Unwanted vertical scroll on ACF top tabs in the block editor.
+
 ## 2.33.0 (1/30/24)
 * Added: New setting to force the logo to white on dark backgrounds (dark header or transparent header background). Find the setting in Customizer > Theme Settings > Site Header.
 * Added: [Developers] New `mai_before_entry` and `mai_after_entry` action hooks.

assets/lang/mai-engine.pot

@@ -2,14 +2,14 @@
 # This file is distributed under the GPL-2.0-or-later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Mai Engine 2.33.0\n"
+"Project-Id-Version: Mai Engine 2.33.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mai-engine\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-01-30T16:34:39+00:00\n"
+"POT-Creation-Date: 2024-02-07T15:34:58+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.9.0\n"
 "X-Domain: mai-engine\n"
@@ -1289,11 +1289,11 @@ msgstr ""
 msgid "Updated options."
 msgstr ""
 
-#: lib/classes/class-mai-entry.php:1265
+#: lib/classes/class-mai-entry.php:1270
 msgid "Pages:"
 msgstr ""
 
-#: lib/classes/class-mai-entry.php:1273
+#: lib/classes/class-mai-entry.php:1278
 msgid "Page "
 msgstr ""
 

assets/scss/editor.scss

@@ -412,6 +412,10 @@ input[type="submit"],
 	pointer-events: none;
 }
 
+.entry-grid {
+	order: var(--entry-order, var(--entry-index, var(--order, unset))) !important;
+}
+
 // Columns.
 
 .has-columns:not(.has-columns-nested) {

assets/scss/plugins/advanced-custom-fields.scss

@@ -1,5 +1,13 @@
 @import "../abstracts/_index";
 
+// tabs.
+
+.acf-tab-wrap.-top {
+	padding-bottom: 1px; // Fixes vertical scrollbar on tabs.
+}
+
+// end tabs.
+
 // acf sortable checkbox.
 
 .mai-sortable ul.acf-checkbox-list > li {
@@ -54,14 +62,15 @@
 // clone.
 
 .acf-field-clone[class*="mai"] {
-	margin: var(--mai-field-clone-margin, 0) !important;
+	margin: 0 !important;
+	// margin: var(--mai-field-clone-margin, 0) !important;
 	padding: 0 !important;
 	border: 0 !important;
 }
 
-.acf-field[class*="mai"] + .acf-field-clone[class*="mai"] {
-	--mai-field-clone-margin: -16px 0 0;
-}
+// .acf-field[class*="mai"] + .acf-field-clone[class*="mai"] {
+	// --mai-field-clone-margin: -16px 0 0;
+// }
 
 .acf-field-clone[class*="mai"] .acf-clone-fields {
 	border: 0 !important;
@@ -356,7 +365,7 @@
 	margin-left: 0;
 }
 
-.acf-block-panel .acf-block-fields div.acf-field[data-name="border_radius"] {
+.acf-block-panel .acf-block-fields div.acf-field[data-key="mai_icon_round_corners"] {
 	padding-top: 16px;
 	border-top: 1px solid #e2e4e7;
 }

assets/scss/utilities/_misc.scss

@@ -191,11 +191,12 @@
 
 	.has--#{ $spacing-name }-margin-top {
 		margin-top: calc(var(--spacing-#{ $spacing-name }) * -1) !important;
-
+		z-index: 1;
 	}
 
 	.has--#{ $spacing-name }-margin-bottom {
 		margin-bottom: calc(var(--spacing-#{ $spacing-name }) * -1) !important;
+		z-index: 1;
 	}
 }
 
@@ -205,11 +206,12 @@
 
 		.has--#{ $spacing-name }-margin-right {
 			margin-right: calc(var(--spacing-#{ $spacing-name }) * -1) !important;
+			z-index: 1;
 		}
 
 		.has--#{ $spacing-name }-margin-left {
 			margin-left: calc(var(--spacing-#{ $spacing-name }) * -1) !important;
-
+			z-index: 1;
 		}
 	}
 }
@@ -233,6 +235,10 @@
 	z-index: 1 !important;
 }
 
+.has-z-index-2 {
+	z-index: 1 !important;
+}
+
 // TODO: Use custom properties?
 // If so, update editor.scss to match.
 @each $padding-name, $padding-size in $padding_scale {

lib/classes/class-mai-entry.php

@@ -133,6 +133,11 @@ public function __construct( $entry, $args ) {
 	 * @return void
 	 */
 	public function render() {
+		// // Bail if not rendering this empty via a filter.
+		// if ( ! (bool) apply_filters( 'mai_do_entry', true, $this->entry, $this->args ) ) {
+		// 	return;
+		// }
+
 		// Get context for index, then get the index. This gets reset in `mai_do_entries_open()`.
 		$entry_index = in_array( $this->context, [ 'archive', 'block' ] ) ? mai_get_index( mai_get_entry_index_context( $this->context ) ) : 0;
 

lib/functions/utilities.php

@@ -806,7 +806,7 @@ function mai_get_menu( $menu, $args = [] ) {
 			if ( in_array( $args['font_size'], ['xs', 'sm', 'md', 'lg', 'xl', 'xxl' ] ) ) {
 				$size = sprintf( 'var(--font-size-%s)', $args['font_size'] );
 			} else {
-				$size = mai_get_unit_value( $args['font-size'] );
+				$size = mai_get_unit_value( $args['font_size'] );
 			}
 
 			$atts['style'] .= sprintf( '--menu-font-size:%s;', $size );

mai-engine.php

@@ -6,7 +6,7 @@
  * Plugin URI:        https://bizbudding.com/mai-theme/
  * GitHub Plugin URI: https://github.com/maithemewp/mai-engine/
  * Description:       The required plugin to power Mai child themes.
- * Version:           2.33.0
+ * Version:           2.33.1
  * Requires at least: 6.4
  * Requires PHP:      7.4
  * Author:            BizBudding

vendor/composer/installed.json

@@ -435,11 +435,11 @@
         },
         {
             "name": "wpengine/advanced-custom-fields-pro",
-            "version": "6.2.5",
-            "version_normalized": "6.2.5.0",
+            "version": "6.2.6.1",
+            "version_normalized": "6.2.6.1",
             "dist": {
                 "type": "zip",
-                "url": "https://connect.advancedcustomfields.com/v2/plugins/composer_download?p=pro&t=6.2.5"
+                "url": "https://connect.advancedcustomfields.com/v2/plugins/composer_download?p=pro&t=6.2.6.1"
             },
             "require": {
                 "composer/installers": "~1.0 || ~2.0"

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'maithemewp/mai-engine',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
-        'reference' => '1ff7e946f4e7b489114d2749140cfefbcf1f597a',
+        'reference' => '68bdde60d4f9ac33f2a87f5a35de03644aef0b1c',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -319,7 +319,7 @@
         'maithemewp/mai-engine' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => '1ff7e946f4e7b489114d2749140cfefbcf1f597a',
+            'reference' => '68bdde60d4f9ac33f2a87f5a35de03644aef0b1c',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -337,12 +337,12 @@
         'wpackagist-plugin/advanced-custom-fields' => array(
             'dev_requirement' => false,
             'replaced' => array(
-                0 => '6.2.5',
+                0 => '6.2.6.1',
             ),
         ),
         'wpengine/advanced-custom-fields-pro' => array(
-            'pretty_version' => '6.2.5',
-            'version' => '6.2.5.0',
+            'pretty_version' => '6.2.6.1',
+            'version' => '6.2.6.1',
             'reference' => NULL,
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../wpengine/advanced-custom-fields-pro',

vendor/wpengine/advanced-custom-fields-pro/acf.php

@@ -9,7 +9,7 @@
  * Plugin Name:       Advanced Custom Fields PRO
  * Plugin URI:        https://www.advancedcustomfields.com
  * Description:       Customize WordPress with powerful, professional and intuitive fields.
- * Version:           6.2.5
+ * Version:           6.2.6.1
  * Author:            WP Engine
  * Author URI:        https://wpengine.com/?utm_source=wordpress.org&utm_medium=referral&utm_campaign=plugin_directory&utm_content=advanced_custom_fields
  * Update URI:        https://www.advancedcustomfields.com/pro
@@ -36,7 +36,7 @@ class ACF {
 		 *
 		 * @var string
 		 */
-		public $version = '6.2.5';
+		public $version = '6.2.6.1';
 
 		/**
 		 * The plugin settings array.
@@ -90,6 +90,9 @@ public function initialize() {
 			$this->define( 'ACF_FIELD_API_VERSION', 5 );
 			$this->define( 'ACF_UPGRADE_VERSION', '5.5.0' ); // Highest version with an upgrade routine. See upgrades.php.
 
+			// Register activation hook.
+			register_activation_hook( __FILE__, array( $this, 'acf_plugin_activated' ) );
+
 			// Define settings.
 			$this->settings = array(
 				'name'                    => __( 'Advanced Custom Fields', 'acf' ),
@@ -215,12 +218,6 @@ public function initialize() {
 				acf_include( 'includes/admin/admin-upgrade.php' );
 			}
 
-			// Include polyfill for < PHP7 unserialize.
-			if ( PHP_VERSION_ID < 70000 ) {
-				acf_include( 'vendor/polyfill-unserialize/src/Unserialize.php' );
-				acf_include( 'vendor/polyfill-unserialize/src/DisallowedClassesSubstitutor.php' );
-			}
-
 			// Include legacy.
 			acf_include( 'includes/legacy/legacy-locations.php' );
 
@@ -617,7 +614,7 @@ public function posts_where( $where, $wp_query ) {
 		 * @date    3/5/17
 		 * @since   5.5.13
 		 *
-		 * @param   string $name The constant name.
+		 * @param   string $name  The constant name.
 		 * @param   mixed  $value The constant value.
 		 * @return  void
 		 */
@@ -659,7 +656,7 @@ public function get_setting( $name ) {
 		 * @date    28/09/13
 		 * @since   5.0.0
 		 *
-		 * @param   string $name The setting name.
+		 * @param   string $name  The setting name.
 		 * @param   mixed  $value The setting value.
 		 * @return  true
 		 */
@@ -687,7 +684,7 @@ public function get_data( $name ) {
 		 * @date    28/09/13
 		 * @since   5.0.0
 		 *
-		 * @param   string $name The data name.
+		 * @param   string $name  The data name.
 		 * @param   mixed  $value The data value.
 		 * @return  void
 		 */
@@ -732,7 +729,7 @@ public function new_instance( $class ) {
 		 * @since   5.9.0
 		 *
 		 * @param   string $key Key name.
-		 * @return  bool
+		 * @return  boolean
 		 */
 		public function __isset( $key ) {
 			return in_array( $key, array( 'locations', 'json' ), true );
@@ -756,6 +753,21 @@ public function __get( $key ) {
 			}
 			return null;
 		}
+
+		/**
+		 * Plugin Activation Hook
+		 *
+		 * @since 6.2.6
+		 */
+		public function acf_plugin_activated() {
+			// Set the first activated version of ACF.
+			if ( null === get_option( 'acf_first_activated_version', null ) ) {
+				// If acf_version is set, this isn't the first activated version, so leave it unset so it's legacy.
+				if ( null === get_option( 'acf_version', null ) ) {
+					update_option( 'acf_first_activated_version', ACF_VERSION, true );
+				}
+			}
+		}
 	}
 
 	/**