← All changes | modules/atomic-widgets/elements/div-block/div-block.php +112 -88 4.0.9 → 3.30.0-beta1 View file →

		@@ -1,21 +1,23 @@
1	1	<?php
2	2	namespace Elementor\Modules\AtomicWidgets\Elements\Div_Block;
3	3
4		-use Elementor\Modules\AtomicWidgets\Elements\Base\Atomic_Element_Base;
	4	+use Elementor\Modules\AtomicWidgets\Controls\Types\Link_Control;
	5	+use Elementor\Modules\AtomicWidgets\Controls\Types\Text_Control;
	6	+use Elementor\Modules\AtomicWidgets\Elements\Atomic_Element_Base;
	7	+use Elementor\Modules\AtomicWidgets\Controls\Section;
	8	+use Elementor\Modules\AtomicWidgets\Controls\Types\Select_Control;
	9	+use Elementor\Modules\AtomicWidgets\Module;
	10	+use Elementor\Modules\AtomicWidgets\PropTypes\Classes_Prop_Type;
	11	+use Elementor\Modules\AtomicWidgets\PropTypes\Color_Prop_Type;
	12	+use Elementor\Modules\AtomicWidgets\PropTypes\Dimensions_Prop_Type;
	13	+use Elementor\Modules\AtomicWidgets\PropTypes\Link_Prop_Type;
5	14	use Elementor\Modules\AtomicWidgets\PropTypes\Primitives\String_Prop_Type;
6	15	use Elementor\Modules\AtomicWidgets\PropTypes\Size_Prop_Type;
7	16	use Elementor\Modules\AtomicWidgets\Styles\Style_Definition;
8		-use Elementor\Modules\AtomicWidgets\PropTypes\Attributes_Prop_Type;
9	17	use Elementor\Modules\AtomicWidgets\Styles\Style_Variant;
10		-use Elementor\Modules\AtomicWidgets\Controls\Section;
11		-use Elementor\Modules\AtomicWidgets\Controls\Types\Link_Control;
12		-use Elementor\Modules\AtomicWidgets\Controls\Types\Html_Tag_Control;
13		-use Elementor\Modules\AtomicWidgets\Controls\Types\Text_Control;
14		-use Elementor\Modules\AtomicWidgets\PropDependencies\Manager as Dependency_Manager;
15		-use Elementor\Modules\AtomicWidgets\PropTypes\Classes_Prop_Type;
16		-use Elementor\Modules\AtomicWidgets\PropTypes\Link_Prop_Type;
17		-use Elementor\Modules\Components\PropTypes\Overridable_Prop_Type;
	18	+use Elementor\Plugin;
	19	+use Elementor\Utils;
18	20
19	21	if ( ! defined( 'ABSPATH' ) ) {
20	22	exit; // Exit if accessed directly.
21	23	}
		@@ -22,13 +24,8 @@
