@elementor/editor-components 4.0.0-634 → 4.0.0-635

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elementor/editor-components",
   "description": "Elementor editor components",
-  "version": "4.0.0-634",
+  "version": "4.0.0-635",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -40,31 +40,31 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "4.0.0-634",
-    "@elementor/editor-canvas": "4.0.0-634",
-    "@elementor/editor-controls": "4.0.0-634",
-    "@elementor/editor-documents": "4.0.0-634",
-    "@elementor/editor-editing-panel": "4.0.0-634",
-    "@elementor/editor-elements": "4.0.0-634",
-    "@elementor/editor-elements-panel": "4.0.0-634",
-    "@elementor/editor-mcp": "4.0.0-634",
-    "@elementor/editor-templates": "4.0.0-634",
-    "@elementor/editor-panels": "4.0.0-634",
-    "@elementor/editor-props": "4.0.0-634",
-    "@elementor/editor-styles-repository": "4.0.0-634",
-    "@elementor/editor-ui": "4.0.0-634",
-    "@elementor/editor-v1-adapters": "4.0.0-634",
-    "@elementor/http-client": "4.0.0-634",
+    "@elementor/editor": "4.0.0-635",
+    "@elementor/editor-canvas": "4.0.0-635",
+    "@elementor/editor-controls": "4.0.0-635",
+    "@elementor/editor-documents": "4.0.0-635",
+    "@elementor/editor-editing-panel": "4.0.0-635",
+    "@elementor/editor-elements": "4.0.0-635",
+    "@elementor/editor-elements-panel": "4.0.0-635",
+    "@elementor/editor-mcp": "4.0.0-635",
+    "@elementor/editor-templates": "4.0.0-635",
+    "@elementor/editor-panels": "4.0.0-635",
+    "@elementor/editor-props": "4.0.0-635",
+    "@elementor/editor-styles-repository": "4.0.0-635",
+    "@elementor/editor-ui": "4.0.0-635",
+    "@elementor/editor-v1-adapters": "4.0.0-635",
+    "@elementor/http-client": "4.0.0-635",
     "@elementor/icons": "^1.68.0",
-    "@elementor/events": "4.0.0-634",
-    "@elementor/query": "4.0.0-634",
-    "@elementor/schema": "4.0.0-634",
-    "@elementor/store": "4.0.0-634",
+    "@elementor/events": "4.0.0-635",
+    "@elementor/query": "4.0.0-635",
+    "@elementor/schema": "4.0.0-635",
+    "@elementor/store": "4.0.0-635",
     "@elementor/ui": "1.36.17",
-    "@elementor/utils": "4.0.0-634",
+    "@elementor/utils": "4.0.0-635",
     "@wordpress/i18n": "^5.13.0",
-    "@elementor/editor-notifications": "4.0.0-634",
-    "@elementor/editor-current-user": "4.0.0-634"
+    "@elementor/editor-notifications": "4.0.0-635",
+    "@elementor/editor-current-user": "4.0.0-635"
   },
   "peerDependencies": {
     "react": "^18.3.1",

package/src/extended/components/create-component-form/create-component-form.tsx

@@ -4,12 +4,11 @@ import { getElementLabel, type V1ElementData } from '@elementor/editor-elements'
 import { type NotificationData, notify } from '@elementor/editor-notifications';
 import { Form as FormElement, ThemeProvider, useTextFieldAutoSelect } from '@elementor/editor-ui';
 import { ComponentsIcon } from '@elementor/icons';
-import { __getState as getState } from '@elementor/store';
 import { Button, FormLabel, Grid, Popover, Stack, TextField, Typography } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 
 import { useComponents } from '../../../hooks/use-components';
-import { selectComponentByUid } from '../../../store/store';
+import { componentsSelectors } from '../../../store/selectors';
 import { type ComponentFormValues, type PublishedComponent } from '../../../types';
 import { switchToComponent } from '../../../utils/switch-to-component';
 import { trackComponentEvent } from '../../../utils/tracking';
@@ -84,7 +83,7 @@ export function CreateComponentForm() {
 				source: 'user',
 			} );
 
