Merge pull request #1134 from publishpress/ppb-1125

Ppb 1125
publishpress · Dec 21, 2022 · f371237 · f371237
2 parents a790d19 + eaed58a
commit f371237
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 3 deletions.
diff --git a/src/assets/blocks/blocks.min.js b/src/assets/blocks/blocks.min.js
diff --git a/src/assets/blocks/blocks.min.js.map b/src/assets/blocks/blocks.min.js.map
diff --git a/src/assets/blocks/summary/block.jsx b/src/assets/blocks/summary/block.jsx
@@ -134,6 +134,46 @@ import latinize from "latinize";
             return storeData;
         }
 
+        /**
+         * Function to get headings from accordions blocks
+         *
+         * @since 3.1.2
+         *
+         * @param block     array Columns block to get data
+         * @param storeData array Data array to store heading blocks
+         *
+         * @returns array   array Headings from block given
+         */
+        static getHeadingsfromAccordion( block, storeData )
+        {
+            block.innerBlocks.map( (item) => {
+                if( item.name === 'advgb/accordion-item' ) {
+                    const content   = item.attributes.header || null;
+                    const level     = item.attributes.headerTag
+                                        ? parseInt( item.attributes.headerTag.substring( 1 ) )
+                                        : 3;
+
+                    if( content ) {
+
+                        // Create a valid heading block
+                        let block_ = wp.blocks.createBlock('core/heading', {
+                          content: content,
+                          level: level
+                        });
+
+                        // Add anchor attribute
+                        if( item.attributes.anchor ) {
+                            block_.attributes = Object.assign( block_.attributes, {
+                                anchor: item.attributes.anchor
+                            } );
+                        }
+
+                        storeData.push( block_ );
+                    }
+                }
+            });
+        }
+
         latinise(str) {
             let lettersArr = str.split('');
             let result = [];
@@ -155,10 +195,15 @@ import latinize from "latinize";
             const filteredBlocks = allBlocks.filter( ( block ) => (
                 block.name === 'core/heading' || block.name === 'core/columns'
                 || block.name === 'core/cover' || block.name === 'core/group'
+                || block.name === 'advgb/accordions'
             ) );
             filteredBlocks.map(function ( block ) {
                 if (block.name === 'core/columns' || block.name === 'core/cover' || block.name === 'core/group') {
                     SummaryBlock.getHeadingBlocksFromColumns( block, headingBlocks );
+                } else if( block.name === 'advgb/accordions'
+                    && advgbBlocks.advgb_pro === '1' // Only in Pro
+                ) {
+                    SummaryBlock.getHeadingsfromAccordion( block, headingBlocks );
                 } else {
                     headingBlocks.push( block );
                 }

diff --git a/src/readme.txt b/src/readme.txt
@@ -264,12 +264,13 @@ Yes, we use the phrase "publishpress-advg-install" to share install links. You w
 
 == Changelog ==
 
-= 3.1.2 - 20 Dec 2022 =
+= 3.1.2 - 21 Dec 2022 =
   * Add: Days of the week and time range settings to Schedule control
   * Add: Term archives and pages control
   * Add: Bring back map files
   * Add: Display timezone below dates
   * Add: Minify compiled JSX files
+  * Add: Support for Accordion items in Table of Contents block for Pro version
   * Fix: For User role control, when no role is selected, the block is hidden to everyone
   * Fix: Hide widgets HTML wrapper when its block is not visible
   * Fix: Set autoload to 'no' for bigger size options