22	24
23	25	class Div_Block extends Atomic_Element_Base {
24	26	const BASE_STYLE_KEY = 'base';
25	27
26		- public function __construct( $data = [], $args = null ) {
27		- parent::__construct( $data, $args );
28		- $this->meta( 'is_container', true );
29		- }
30		-
31	28	public static function get_type() {
32	29	return 'e-div-block';
33	30	}
34	31
		@@ -36,9 +33,9 @@
36	33	return 'e-div-block';
37	34	}
38	35
39	36	public function get_title() {
40		- return esc_html__( 'Div block', 'elementor' );
	37	+ return esc_html__( 'Div Block', 'elementor' );
41	38	}
42	39
43	40	public function get_keywords() {
44	41	return [ 'ato', 'atom', 'atoms', 'atomic' ];
		@@ -48,89 +45,119 @@
48	45	return 'eicon-div-block';
49	46	}
50	47
51	48	protected static function define_props_schema(): array {
52		- $tag_dependencies = Dependency_Manager::make( Dependency_Manager::RELATION_AND )
53		- ->where( [
54		- 'operator' => 'ne',
55		- 'path' => [ 'link', 'destination' ],
56		- 'nestedPath' => [ 'group' ],
57		- 'value' => 'action',
58		- 'newValue' => [
59		- '$$type' => 'string',
60		- 'value' => 'button',
61		- ],
62		- ] )->where( [
63		- 'operator' => 'not_exist',
64		- 'path' => [ 'link', 'destination' ],
65		- 'newValue' => [
66		- '$$type' => 'string',
67		- 'value' => 'a',
68		- ],
69		- ] )->get();
70		-
71		- return [
	49	+ $props = [
72	50	'classes' => Classes_Prop_Type::make()
73	51	->default( [] ),
	52	+
74	53	'tag' => String_Prop_Type::make()
75		- ->enum( [ 'div', 'header', 'section', 'article', 'aside', 'footer', 'a', 'button' ] )
76		- ->default( 'div' )
77		- ->set_dependencies( $tag_dependencies ),
	54	+ ->enum( [ 'div', 'header', 'section', 'article', 'aside', 'footer' ] )
	55	+ ->default( 'div' ),
	56	+
78	57	'link' => Link_Prop_Type::make(),
79		- 'attributes' => Attributes_Prop_Type::make()->meta( Overridable_Prop_Type::ignore() ),
80	58	];
	59	+
	60	+ if ( Plugin::$instance->experiments->is_feature_active( Module::EXPERIMENT_VERSION_3_30 ) ) {
	61	+ $props['_cssid'] = String_Prop_Type::make();
	62	+ }
	63	+
	64	+ return $props;
81	65	}
82	66
83	67	protected function define_atomic_controls(): array {
	68	+ $settings_section_items = [
	69	+ Select_Control::bind_to( 'tag' )
	70	+ ->set_label( esc_html__( 'HTML Tag', 'elementor' ) )
	71	+ ->set_options( [
	72	+ [
	73	+ 'value' => 'div',
	74	+ 'label' => 'Div',
	75	+ ],
	76	+ [
	77	+ 'value' => 'header',
	78	+ 'label' => 'Header',
	79	+ ],
	80	+ [
	81	+ 'value' => 'section',
	82	+ 'label' => 'Section',
	83	+ ],
	84	+ [
	85	+ 'value' => 'article',
	86	+ 'label' => 'Article',
	87	+ ],
	88	+ [
	89	+ 'value' => 'aside',
	90	+ 'label' => 'Aside',
	91	+ ],
	92	+ [
	93	+ 'value' => 'footer',
	94	+ 'label' => 'Footer',
	95	+ ],
	96	+ ]),
	97	+
	98	+ Link_Control::bind_to( 'link' )->set_meta( [
	99	+ 'topDivider' => true,
	100	+ ] ),
	101	+ ];
	102	+
	103	+ if ( Plugin::$instance->experiments->is_feature_active( Module::EXPERIMENT_VERSION_3_30 ) ) {
	104	+ $settings_section_items[] = Text_Control::bind_to( '_cssid' )->set_label( __( 'ID', 'elementor' ) )->set_meta( [
	105	+ 'layout' => 'two-columns',
	106	+ 'topDivider' => true,
	107	+ ] );
	108	+ }
	109	+
84	110	return [
85	111	Section::make()
86	112	->set_label( __( 'Settings', 'elementor' ) )
87		- ->set_id( 'settings' )
88		- ->set_items( [
89		- Html_Tag_Control::bind_to( 'tag' )
90		- ->set_options( [
91		- [
92		- 'value' => 'div',
93		- 'label' => 'Div',
94		- ],
95		- [
96		- 'value' => 'header',
97		- 'label' => 'Header',
98		- ],
99		- [
100		- 'value' => 'section',
101		- 'label' => 'Section',
102		- ],
103		- [
104		- 'value' => 'article',
105		- 'label' => 'Article',
106		- ],
107		- [
108		- 'value' => 'aside',
109		- 'label' => 'Aside',
110		- ],
111		- [
112		- 'value' => 'footer',
113		- 'label' => 'Footer',
114		- ],
115		- ])
116		- ->set_fallback_labels( [
117		- 'a' => 'a (link)',
118		- ] )
119		- ->set_label( esc_html__( 'HTML Tag', 'elementor' ) ),
120		- Link_Control::bind_to( 'link' )
121		- ->set_placeholder( __( 'Type or paste your URL', 'elementor' ) )
122		- ->set_label( __( 'Link', 'elementor' ) )
123		- ->set_meta( [
124		- 'topDivider' => true,
125		- ] ),
126		- Text_Control::bind_to( '_cssid' )
127		- ->set_label( __( 'ID', 'elementor' ) )
128		- ->set_meta( $this->get_css_id_control_meta() ),
129		- ] ),
	113	+ ->set_items( $settings_section_items ),
130	114	];
131	115	}
132	116
	117	+ protected function _get_default_child_type( array $element_data ) {
	118	+ $el_types = array_keys( Plugin::$instance->elements_manager->get_element_types() );
	119	+
	120	+ if ( in_array( $element_data['elType'], $el_types, true ) ) {
	121	+ return Plugin::$instance->elements_manager->get_element_types( $element_data['elType'] );
	122	+ }
	123	+
	124	+ return Plugin::$instance->widgets_manager->get_widget_types( $element_data['widgetType'] );
	125	+ }
	126	+
	127	+ protected function content_template() {
	128	+ ?>
	129	+ <?php
	130	+ }
	131	+
	132	+ public function before_render() {
	133	+ ?>
	134	+ <<?php $this->print_html_tag(); ?> <?php $this->print_render_attribute_string( '_wrapper' ); ?>>
	135	+ <?php
	136	+ }
	137	+
	138	+ public function after_render() {
	139	+ ?>
	140	+ </<?php $this->print_html_tag(); ?>>
	141	+ <?php
	142	+ }
	143	+
	144	+ /**
	145	+ * Print safe HTML tag for the element based on the element settings.
	146	+ *
	147	+ * @return void
	148	+ */
	149	+ protected function print_html_tag() {
	150	+ $html_tag = $this->get_html_tag();
	151	+ Utils::print_validated_html_tag( $html_tag );
	152	+ }
	153	+
	154	+ protected function get_html_tag(): string {
	155	+ $settings = $this->get_atomic_settings();
	156	+
	157	+ return ! empty( $settings['link']['href'] ) ? 'a' : ( $settings['tag'] ?? 'div' );
	158	+ }
	159	+
133	160	protected function define_base_styles(): array {
134	161	$display = String_Prop_Type::generate( 'block' );
135	162
136	163	return [
		@@ -161,14 +188,12 @@
161	188	protected function add_render_attributes() {
162	189	parent::add_render_attributes();
163	190	$settings = $this->get_atomic_settings();
164	191	$base_style_class = $this->get_base_styles_dictionary()[ static::BASE_STYLE_KEY ];
165		- $initial_attributes = $this->define_initial_attributes();
166	192
167	193	$attributes = [
168	194	'class' => [
169	195	'e-con',
170		- 'e-atomic-element',
171	196	$base_style_class,
172	197	...( $settings['classes'] ?? [] ),
173	198	],
174	199	];
		@@ -177,11 +202,10 @@
177	202	$attributes['id'] = esc_attr( $settings['_cssid'] );
178	203	}
179	204
180	205	if ( ! empty( $settings['link']['href'] ) ) {
181		- $link_attributes = $this->get_link_attributes( $settings['link'] );
182		- $attributes = array_merge( $attributes, $link_attributes );
	206	+ $attributes = array_merge( $attributes, $settings['link'] );
183	207	}
184	208
185		- $this->add_render_attribute( '_wrapper', array_merge( $initial_attributes, $attributes ) );
	209	+ $this->add_render_attribute( '_wrapper', $attributes );
186	210	}
187	211	}