fix: remove removeIfDisabled, make icon required for notification

Author: Arukuen

src/block/notification/block.json

@@ -15,6 +15,9 @@
 	"textdomain": "stackable-ultimate-gutenberg-blocks",
 	"stk-type": "special",
 	"stk-demo": "https://wpstackable.com/notification-block/?utm_source=welcome&utm_medium=settings&utm_campaign=view_demo&utm_content=demolink",
+	"stk-required-blocks": [
+		"stackable/icon"
+	],
 	"stk-substitution-blocks": [
 		"stackable/heading",
 		"stackable/text",

src/block/notification/variations.js

@@ -2,7 +2,6 @@
  * External dependencies
  */
 import { i18n, isPro } from 'stackable'
-import { removeChildIfDisabled } from '~stackable/util'
 
 /**
  * WordPress dependencies
@@ -38,7 +37,7 @@ const variations = applyFilters(
 			pickerTitle: __( 'Default', i18n ),
 			pickerIcon: ImageDefault,
 			isActive: [ 'className' ],
-			innerBlocks: removeChildIfDisabled( 'stackable/icon', [
+			innerBlocks: [
 				[ 'stackable/icon', {
 					icon: '<svg data-prefix="fas" data-icon="exclamation-triangle" class="svg-inline--fa fa-exclamation-triangle fa-w-18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" aria-hidden="true" width="32" height="32"><path fill="currentColor" d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"></path></svg>',
 					iconColor1: '#FFFFFF',
@@ -63,7 +62,7 @@ const variations = applyFilters(
 						},
 					} ],
 				] ],
-			] ),
+			],
 			scope: [ 'block' ],
 		},
 		{
@@ -84,7 +83,7 @@ const variations = applyFilters(
 			pickerTitle: __( 'Plain', i18n ),
 			pickerIcon: ImagePlain,
 			isActive: [ 'className' ],
-			innerBlocks: removeChildIfDisabled( 'stackable/icon', [
+			innerBlocks: [
 				[ 'stackable/icon', {
 					icon: '<svg data-prefix="fas" data-icon="exclamation-triangle" class="svg-inline--fa fa-exclamation-triangle fa-w-18" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" aria-hidden="true" width="32" height="32"><path fill="currentColor" d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"></path></svg>',
 					iconColor1: 'var(--stk-container-background-color, #40ba7b)',
@@ -112,7 +111,7 @@ const variations = applyFilters(
 						},
 					} ],
 				] ],
-			] ),
+			],
 			scope: [ 'block' ],
 		},
 		{

src/util/blocks.js

@@ -547,21 +547,3 @@ export const substituteCoreIfDisabled = ( blockName, blockAttributes, innerBlock
 	}
 	return [ blockName, blockAttributes ]
 }
-
-/**
- * Remove a given child block from a block tree definition if disabled
- *
- * 	@param {Array} blockName The block name of the child to remove
- * 	@param {Array} blockTree The array that contains the child block
- *
- * 	@return {Array} The resulting block tree definition
- */
-export const removeChildIfDisabled = ( blockName, blockTree ) => {
-	const disabled_blocks = stackableSettings.stackable_block_states || {} // eslint-disable-line camelcase
-
-	if ( blockName in disabled_blocks && disabled_blocks[ blockName ] === BLOCK_STATE.DISABLED ) { // eslint-disable-line camelcase
-		return blockTree.filter( innerBlock => innerBlock[ 0 ] !== blockName )
-	}
-
-	return blockTree
-}