-			const publishedComponentId = ( selectComponentByUid( getState(), uid ) as PublishedComponent )?.id;
+			const publishedComponentId = ( componentsSelectors.getComponentByUid( uid ) as PublishedComponent )?.id;
 
 			if ( publishedComponentId ) {
 				switchToComponent( publishedComponentId, instanceId );

package/src/extended/init.ts

@@ -32,9 +32,12 @@ import { initNonAtomicNestingPrevention } from './sync/prevent-non-atomic-nestin
 import { initRevertOverridablesOnCopyOrDuplicate } from './sync/revert-overridables-on-copy-or-duplicate';
 import { SanitizeOverridableProps } from './sync/sanitize-overridable-props';
 
+const PRIORITY = 1;
+
 export function initExtended() {
 	registerEditingPanelReplacement( {
-		id: 'component-instance-edit-panel',
+		id: 'extended-component-instance-edit-panel',
+		priority: PRIORITY,
 		condition: ( _, elementType ) => elementType.key === 'e-component',
 		component: ExtendedInstanceEditingPanel,
 	} );
@@ -43,6 +46,7 @@ export function initExtended() {
 		id: 'components',
 		label: __( 'Components', 'elementor' ),
 		component: ExtendedComponents,
+		priority: PRIORITY,
 	} );
 
 	registerPanel( componentPropertiesPanel );

package/src/extended/store/actions/add-overridable-group.ts

@@ -1,6 +1,5 @@
-import { __dispatch as dispatch, __getState as getState } from '@elementor/store';
-
-import { selectCurrentComponent, selectOverridableProps, slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
+import { componentsSelectors } from '../../../store/selectors';
 import { type ComponentId, type OverridablePropsGroup } from '../../../types';
 import { type Source, trackComponentEvent } from '../../../utils/tracking';
 
@@ -17,9 +16,9 @@ export function addOverridableGroup( {
 	label,
 	source,
 }: AddGroupParams ): OverridablePropsGroup | undefined {
-	const currentComponent = selectCurrentComponent( getState() );
+	const currentComponent = componentsSelectors.getCurrentComponent();
 
-	const overridableProps = selectOverridableProps( getState(), componentId );
+	const overridableProps = componentsSelectors.getOverridableProps( componentId );
 
 	if ( ! overridableProps ) {
 		return;
@@ -31,22 +30,17 @@ export function addOverridableGroup( {
 		props: [],
 	};
 
-	dispatch(
-		slice.actions.setOverridableProps( {
-			componentId,
-			overridableProps: {
-				...overridableProps,
-				groups: {
-					...overridableProps.groups,
-					items: {
-						...overridableProps.groups.items,
-						[ groupId ]: newGroup,
-					},
-					order: [ groupId, ...overridableProps.groups.order ],
-				},
+	componentsActions.setOverridableProps( componentId, {
+		...overridableProps,
+		groups: {
+			...overridableProps.groups,
+			items: {
+				...overridableProps.groups.items,
+				[ groupId ]: newGroup,
 			},
-		} )
-	);
+			order: [ groupId, ...overridableProps.groups.order ],
+		},
+	} );
 
 	trackComponentEvent( {
 		action: 'propertiesGroupCreated',

package/src/extended/store/actions/archive-component.ts

@@ -1,9 +1,8 @@
 import { setDocumentModifiedStatus } from '@elementor/editor-documents';
 import { type NotificationData, notify } from '@elementor/editor-notifications';
-import { __dispatch as dispatch } from '@elementor/store';
 import { __ } from '@wordpress/i18n';
 
-import { slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
 
 const successNotification = ( componentId: number, componentName: string ): NotificationData => ( {
 	type: 'success',
@@ -13,7 +12,7 @@ const successNotification = ( componentId: number, componentName: string ): Noti
 } );
 
 export const archiveComponent = ( componentId: number, componentName: string ) => {
-	dispatch( slice.actions.archive( componentId ) );
+	componentsActions.archive( componentId );
 	setDocumentModifiedStatus( true );
 	notify( successNotification( componentId, componentName ) );
 };

package/src/extended/store/actions/create-unpublished-component.ts

@@ -1,10 +1,9 @@
 import { createElements, deleteElement, getContainer, type V1ElementData } from '@elementor/editor-elements';
 import { __privateRunCommand as runCommand } from '@elementor/editor-v1-adapters';
-import { __dispatch as dispatch } from '@elementor/store';
 import { generateUniqueId } from '@elementor/utils';
 import { __ } from '@wordpress/i18n';
 
-import { slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
 import { type OriginalElementData, type OverridableProps } from '../../../types';
 import { type Source, trackComponentEvent } from '../../../utils/tracking';
 import { type ComponentEventData } from '../../components/create-component-form/utils/get-component-event-data';
@@ -40,15 +39,13 @@ export async function createUnpublishedComponent( {
 		index: container?.view?._index ?? 0,
 	};
 
-	dispatch(
-		slice.actions.addUnpublished( {
-			...componentBase,
-			elements: [ elementDataWithOverridablesReverted ],
-			overridableProps,
-		} )
-	);
+	componentsActions.addUnpublished( {
+		...componentBase,
+		elements: [ elementDataWithOverridablesReverted ],
+		overridableProps,
+	} );
 
-	dispatch( slice.actions.addCreatedThisSession( generatedUid ) );
+	componentsActions.addCreatedThisSession( generatedUid );
 
 	const componentInstance = await replaceElementWithComponent( element, componentBase );
 
@@ -65,8 +62,8 @@ export async function createUnpublishedComponent( {
 	} catch ( error ) {
 		restoreOriginalElement( originalElement, componentInstance.id );
 
-		dispatch( slice.actions.removeUnpublished( generatedUid ) );
-		dispatch( slice.actions.removeCreatedThisSession( generatedUid ) );
+		componentsActions.removeUnpublished( generatedUid );
+		componentsActions.removeCreatedThisSession( generatedUid );
 
 		throw error;
 	}

package/src/extended/store/actions/delete-overridable-group.ts

@@ -1,6 +1,5 @@
-import { __dispatch as dispatch, __getState as getState } from '@elementor/store';
-
-import { selectOverridableProps, slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
+import { componentsSelectors } from '../../../store/selectors';
 import { type ComponentId } from '../../../types';
 import { deleteGroup } from '../utils/groups-transformers';
 
@@ -10,7 +9,7 @@ type DeleteGroupParams = {
 };
 
 export function deleteOverridableGroup( { componentId, groupId }: DeleteGroupParams ): boolean {
-	const overridableProps = selectOverridableProps( getState(), componentId );
+	const overridableProps = componentsSelectors.getOverridableProps( componentId );
 
 	if ( ! overridableProps ) {
 		return false;
@@ -24,15 +23,10 @@ export function deleteOverridableGroup( { componentId, groupId }: DeleteGroupPar
 
 	const updatedGroups = deleteGroup( overridableProps.groups, groupId );
 
-	dispatch(
-		slice.actions.setOverridableProps( {
-			componentId,
-			overridableProps: {
-				...overridableProps,
-				groups: updatedGroups,
-			},
-		} )
-	);
+	componentsActions.setOverridableProps( componentId, {
+		...overridableProps,
+		groups: updatedGroups,
+	} );
 
 	return true;
 }

package/src/extended/store/actions/delete-overridable-prop.ts

@@ -1,6 +1,5 @@
-import { __dispatch as dispatch, __getState as getState } from '@elementor/store';
-
-import { selectCurrentComponent, selectOverridableProps, slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
+import { componentsSelectors } from '../../../store/selectors';
 import { type ComponentId, type OverridableProp } from '../../../types';
 import { type Source, trackComponentEvent } from '../../../utils/tracking';
 import { revertElementOverridableSetting } from '../../utils/revert-overridable-settings';
@@ -13,7 +12,7 @@ type DeletePropParams = {
 };
 
 export function deleteOverridableProp( { componentId, propKey, source }: DeletePropParams ): void {
-	const overridableProps = selectOverridableProps( getState(), componentId );
+	const overridableProps = componentsSelectors.getOverridableProps( componentId );
 
 	if ( ! overridableProps || Object.keys( overridableProps.props ).length === 0 ) {
 		return;
@@ -43,18 +42,13 @@ export function deleteOverridableProp( { componentId, propKey, source }: DeleteP
 
 	const updatedGroups = removePropFromAllGroups( overridableProps.groups, propKey );
 
-	dispatch(
-		slice.actions.setOverridableProps( {
-			componentId,
-			overridableProps: {
-				...overridableProps,
-				props: remainingProps,
-				groups: updatedGroups,
-			},
-		} )
-	);
+	componentsActions.setOverridableProps( componentId, {
+		...overridableProps,
+		props: remainingProps,
+		groups: updatedGroups,
+	} );
 
-	const currentComponent = selectCurrentComponent( getState() );
+	const currentComponent = componentsSelectors.getCurrentComponent();
 
 	for ( const prop of deletedProps ) {
 		trackComponentEvent( {

package/src/extended/store/actions/rename-component.ts

@@ -1,14 +1,13 @@
 import { getV1DocumentsManager, setDocumentModifiedStatus } from '@elementor/editor-documents';
 import { getAllDescendants, type V1Element } from '@elementor/editor-elements';
-import { __dispatch as dispatch } from '@elementor/store';
 
 import { COMPONENT_WIDGET_TYPE } from '../../../create-component-type';
-import { slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
 
 const TITLE_EXTERNAL_CHANGE_COMMAND = 'title_external_change';
 
 export const renameComponent = ( componentUid: string, newName: string ) => {
-	dispatch( slice.actions.rename( { componentUid, name: newName } ) );
+	componentsActions.rename( componentUid, newName );
 
 	setDocumentModifiedStatus( true );
 

package/src/extended/store/actions/rename-overridable-group.ts

@@ -1,6 +1,5 @@
-import { __dispatch as dispatch, __getState as getState } from '@elementor/store';
-
-import { selectOverridableProps, slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
+import { componentsSelectors } from '../../../store/selectors';
 import { type ComponentId } from '../../../types';
 import { renameGroup } from '../utils/groups-transformers';
 
@@ -11,7 +10,7 @@ type RenameGroupParams = {
 };
 
 export function renameOverridableGroup( { componentId, groupId, label }: RenameGroupParams ): boolean {
-	const overridableProps = selectOverridableProps( getState(), componentId );
+	const overridableProps = componentsSelectors.getOverridableProps( componentId );
 
 	if ( ! overridableProps ) {
 		return false;
@@ -25,15 +24,10 @@ export function renameOverridableGroup( { componentId, groupId, label }: RenameG
 
 	const updatedGroups = renameGroup( overridableProps.groups, groupId, label );
 
-	dispatch(
-		slice.actions.setOverridableProps( {
-			componentId,
-			overridableProps: {
-				...overridableProps,
-				groups: updatedGroups,
-			},
-		} )
-	);
+	componentsActions.setOverridableProps( componentId, {
+		...overridableProps,
+		groups: updatedGroups,
+	} );
 
 	return true;
 }

package/src/extended/store/actions/reorder-group-props.ts

@@ -1,6 +1,5 @@
-import { __dispatch as dispatch, __getState as getState } from '@elementor/store';
-
-import { selectOverridableProps, slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
+import { componentsSelectors } from '../../../store/selectors';
 import { type ComponentId } from '../../../types';
 
 type ReorderGroupPropsParams = {
@@ -10,7 +9,7 @@ type ReorderGroupPropsParams = {
 };
 
 export function reorderGroupProps( { componentId, groupId, newPropsOrder }: ReorderGroupPropsParams ): void {
-	const overridableProps = selectOverridableProps( getState(), componentId );
+	const overridableProps = componentsSelectors.getOverridableProps( componentId );
 
 	if ( ! overridableProps ) {
 		return;
@@ -22,22 +21,17 @@ export function reorderGroupProps( { componentId, groupId, newPropsOrder }: Reor
 		return;
 	}
 
-	dispatch(
-		slice.actions.setOverridableProps( {
-			componentId,
-			overridableProps: {
-				...overridableProps,
-				groups: {
-					...overridableProps.groups,
-					items: {
-						...overridableProps.groups.items,
-						[ groupId ]: {
-							...group,
-							props: newPropsOrder,
-						},
-					},
+	componentsActions.setOverridableProps( componentId, {
+		...overridableProps,
+		groups: {
+			...overridableProps.groups,
+			items: {
+				...overridableProps.groups.items,
+				[ groupId ]: {
+					...group,
+					props: newPropsOrder,
 				},
 			},
-		} )
-	);
+		},
+	} );
 }

package/src/extended/store/actions/reorder-overridable-groups.ts

@@ -1,6 +1,5 @@
-import { __dispatch as dispatch, __getState as getState } from '@elementor/store';
-
-import { selectOverridableProps, slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
+import { componentsSelectors } from '../../../store/selectors';
 import { type ComponentId } from '../../../types';
 
 type ReorderGroupsParams = {
@@ -9,22 +8,17 @@ type ReorderGroupsParams = {
 };
 
 export function reorderOverridableGroups( { componentId, newOrder }: ReorderGroupsParams ): void {
-	const overridableProps = selectOverridableProps( getState(), componentId );
+	const overridableProps = componentsSelectors.getOverridableProps( componentId );
 
 	if ( ! overridableProps ) {
 		return;
 	}
 
-	dispatch(
-		slice.actions.setOverridableProps( {
-			componentId,
-			overridableProps: {
-				...overridableProps,
-				groups: {
-					...overridableProps.groups,
-					order: newOrder,
-				},
-			},
-		} )
-	);
+	componentsActions.setOverridableProps( componentId, {
+		...overridableProps,
+		groups: {
+			...overridableProps.groups,
+			order: newOrder,
+		},
+	} );
 }

package/src/extended/store/actions/reset-sanitized-components.ts

@@ -1,7 +1,5 @@
-import { __dispatch as dispatch } from '@elementor/store';
-
-import { slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
 
 export function resetSanitizedComponents() {
-	dispatch( slice.actions.resetSanitizedComponents() );
+	componentsActions.resetSanitizedComponents();
 }

package/src/extended/store/actions/set-overridable-prop.ts

@@ -1,8 +1,8 @@
 import { type PropValue } from '@elementor/editor-props';
-import { __dispatch as dispatch, __getState as getState } from '@elementor/store';
 import { generateUniqueId } from '@elementor/utils';
 
-import { selectCurrentComponent, selectOverridableProps, slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
+import { componentsSelectors } from '../../../store/selectors';
 import { type OriginPropFields, type OverridableProp } from '../../../types';
 import { type Source, trackComponentEvent } from '../../../utils/tracking';
 import {
@@ -40,7 +40,7 @@ export function setOverridableProp( {
 	originPropFields,
 	source,
 }: Props ): OverridableProp | undefined {
-	const overridableProps = selectOverridableProps( getState(), componentId );
+	const overridableProps = componentsSelectors.getOverridableProps( componentId );
 
 	if ( ! overridableProps ) {
 		return;
@@ -87,20 +87,12 @@ export function setOverridableProp( {
 		groups = removePropFromGroup( groups, existingOverridableProp.groupId, overridableProp.overrideKey );
 	}
 
-	dispatch(
-		slice.actions.setOverridableProps( {
-			componentId,
-			overridableProps: {
-				props,
-				groups,
-			},
-		} )
-	);
+	componentsActions.setOverridableProps( componentId, { props, groups } );
 
 	const isNewProperty = ! existingOverridableProp;
 
 	if ( isNewProperty ) {
-		const currentComponent = selectCurrentComponent( getState() );
+		const currentComponent = componentsSelectors.getCurrentComponent();
 
 		trackComponentEvent( {
 			action: 'propertyExposed',

package/src/extended/store/actions/update-component-sanitized-attribute.ts

@@ -1,8 +1,7 @@
-import { __dispatch as dispatch } from '@elementor/store';
-
-import { type SanitizeAttributes, slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
+import { type SanitizeAttributes } from '../../../store/store';
 import { type ComponentId } from '../../../types';
 
 export function updateComponentSanitizedAttribute( componentId: ComponentId, attribute: SanitizeAttributes ) {
-	dispatch( slice.actions.updateComponentSanitizedAttribute( { componentId, attribute } ) );
+	componentsActions.updateComponentSanitizedAttribute( componentId, attribute );
 }

package/src/extended/store/actions/update-current-component.ts

@@ -1,21 +1,12 @@
 import { type V1Document } from '@elementor/editor-documents';
-import { __getStore as getStore } from '@elementor/store';
 
-import { type ComponentsPathItem, slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
+import { type ComponentsPathItem } from '../../../store/store';
 
-export function updateCurrentComponent( {
-	path,
-	currentComponentId,
-}: {
+export function updateCurrentComponent( params: {
 	path: ComponentsPathItem[];
 	currentComponentId: V1Document[ 'id' ] | null;
 } ) {
-	const dispatch = getStore()?.dispatch;
-
-	if ( ! dispatch ) {
-		return;
-	}
-
-	dispatch( slice.actions.setPath( path ) );
-	dispatch( slice.actions.setCurrentComponentId( currentComponentId ) );
+	componentsActions.setPath( params.path );
+	componentsActions.setCurrentComponentId( params.currentComponentId );
 }

package/src/extended/store/actions/update-overridable-prop-params.ts

@@ -1,6 +1,5 @@
-import { __dispatch as dispatch, __getState as getState } from '@elementor/store';
-
-import { selectOverridableProps, slice } from '../../../store/store';
+import { componentsActions } from '../../../store/dispatchers';
+import { componentsSelectors } from '../../../store/selectors';
 import { type ComponentId, type OverridableProp } from '../../../types';
 import { movePropBetweenGroups } from '../utils/groups-transformers';
 
@@ -17,7 +16,7 @@ export function updateOverridablePropParams( {
 	label,
 	groupId,
 }: UpdatePropParams ): OverridableProp | undefined {
-	const overridableProps = selectOverridableProps( getState(), componentId );
+	const overridableProps = componentsSelectors.getOverridableProps( componentId );
 
 	if ( ! overridableProps ) {
 		return;
@@ -40,19 +39,14 @@ export function updateOverridablePropParams( {
 
 	const updatedGroups = movePropBetweenGroups( overridableProps.groups, overrideKey, oldGroupId, newGroupId );
 
-	dispatch(
-		slice.actions.setOverridableProps( {
-			componentId,
-			overridableProps: {
-				...overridableProps,
-				props: {
-					...overridableProps.props,
-					[ overrideKey ]: updatedProp,
-				},
-				groups: updatedGroups,
-			},
-		} )
-	);
+	componentsActions.setOverridableProps( componentId, {
+		...overridableProps,
+		props: {
+			...overridableProps.props,
+			[ overrideKey ]: updatedProp,
+		},
+		groups: updatedGroups,
+	} );
 
 	return updatedProp;
 }

package/src/extended/sync/cleanup-overridable-props-on-delete.ts

@@ -1,8 +1,7 @@
 import { getAllDescendants, type V1Element } from '@elementor/editor-elements';
 import { type HookOptions, registerDataHook } from '@elementor/editor-v1-adapters';
-import { __getState as getState } from '@elementor/store';
 
-import { type ComponentsSlice, selectCurrentComponentId, selectOverridableProps } from '../../store/store';
+import { componentsSelectors } from '../../store/selectors';
 import { deleteOverridableProp } from '../store/actions/delete-overridable-prop';
 
 type DeleteCommandArgs = {
@@ -19,19 +18,13 @@ export function initCleanupOverridablePropsOnDelete() {
 			return true;
 		}
 
-		const state = getState() as ComponentsSlice | undefined;
-
-		if ( ! state ) {
-			return true;
-		}
-
-		const currentComponentId = selectCurrentComponentId( state );
+		const currentComponentId = componentsSelectors.getCurrentComponentId();
 
 		if ( ! currentComponentId ) {
 			return true;
 		}
 
-		const overridableProps = selectOverridableProps( state, currentComponentId );
+		const overridableProps = componentsSelectors.getOverridableProps( currentComponentId );
 
 		if ( ! overridableProps || Object.keys( overridableProps.props ).length === 0 ) {
 			return true;