Cater for variations where block.icon.src is not set #50

bobbingwide · Nov 18, 2021 · 6485b9f · 6485b9f
1 parent 357a4dc
commit 6485b9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/oik-blockicon/blockicons.js b/src/oik-blockicon/blockicons.js
@@ -136,7 +136,7 @@ function BlockiconStyled( blocknamebarvariation, ...props ) {
     var block = getBlockorVariation( blocknamebarvariation );
     return(
         <div className={ props.className } >
-            { block ? <Icon icon={ block.icon.src } /> : <p>Hmm</p> }
+            { block ? <Icon icon={ block.icon && block.icon.src ? block.icon.src : block.icon } /> : <p>Hmm</p> }
         </div>
 
 

diff --git a/src/oik-blockinfo/blockinfo.js b/src/oik-blockinfo/blockinfo.js
@@ -1,19 +1,16 @@
 /*
  * Block info renderer - displays the fields for the block info block
  *
- * @copyright (C) Copyright Bobbing Wide 2019,2020
+ * @copyright (C) Copyright Bobbing Wide 2019,2020,2021
  * @author Herb Miller @bobbingwide
  *
  */
 
-
 import {BlockSupportsInserter, getBlockorVariation} from "../oik-blockicon/blockicons";
 import {BlockVariations } from "../oik-blockicon/blockvariations";
-const { getBlockType } = wp.blocks;
 import { BlockiconStyled } from '../oik-blockicon/blockicons.js';
 import { BlockListItem } from '../oik-blocklist/blocklist';
 
-
 /**
  *
  * @param blocknamebarvariation
@@ -43,6 +40,7 @@ function BlockinfoStyled( blocknamebarvariation, showBlockLink, showBlockIcon, s
     } else {
         //console.log( block );
         var blockicon = showBlockIcon ? BlockiconStyled(blocknamebarvariation, props) : null;
+        //console.log( blockicon );
         var blockTypeName = showBlockTypeName ? <div>{block.block_name} {block.name}</div> : null;
         var blockTitle = showTitle ? <div>{block.title}</div> : null;
         var blockDescription = showDescription ? <div>{block.description}</div> : null;
@@ -69,7 +67,6 @@ function BlockinfoStyled( blocknamebarvariation, showBlockLink, showBlockIcon, s
         );
     }
 
-
 }
 
 export  { BlockinfoStyled };