Merge pull request #911 from publishpress/develop

Develop
publishpress · Mar 30, 2022 · 9addd1c · 9addd1c
2 parents b83c396 + 809731c
commit 9addd1c
Show file tree

Hide file tree

Showing 28 changed files with 21,167 additions and 11,716 deletions.
diff --git a/src/advanced-gutenberg.php b/src/advanced-gutenberg.php
@@ -3,8 +3,8 @@
  * Plugin Name: PublishPress Blocks
  * Plugin URI: https://publishpress.com/blocks/
  * Description: PublishPress Blocks has everything you need to build professional websites with the Gutenberg editor.
- * Version: 2.11.6
- * Tested up to: 5.9.1
+ * Version: 2.12.0
+ * Tested up to: 5.9.2
  * Author: PublishPress
  * Author URI: https://publishpress.com/
  * License: GPL2
@@ -39,7 +39,7 @@
 defined('ABSPATH') || die;
 
 if (! defined('ADVANCED_GUTENBERG_VERSION')) {
-    define('ADVANCED_GUTENBERG_VERSION', '2.11.6');
+    define('ADVANCED_GUTENBERG_VERSION', '2.12.0');
 }
 
 if (! defined('ADVANCED_GUTENBERG_PLUGIN')) {

diff --git a/src/assets/blocks/advbutton/block.jsx b/src/assets/blocks/advbutton/block.jsx
@@ -456,7 +456,7 @@ import {IconListPopupHook} from "../0-adv-components/icon-class.jsx";
                         </PanelBody>
                         {advgbBlocks.advgb_pro === '1' && (
                             <Fragment>
-                                <PanelBody title={ __( 'Icon', 'advanced-gutenberg' ) } initialOpen={ false } >
+                                <PanelBody title={ __( 'Icon', 'advanced-gutenberg' ) } initialOpen={ false } className="advgb-pro-icon">
                                     <ToggleControl
                                         label={ __( 'Display icon', 'advanced-gutenberg' ) }
                                         checked={ iconDisplay }

diff --git a/src/assets/blocks/advimage/block.jsx b/src/assets/blocks/advimage/block.jsx
@@ -41,6 +41,14 @@
             const { blockIDX } = attributes;
 
             setAttributes({blockIDX: `advgb-img-${clientId}`});
+
+            // Reset attributes when Pro is not available
+            if( advgbBlocks.advgb_pro !== 'undefined' && advgbBlocks.advgb_pro !== '1' ) {
+                setAttributes( {
+                    titleTag: 'h4',
+                    subtitleTag: 'p'
+                } );
+            }
         }
 
         render() {
@@ -50,7 +58,7 @@
                 blockIDX, openOnClick, openUrl, linkInNewTab, imageUrl, imageID,
                 title, titleColor, subtitle, subtitleColor, overlayColor, defaultOpacity,
                 fullWidth, width, height, vAlign, hAlign, overlayOpacity, focalPoint,
-                isPreview,
+                isPreview, titleTag, subtitleTag
             } = attributes;
             const blockClassName = [
                 'advgb-image-block',
@@ -236,7 +244,7 @@
                         />
                         }
                         <RichText
-                            tagName="h4"
+                            tagName={ titleTag }
                             className="advgb-image-title"
                             value={ title }
                             onChange={ (value) => setAttributes( { title: value.trim() } ) }
@@ -248,7 +256,7 @@
                             allowedFormats={ [] }
                         />
                         <RichText
-                            tagName="p"
+                            tagName={ subtitleTag }
                             className="advgb-image-subtitle"
                             value={ subtitle }
                             onChange={ (value) => setAttributes( { subtitle: value.trim() } ) }
@@ -354,6 +362,14 @@
         isPreview: {
             type: 'boolean',
             default: false,
+        },
+        titleTag: {
+            type: 'string',
+            default: 'h4'
+        },
+        subtitleTag: {
+            type: 'string',
+            default: 'p'
         }
     };
 
@@ -395,6 +411,8 @@
                 vAlign,
                 hAlign,
                 focalPoint,
+                titleTag,
+                subtitleTag
             } = attributes;
             const linkURL = ( openOnClick === 'url' && !!openUrl ) ? openUrl : undefined;
             const blockClassName = [
@@ -423,14 +441,20 @@
                        href={ linkURL }
                     />
                     {title && (
-                        <h4 className="advgb-image-title" style={ { color: titleColor } }>
-                            {title}
-                        </h4>
+                        <RichText.Content
+                            tagName={ titleTag }
+                            className="advgb-image-title"
+                            style={ { color: titleColor } }
+                            value={ title }
+                        />
                     ) }
                     {subtitle && (
-                        <p className="advgb-image-subtitle" style={ { color: subtitleColor } }>
-                            {subtitle}
-                        </p>
+                        <RichText.Content
+                            tagName={ subtitleTag }
+                            className="advgb-image-subtitle"
+                            style={ { color: subtitleColor } }
+                            value={ subtitle }
+                        />
                     ) }
                 </div>
             );