← All changes | app/app.php +9 -35 4.3.4 → 3.33.0-beta1 View file →

		@@ -13,11 +13,8 @@
13	13	use Elementor\Utils;
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		-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	17
21	18	use Elementor\App\Modules\ImportExport\Module as ImportExportModule;
22	19	use Elementor\App\Modules\KitLibrary\Module as KitLibraryModule;
23	20	use Elementor\App\Modules\ImportExportCustomization\Module as ImportExportCustomizationModule;
		@@ -22,9 +19,8 @@
22	19	use Elementor\App\Modules\KitLibrary\Module as KitLibraryModule;
23	20	use Elementor\App\Modules\ImportExportCustomization\Module as ImportExportCustomizationModule;
24	21	use Elementor\App\Modules\SiteEditor\Module as SiteEditorModule;
25	22	use Elementor\App\Modules\Onboarding\Module as OnboardingModule;
26		-use Elementor\App\Modules\OnboardingNew\Module as OnboardingNewModule;
27	23
28	24	if ( ! defined( 'ABSPATH' ) ) {
29	25	exit; // Exit if accessed directly.
30	26	}
		@@ -50,10 +46,10 @@
50	46	public function get_base_url() {
51	47	return admin_url( 'admin.php?page=' . self::PAGE_ID . '&ver=' . ELEMENTOR_VERSION );
52	48	}
53	49
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() );
	50	+ private function register_admin_menu( Admin_Menu_Manager $admin_menu ) {
	51	+ $admin_menu->register( static::PAGE_ID, new Theme_Builder_Menu_Item() );
56	52	}
57	53
58	54	public function fix_submenu( $menu ) {
59	55	global $submenu;
		@@ -169,9 +165,9 @@
169	165	->set_path_resolver( function ( $name ) {
170	166	return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php";
171	167	} );
172	168
173		- Collection::make( [ 'ui', 'icons', 'store', 'query', 'utils', 'events', 'onboarding', 'schema' ] )
	169	+ Collection::make( [ 'ui', 'icons' ] )
174	170	->each( function( $package ) use ( $assets_config_provider ) {
175	171	$suffix = Utils::is_script_debug() ? '' : '.min';
176	172	$config = $assets_config_provider->load( $package )->get( $package );
177	173
		@@ -256,9 +252,8 @@
256	252	'wp-url',
257	253	'wp-i18n',
258	254	'elementor-v2-ui',
259	255	'elementor-v2-icons',
260		- 'elementor-v2-onboarding',
261	256	'react',
262	257	'react-dom',
263	258	'select2',
264	259	],
		@@ -267,9 +262,10 @@
267	262	);
268	263
269	264	$this->enqueue_dark_theme_detection_script();
270	265
271		- Assets_Translation_Loader::for_handles( [ 'elementor-app-packages', 'elementor-app' ], 'elementor' );
	266	+ wp_set_script_translations( 'elementor-app-packages', 'elementor' );
	267	+ wp_set_script_translations( 'elementor-app', 'elementor' );
272	268
273	269	$this->print_config();
274	270	}
275	271
		@@ -293,27 +289,11 @@
293	289	'title' => esc_html__( 'Import/Export Customization', 'elementor' ),
294	290	'description' => esc_html__( 'Enhanced import/export for website templates. Selectively include site content, templates, and settings with advanced granular control.', 'elementor' ),
295	291	'release_status' => ExperimentsManager::RELEASE_STATUS_BETA,
296	292	'default' => ExperimentsManager::STATE_ACTIVE,
297		- 'hidden' => true,
298		- 'mutable' => false,
299	293	] );
300	294	}
301	295
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	296	public function __construct() {
317	297	$this->register_import_export_customization_experiment();
318	298
319	299	$this->add_component( 'site-editor', new SiteEditorModule() );
		@@ -328,19 +308,13 @@
328	308	// Kit library is depended on import-export
329	309	$this->add_component( 'kit-library', new KitLibraryModule() );
330	310	}
331	311
332		- $this->register_e_onboarding_experiment();
	312	+ $this->add_component( 'onboarding', new OnboardingModule() );
333	313
334		- if ( $this->is_e_onboarding_active() ) {
335		- $this->add_component( 'onboarding', new OnboardingNewModule() );
336		- } else {
337		- $this->add_component( 'onboarding', new OnboardingModule() );
338		- }
339		-
340		- add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) {
341		- $this->register_editor_one_menu( $menu_data_provider );
342		- } );
	314	+ add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) {
	315	+ $this->register_admin_menu( $admin_menu );
	316	+ }, Source_Local::ADMIN_MENU_PRIORITY + 10 );
343	317
344	318	// Happens after WP plugin page validation.
345	319	add_filter( 'add_menu_classes', [ $this, 'fix_submenu' ] );
346	320