← All changes | modules/atomic-widgets/elements/div-block/div-block.php +111 -107 4.3.0-beta3 → 3.31.4 View file →

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