← All changes | app/app.php +15 -23 4.3.2 → 3.35.0-dev2 View file →

		@@ -22,9 +22,8 @@
22	22	use Elementor\App\Modules\KitLibrary\Module as KitLibraryModule;
23	23	use Elementor\App\Modules\ImportExportCustomization\Module as ImportExportCustomizationModule;
24	24	use Elementor\App\Modules\SiteEditor\Module as SiteEditorModule;
25	25	use Elementor\App\Modules\Onboarding\Module as OnboardingModule;
26		-use Elementor\App\Modules\OnboardingNew\Module as OnboardingNewModule;
27	26
28	27	if ( ! defined( 'ABSPATH' ) ) {
29	28	exit; // Exit if accessed directly.
30	29	}
		@@ -50,12 +49,22 @@
50	49	public function get_base_url() {
51	50	return admin_url( 'admin.php?page=' . self::PAGE_ID . '&ver=' . ELEMENTOR_VERSION );
52	51	}
53	52
	53	+ private function register_admin_menu( Admin_Menu_Manager $admin_menu ) {
	54	+ if ( ! $this->is_editor_one_active() ) {
	55	+ $admin_menu->register( static::PAGE_ID, new Theme_Builder_Menu_Item() );
	56	+ }
	57	+ }
	58	+
54	59	private function register_editor_one_menu( Menu_Data_Provider $menu_data_provider ) {
55	60	$menu_data_provider->register_menu( new Editor_One_Theme_Builder_Menu() );
56	61	}
57	62
	63	+ private function is_editor_one_active(): bool {
	64	+ return (bool) Plugin::instance()->modules_manager->get_modules( 'editor-one' );
	65	+ }
	66	+
58	67	public function fix_submenu( $menu ) {
59	68	global $submenu;
60	69
61	70	if ( is_multisite() && is_network_admin() ) {
		@@ -169,9 +178,9 @@
169	178	->set_path_resolver( function ( $name ) {
170	179	return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php";
171	180	} );
172	181
173		- Collection::make( [ 'ui', 'icons', 'store', 'query', 'utils', 'events', 'onboarding', 'schema' ] )
	182	+ Collection::make( [ 'ui', 'icons' ] )
174	183	->each( function( $package ) use ( $assets_config_provider ) {
175	184	$suffix = Utils::is_script_debug() ? '' : '.min';
176	185	$config = $assets_config_provider->load( $package )->get( $package );
177	186
		@@ -256,9 +265,8 @@
256	265	'wp-url',
257	266	'wp-i18n',
258	267	'elementor-v2-ui',
259	268	'elementor-v2-icons',
260		- 'elementor-v2-onboarding',
261	269	'react',
262	270	'react-dom',
263	271	'select2',
264	272	],
		@@ -298,22 +306,8 @@
298	306	'mutable' => false,
299	307	] );
300	308	}
301	309
302		- private function register_e_onboarding_experiment() {
303		- Plugin::$instance->experiments->add_feature( [
304		- 'name' => 'e_onboarding',
305		- 'title' => esc_html__( 'New Onboarding', 'elementor' ),
306		- 'hidden' => true,
307		- 'default' => ExperimentsManager::STATE_INACTIVE,
308		- 'release_status' => ExperimentsManager::RELEASE_STATUS_DEV,
309		- ] );
310		- }
311		-
312		- private function is_e_onboarding_active(): bool {
313		- return Plugin::$instance->experiments->is_feature_active( 'e_onboarding' );
314		- }
315		-
316	310	public function __construct() {
317	311	$this->register_import_export_customization_experiment();
318	312
319	313	$this->add_component( 'site-editor', new SiteEditorModule() );
		@@ -328,15 +322,13 @@
328	322	// Kit library is depended on import-export
329	323	$this->add_component( 'kit-library', new KitLibraryModule() );
330	324	}
331	325
332		- $this->register_e_onboarding_experiment();
	326	+ $this->add_component( 'onboarding', new OnboardingModule() );
333	327
334		- if ( $this->is_e_onboarding_active() ) {
335		- $this->add_component( 'onboarding', new OnboardingNewModule() );
336		- } else {
337		- $this->add_component( 'onboarding', new OnboardingModule() );
338		- }
	328	+ add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) {
	329	+ $this->register_admin_menu( $admin_menu );
	330	+ }, Source_Local::ADMIN_MENU_PRIORITY + 10 );
339	331
340	332	add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) {
341	333	$this->register_editor_one_menu( $menu_data_provider );
342	334	} );