Show help icon only if block instructions differ from section instruc…

…tions
eea · Jun 24, 2021 · a4ca4e5 · a4ca4e5
1 parent 26b99ae
commit a4ca4e5
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/components/manage/Blocks/Group/EditBlockWrapper.jsx b/src/components/manage/Blocks/Group/EditBlockWrapper.jsx
@@ -86,6 +86,12 @@ class EditBlockWrapper extends React.Component {
       ? data.required
       : includes(config.blocks.requiredBlocks, type);
 
+    // Get editing instructions from block settings or props
+    let instructions = data?.instructions?.data || data?.instructions;
+    if (!instructions || instructions === '<p><br/></p>') {
+      instructions = '';
+    }
+
     return (
       <div ref={this.blockNode}>
         <div
@@ -104,7 +110,7 @@ class EditBlockWrapper extends React.Component {
           )}
           {visible && (
             <div className="block-toolbar">
-              {extraControls}
+              {instructions ? extraControls : ''}
 
               {!disabled && (
                 <>