Merge branch 'staging' of https://github.com/WebDevStudios/nextjs-wordpress-starter into feature/component-handling

Author: dcooney

functions/displayBlock.js

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types'
  * @author WebDevStudios
  * @param {object} block The block data.
  * @param {number} index A unique key required by React.
- * @return {Element} A block-based component.
+ * @return {Element}     A block-based component.
  */
 export default function displayBlock(block, index) {
   const {attributes, name} = block
@@ -45,7 +45,7 @@ export default function displayBlock(block, index) {
     case 'core/spacer':
       return <Blocks.BlockSpacer {...attributes} key={index} />
     default:
-      return <pre key={index}>{JSON.stringify(attributes, null, 2)}</pre>
+      return <pre key={index}>{JSON.stringify(block, null, 2)}</pre>
   }
 }
 

functions/formatBlockData.js

@@ -4,8 +4,8 @@ import getFormById from '@/api/wordpress/gravityForms/getFormById'
  * Format and retrieve expanded block data.
  *
  * @author WebDevStudios
- * @param  {Array} blocks Basic block data.
- * @return {Array}        Formatted block data.
+ * @param {Array} blocks Basic block data.
+ * @return {Array}       Formatted block data.
  */
 export default async function formatBlockData(blocks) {
   if (!blocks || !blocks.length) {
@@ -14,7 +14,7 @@ export default async function formatBlockData(blocks) {
 
   return await Promise.all(
     blocks.map(async (block) => {
-      const {name, attributes} = block
+      const {name, attributes, innerBlocks} = block
 
       switch (name) {
         case 'gravityforms/form':
@@ -23,7 +23,9 @@ export default async function formatBlockData(blocks) {
           break
       }
 
-      return {name, attributes}
+      const innerBlocksFormatted = await formatBlockData(innerBlocks)
+
+      return {name, attributes, innerBlocks: innerBlocksFormatted}
     })
   )
 }