@elementor/editor-app-bar 0.8.0 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@elementor/editor-app-bar",
-	"version": "0.8.0",
+	"version": "0.9.0",
 	"private": false,
 	"author": "Elementor Team",
 	"homepage": "https://elementor.com/",
@@ -32,9 +32,9 @@
 		"dev": "tsup --config=../../tsup.dev.ts"
 	},
 	"dependencies": {
-		"@elementor/editor": "^0.9.0",
-		"@elementor/editor-documents": "^0.9.0",
-		"@elementor/editor-v1-adapters": "^0.5.0",
+		"@elementor/editor": "^0.10.0",
+		"@elementor/editor-documents": "^0.10.0",
+		"@elementor/editor-v1-adapters": "^0.6.0",
 		"@elementor/icons": "^0.7.0",
 		"@elementor/locations": "^0.7.0",
 		"@elementor/ui": "^1.4.53",
@@ -46,5 +46,5 @@
 	"elementor": {
 		"type": "extension"
 	},
-	"gitHead": "7dc3971d2dd061848d6547aa2caed8332e7b9167"
+	"gitHead": "7fe9af3ba0569f3003d2aa148cb4ad0bdf1c419e"
 }

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

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import SettingsButton from '../settings-button';
-import { openRoute, useRouteStatus } from '@elementor/editor-v1-adapters';
+import { __privateOpenRoute as openRoute, __privateUseRouteStatus as useRouteStatus } from '@elementor/editor-v1-adapters';
 import { fireEvent, render, screen } from '@testing-library/react';
