Merge branch 'develop' into feat/generate-css-file

Author: [email protected]

languages/stackable-ultimate-gutenberg-blocks.pot

@@ -1,6 +1,6 @@
 {
 	"name": "stackable",
-	"version": "3.18.0",
+	"version": "3.18.1",
 	"private": true,
 	"description": "Blocks for everyone",
 	"author": "Benjamin Intal of Gambit",

package-lock.json

@@ -6,7 +6,7 @@
  * Author: Gambit Technologies, Inc
  * Author URI: http://gambit.ph
  * Text Domain: stackable-ultimate-gutenberg-blocks
- * Version: 3.18.0
+ * Version: 3.18.1
  *
  * @package Stackable
  * @fs_premium_only /freemius.php, /freemius/
@@ -17,6 +17,27 @@
 	exit;
 }
 
+if ( ! function_exists( 'stackable_multiple_plugins_check' ) ) {
+	// Prevent multiple Stackable plugin versions from being active simultaneously.
+	function stackable_multiple_plugins_check() {
+		if ( is_plugin_active( $GLOBALS['OTHER_STACKABLE_FILE'] ) ) {
+			deactivate_plugins( $GLOBALS['OTHER_STACKABLE_FILE'] );
+		}
+	}
+}
+
+if ( defined('STACKABLE_FILE') && STACKABLE_FILE !== __FILE__ && ! isset( $GLOBALS['OTHER_STACKABLE_FILE'] ) ) {
+	// Get relative file path of the other Stackable version.
+	$GLOBALS['OTHER_STACKABLE_FILE'] = plugin_basename( STACKABLE_FILE );
+
+	// Use a temporary option to store the other Stackable Plugin info needed for the admin notice. This will be deleted later.
+	// Note: We cannot use add_action in the register_activation_hook callback so we use this temporary option.
+	// See https://developer.wordpress.org/reference/functions/register_activation_hook/#process-flow for more info.
+	add_option( 'stackable_other_stackable_plugin_info', [ 'BUILD' => STACKABLE_BUILD, 'VERSION' => STACKABLE_VERSION ] );
+
+	register_activation_hook( __FILE__, 'stackable_multiple_plugins_check' );
+}
+
 // Freemius SDK: Auto deactivate the free version when activating the paid one.
 if ( function_exists( 'sugb_fs' ) ) {
 	sugb_fs()->set_basename( true, __FILE__ );
@@ -25,7 +46,7 @@
 
 defined( 'STACKABLE_SHOW_PRO_NOTICES' ) || define( 'STACKABLE_SHOW_PRO_NOTICES', true );
 defined( 'STACKABLE_BUILD' ) || define( 'STACKABLE_BUILD', 'free' );
-defined( 'STACKABLE_VERSION' ) || define( 'STACKABLE_VERSION', '3.18.0' );
+defined( 'STACKABLE_VERSION' ) || define( 'STACKABLE_VERSION', '3.18.1' );
 defined( 'STACKABLE_FILE' ) || define( 'STACKABLE_FILE', __FILE__ );
 defined( 'STACKABLE_I18N' ) || define( 'STACKABLE_I18N', 'stackable-ultimate-gutenberg-blocks' ); // Plugin slug.
 defined( 'STACKABLE_DESIGN_LIBRARY_URL' ) || define( 'STACKABLE_DESIGN_LIBRARY_URL', 'https://stackable-files.pages.dev' ); // Design Library CDN URL
@@ -158,6 +179,28 @@ function stackable_notice_gutenberg_plugin_ignore() {
 	add_action( 'wp_ajax_stackable_notice_gutenberg_plugin_ignore', 'stackable_notice_gutenberg_plugin_ignore' );
 }
 
+/**
+ * Show notice if another Stackable plugin has been deactivated.
+ *
+ * @since 3.18.1
+ */
+if ( ! function_exists( 'stackable_notice_other_stackable_plugin_deactivated' ) ) {
+    function stackable_notice_other_stackable_plugin_deactivated() {
+        $OTHER_STACKABLE_INFO = get_option( 'stackable_other_stackable_plugin_info', false );
+        if ( $OTHER_STACKABLE_INFO ) {
+            printf(
+                '<div class="notice notice-info is-dismissible stackable_notice_gutenberg_plugin"><p>%s</p></div>',
+                sprintf( esc_html__( '%sStackable Notice%s: The Stackable plugin (%s version %s) has been deactivated. Only one active Stackable plugin is needed.', STACKABLE_I18N ), '<strong>', '</strong>', $OTHER_STACKABLE_INFO['BUILD'], $OTHER_STACKABLE_INFO['VERSION'] )
+            );
+            delete_option( 'stackable_other_stackable_plugin_info' );
+        }
+	}
+
+	if ( get_option( 'stackable_other_stackable_plugin_info', false ) ) {
+		add_action( 'admin_notices', 'stackable_notice_other_stackable_plugin_deactivated' );
+	}
+}
+
 /********************************************************************************************
  * END Activation & PHP version checks.
  ********************************************************************************************/

package.json

@@ -4,7 +4,7 @@ Tags: blocks, gutenberg, gutenberg blocks, page builder, WordPress blocks
 Requires at least: 6.5.5
 Tested up to: 6.8.2
 Requires PHP: 7.3
-Stable tag: 3.18.0
+Stable tag: 3.18.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -18,7 +18,7 @@ Custom Blocks that transform your WordPress Block Editor into a page builder
 
 > [Try our live demo](https://wpstackable.com/demo/?utm_source=wp-repo&utm_campaign=readme&utm_medium=link) | [Join the Facebook Community](https://www.facebook.com/groups/wpstackable/)
 
-[youtube https://www.youtube.com/watch?v=xAOWZHAkG3E]
+[youtube https://www.youtube.com/watch?v=ZSo3t1l5tHQ]
 
 ## Transform Gutenberg into a Page Builder.
 
@@ -305,6 +305,13 @@ Nope. Stackable only works with Gutenberg, the new WordPress editor.
 
 == Changelog ==
 
+= 3.18.1 =
+* Fixed: Block styles - error encountered when creating divider and icon button block styles #3583
+* Fixed: Role Manager settings doesn't display when changing the site language #3565
+* Fixed: Auto-deactivate free/premium when another is acitvated and show an admin notice #3574
+* Fixed: Block styles - show the correct block title when deleting a style #387
+* Fixed: PHP error on stackable_add_welcome_notification when doing some REST API calls #3579
+
 = 3.18.0 =
 
 [Introducing: Global Block Styles](https://wpstackable.com/blog/introducing-block-styles/?utm_source=wp-repo&utm_campaign=readme&utm_medium=link)

plugin.php

@@ -137,5 +137,5 @@ export default compose(
 	withBlockWrapperIsHovered,
 	withQueryLoopContext,
 	withBlockAttributeContext,
-	withBlockStyleContext( blockStyles ),
+	withBlockStyleContext( dividerStyles ),
 )( Edit )

readme.txt

@@ -121,5 +121,5 @@ export default compose(
 	withBlockWrapper,
 	withQueryLoopContext,
 	withBlockAttributeContext,
-	withBlockStyleContext( blockStyles ),
+	withBlockStyleContext( iconButtonStyles ),
 )( Edit )

src/block/divider/edit.js

@@ -1,7 +1,7 @@
 .ugb-design-library-items {
 	page-break-inside: avoid;
 	break-inside: avoid;
-	gap: 40px;
+	gap: 30px;
 	display: grid;
 	grid-template-columns: 1fr 1fr 1fr;
 	align-items: center;
@@ -24,6 +24,7 @@
 }
 .ugb-modal-design-library__designs {
 	overflow: auto;
+	background: #f4f4f5;
 }
 .ugb-design-library-item {
 	display: grid;
@@ -122,7 +123,7 @@
 	// Toggle mode
 	&.ugb-design-library-item--toggle footer {
 		position: relative;
-		padding: 16px 16px 24px;
+		padding: 16px;
 		display: flex;
 		justify-content: space-between;
 		> div {