@elementor/editor-app-bar 0.7.3 → 0.9.0

package/src/extensions/documents-indicator/components/settings-button.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { Box, ToggleButton, Tooltip } from '@elementor/ui';
+import { Box, ToggleButton, Tooltip as BaseTooltip, TooltipProps } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
-import { openRoute, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateOpenRoute as openRoute, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 import { SettingsIcon } from '@elementor/icons';
-import { useActiveDocument, useHostDocument } from '@elementor/editor-documents';
+import { __useActiveDocument as useActiveDocument, __useHostDocument as useHostDocument } from '@elementor/editor-documents';
 
 export default function SettingsButton() {
 	const activeDocument = useActiveDocument();
@@ -34,10 +34,29 @@ export default function SettingsButton() {
 					onChange={ () => openRoute( 'panel/page-settings/settings' ) }
 					aria-label={ title }
 					size="small"
+					sx={ {
+						border: 0, // Temp fix until the style of the ToggleButton component will be decided.
+						'&.Mui-disabled': {
+							border: 0, // Temp fix until the style of the ToggleButton component will be decided.
+						},
+					} }
 				>
-					<SettingsIcon />
+					<SettingsIcon fontSize="small" />
 				</ToggleButton>
 			</Box>
 		</Tooltip>
 	);
 }
+
+function Tooltip( props: TooltipProps ) {
+	return <BaseTooltip
+		PopperProps={ {
+			sx: {
+				'&.MuiTooltip-popper .MuiTooltip-tooltip.MuiTooltip-tooltipPlacementBottom': {
+					mt: 1.7,
+				},
+			},
+		} }
+		{ ...props }
+	/>;
+}

package/src/extensions/documents-preview/hooks/__tests__/use-document-preview-props.test.ts

@@ -1,15 +1,15 @@
 import { renderHook } from '@testing-library/react';
 import useActionProps from '../use-action-props';
-import { runCommand } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand } from '@elementor/editor-v1-adapters';
 import { createMockDocument } from 'test-utils';