-import { __useActiveDocument } from '@elementor/editor-documents';
+import { __useActiveDocument as useActiveDocument } from '@elementor/editor-documents';
 import { createMockDocument } from 'test-utils';
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	openRoute: jest.fn(),
-	useRouteStatus: jest.fn( () => ( { isActive: false, isBlocked: false } ) ),
+	__privateOpenRoute: jest.fn(),
+	__privateUseRouteStatus: jest.fn( () => ( { isActive: false, isBlocked: false } ) ),
 } ) );
 
 jest.mock( '@elementor/editor-documents', () => ( {
@@ -17,7 +17,7 @@ jest.mock( '@elementor/editor-documents', () => ( {
 
 describe( '@elementor/editor-app-bar - App bar document settings button', () => {
 	beforeEach( () => {
-		jest.mocked( __useActiveDocument ).mockReturnValue( createMockDocument( {
+		jest.mocked( useActiveDocument ).mockReturnValue( createMockDocument( {
 			type: { value: 'wp-page', label: 'Page' },
 		} ) );
 	} );

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

@@ -1,13 +1,13 @@
 import * as React from 'react';
 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();
-	const hostDocument = __useHostDocument();
+	const activeDocument = useActiveDocument();
+	const hostDocument = useHostDocument();
 
 	const document = activeDocument && activeDocument.type.value !== 'kit'
 		? activeDocument

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

@@ -1,21 +1,21 @@
 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(),
 } ) );
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	runCommand: jest.fn(),
+	__privateRunCommand: jest.fn(),
 } ) );
 
 describe( '@elementor/editor-app-bar - useDocumentPreviewProps', () => {
 	it( 'should open the document preview', () => {
 		// Arrange.
-		jest.mocked( __useActiveDocument ).mockReturnValue( createMockDocument() );
+		jest.mocked( useActiveDocument ).mockReturnValue( createMockDocument() );
 
 		const command = 'editor/documents/preview';
 		const args = { id: 1, force: true };
@@ -31,7 +31,7 @@ describe( '@elementor/editor-app-bar - useDocumentPreviewProps', () => {
 
 	it( 'should not run the command when there is no document', () => {
 		// Arrange.
-		jest.mocked( __useActiveDocument ).mockReturnValue( null );
+		jest.mocked( useActiveDocument ).mockReturnValue( null );
 
 		// Act.
 		const { result } = renderHook( () => useActionProps() );

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

@@ -1,10 +1,10 @@
 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();
+	const document = useActiveDocument();
 
 	return {
 		icon: EyeIcon,

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

@@ -2,8 +2,8 @@ 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(),
@@ -11,7 +11,7 @@ jest.mock( '@elementor/editor-documents', () => ( {
 } ) );
 
 jest.mock( '@elementor/editor-v1-adapters', () => ( {
-	useIsPreviewMode: jest.fn(),
+	__privateUseIsPreviewMode: jest.fn(),
 } ) );
 
 const actionsMock = {
@@ -22,7 +22,7 @@ const actionsMock = {
 
 describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 	beforeEach( () => {
-		jest.mocked( __useActiveDocumentActions ).mockReturnValue( actionsMock );
+		jest.mocked( useActiveDocumentActions ).mockReturnValue( actionsMock );
 		jest.mocked( useIsPreviewMode ).mockReturnValue( false );
 	} );
 
@@ -32,7 +32,7 @@ describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 
 	it( 'should not render when there is no active document', () => {
 		// Arrange.
-		jest.mocked( __useActiveDocument ).mockReturnValue( null );
+		jest.mocked( useActiveDocument ).mockReturnValue( null );
 
 		// Act.
 		const { container } = render( <PrimaryAction /> );
@@ -49,7 +49,7 @@ describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 			},
 		} );
 
-		jest.mocked( __useActiveDocument ).mockReturnValue( mockDocument );
+		jest.mocked( useActiveDocument ).mockReturnValue( mockDocument );
 
 		// Act.
 		render( <PrimaryAction /> );
@@ -66,7 +66,7 @@ describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 			},
 		} );
 
-		jest.mocked( __useActiveDocument ).mockReturnValue( mockDocument );
+		jest.mocked( useActiveDocument ).mockReturnValue( mockDocument );
 
 		// Act.
 		render( <PrimaryAction /> );
@@ -85,7 +85,7 @@ describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 			},
 		} );
 
-		jest.mocked( __useActiveDocument ).mockReturnValue( mockDocument );
+		jest.mocked( useActiveDocument ).mockReturnValue( mockDocument );
 
 		// Act.
 		render( <PrimaryAction /> );
@@ -102,7 +102,7 @@ describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 		// Arrange.
 		const mockDocument = createMockDocument();
 
-		jest.mocked( __useActiveDocument ).mockReturnValue( mockDocument );
+		jest.mocked( useActiveDocument ).mockReturnValue( mockDocument );
 		jest.mocked( useIsPreviewMode ).mockReturnValue( true );
 
 		// Act.
@@ -120,7 +120,7 @@ describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 		// Arrange.
 		const mockDocument = createMockDocument( { isDirty: false } );
 
-		jest.mocked( __useActiveDocument ).mockReturnValue( mockDocument );
+		jest.mocked( useActiveDocument ).mockReturnValue( mockDocument );
 
 		// Act.
 		render( <PrimaryAction /> );
@@ -143,7 +143,7 @@ describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 			},
 		} );
 
-		jest.mocked( __useActiveDocument ).mockReturnValue( mockDocument );
+		jest.mocked( useActiveDocument ).mockReturnValue( mockDocument );
 
 		// Act.
 		render( <PrimaryAction /> );
@@ -160,7 +160,7 @@ describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 		// Arrange.
 		const mockDocument = createMockDocument( { isDirty: true } );
 
-		jest.mocked( __useActiveDocument ).mockReturnValue( mockDocument );
+		jest.mocked( useActiveDocument ).mockReturnValue( mockDocument );
 
 		// Act.
 		render( <PrimaryAction /> );
@@ -178,7 +178,7 @@ describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 			isSaving: true,
 		} );
 
-		jest.mocked( __useActiveDocument ).mockReturnValue( mockDocument );
+		jest.mocked( useActiveDocument ).mockReturnValue( mockDocument );
 
 		// Act.
 		render( <PrimaryAction /> );
@@ -204,7 +204,7 @@ describe( '@elementor/editor-app-bar - Top Bar Primary Action', () => {
 			isSaving: true,
 		} );
 
-		jest.mocked( __useActiveDocument ).mockReturnValue( mockDocument );
+		jest.mocked( useActiveDocument ).mockReturnValue( mockDocument );
 
 		// Act.
 		render( <PrimaryAction /> );

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

@@ -11,13 +11,13 @@ 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();
-	const { save } = __useActiveDocumentActions();
+	const document = useActiveDocument();
+	const { save } = useActiveDocumentActions();
 	const isPreviewMode = useIsPreviewMode();
 
 	const popupState = usePopupState( {

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

@@ -1,7 +1,7 @@
 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(),
@@ -17,8 +17,8 @@ const documentActions = {
 describe( '@elementor/editor-app-bar - useDocumentSaveDraftProps', () => {
 	it( 'should save a draft of the current document', () => {
 		// Arrange.
-		jest.mocked( __useActiveDocumentActions ).mockReturnValue( documentActions );
-		jest.mocked( __useActiveDocument ).mockReturnValue( createMockDocument() );
+		jest.mocked( useActiveDocumentActions ).mockReturnValue( documentActions );
+		jest.mocked( useActiveDocument ).mockReturnValue( createMockDocument() );
 
 		// Act.
 		const { result } = renderHook( () => useDocumentSaveDraftProps() );
@@ -53,7 +53,7 @@ describe( '@elementor/editor-app-bar - useDocumentSaveDraftProps', () => {
 		},
 	] )( 'should be disabled when $condition', ( { document } ) => {
 		// Arrange.
-		jest.mocked( __useActiveDocument ).mockReturnValue( document );
+		jest.mocked( useActiveDocument ).mockReturnValue( document );
 
 		// Act.
 		const { result } = renderHook( () => useDocumentSaveDraftProps() );

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

@@ -1,5 +1,5 @@
 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', () => ( {
@@ -15,7 +15,7 @@ const documentActions = {
 describe( '@elementor/editor-app-bar - useDocumentSaveTemplateProps', () => {
 	it( 'should open the "save as template" modal', () => {
 		// Arrange.
-		jest.mocked( __useActiveDocumentActions ).mockReturnValue( documentActions );
+		jest.mocked( useActiveDocumentActions ).mockReturnValue( documentActions );
 
 		// Act.
 		const { result } = renderHook( () => useDocumentSaveTemplateProps() );

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

@@ -1,11 +1,11 @@
 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();
-	const { saveDraft } = __useActiveDocumentActions();
+	const document = useActiveDocument();
+	const { saveDraft } = useActiveDocumentActions();
 
 	return {
 		icon: FileReportIcon,

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

@@ -1,10 +1,10 @@
 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();
+	const { saveTemplate } = useActiveDocumentActions();
 
 	return {
 		icon: FolderIcon,

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', () => {

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

@@ -1,6 +1,6 @@
 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 { isBlocked } = useRouteStatus( 'finder', {

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,13 +1,13 @@
 import * as React from 'react';
 import { act, render, screen } from '@testing-library/react';
-import { isRouteActive } from '@elementor/editor-v1-adapters';
-import { __useActiveDocument, __useActiveDocumentActions } 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', () => ( {
@@ -17,9 +17,9 @@ jest.mock( '@elementor/editor-documents', () => ( {
 
 describe( '@elementor/editor-app-bar - Portalled primary action', () => {
 	beforeEach( () => {
-		jest.mocked( __useActiveDocument ).mockReturnValue( createMockDocument() );
+		jest.mocked( useActiveDocument ).mockReturnValue( createMockDocument() );
 
-		jest.mocked( __useActiveDocumentActions ).mockReturnValue( {
+		jest.mocked( useActiveDocumentActions ).mockReturnValue( {
 			save: jest.fn(),
 			saveDraft: jest.fn(),
 			saveTemplate: jest.fn(),

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

@@ -2,7 +2,7 @@ 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(),
@@ -15,8 +15,8 @@ describe( '@elementor/editor-app-bar - Primary action', () => {
 	beforeEach( () => {
 		saveFn = jest.fn( () => Promise.resolve() );
 
-		jest.mocked( __useActiveDocument ).mockReturnValue( createMockDocument() );
-		jest.mocked( __useActiveDocumentActions ).mockReturnValue( {
+		jest.mocked( useActiveDocument ).mockReturnValue( createMockDocument() );
+		jest.mocked( useActiveDocumentActions ).mockReturnValue( {
 			save: saveFn,
 			saveTemplate: jest.fn(),
 			saveDraft: jest.fn(),
@@ -25,7 +25,7 @@ describe( '@elementor/editor-app-bar - Primary action', () => {
 
 	it( 'should save site settings on click', () => {
 		// Arrange.
-		jest.mocked( __useActiveDocument ).mockReturnValue( 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 ).mockReturnValue( 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 ).mockReturnValue( 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 ).mockReturnValue( 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,11 +1,11 @@
 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';
 
 export default function PrimaryAction() {
-	const document = __useActiveDocument();
-	const { save } = __useActiveDocumentActions();
+	const document = useActiveDocument();
+	const { save } = useActiveDocumentActions();
 
 	return (
 		<Paper sx={ {

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 {