feat: store the block mode value inside attributes and remove from st…

…ore api
blockeraai · Oct 24, 2024 · 8226027 · 8226027
1 parent 853f4ee
commit 8226027
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 33 deletions.
diff --git a/packages/editor/js/extensions/components/block-dropdown-all-menu.js b/packages/editor/js/extensions/components/block-dropdown-all-menu.js
@@ -6,7 +6,6 @@
 import { __ } from '@wordpress/i18n';
 import { check } from '@wordpress/icons';
 import type { MixedElement } from 'react';
-import { dispatch } from '@wordpress/data';
 import { DropdownMenu, MenuGroup, MenuItem } from '@wordpress/components';
 
 /**
@@ -23,8 +22,6 @@ export const BlockDropdownAllMenu = ({
 	isActive: boolean,
 	setActive: (isActive: boolean) => void,
 }): MixedElement => {
-	const { setBlockExtensionsStatus } = dispatch('blockera/extensions');
-
 	return (
 		<DropdownMenu
 			icon={<Icon icon="more-vertical" iconSize="24" />}
@@ -42,7 +39,6 @@ export const BlockDropdownAllMenu = ({
 							data-test={'advanced-mode-block'}
 							icon={isActive ? check : ''}
 							onClick={() => {
-								setBlockExtensionsStatus(!isActive);
 								setActive(!isActive);
 								onClose();
 							}}
@@ -65,7 +61,6 @@ export const BlockDropdownAllMenu = ({
 							data-test={'basic-mode-block'}
 							icon={isActive ? '' : check}
 							onClick={() => {
-								setBlockExtensionsStatus(!isActive);
 								setActive(!isActive);
 								onClose();
 							}}

diff --git a/packages/editor/js/extensions/components/block-fill-partials.js b/packages/editor/js/extensions/components/block-fill-partials.js
@@ -33,8 +33,6 @@ export const BlockFillPartials: ComponentType<any> = memo(
 		blockeraInnerBlocks,
 		updateBlockEditorSettings,
 	}): Element<any> => {
-		const { isActiveBlockExtensions } = select('blockera/extensions');
-
 		// prevent memory leak, componentDidMount.
 		useEffect(() => {
 			const others = select('blockera/controls').getControls();
@@ -79,7 +77,7 @@ export const BlockFillPartials: ComponentType<any> = memo(
 						/>
 					)}
 				</Fill>
-				{isActiveBlockExtensions() && (
+				{isActive && (
 					<Fill name={`blockera-block-edit-content-${clientId}`}>
 						<BlockEditComponent {...blockProps} />
 					</Fill>

diff --git a/packages/editor/js/extensions/store/actions.js b/packages/editor/js/extensions/store/actions.js
@@ -102,13 +102,6 @@ export function changeExtensionCurrentBlockStateBreakpoint(
 	};
 }
 
-export function setBlockExtensionsStatus(isActive: boolean): Object {
-	return {
-		isActive,
-		type: 'SET_EXTENSIONS_STATUS',
-	};
-}
-
 export function setExtensionsActiveBlockVariation(variation: Object): Object {
 	return {
 		variation,

diff --git a/packages/editor/js/extensions/store/reducer.js b/packages/editor/js/extensions/store/reducer.js
@@ -91,11 +91,6 @@ export function blockExtensions(state: Object = {}, action: Object): Object {
 				...state,
 				currentBreakpoint: action.currentBreakpoint,
 			};
-		case 'SET_EXTENSIONS_STATUS':
-			return {
-				...state,
-				isActiveExtensions: action.isActive,
-			};
 		case 'SET_EXTENSIONS_ACTIVE_VARIATION':
 			return {
 				...state,

diff --git a/packages/editor/js/extensions/store/selectors.js b/packages/editor/js/extensions/store/selectors.js
@@ -305,19 +305,6 @@ export function getExtensionCurrentBlockStateBreakpoint({
 	return blockExtensions?.currentBreakpoint || getBaseBreakpoint();
 }
 
-/**
- * Get current block is active extensions?
- *
- * @param {Object} blockExtensions the block extension details.
- *
- * @return {boolean} true on success,false on otherwise!
- */
-export function isActiveBlockExtensions({ blockExtensions }: Object): boolean {
-	return 'undefined' === typeof blockExtensions?.isActiveExtensions
-		? true
-		: blockExtensions?.isActiveExtensions;
-}
-
 /**
  * Get active block variation in extensions.
  *