← All changes
|
modules/atomic-widgets/elements/div-block/div-block.php
+59
-118
4.3.0
→
3.28.0-dev2
View file →
| @@ -1,23 +1,16 @@ | ||
| 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; | |
| 7 | -use Elementor\Modules\AtomicWidgets\PropTypes\Primitives\String_Prop_Type; | |
| 8 | -use Elementor\Modules\AtomicWidgets\PropTypes\Size_Prop_Type; | |
| 9 | -use Elementor\Modules\AtomicWidgets\Styles\Style_Definition; | |
| 10 | -use Elementor\Modules\AtomicWidgets\PropTypes\Attributes_Prop_Type; | |
| 11 | -use Elementor\Modules\AtomicWidgets\Styles\Style_Variant; | |
| 4 | +use Elementor\Modules\AtomicWidgets\Controls\Types\Link_Control; | |
| 5 | +use Elementor\Modules\AtomicWidgets\Elements\Atomic_Element_Base; | |
| 12 | 6 | 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; | |
| 7 | +use Elementor\Modules\AtomicWidgets\Controls\Types\Select_Control; | |
| 17 | 8 | use Elementor\Modules\AtomicWidgets\PropTypes\Classes_Prop_Type; |
| 18 | 9 | use Elementor\Modules\AtomicWidgets\PropTypes\Link_Prop_Type; |
| 19 | -use Elementor\Modules\Components\PropTypes\Overridable_Prop_Type; | |
| 10 | +use Elementor\Modules\AtomicWidgets\PropTypes\Primitives\String_Prop_Type; | |
| 11 | +use Elementor\Plugin; | |
| 12 | +use Elementor\Utils; | |
| 20 | 13 | |
| 21 | 14 | if ( ! defined( 'ABSPATH' ) ) { |
| 22 | 15 | exit; // Exit if accessed directly. |
| 23 | 16 | } |
| @@ -22,71 +15,34 @@ | ||
| 22 | 15 | exit; // Exit if accessed directly. |
| 23 | 16 | } |
| 24 | 17 | |
| 25 | 18 | class Div_Block extends Atomic_Element_Base { |
| 26 | - use Has_Element_Template; | |
| 27 | - | |
| 28 | - const BASE_STYLE_KEY = 'base'; | |
| 29 | - | |
| 30 | - public function __construct( $data = [], $args = null ) { | |
| 31 | - parent::__construct( $data, $args ); | |
| 32 | - $this->meta( 'is_container', true ); | |
| 33 | - } | |
| 34 | - | |
| 35 | 19 | public static function get_type() { |
| 36 | - return 'e-div-block'; | |
| 20 | + return 'div-block'; | |
| 37 | 21 | } |
| 38 | 22 | |
| 39 | 23 | public static function get_element_type(): string { |
| 40 | - return 'e-div-block'; | |
| 24 | + return 'div-block'; | |
| 41 | 25 | } |
| 42 | 26 | |
| 43 | 27 | public function get_title() { |
| 44 | - return esc_html__( 'Div block', 'elementor' ); | |
| 28 | + return esc_html__( 'Div Block', 'elementor' ); | |
| 45 | 29 | } |
| 46 | 30 | |
| 47 | - public function get_keywords() { | |
| 48 | - return [ 'ato', 'atom', 'atoms', 'atomic', 'container', 'wrapper', 'section', 'row', 'column', 'div', 'box', 'layout' ]; | |
| 49 | - } | |
| 50 | - | |
| 51 | 31 | public function get_icon() { |
| 52 | 32 | return 'eicon-div-block'; |
| 53 | 33 | } |
| 54 | 34 | |
| 55 | - public static function get_computed_html_tag( array $settings ): string { | |
| 56 | - return Html_Tag_Computer::compute( $settings, 'div' ); | |
| 57 | - } | |
| 58 | - | |
| 59 | 35 | 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 | 36 | return [ |
| 80 | 37 | 'classes' => Classes_Prop_Type::make() |
| 81 | 38 | ->default( [] ), |
| 39 | + | |
| 82 | 40 | '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 ), | |
| 41 | + ->enum( [ 'div', 'header', 'section', 'article', 'aside', 'footer' ] ) | |
| 42 | + ->default( 'div' ), | |
| 43 | + | |
| 87 | 44 | 'link' => Link_Prop_Type::make(), |
| 88 | - 'attributes' => Attributes_Prop_Type::make()->meta( Overridable_Prop_Type::ignore() ), | |
| 89 | 45 | ]; |
| 90 | 46 | } |
| 91 | 47 | |
| 92 | 48 | protected function define_atomic_controls(): array { |
| @@ -92,11 +48,11 @@ | ||
| 92 | 48 | protected function define_atomic_controls(): array { |
| 93 | 49 | return [ |
| 94 | 50 | Section::make() |
| 95 | 51 | ->set_label( __( 'Settings', 'elementor' ) ) |
| 96 | - ->set_id( 'settings' ) | |
| 97 | 52 | ->set_items( [ |
| 98 | - Html_Tag_Control::bind_to( 'tag' ) | |
| 53 | + Select_Control::bind_to( 'tag' ) | |
| 54 | + ->set_label( esc_html__( 'HTML Tag', 'elementor' ) ) | |
| 99 | 55 | ->set_options( [ |
| 100 | 56 | [ |
| 101 | 57 | 'value' => 'div', |
| 102 | 58 | 'label' => 'Div', |
| @@ -120,91 +76,76 @@ | ||
| 120 | 76 | [ |
| 121 | 77 | 'value' => 'footer', |
| 122 | 78 | 'label' => 'Footer', |
| 123 | 79 | ], |
| 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' ) ), | |
| 80 | + ]), | |
| 81 | + | |
| 137 | 82 | 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 | - ] ), | |
| 83 | + ->set_placeholder( __( 'Paste URL or type', 'elementor' ) ), | |
| 84 | + ]), | |
| 147 | 85 | ]; |
| 148 | 86 | } |
| 149 | 87 | |
| 150 | - protected function define_base_styles(): array { | |
| 151 | - $display = String_Prop_Type::generate( 'block' ); | |
| 88 | + public function get_style_depends() { | |
| 89 | + return [ 'div-block' ]; | |
| 90 | + } | |
| 152 | 91 | |
| 153 | - return [ | |
| 154 | - static::BASE_STYLE_KEY => Style_Definition::make() | |
| 155 | - ->add_variant( | |
| 156 | - Style_Variant::make() | |
| 157 | - ->add_prop( 'display', $display ) | |
| 158 | - ->add_prop( 'padding', $this->get_base_padding() ) | |
| 159 | - ->add_prop( 'min-width', $this->get_base_min_width() ) | |
| 160 | - ), | |
| 161 | - ]; | |
| 162 | - } | |
| 92 | + protected function _get_default_child_type( array $element_data ) { | |
| 93 | + if ( 'div-block' === $element_data['elType'] ) { | |
| 94 | + return Plugin::$instance->elements_manager->get_element_types( 'div-block' ); | |
| 95 | + } | |
| 163 | 96 | |
| 164 | - protected function get_base_padding(): array { | |
| 165 | - return Size_Prop_Type::generate( [ | |
| 166 | - 'size' => 10, | |
| 167 | - 'unit' => 'px', | |
| 168 | - ] ); | |
| 97 | + return Plugin::$instance->widgets_manager->get_widget_types( $element_data['widgetType'] ); | |
| 169 | 98 | } |
| 170 | 99 | |
| 171 | - protected function get_base_min_width(): array { | |
| 172 | - return Size_Prop_Type::generate( [ | |
| 173 | - 'size' => 30, | |
| 174 | - 'unit' => 'px', | |
| 175 | - ] ); | |
| 100 | + protected function content_template() { | |
| 101 | + ?> | |
| 102 | + <?php | |
| 176 | 103 | } |
| 177 | 104 | |
| 178 | 105 | protected function add_render_attributes() { |
| 179 | 106 | parent::add_render_attributes(); |
| 180 | 107 | $settings = $this->get_atomic_settings(); |
| 181 | - $base_style_class = $this->get_base_styles_dictionary()[ static::BASE_STYLE_KEY ]; | |
| 182 | - $initial_attributes = $this->define_initial_attributes(); | |
| 183 | 108 | |
| 184 | 109 | $attributes = [ |
| 185 | 110 | 'class' => [ |
| 186 | 111 | 'e-con', |
| 187 | - 'e-atomic-element', | |
| 188 | - $base_style_class, | |
| 112 | + 'e-div-block', | |
| 189 | 113 | ...( $settings['classes'] ?? [] ), |
| 190 | 114 | ], |
| 191 | 115 | ]; |
| 192 | 116 | |
| 193 | - if ( ! empty( $settings['_cssid'] ) ) { | |
| 194 | - $attributes['id'] = esc_attr( $settings['_cssid'] ); | |
| 117 | + if ( ! empty( $settings['link']['href'] ) ) { | |
| 118 | + $attributes = array_merge( $attributes, $settings['link'] ); | |
| 195 | 119 | } |
| 196 | 120 | |
| 197 | - if ( ! empty( $settings['link']['href'] ) ) { | |
| 198 | - $link_attributes = $this->get_link_attributes( $settings['link'] ); | |
| 199 | - $attributes = array_merge( $attributes, $link_attributes ); | |
| 200 | - } | |
| 121 | + $this->add_render_attribute( '_wrapper', $attributes ); | |
| 122 | + } | |
| 201 | 123 | |
| 202 | - $this->add_render_attribute( '_wrapper', array_merge( $initial_attributes, $attributes ) ); | |
| 124 | + public function before_render() { | |
| 125 | + ?> | |
| 126 | + <<?php $this->print_html_tag(); ?> <?php $this->print_render_attribute_string( '_wrapper' ); ?>> | |
| 127 | + <?php | |
| 203 | 128 | } |
| 204 | 129 | |
| 205 | - protected function get_templates(): array { | |
| 206 | - return [ | |
| 207 | - 'elementor/elements/div-block' => __DIR__ . '/div-block.html.twig', | |
| 208 | - ]; | |
| 130 | + public function after_render() { | |
| 131 | + ?> | |
| 132 | + </<?php $this->print_html_tag(); ?>> | |
| 133 | + <?php | |
| 134 | + } | |
| 135 | + | |
| 136 | + /** | |
| 137 | + * Print safe HTML tag for the element based on the element settings. | |
| 138 | + * | |
| 139 | + * @return void | |
| 140 | + */ | |
| 141 | + protected function print_html_tag() { | |
| 142 | + $html_tag = $this->get_html_tag(); | |
| 143 | + Utils::print_validated_html_tag( $html_tag ); | |
| 144 | + } | |
| 145 | + | |
| 146 | + protected function get_html_tag(): string { | |
| 147 | + $settings = $this->get_atomic_settings(); | |
| 148 | + | |
| 149 | + return ! empty( $settings['link']['href'] ) ? 'a' : ( $settings['tag'] ?? 'div' ); | |
| 209 | 150 | } |
| 210 | 151 | } |