Merge branch 'develop' into feat/getting-started-onboarding

# Conflicts:
#	src/plugins/global-settings/block-styles/index.js

Author: kaeizen

plugin.php

@@ -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__ );
@@ -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.
  ********************************************************************************************/

readme.txt

@@ -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.
 
@@ -322,6 +322,9 @@ Nope. Stackable only works with Gutenberg, the new WordPress editor.
 * Fixed: Added support for CSS optimizers that strip out the "px" from "0px" #3564
 * Fixed: Added some missing string translations #3414
 
+= 3.17.3 =
+* Fixed: Stopped design library from being registered as patterns
+
 = 3.17.2 =
 * Fixed: Design Library - Updated CDN URL
 * Fixed: If using non-English locale, Google Fonts may not load properly in the editor

src/components/block-styles-control/editor.scss

@@ -84,7 +84,7 @@
 
 .ugb-block-styles-controls__popover {
 	.components-popover__content {
-		width: 350px !important;
+		width: 370px !important;
 	}
 	.components-button {
 		width: 100%;
@@ -109,6 +109,9 @@
 		overflow: hidden !important;
 		min-height: 0 !important;
 		max-height: 0 !important;
+		opacity: 0 !important;
+		margin: 0 !important;
+		padding: 0 !important;
 	}
 
 	.components-panel__body-description {

src/components/block-styles-control/index.js

@@ -340,15 +340,15 @@ const SaveUpdateButtons = props => {
 	const ActionButtons = applyFilters( 'stackable.global-settings.global-block-styles.action-buttons', Fragment )
 
 	return ( <>
-		<Flex style={ { marginTop: '24px' } }>
+		<Flex style={ { marginTop: '24px', justifyContent: 'flex-end' } }>
 			<ActionButtons { ...propsToPass } />
 			<FlexItem style={ ! props.blockStyle || ! props.inOptions ? { marginLeft: 'auto' } : {} }>
 				<Button
 					variant="primary"
 					onClick={ () => onAddBlockStyle() }
 					size="small"
 				>
-					{ __( 'Save as New Style', i18n ) }
+					{ __( 'Save New Block Style', i18n ) }
 					{ ! isPro && <span className="stk-pulsating-circle" role="presentation" /> }
 				</Button>
 			</FlexItem>

src/components/design-library-list/editor.scss

@@ -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 {

src/components/design-library-list/util.js

@@ -1,6 +1,8 @@
 /* eslint-disable no-console */
 import DEFAULT from './default.json'
-import { settings, isPro } from 'stackable'
+import {
+	settings, isPro, cdnUrl,
+} from 'stackable'
 import { parse, serialize } from '@wordpress/blocks'
 
 const DEFAULT_CONTENT = { ...DEFAULT }
@@ -199,7 +201,7 @@ export const parseDisabledBlocks = parsedBlock => {
 	return { block, blocksForSubstitution }
 }
 
-const IMAGE_STORAGE = 'https://stackable-files.pages.dev/library-v4/images/'
+const IMAGE_STORAGE = cdnUrl.replace( /\/$/, '' ) + '/library-v4/images/'
 
 export const addPlaceholderForPostsBlock = ( content, postsPlaceholder, defaultValues ) => {
 	const remainingPosts = [ ...postsPlaceholder ]

src/components/pro-control-button/index.js

@@ -24,7 +24,7 @@ const ProControlButton = props => {
 	} )
 
 	return (
-		<div className="components-base-control">
+		<div className="components-base-control ugb-pro-control-button">
 			<button className="ugb-pro-control-more-dots" onClick={ () => setIsOpen( v => ! v ) }>
 				<div className="ugb-pro-control-more-dots__dot stk-pulsating-circle"></div>
 				<div className="ugb-pro-control-more-dots__dot stk-pulsating-circle"></div>

src/components/pro-control/index.js

@@ -120,32 +120,34 @@ const LABELS = {
 	'font-pairs': {
 		title: __( 'Premium Typography', i18n ),
 		description: <ul>
-			<li>{ __( 'Access to 90+ curated font pairs', i18n ) }</li>
-			<li>{ __( 'Create your own custom font pairs', i18n ) }</li>
+			<li>{ __( 'Apply beautiful typography combinations instantly', i18n ) }</li>
+			<li>{ __( 'Access to 90+ curated font pairs for professional designs', i18n ) }</li>
+			<li>{ __( 'Create custom font combinations for your brand', i18n ) }</li>
 		</ul>,
 	},
 	'color-schemes': {
 		title: __( 'Premium Color Schemes', i18n ),
 		description: <ul>
+			<li>{ __( 'Define site-wide colors that apply to all blocks automatically', i18n ) }</li>
 			<li>{ __( 'Access to 50+ curated color scheme presets', i18n ) }</li>
-			<li>{ __( 'Create your own color schemes', i18n ) }</li>
-			<li>{ __( 'Set default color schemes for blocks and sections', i18n ) }</li>
-			<li>{ __( 'Streamline your design workflow', i18n ) }</li>
+			<li>{ __( 'Create custom color schemes for backgrounds, containers, and buttons', i18n ) }</li>
 		</ul>,
 	},
 	'preset-controls': {
 		title: __( 'Premium Preset Controls', i18n ),
 		description: <ul>
 			<li>{ __( 'Customize your own presets like small, medium, large & x-large', i18n ) }</li>
+			<li>{ __( 'Maintain structured, well-balanced designs effortlessly', i18n ) }</li>
 			<li>{ __( 'Use Global Typography sizes as presets', i18n ) }</li>
 		</ul>,
 	},
 	'global-block-styles': {
 		title: __( 'Global Block Styles', i18n ),
 		description: <ul>
-			<li>{ __( 'Create and use your own block styles', i18n ) }</li>
-			<li>{ __( 'Update your block styles', i18n ) }</li>
-			<li>{ __( 'Organize your custom block styles', i18n ) }</li>
+			<li>{ __( 'Design once, apply everywhere - no more copy-paste', i18n ) }</li>
+			<li>{ __( 'Class-based styling for leaner, faster websites', i18n ) }</li>
+			<li>{ __( 'Sync changes across all blocks instantly', i18n ) }</li>
+			<li>{ __( 'Override styles while keeping them synced', i18n ) }</li>
 		</ul>,
 	},
 }

src/deprecated/block-defaults/index.js

@@ -2,6 +2,7 @@ import { settings as stackableSettings } from 'stackable'
 
 // Conditionally import scripts
 if ( stackableSettings.stackable_enable_block_defaults ) {
-	import( './save-block' )
-	import( './global-settings' )
+	// Use require instead of dynamic import to avoid code splitting
+	require( './save-block' )
+	require( './global-settings' )
 }

src/deprecated/v2/design-library/init.php

@@ -119,7 +119,7 @@ public function get_block_designs( $request ) {
 				$designs = json_decode( $content, true );
 
 				// Cache results.
-				set_transient( 'stackable_get_block_designs_v2_' . $block, $designs, DAY_IN_SECONDS );
+				set_transient( 'stackable_get_block_designs_v2_' . $block, $designs, 7 * DAY_IN_SECONDS );
 			}
 
 			$designs = apply_filters( 'stackable_block_design_v2_' . $block, $designs );