← All changes
|
modules/atomic-widgets/elements/div-block/div-block.php
+113
-112
4.3.0-beta3
→
3.30.1
View file →
| @@ -1,23 +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; | |
| 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\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; | |
| 7 | 14 | use Elementor\Modules\AtomicWidgets\PropTypes\Primitives\String_Prop_Type; |
| 8 | 15 | use Elementor\Modules\AtomicWidgets\PropTypes\Size_Prop_Type; |
| 9 | 16 | use Elementor\Modules\AtomicWidgets\Styles\Style_Definition; |
| 10 | -use Elementor\Modules\AtomicWidgets\PropTypes\Attributes_Prop_Type; | |
| 11 | 17 | 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; | |
| 18 | +use Elementor\Plugin; | |
| 19 | +use Elementor\Utils; | |
| 20 | 20 | |
| 21 | 21 | if ( ! defined( 'ABSPATH' ) ) { |
| 22 | 22 | exit; // Exit if accessed directly. |
| 23 | 23 | } |
| @@ -22,17 +22,10 @@ | ||
| 22 | 22 | exit; // Exit if accessed directly. |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | class Div_Block extends Atomic_Element_Base { |
| 26 | - use Has_Element_Template; | |
| 27 | - | |
| 28 | 26 | const BASE_STYLE_KEY = 'base'; |
| 29 | 27 | |
| 30 | - public function __construct( $data = [], $args = null ) { | |
| 31 | - parent::__construct( $data, $args ); | |
| 32 | - $this->meta( 'is_container', true ); | |
| 33 | - } | |
| 34 | - | |
| 35 | 28 | public static function get_type() { |
| 36 | 29 | return 'e-div-block'; |
| 37 | 30 | } |
| 38 | 31 | |
| @@ -40,13 +33,13 @@ | ||
| 40 | 33 | return 'e-div-block'; |
| 41 | 34 | } |
| 42 | 35 | |
| 43 | 36 | public function get_title() { |
| 44 | - return esc_html__( 'Div block', 'elementor' ); | |
| 37 | + return esc_html__( 'Div Block', 'elementor' ); | |
| 45 | 38 | } |
| 46 | 39 | |
| 47 | 40 | public function get_keywords() { |
| 48 | - return [ 'ato', 'atom', 'atoms', 'atomic', 'container', 'wrapper', 'section', 'row', 'column', 'div', 'box', 'layout' ]; | |
| 41 | + return [ 'ato', 'atom', 'atoms', 'atomic' ]; | |
| 49 | 42 | } |
| 50 | 43 | |
| 51 | 44 | public function get_icon() { |
| 52 | 45 | return 'eicon-div-block'; |
| @@ -51,103 +44,120 @@ | ||
| 51 | 44 | public function get_icon() { |
| 52 | 45 | return 'eicon-div-block'; |
| 53 | 46 | } |
| 54 | 47 | |
| 55 | - public static function get_computed_html_tag( array $settings ): string { | |
| 56 | - return Html_Tag_Computer::compute( $settings, 'div' ); | |
| 57 | - } | |
| 58 | - | |
| 59 | 48 | protected static function define_props_schema(): array { |
| 60 | - $tag_dependencies = Dependency_Manager::make( Dependency_Manager::RELATION_AND ) | |
| 61 | - ->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 | - 'operator' => 'not_exist', | |
| 72 | - 'path' => [ 'link', 'destination' ], | |
| 73 | - 'newValue' => [ | |
| 74 | - '$$type' => 'string', | |
| 75 | - 'value' => 'a', | |
| 76 | - ], | |
| 77 | - ] )->get(); | |
| 78 | - | |
| 79 | - return [ | |
| 49 | + $props = [ | |
| 80 | 50 | 'classes' => Classes_Prop_Type::make() |
| 81 | 51 | ->default( [] ), |
| 52 | + | |
| 82 | 53 | 'tag' => String_Prop_Type::make() |
| 83 | - ->enum( [ 'div', 'header', 'section', 'article', 'aside', 'footer', 'a', 'button', 'main', 'nav' ] ) | |
| 84 | - ->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 | - ->set_dependencies( $tag_dependencies ), | |
| 54 | + ->enum( [ 'div', 'header', 'section', 'article', 'aside', 'footer' ] ) | |
| 55 | + ->default( 'div' ), | |
| 56 | + | |
| 87 | 57 | 'link' => Link_Prop_Type::make(), |
| 88 | - 'attributes' => Attributes_Prop_Type::make()->meta( Overridable_Prop_Type::ignore() ), | |
| 89 | 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; | |
| 90 | 65 | } |
| 91 | 66 | |
| 92 | 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 | + | |
| 93 | 110 | return [ |
| 94 | 111 | Section::make() |
| 95 | 112 | ->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() ), | |
| 146 | - ] ), | |
| 113 | + ->set_items( $settings_section_items ), | |
| 147 | 114 | ]; |
| 148 | 115 | } |
| 149 | 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 | + | |
| 150 | 160 | protected function define_base_styles(): array { |
| 151 | 161 | $display = String_Prop_Type::generate( 'block' ); |
| 152 | 162 | |
| 153 | 163 | return [ |
| @@ -178,14 +188,12 @@ | ||
| 178 | 188 | protected function add_render_attributes() { |
| 179 | 189 | parent::add_render_attributes(); |
| 180 | 190 | $settings = $this->get_atomic_settings(); |
| 181 | 191 | $base_style_class = $this->get_base_styles_dictionary()[ static::BASE_STYLE_KEY ]; |
| 182 | - $initial_attributes = $this->define_initial_attributes(); | |
| 183 | 192 | |
| 184 | 193 | $attributes = [ |
| 185 | 194 | 'class' => [ |
| 186 | 195 | 'e-con', |
| 187 | - 'e-atomic-element', | |
| 188 | 196 | $base_style_class, |
| 189 | 197 | ...( $settings['classes'] ?? [] ), |
| 190 | 198 | ], |
| 191 | 199 | ]; |
| @@ -194,17 +202,10 @@ | ||
| 194 | 202 | $attributes['id'] = esc_attr( $settings['_cssid'] ); |
| 195 | 203 | } |
| 196 | 204 | |
| 197 | 205 | if ( ! empty( $settings['link']['href'] ) ) { |
| 198 | - $link_attributes = $this->get_link_attributes( $settings['link'] ); | |
| 199 | - $attributes = array_merge( $attributes, $link_attributes ); | |
| 206 | + $attributes = array_merge( $attributes, $settings['link'] ); | |
| 200 | 207 | } |
| 201 | 208 | |
| 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 | - ]; | |
| 209 | + $this->add_render_attribute( '_wrapper', $attributes ); | |
| 209 | 210 | } |
| 210 | 211 | } |