← All changes | app/app.php +6 -12 4.1.0 → 3.34.0-beta1 View file →

		@@ -14,10 +14,8 @@
14	14	use Elementor\Core\Utils\Promotions\Filtered_Promotions_Manager;
15	15	use Elementor\Core\Utils\Assets_Config_Provider;
16	16	use Elementor\Core\Utils\Collection;
17	17	use Elementor\Core\Utils\Assets_Translation_Loader;
18		-use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider;
19		-use Elementor\App\AdminMenuItems\Editor_One_Theme_Builder_Menu;
20	18
21	19	use Elementor\App\Modules\ImportExport\Module as ImportExportModule;
22	20	use Elementor\App\Modules\KitLibrary\Module as KitLibraryModule;
23	21	use Elementor\App\Modules\ImportExportCustomization\Module as ImportExportCustomizationModule;
		@@ -22,9 +20,8 @@
22	20	use Elementor\App\Modules\KitLibrary\Module as KitLibraryModule;
23	21	use Elementor\App\Modules\ImportExportCustomization\Module as ImportExportCustomizationModule;
24	22	use Elementor\App\Modules\SiteEditor\Module as SiteEditorModule;
25	23	use Elementor\App\Modules\Onboarding\Module as OnboardingModule;
26		-use Elementor\App\Modules\SiteBuilder\Module as SiteBuilderModule;
27	24
28	25	if ( ! defined( 'ABSPATH' ) ) {
29	26	exit; // Exit if accessed directly.
30	27	}
		@@ -50,10 +47,10 @@
50	47	public function get_base_url() {
51	48	return admin_url( 'admin.php?page=' . self::PAGE_ID . '&ver=' . ELEMENTOR_VERSION );
52	49	}
53	50
54		- private function register_editor_one_menu( Menu_Data_Provider $menu_data_provider ) {
55		- $menu_data_provider->register_menu( new Editor_One_Theme_Builder_Menu() );
	51	+ private function register_admin_menu( Admin_Menu_Manager $admin_menu ) {
	52	+ $admin_menu->register( static::PAGE_ID, new Theme_Builder_Menu_Item() );
56	53	}
57	54
58	55	public function fix_submenu( $menu ) {
59	56	global $submenu;
		@@ -169,9 +166,9 @@
169	166	->set_path_resolver( function ( $name ) {
170	167	return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php";
171	168	} );
172	169
173		- Collection::make( [ 'ui', 'icons', 'store', 'query', 'utils', 'events', 'onboarding', 'site-builder' ] )
	170	+ Collection::make( [ 'ui', 'icons' ] )
174	171	->each( function( $package ) use ( $assets_config_provider ) {
175	172	$suffix = Utils::is_script_debug() ? '' : '.min';
176	173	$config = $assets_config_provider->load( $package )->get( $package );
177	174
		@@ -256,10 +253,8 @@
256	253	'wp-url',
257	254	'wp-i18n',
258	255	'elementor-v2-ui',
259	256	'elementor-v2-icons',
260		- 'elementor-v2-onboarding',
261		- 'elementor-v2-site-builder',
262	257	'react',
263	258	'react-dom',
264	259	'select2',
265	260	],
		@@ -303,9 +298,8 @@
303	298	public function __construct() {
304	299	$this->register_import_export_customization_experiment();
305	300
306	301	$this->add_component( 'site-editor', new SiteEditorModule() );
307		- $this->add_component( 'site-builder', new SiteBuilderModule() );
308	302
309	303	if ( current_user_can( 'manage_options' ) || Utils::is_wp_cli() ) {
310	304	$this->add_component( 'import-export', new ImportExportModule() );
311	305
		@@ -318,11 +312,11 @@
318	312	}
319	313
320	314	$this->add_component( 'onboarding', new OnboardingModule() );
321	315
322		- add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) {
323		- $this->register_editor_one_menu( $menu_data_provider );
324		- } );
	316	+ add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) {
	317	+ $this->register_admin_menu( $admin_menu );
	318	+ }, Source_Local::ADMIN_MENU_PRIORITY + 10 );
325	319
326	320	// Happens after WP plugin page validation.
327	321	add_filter( 'add_menu_classes', [ $this, 'fix_submenu' ] );
328	322