← All changes | includes/managers/elements.php +8 -94 4.2.0 → 3.30.1 View file →

		@@ -16,15 +16,8 @@
16	16	* @since 1.0.0
17	17	*/
18	18	class Elements_Manager {
19	19
20		- const CATEGORY_ATOMIC_ELEMENTS = 'v4-elements';
21		- const CATEGORY_ATOMIC_FORM = 'atomic-form';
22		- const CATEGORY_FAVORITES = 'favorites';
23		- const CATEGORY_ANGIE_WIDGETS = 'angie-widgets';
24		- const CATEGORY_CUSTOM_WIDGETS = 'custom-widgets';
25		- const CATEGORY_BASIC = 'basic';
26		-
27	20	/**
28	21	* Element types.
29	22	*
30	23	* Holds the list of all the element types.
		@@ -73,11 +66,15 @@
73	66	*
74	67	* @return Element_Base|null Element instance if element created, or null
75	68	* otherwise.
76	69	*/
77		- public function create_element_instance( array $element_data, array $element_args = [], ?Element_Base $element_type = null ) {
	70	+ public function create_element_instance( array $element_data, array $element_args = [], Element_Base $element_type = null ) {
78	71	if ( null === $element_type ) {
79		- $element_type = $this->get_element( $element_data['elType'], isset( $element_data['widgetType'] ) ? $element_data['widgetType'] : null );
	72	+ if ( 'widget' === $element_data['elType'] ) {
	73	+ $element_type = Plugin::$instance->widgets_manager->get_widget_types( $element_data['widgetType'] );
	74	+ } else {
	75	+ $element_type = $this->get_element_types( $element_data['elType'] );
	76	+ }
80	77	}
81	78
82	79	if ( ! $element_type ) {
83	80	return null;
		@@ -95,20 +92,8 @@
95	92
96	93	return $element;
97	94	}
98	95
99		- public function get_element( string $el_type, ?string $widget_type = null ) {
100		- $element = null;
101		-
102		- if ( 'widget' === $el_type ) {
103		- $element = Plugin::$instance->widgets_manager->get_widget_types( $widget_type );
104		- } else {
105		- $element = $this->get_element_types( $el_type );
106		- }
107		-
108		- return $element;
109		- }
110		-
111	96	/**
112	97	* Get element categories.
113	98	*
114	99	* Retrieve the list of categories the element belongs to.
		@@ -290,9 +275,9 @@
290	275	* @access private
291	276	*/
292	277	private function init_categories() {
293	278	$this->categories = [
294		- self::CATEGORY_ATOMIC_ELEMENTS => [
	279	+ 'v4-elements' => [
295	280	'title' => esc_html__( 'Atomic Elements', 'elementor' ),
296	281	'hideIfEmpty' => true,
297	282	],
298	283	'layout' => [
		@@ -336,34 +321,11 @@
336	321	],
337	322	],
338	323	];
339	324
340		- if ( Plugin::$instance->experiments->is_feature_active( 'e_atomic_elements' ) ) {
341		- $atomic_form_category = [
342		- 'title' => esc_html__( 'Atomic Form', 'elementor' ),
343		- ];
344		-
345		- if ( Utils::has_pro() && Plugin::$instance->experiments->is_feature_active( 'e_pro_atomic_form' ) ) {
346		- $atomic_form_category['hideIfEmpty'] = true;
347		- } elseif ( ! Utils::has_pro() ) {
348		- $atomic_form_category['hideIfEmpty'] = false;
349		- $atomic_form_category['promotion'] = [
350		- 'url' => esc_url( 'https://go.elementor.com/go-pro-atomic-form-section/' ),
351		- ];
352		- } else {
353		- $atomic_form_category['hideIfEmpty'] = true;
354		- }
355		-
356		- $this->categories = array_merge(
357		- [ self::CATEGORY_ATOMIC_ELEMENTS => $this->categories[ self::CATEGORY_ATOMIC_ELEMENTS ] ],
358		- [ self::CATEGORY_ATOMIC_FORM => $atomic_form_category ],
359		- array_diff_key( $this->categories, [ self::CATEGORY_ATOMIC_ELEMENTS => true ] )
360		- );
361		- }
362		-
363	325	// Not using the `add_category` because it doesn't allow 3rd party to inject a category on top the others.
364	326	$this->categories = array_merge_recursive( [
365		- self::CATEGORY_FAVORITES => [
	327	+ 'favorites' => [
366	328	'title' => esc_html__( 'Favorites', 'elementor' ),
367	329	'icon' => 'eicon-heart',
368	330	'sort' => 'a-z',
369	331	'hideIfEmpty' => false,
		@@ -384,15 +346,8 @@
384	346	* @param Elements_Manager $this Elements manager instance.
385	347	*/
386	348	do_action( 'elementor/elements/categories_registered', $this );
387	349
388		- $after_candidates = Plugin::$instance->experiments->is_feature_active( 'e_atomic_elements' )
389		- ? [ self::CATEGORY_ATOMIC_FORM, self::CATEGORY_ATOMIC_ELEMENTS ]
390		- : [ self::CATEGORY_BASIC ];
391		-
392		- $this->promote_category_after( self::CATEGORY_ANGIE_WIDGETS, $after_candidates );
393		- $this->promote_category_after( self::CATEGORY_CUSTOM_WIDGETS, $after_candidates );
394		-
395	350	$this->categories['wordpress'] = [
396	351	'title' => esc_html__( 'WordPress', 'elementor' ),
397	352	'icon' => 'eicon-wordpress',
398	353	'active' => false,
		@@ -402,49 +357,8 @@
402	357	public function enqueue_elements_styles() {
403	358	foreach ( $this->get_element_types() as $element ) {
404	359	$element->enqueue_styles();
405	360	}
406		- }
407		-
408		- public function enqueue_elements_scripts() {
409		- foreach ( $this->get_element_types() as $element ) {
410		- $element->enqueue_scripts();
411		- }
412		- }
413		-
414		- public function register_frontend_handlers() {
415		- foreach ( $this->get_element_types() as $element ) {
416		- $element->register_frontend_handlers();
417		- }
418		- }
419		-
420		- private function promote_category_after( string $category_name, array $after_candidates ): void {
421		- if ( ! isset( $this->categories[ $category_name ] ) ) {
422		- return;
423		- }
424		-
425		- $after = null;
426		-
427		- foreach ( $after_candidates as $candidate ) {
428		- if ( isset( $this->categories[ $candidate ] ) ) {
429		- $after = $candidate;
430		- break;
431		- }
432		- }
433		-
434		- if ( ! $after ) {
435		- return;
436		- }
437		-
438		- $category = $this->categories[ $category_name ];
439		- unset( $this->categories[ $category_name ] );
440		-
441		- $position = array_search( $after, array_keys( $this->categories ), true ) + 1;
442		- $this->categories = array_merge(
443		- array_slice( $this->categories, 0, $position, true ),
444		- [ $category_name => $category ],
445		- array_slice( $this->categories, $position, null, true )
446		- );
447	361	}
448	362
449	363	/**
450	364	* Require files.