fix: remove substituteIfDisabledFunction

Author: Arukuen

src/block/card/variations.js

@@ -11,7 +11,6 @@ import ImageFaded from './images/faded.svg'
  * External dependencies
  */
 import { i18n, isPro } from 'stackable'
-import { substituteIfDisabled } from '~stackable/util'
 
 /**
  * WordPress dependencies
@@ -106,7 +105,7 @@ const variations = applyFilters(
 							bottom: 0,
 							left: 0,
 						},
-					}, [ substituteIfDisabled( [ 'stackable/button-group|social-buttons', 'stackable/button-group|icon-button' ],
+					}, [
 						[ 'stackable/button-group', {
 							columnSpacing: {
 								top: 0,
@@ -133,15 +132,6 @@ const variations = applyFilters(
 								className: 'is-style-plain',
 							} ],
 						] ],
-						[ 'core/social-links',
-							{
-								align: 'right',
-							},
-							[
-								[ 'core/social-link', { service: 'facebook' } ],
-								[ 'core/social-link', { service: 'twitter' } ],
-							],
-						] ),
 					] ],
 				] ],
 			],

src/block/team-member/variations.js

@@ -2,7 +2,6 @@
  * Internal dependencies
  */
 import { i18n, isPro } from 'stackable'
-import { substituteIfDisabled } from '~stackable/util'
 
 /**
  * WordPress dependencies
@@ -54,14 +53,6 @@ import ImageCover from './images/cover.svg'
 	],
 ]
 
-const socialLinksInnerBlocks = [
-	[ 'core/social-link', { service: 'facebook' } ],
-	[ 'core/social-link', { service: 'twitter' } ],
-	[ 'core/social-link', { service: 'instagram' } ],
-	[ 'core/social-link', { service: 'youtube' } ],
-	[ 'core/social-link', { service: 'linkedin' } ],
-]
-
 const variations = applyFilters(
 	'stackable.team-member.variations',
 	[
@@ -86,10 +77,7 @@ const variations = applyFilters(
 					text: __( 'Position', i18n ),
 				} ],
 				[ 'stackable/text', { text: _x( 'Description for this block. Use this space for describing your block. Any text will do. Description for this block. You can use this space for describing your block.', 'Content placeholder', i18n ) } ],
-				substituteIfDisabled( [ 'stackable/button-group|social-buttons', 'stackable/button-group|icon-button' ],
-					[ 'stackable/button-group', {}, buttonGroupInnerBlocks ],
-					[ 'core/social-links', { align: 'center' }, socialLinksInnerBlocks ],
-				),
+				[ 'stackable/button-group', {}, buttonGroupInnerBlocks ],
 			],
 			scope: [ 'block' ],
 		},
@@ -110,10 +98,7 @@ const variations = applyFilters(
 				[ 'stackable/subtitle', {
 					text: __( 'Position', i18n ),
 				} ],
-				substituteIfDisabled( [ 'stackable/button-group|social-buttons', 'stackable/button-group|icon-button' ],
-					[ 'stackable/button-group', {}, buttonGroupInnerBlocks ],
-					[ 'core/social-links', { align: 'center' }, socialLinksInnerBlocks ],
-				),
+				[ 'stackable/button-group', {}, buttonGroupInnerBlocks ],
 			],
 			scope: [ 'block' ],
 		},

src/util/blocks.js

@@ -578,6 +578,18 @@ export const substituteCoreIfDisabled = ( blockName, blockAttributes, children )
 		if ( 'stackable/button-group|button' in disabled_blocks && disabled_blocks[ 'stackable/button-group|button' ] === BLOCK_STATE.DISABLED ) { // eslint-disable-line camelcase
 			return [ 'core/buttons', {}, children ]
 		}
+		if ( 'stackable/button-group|icon-button' in disabled_blocks && disabled_blocks[ 'stackable/button-group|icon-button' ] === BLOCK_STATE.DISABLED && // eslint-disable-line camelcase
+			children.length &&
+			children[ 0 ][ 0 ] === 'stackable/icon-button'
+		) {
+			return [ 'core/social-links',
+				{ align: blockAttributes.contentAlign },
+				[
+					[ 'core/social-link', { service: 'facebook' } ],
+					[ 'core/social-link', { service: 'twitter' } ],
+				],
+			]
+		}
 		return [ 'stackable/button-group', blockAttributes, children ]
 	}
 
@@ -608,27 +620,6 @@ export const substituteCoreIfDisabled = ( blockName, blockAttributes, children )
 	return [ blockName, blockAttributes ]
 }
 
-/**
- * Substitutes a block definition with another block definition if any of the block names given are disabled.
- *
- * 	@param {Array} blockNames The block names to check if disabled
- * 	@param {Array} originalBlockDefinition The original block definition
- * 	@param {Array} substituteBlockDefinition The block definition to substitute with
- *
- * 	@return {Array} The resulting block definition
- */
-export const substituteIfDisabled = ( blockNames, originalBlockDefinition, substituteBlockDefinition ) => {
-	const disabled_blocks = stackableSettings.stackable_block_states || {} // eslint-disable-line camelcase
-
-	for ( const blockName of blockNames ) {
-		if ( blockName in disabled_blocks && disabled_blocks[ blockName ] === BLOCK_STATE.DISABLED ) { // eslint-disable-line camelcase
-			return substituteBlockDefinition
-		}
-	}
-
-	return originalBlockDefinition
-}
-
 /**
  * Remove a given child block from a block tree definition if disabled
  *