-import { useActiveDocument } from '@elementor/editor-documents';
+import { __useActiveDocument as useActiveDocument } from '@elementor/editor-documents';
 
 jest.mock( '@elementor/editor-documents', () => ( {
-	useActiveDocument: jest.fn(),
+	__useActiveDocument: jest.fn(),
 } ) );
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	runCommand: jest.fn(),
+	__privateRunCommand: jest.fn(),
 } ) );
 
 describe( '@elementor/editor-app-bar - useDocumentPreviewProps', () => {

package/src/extensions/documents-preview/hooks/use-action-props.ts

@@ -1,7 +1,7 @@
 import { __ } from '@wordpress/i18n';
 import { EyeIcon } from '@elementor/icons';
-import { runCommand } from '@elementor/editor-v1-adapters';
-import { useActiveDocument } from '@elementor/editor-documents';
+import { __privateRunCommand as runCommand } from '@elementor/editor-v1-adapters';
+import { __useActiveDocument as useActiveDocument } from '@elementor/editor-documents';
 
 export default function useActionProps() {
 	const document = useActiveDocument();

package/src/extensions/documents-save/components/__tests__/primary-action-menu.test.tsx

@@ -3,9 +3,7 @@ import { render, screen } from '@testing-library/react';
 import PrimaryActionMenu from '../primary-action-menu';
 import { documentOptionsMenu } from '../../../../locations';
 
-jest.mock( '@elementor/editor-documents', () => ( {
-	useActiveDocument: jest.fn(),
-} ) );
+jest.mock( '@elementor/editor-documents' );
 
 describe( '@elementor/editor-app-bar - Primary action menu', () => {
 	it( 'should render the actions ordered properly (save, default)', () => {

package/src/extensions/documents-save/components/__tests__/primary-action.test.tsx

@@ -2,16 +2,16 @@ import * as React from 'react';
 import PrimaryAction from '../primary-action';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { createMockDocument } from 'test-utils';
-import { useActiveDocument, useActiveDocumentActions } from '@elementor/editor-documents';
-import { useIsPreviewMode } from '@elementor/editor-v1-adapters';
+import { __useActiveDocument as useActiveDocument, __useActiveDocumentActions as useActiveDocumentActions } from '@elementor/editor-documents';
+import { __privateUseIsPreviewMode as useIsPreviewMode } from '@elementor/editor-v1-adapters';
 
 jest.mock( '@elementor/editor-documents', () => ( {
-	useActiveDocument: jest.fn(),
-	useActiveDocumentActions: jest.fn(),
+	__useActiveDocument: jest.fn(),
+	__useActiveDocumentActions: jest.fn(),
 } ) );
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	useIsPreviewMode: jest.fn(),
+	__privateUseIsPreviewMode: jest.fn(),
 } ) );
 
 const actionsMock = {
@@ -20,10 +20,9 @@ const actionsMock = {
 	saveTemplate: jest.fn(),
 };
 
-jest.mocked( useActiveDocumentActions ).mockReturnValue( actionsMock );
-
 describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 	beforeEach( () => {
+		jest.mocked( useActiveDocumentActions ).mockReturnValue( actionsMock );
 		jest.mocked( useIsPreviewMode ).mockReturnValue( false );
 	} );
 

package/src/extensions/documents-save/components/primary-action-menu.tsx

@@ -31,9 +31,9 @@ export default function PrimaryActionMenu( props: PopoverMenuProps ) {
 				vertical: 'top',
 				horizontal: 'right',
 			} }
-			marginThreshold={ 8 }
+			marginThreshold={ 4 }
 			PaperProps={ {
-				sx: { mt: 2 },
+				sx: { mt: 0.5 },
 			} }
 		>
 			{ saveActions.map( ( { MenuItem, id }, index ) => ( [

package/src/extensions/documents-save/components/primary-action.tsx

@@ -11,9 +11,9 @@ import {
 	Tooltip,
 	usePopupState,
 } from '@elementor/ui';
-import { Document, useActiveDocument, useActiveDocumentActions } from '@elementor/editor-documents';
+import { Document, __useActiveDocument as useActiveDocument, __useActiveDocumentActions as useActiveDocumentActions } from '@elementor/editor-documents';
 import { ChevronDownIcon } from '@elementor/icons';
-import { useIsPreviewMode } from '@elementor/editor-v1-adapters';
+import { __privateUseIsPreviewMode as useIsPreviewMode } from '@elementor/editor-v1-adapters';
 
 export default function PrimaryAction() {
 	const document = useActiveDocument();
@@ -38,12 +38,12 @@ export default function PrimaryAction() {
 
 	return (
 		<>
-			<ButtonGroup size="medium" variant="contained">
+			<ButtonGroup size="large" variant="contained">
 				<Button
 					onClick={ () => ! document.isSaving && save() }
 					sx={ {
-						px: 7,
 						height: '100%',
+						borderRadius: 0,
 						maxWidth: '158px',
 						'&.MuiButtonBase-root.MuiButtonGroup-grouped': {
 							minWidth: '110px',
@@ -51,7 +51,7 @@ export default function PrimaryAction() {
 					} }
 					disabled={ isPublishDisabled }
 				>
-					{ shouldShowSpinner ? <CircularProgress /> : getLabel( document ) }
+					{ shouldShowSpinner ? <CircularProgress color="inherit" size="1.5em" /> : getLabel( document ) }
 				</Button>
 
 				<Tooltip
@@ -59,16 +59,17 @@ export default function PrimaryAction() {
 					PopperProps={ {
 						sx: {
 							'&.MuiTooltip-popper .MuiTooltip-tooltip.MuiTooltip-tooltipPlacementBottom': {
-								mt: 3,
-								mr: 1,
+								mt: 1,
+								mr: 0.25,
 							},
 						},
 					} }
 				>
 					<Box component="span" aria-label={ undefined }>
 						<Button
+							size="small"
 							{ ...bindTrigger( popupState ) }
-							sx={ { px: 0, height: '100%' } }
+							sx={ { px: 0, height: '100%', borderRadius: 0 } }
 							disabled={ isSaveOptionsDisabled }
 							aria-label={ __( 'Save Options', 'elementor' ) }
 						>

package/src/extensions/documents-save/hooks/__tests__/use-document-save-draft-props.test.ts

@@ -1,11 +1,11 @@
 import { createMockDocument } from 'test-utils';
 import { renderHook } from '@testing-library/react';
 import useDocumentSaveDraftProps from '../use-document-save-draft-props';
-import { useActiveDocument, useActiveDocumentActions } from '@elementor/editor-documents';
+import { __useActiveDocument as useActiveDocument, __useActiveDocumentActions as useActiveDocumentActions } from '@elementor/editor-documents';
 
 jest.mock( '@elementor/editor-documents', () => ( {
-	useActiveDocument: jest.fn(),
-	useActiveDocumentActions: jest.fn(),
+	__useActiveDocument: jest.fn(),
+	__useActiveDocumentActions: jest.fn(),
 } ) );
 
 const documentActions = {

package/src/extensions/documents-save/hooks/__tests__/use-document-save-template-props.test.ts

@@ -1,9 +1,9 @@
 import { renderHook } from '@testing-library/react';
-import { useActiveDocumentActions } from '@elementor/editor-documents';
+import { __useActiveDocumentActions as useActiveDocumentActions } from '@elementor/editor-documents';
 import useDocumentSaveTemplateProps from '../use-document-save-template-props';
 
 jest.mock( '@elementor/editor-documents', () => ( {
-	useActiveDocumentActions: jest.fn(),
+	__useActiveDocumentActions: jest.fn(),
 } ) );
 
 const documentActions = {

package/src/extensions/documents-save/hooks/use-document-save-draft-props.ts

@@ -1,7 +1,7 @@
 import { __ } from '@wordpress/i18n';
 import { ActionProps } from '../../../types';
 import { FileReportIcon } from '@elementor/icons';
-import { useActiveDocument, useActiveDocumentActions } from '@elementor/editor-documents';
+import { __useActiveDocument as useActiveDocument, __useActiveDocumentActions as useActiveDocumentActions } from '@elementor/editor-documents';
 
 export default function useDocumentSaveDraftProps(): ActionProps {
 	const document = useActiveDocument();

package/src/extensions/documents-save/hooks/use-document-save-template-props.ts

@@ -1,7 +1,7 @@
 import { __ } from '@wordpress/i18n';
 import { ActionProps } from '../../../types';
 import { FolderIcon } from '@elementor/icons';
-import { useActiveDocumentActions } from '@elementor/editor-documents';
+import { __useActiveDocumentActions as useActiveDocumentActions } from '@elementor/editor-documents';
 
 export default function useDocumentSaveTemplateProps(): ActionProps {
 	const { saveTemplate } = useActiveDocumentActions();

package/src/extensions/elements/hooks/__tests__/use-action-props.test.ts

@@ -1,10 +1,10 @@
 import useActionProps from '../use-action-props';
 import { renderHook } from '@testing-library/react';
-import { openRoute, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateOpenRoute as openRoute, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	openRoute: jest.fn(),
-	useRouteStatus: jest.fn( () => ( { isActive: true, isBlocked: true } ) ),
+	__privateOpenRoute: jest.fn(),
+	__privateUseRouteStatus: jest.fn( () => ( { isActive: true, isBlocked: true } ) ),
 } ) );
 
 describe( '@elementor/editor-app-bar - useElementsPanelActionProps', () => {

package/src/extensions/elements/hooks/use-action-props.ts

@@ -1,6 +1,6 @@
 import { PlusIcon } from '@elementor/icons';
 import { __ } from '@wordpress/i18n';
-import { openRoute, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateOpenRoute as openRoute, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 
 export default function useActionProps() {
 	const { isActive, isBlocked } = useRouteStatus( 'panel/elements' );

package/src/extensions/elements/sync/__tests__/sync-panel-title.test.ts

@@ -1,5 +1,5 @@
 import syncPanelTitle from '../sync-panel-title';
-import { isRouteActive } from '@elementor/editor-v1-adapters';
+import { __privateIsRouteActive as isRouteActive } from '@elementor/editor-v1-adapters';
 
 type ExtendedWindow = Window & {
 	elementor?: {
@@ -13,7 +13,7 @@ type ExtendedWindow = Window & {
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
 	...jest.requireActual( '@elementor/editor-v1-adapters' ),
-	isRouteActive: jest.fn().mockReturnValue( false ),
+	__privateIsRouteActive: jest.fn().mockReturnValue( false ),
 } ) );
 
 const mockIsRouteActive = jest.mocked( isRouteActive );

package/src/extensions/elements/sync/sync-panel-title.ts

@@ -1,5 +1,5 @@
 import { __ } from '@wordpress/i18n';
-import { isRouteActive, listenTo, routeOpenEvent, v1ReadyEvent } from '@elementor/editor-v1-adapters';
+import { __privateIsRouteActive as isRouteActive, __privateListenTo as listenTo, routeOpenEvent, v1ReadyEvent } from '@elementor/editor-v1-adapters';
 
 type ExtendedWindow = Window & {
 	elementor: {

package/src/extensions/finder/hooks/__tests__/use-action-props.test.ts

@@ -1,10 +1,10 @@
 import useActionProps from '../use-action-props';
 import { renderHook } from '@testing-library/react';
-import { runCommand, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	runCommand: jest.fn(),
-	useRouteStatus: jest.fn( () => ( { isActive: true, isBlocked: true } ) ),
+	__privateRunCommand: jest.fn(),
+	__privateUseRouteStatus: jest.fn( () => ( { isActive: true, isBlocked: true } ) ),
 } ) );
 
 describe( '@elementor/editor-app-bar - useFinderActionProps', () => {
@@ -25,7 +25,6 @@ describe( '@elementor/editor-app-bar - useFinderActionProps', () => {
 		const { result } = renderHook( () => useActionProps() );
 
 		// Assert.
-		expect( result.current.selected ).toBe( true );
 		expect( result.current.disabled ).toBe( true );
 		expect( useRouteStatus ).toHaveBeenCalledTimes( 1 );
 		expect( useRouteStatus ).toHaveBeenCalledWith( 'finder', {

package/src/extensions/finder/hooks/use-action-props.ts

@@ -1,9 +1,9 @@
 import { __ } from '@wordpress/i18n';
 import { SearchIcon } from '@elementor/icons';
-import { runCommand, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 
 export default function useActionProps() {
-	const { isActive, isBlocked } = useRouteStatus( 'finder', {
+	const { isBlocked } = useRouteStatus( 'finder', {
 		blockOnKitRoutes: false,
 		blockOnPreviewMode: false,
 	} );
@@ -12,7 +12,6 @@ export default function useActionProps() {
 		title: __( 'Finder', 'elementor' ),
 		icon: SearchIcon,
 		onClick: () => runCommand( 'finder/toggle' ),
-		selected: isActive,
 		disabled: isBlocked,
 	};
 }

package/src/extensions/finder/index.ts

@@ -2,7 +2,7 @@ import { utilitiesMenu } from '../../locations';
 import useActionProps from './hooks/use-action-props';
 
 export function init() {
-	utilitiesMenu.registerToggleAction( {
+	utilitiesMenu.registerAction( {
 		id: 'toggle-finder',
 		priority: 10, // Before help.
 		useProps: useActionProps,

package/src/extensions/history/hooks/__tests__/use-action-props.test.ts

@@ -1,10 +1,10 @@
 import useActionProps from '../use-action-props';
 import { renderHook } from '@testing-library/react';
-import { openRoute, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateOpenRoute as openRoute, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	openRoute: jest.fn(),
-	useRouteStatus: jest.fn( () => ( { isActive: true, isBlocked: true } ) ),
+	__privateOpenRoute: jest.fn(),
+	__privateUseRouteStatus: jest.fn( () => ( { isActive: true, isBlocked: true } ) ),
 } ) );
 
 describe( '@elementor/editor-app-bar - useHistoryActionProps', () => {

package/src/extensions/history/hooks/use-action-props.ts

@@ -1,6 +1,6 @@
 import { HistoryIcon } from '@elementor/icons';
 import { __ } from '@wordpress/i18n';
-import { openRoute, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateOpenRoute as openRoute, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 
 export default function useActionProps() {
 	const { isActive, isBlocked } = useRouteStatus( 'panel/history' );

package/src/extensions/keyboard-shortcuts/hooks/__tests__/use-action-props.test.ts

@@ -1,9 +1,9 @@
 import { renderHook } from '@testing-library/react';
 import useActionProps from '../use-action-props';
-import { runCommand } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand } from '@elementor/editor-v1-adapters';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	runCommand: jest.fn(),
+	__privateRunCommand: jest.fn(),
 } ) );
 
 describe( '@elementor/editor-app-bar - useKeyboardShortcutsActionProps', () => {

package/src/extensions/keyboard-shortcuts/hooks/use-action-props.ts

@@ -1,7 +1,7 @@
 import { __ } from '@wordpress/i18n';
 import { ActionProps } from '../../../types';
 import { KeyboardIcon } from '@elementor/icons';
-import { runCommand } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand } from '@elementor/editor-v1-adapters';
 
 export default function useActionProps(): ActionProps {
 	return {

package/src/extensions/site-settings/components/__tests__/portalled-primary-action.test.tsx

@@ -1,25 +1,29 @@
 import * as React from 'react';
 import { act, render, screen } from '@testing-library/react';
-import { isRouteActive } from '@elementor/editor-v1-adapters';
-import { useActiveDocument } from '@elementor/editor-documents';
+import { __privateIsRouteActive as isRouteActive } from '@elementor/editor-v1-adapters';
+import { __useActiveDocument as useActiveDocument, __useActiveDocumentActions as useActiveDocumentActions } from '@elementor/editor-documents';
 import PortalledPrimaryAction from '../portalled-primary-action';
 import { createMockDocument } from 'test-utils';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
 	...jest.requireActual( '@elementor/editor-v1-adapters' ),
-	isRouteActive: jest.fn(),
+	__privateIsRouteActive: jest.fn(),
 } ) );
 
 jest.mock( '@elementor/editor-documents', () => ( {
-	useActiveDocument: jest.fn(),
-	useActiveDocumentActions: jest.fn( () => ( {
-		save: jest.fn(),
-	} ) ),
+	__useActiveDocument: jest.fn(),
+	__useActiveDocumentActions: jest.fn(),
 } ) );
 
 describe( '@elementor/editor-app-bar - Portalled primary action', () => {
 	beforeEach( () => {
-		jest.mocked( useActiveDocument ).mockImplementation( () => createMockDocument() );
+		jest.mocked( useActiveDocument ).mockReturnValue( createMockDocument() );
+
+		jest.mocked( useActiveDocumentActions ).mockReturnValue( {
+			save: jest.fn(),
+			saveDraft: jest.fn(),
+			saveTemplate: jest.fn(),
+		} );
 	} );
 
 	afterEach( () => {

package/src/extensions/site-settings/components/__tests__/primary-action.test.tsx

@@ -2,11 +2,11 @@ import * as React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import PrimaryAction from '../primary-action';
 import { createMockDocument } from 'test-utils';
-import { useActiveDocument, useActiveDocumentActions } from '@elementor/editor-documents';
+import { __useActiveDocument as useActiveDocument, __useActiveDocumentActions as useActiveDocumentActions } from '@elementor/editor-documents';
 
 jest.mock( '@elementor/editor-documents', () => ( {
-	useActiveDocument: jest.fn(),
-	useActiveDocumentActions: jest.fn(),
+	__useActiveDocument: jest.fn(),
+	__useActiveDocumentActions: jest.fn(),
 } ) );
 
 describe( '@elementor/editor-app-bar - Primary action', () => {
@@ -15,17 +15,17 @@ describe( '@elementor/editor-app-bar - Primary action', () => {
 	beforeEach( () => {
 		saveFn = jest.fn( () => Promise.resolve() );
 
-		jest.mocked( useActiveDocument ).mockImplementation( () => createMockDocument() );
-		jest.mocked( useActiveDocumentActions ).mockImplementation( () => ( {
+		jest.mocked( useActiveDocument ).mockReturnValue( createMockDocument() );
+		jest.mocked( useActiveDocumentActions ).mockReturnValue( {
 			save: saveFn,
 			saveTemplate: jest.fn(),
 			saveDraft: jest.fn(),
-		} ) );
+		} );
 	} );
 
 	it( 'should save site settings on click', () => {
 		// Arrange.
-		jest.mocked( useActiveDocument ).mockImplementation( () => createMockDocument( { isDirty: true } ) );
+		jest.mocked( useActiveDocument ).mockReturnValue( createMockDocument( { isDirty: true } ) );
 
 		render( <PrimaryAction /> );
 
@@ -51,7 +51,7 @@ describe( '@elementor/editor-app-bar - Primary action', () => {
 		},
 	] )( 'should not save site settings when $title', ( { document } ) => {
 		// Arrange.
-		jest.mocked( useActiveDocument ).mockImplementation( () => document );
+		jest.mocked( useActiveDocument ).mockReturnValue( document );
 
 		render( <PrimaryAction /> );
 
@@ -73,7 +73,7 @@ describe( '@elementor/editor-app-bar - Primary action', () => {
 		},
 	] )( 'should be disabled when $title', ( { document } ) => {
 		// Arrange.
-		jest.mocked( useActiveDocument ).mockImplementation( () => document );
+		jest.mocked( useActiveDocument ).mockReturnValue( document );
 
 		// Act.
 		render( <PrimaryAction /> );
@@ -84,7 +84,7 @@ describe( '@elementor/editor-app-bar - Primary action', () => {
 
 	it( 'should show a loader when saving site settings', () => {
 		// Arrange.
-		jest.mocked( useActiveDocument ).mockImplementation( () => createMockDocument( {
+		jest.mocked( useActiveDocument ).mockReturnValue( createMockDocument( {
 			isDirty: true,
 			isSaving: true,
 		} ) );

package/src/extensions/site-settings/components/portal.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Portal as BasePortal, PortalProps } from '@elementor/ui';
-import { isRouteActive, routeCloseEvent, routeOpenEvent, useListenTo } from '@elementor/editor-v1-adapters';
+import { __privateIsRouteActive as isRouteActive, routeCloseEvent, routeOpenEvent, __privateUseListenTo as useListenTo } from '@elementor/editor-v1-adapters';
 
 export default function Portal( props: Omit<PortalProps, 'container'> ) {
 	const containerRef = useListenTo(

package/src/extensions/site-settings/components/primary-action.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useActiveDocument, useActiveDocumentActions } from '@elementor/editor-documents';
+import { __useActiveDocument as useActiveDocument, __useActiveDocumentActions as useActiveDocumentActions } from '@elementor/editor-documents';
 import { Button, CircularProgress, Paper } from '@elementor/ui';
 import { __ } from '@wordpress/i18n';
 

package/src/extensions/site-settings/hooks/__tests__/use-action-props.test.ts

@@ -1,10 +1,10 @@
 import useActionProps from '../use-action-props';
 import { renderHook } from '@testing-library/react';
-import { runCommand, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	runCommand: jest.fn(),
-	useRouteStatus: jest.fn(),
+	__privateRunCommand: jest.fn(),
+	__privateUseRouteStatus: jest.fn(),
 } ) );
 
 describe( '@elementor/editor-app-bar - site-settings - useActionProps', () => {

package/src/extensions/site-settings/hooks/use-action-props.ts

@@ -1,5 +1,5 @@
 import { __ } from '@wordpress/i18n';
-import { runCommand, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 import { ToggleActionProps } from '../../../types';
 import { AdjustmentsHorizontalIcon } from '@elementor/icons';
 

package/src/extensions/structure/hooks/__tests__/use-action-props.test.ts

@@ -1,10 +1,10 @@
 import useActionProps from '../use-action-props';
 import { renderHook } from '@testing-library/react';
-import { runCommand, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	runCommand: jest.fn(),
-	useRouteStatus: jest.fn( () => ( { isActive: true, isBlocked: true } ) ),
+	__privateRunCommand: jest.fn(),
+	__privateUseRouteStatus: jest.fn( () => ( { isActive: true, isBlocked: true } ) ),
 } ) );
 
 describe( '@elementor/editor-app-bar - useStructureActionProps', () => {

package/src/extensions/structure/hooks/use-action-props.ts

@@ -1,5 +1,5 @@
 import { __ } from '@wordpress/i18n';
-import { runCommand, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 import { StructureIcon } from '@elementor/icons';
 import { ToggleActionProps } from '../../../types';
 

package/src/extensions/theme-builder/hooks/__tests__/use-action-props.test.ts

@@ -1,9 +1,9 @@
 import { renderHook } from '@testing-library/react';
 import useThemeBuilderActionProps from '../use-action-props';
-import { runCommand } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand } from '@elementor/editor-v1-adapters';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	runCommand: jest.fn(),
+	__privateRunCommand: jest.fn(),
 } ) );
 
 describe( '@elementor/editor-app-bar - useThemeBuilderActionProps', () => {

package/src/extensions/theme-builder/hooks/use-action-props.ts

@@ -1,6 +1,6 @@
 import { __ } from '@wordpress/i18n';
 import { ThemeBuilderIcon } from '@elementor/icons';
-import { runCommand } from '@elementor/editor-v1-adapters';
+import { __privateRunCommand as runCommand } from '@elementor/editor-v1-adapters';
 import { ActionProps } from '../../../types';
 
 export default function useActionProps(): ActionProps {

package/src/extensions/user-preferences/hooks/__tests__/use-action-props.test.ts

@@ -1,10 +1,10 @@
 import useActionProps from '../use-action-props';
 import { renderHook } from '@testing-library/react';
-import { openRoute, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateOpenRoute as openRoute, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	openRoute: jest.fn(),
-	useRouteStatus: jest.fn( () => ( { isActive: true, isBlocked: true } ) ),
+	__privateOpenRoute: jest.fn(),
+	__privateUseRouteStatus: jest.fn( () => ( { isActive: true, isBlocked: true } ) ),
 } ) );
 
 describe( '@elementor/editor-app-bar - useUserPreferencesActionProps', () => {

package/src/extensions/user-preferences/hooks/use-action-props.ts

@@ -1,7 +1,7 @@
 import { __ } from '@wordpress/i18n';
 import { ToggleActionProps } from '../../../types';
 import { ToggleRightIcon } from '@elementor/icons';
-import { openRoute, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateOpenRoute as openRoute, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 
 export default function useActionProps(): ToggleActionProps {
 	const { isActive, isBlocked } = useRouteStatus( 'panel/editor-preferences' );

package/src/extensions/wordpress/index.ts

@@ -1,7 +1,7 @@
 import { mainMenu } from '../../locations';
 import { __ } from '@wordpress/i18n';
 import { WordpressIcon } from '@elementor/icons';
-import { useActiveDocument } from '@elementor/editor-documents';
+import { __useActiveDocument as useActiveDocument } from '@elementor/editor-documents';
 
 export function init() {
 	mainMenu.registerLink( {

package/src/sync/__tests__/redirect-old-menus.test.ts

@@ -1,9 +1,9 @@
-import { openRoute } from '@elementor/editor-v1-adapters';
+import { __privateOpenRoute as openRoute } from '@elementor/editor-v1-adapters';
 import redirectOldMenus from '../redirect-old-menus';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
 	...jest.requireActual( '@elementor/editor-v1-adapters' ),
-	openRoute: jest.fn(),
+	__privateOpenRoute: jest.fn(),
 } ) );
 
 describe( '@elementor/editor-app-bar - Redirect old menus', () => {