← All changes
|
modules/nested-tabs/widgets/nested-tabs.php
+198
-167
4.2.0-beta1
→
3.22.0-beta1
View file →
| @@ -16,17 +16,13 @@ | ||
| 16 | 16 | use Elementor\Plugin; |
| 17 | 17 | use Elementor\Repeater; |
| 18 | 18 | |
| 19 | 19 | if ( ! defined( 'ABSPATH' ) ) { |
| 20 | - exit; // Exit if accessed directly. | |
| 20 | + exit; // Exit if accessed directly | |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | class NestedTabs extends Widget_Nested_Base { |
| 24 | 24 | |
| 25 | - private $tab_item_settings = []; | |
| 26 | - private $optimized_markup = null; | |
| 27 | - private $widget_container_selector = ''; | |
| 28 | - | |
| 29 | 25 | public function get_name() { |
| 30 | 26 | return 'nested-tabs'; |
| 31 | 27 | } |
| 32 | 28 | |
| @@ -41,29 +37,13 @@ | ||
| 41 | 37 | public function get_keywords() { |
| 42 | 38 | return [ 'nested', 'tabs', 'accordion', 'toggle' ]; |
| 43 | 39 | } |
| 44 | 40 | |
| 45 | - public function get_style_depends(): array { | |
| 46 | - return [ 'widget-nested-tabs' ]; | |
| 47 | - } | |
| 48 | - | |
| 49 | - public function has_widget_inner_wrapper(): bool { | |
| 50 | - return ! Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' ); | |
| 51 | - } | |
| 52 | - | |
| 53 | - public function show_in_panel(): bool { | |
| 54 | - return Plugin::$instance->experiments->is_feature_active( 'nested-elements', true ); | |
| 55 | - } | |
| 56 | - | |
| 57 | 41 | protected function tab_content_container( int $index ) { |
| 58 | 42 | return [ |
| 59 | 43 | 'elType' => 'container', |
| 60 | 44 | 'settings' => [ |
| 61 | - '_title' => sprintf( | |
| 62 | - /* translators: %d: Tab index. */ | |
| 63 | - __( 'Tab #%d', 'elementor' ), | |
| 64 | - $index | |
| 65 | - ), | |
| 45 | + '_title' => sprintf( __( 'Tab #%s', 'elementor' ), $index ), | |
| 66 | 46 | 'content_width' => 'full', |
| 67 | 47 | ], |
| 68 | 48 | ]; |
| 69 | 49 | } |
| @@ -80,9 +60,8 @@ | ||
| 80 | 60 | return 'tab_title'; |
| 81 | 61 | } |
| 82 | 62 | |
| 83 | 63 | protected function get_default_children_title() { |
| 84 | - /* translators: %d: Tab index. */ | |
| 85 | 64 | return esc_html__( 'Tab #%d', 'elementor' ); |
| 86 | 65 | } |
| 87 | 66 | |
| 88 | 67 | protected function get_default_children_placeholder_selector() { |
| @@ -93,21 +72,16 @@ | ||
| 93 | 72 | return 'elementor-widget-n-tabs'; |
| 94 | 73 | } |
| 95 | 74 | |
| 96 | 75 | protected function register_controls() { |
| 97 | - if ( null === $this->optimized_markup ) { | |
| 98 | - $this->optimized_markup = Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' ) && ! $this->has_widget_inner_wrapper(); | |
| 99 | - $this->widget_container_selector = $this->optimized_markup ? '' : ' > .elementor-widget-container'; | |
| 100 | - } | |
| 101 | - | |
| 102 | 76 | $start = is_rtl() ? 'right' : 'left'; |
| 103 | 77 | $end = is_rtl() ? 'left' : 'right'; |
| 104 | 78 | $start_logical = is_rtl() ? 'end' : 'start'; |
| 105 | 79 | $end_logical = is_rtl() ? 'start' : 'end'; |
| 106 | - $heading_selector_non_touch_device = "{{WRAPPER}}.elementor-widget-n-tabs{$this->widget_container_selector} > .e-n-tabs[data-touch-mode='false'] > .e-n-tabs-heading"; | |
| 107 | - $heading_selector_touch_device = "{{WRAPPER}}.elementor-widget-n-tabs{$this->widget_container_selector} > .e-n-tabs[data-touch-mode='true'] > .e-n-tabs-heading"; | |
| 108 | - $heading_selector = "{{WRAPPER}}.elementor-widget-n-tabs{$this->widget_container_selector} > .e-n-tabs > .e-n-tabs-heading"; | |
| 109 | - $content_selector = ":where( {{WRAPPER}}.elementor-widget-n-tabs{$this->widget_container_selector} > .e-n-tabs > .e-n-tabs-content ) > .e-con"; | |
| 80 | + $heading_selector_non_touch_device = '{{WRAPPER}} > .elementor-widget-container > .e-n-tabs[data-touch-mode="false"] > .e-n-tabs-heading'; | |
| 81 | + $heading_selector_touch_device = '{{WRAPPER}} > .elementor-widget-container > .e-n-tabs[data-touch-mode="true"] > .e-n-tabs-heading'; | |
| 82 | + $heading_selector = '{{WRAPPER}} > .elementor-widget-container > .e-n-tabs > .e-n-tabs-heading'; | |
| 83 | + $content_selector = ':where( {{WRAPPER}} > .elementor-widget-container > .e-n-tabs > .e-n-tabs-content ) > .e-con'; | |
| 110 | 84 | |
| 111 | 85 | $this->start_controls_section( 'section_tabs', [ |
| 112 | 86 | 'label' => esc_html__( 'Tabs', 'elementor' ), |
| 113 | 87 | ] ); |
| @@ -183,9 +157,9 @@ | ||
| 183 | 157 | 'tab_title' => esc_html__( 'Tab #3', 'elementor' ), |
| 184 | 158 | ], |
| 185 | 159 | ], |
| 186 | 160 | 'title_field' => '{{{ tab_title }}}', |
| 187 | - 'button_text' => esc_html__( 'Add Tab', 'elementor' ), | |
| 161 | + 'button_text' => 'Add Tab', | |
| 188 | 162 | ] ); |
| 189 | 163 | |
| 190 | 164 | $styling_block_start = '--n-tabs-direction: column; --n-tabs-heading-direction: row; --n-tabs-heading-width: initial; --n-tabs-title-flex-basis: content; --n-tabs-title-flex-shrink: 0;'; |
| 191 | 165 | $styling_block_end = '--n-tabs-direction: column-reverse; --n-tabs-heading-direction: row; --n-tabs-heading-width: initial; --n-tabs-title-flex-basis: content; --n-tabs-title-flex-shrink: 0'; |
| @@ -504,9 +478,9 @@ | ||
| 504 | 478 | [ |
| 505 | 479 | 'name' => 'tabs_title_background_color', |
| 506 | 480 | 'types' => [ 'classic', 'gradient' ], |
| 507 | 481 | 'exclude' => [ 'image' ], |
| 508 | - 'selector' => "{{WRAPPER}}{$this->widget_container_selector} > .e-n-tabs > .e-n-tabs-heading > .e-n-tab-title[aria-selected='false']:not( :hover )", | |
| 482 | + 'selector' => '{{WRAPPER}} > .elementor-widget-container > .e-n-tabs > .e-n-tabs-heading > .e-n-tab-title[aria-selected="false"]:not( :hover )', | |
| 509 | 483 | 'fields_options' => [ |
| 510 | 484 | 'color' => [ |
| 511 | 485 | 'label' => esc_html__( 'Background Color', 'elementor' ), |
| 512 | 486 | 'selectors' => [ |
| @@ -536,8 +510,9 @@ | ||
| 536 | 510 | $this->add_group_control( |
| 537 | 511 | Group_Control_Box_Shadow::get_type(), |
| 538 | 512 | [ |
| 539 | 513 | 'name' => 'tabs_title_box_shadow', |
| 514 | + 'label' => esc_html__( 'Shadow', 'elementor' ), | |
| 540 | 515 | 'separator' => 'after', |
| 541 | 516 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"false\"]:not( :hover )", |
| 542 | 517 | ] |
| 543 | 518 | ); |
| @@ -594,8 +569,9 @@ | ||
| 594 | 569 | $this->add_group_control( |
| 595 | 570 | Group_Control_Box_Shadow::get_type(), |
| 596 | 571 | [ |
| 597 | 572 | 'name' => 'tabs_title_box_shadow_hover', |
| 573 | + 'label' => esc_html__( 'Shadow', 'elementor' ), | |
| 598 | 574 | 'separator' => 'after', |
| 599 | 575 | 'selector' => "{$heading_selector_non_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover", |
| 600 | 576 | ] |
| 601 | 577 | ); |
| @@ -678,8 +654,9 @@ | ||
| 678 | 654 | $this->add_group_control( |
| 679 | 655 | Group_Control_Box_Shadow::get_type(), |
| 680 | 656 | [ |
| 681 | 657 | 'name' => 'tabs_title_box_shadow_active', |
| 658 | + 'label' => esc_html__( 'Shadow', 'elementor' ), | |
| 682 | 659 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"true\"], {$heading_selector_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover", |
| 683 | 660 | ] |
| 684 | 661 | ); |
| 685 | 662 | |
| @@ -758,8 +735,13 @@ | ||
| 758 | 735 | Group_Control_Text_Shadow::get_type(), |
| 759 | 736 | [ |
| 760 | 737 | 'name' => 'title_text_shadow', |
| 761 | 738 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"false\"]:not( :hover )", |
| 739 | + 'fields_options' => [ | |
| 740 | + 'text_shadow_type' => [ | |
| 741 | + 'label' => esc_html__( 'Shadow', 'elementor' ), | |
| 742 | + ], | |
| 743 | + ], | |
| 762 | 744 | ] |
| 763 | 745 | ); |
| 764 | 746 | |
| 765 | 747 | $this->add_group_control( |
| @@ -766,8 +748,13 @@ | ||
| 766 | 748 | Group_Control_Text_Stroke::get_type(), |
| 767 | 749 | [ |
| 768 | 750 | 'name' => 'title_text_stroke', |
| 769 | 751 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"false\"]:not( :hover ) :is( span, a, i )", |
| 752 | + 'fields_options' => [ | |
| 753 | + 'text_stroke_type' => [ | |
| 754 | + 'label' => esc_html__( 'Stroke', 'elementor' ), | |
| 755 | + ], | |
| 756 | + ], | |
| 770 | 757 | ] |
| 771 | 758 | ); |
| 772 | 759 | |
| 773 | 760 | $this->end_controls_tab(); |
| @@ -794,8 +781,14 @@ | ||
| 794 | 781 | Group_Control_Text_Shadow::get_type(), |
| 795 | 782 | [ |
| 796 | 783 | 'name' => 'title_text_shadow_hover', |
| 797 | 784 | 'selector' => "{$heading_selector_non_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover", |
| 785 | + 'fields_options' => [ | |
| 786 | + 'text_shadow_type' => [ | |
| 787 | + 'label' => esc_html__( 'Shadow', 'elementor' ), | |
| 788 | + ], | |
| 789 | + ], | |
| 790 | + | |
| 798 | 791 | ] |
| 799 | 792 | ); |
| 800 | 793 | |
| 801 | 794 | $this->add_group_control( |
| @@ -802,8 +795,13 @@ | ||
| 802 | 795 | Group_Control_Text_Stroke::get_type(), |
| 803 | 796 | [ |
| 804 | 797 | 'name' => 'title_text_stroke_hover', |
| 805 | 798 | 'selector' => "{$heading_selector_non_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover :is( span, a, i )", |
| 799 | + 'fields_options' => [ | |
| 800 | + 'text_stroke_type' => [ | |
| 801 | + 'label' => esc_html__( 'Stroke', 'elementor' ), | |
| 802 | + ], | |
| 803 | + ], | |
| 806 | 804 | ] |
| 807 | 805 | ); |
| 808 | 806 | |
| 809 | 807 | $this->end_controls_tab(); |
| @@ -830,8 +828,13 @@ | ||
| 830 | 828 | Group_Control_Text_Shadow::get_type(), |
| 831 | 829 | [ |
| 832 | 830 | 'name' => 'title_text_shadow_active', |
| 833 | 831 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"true\"], {$heading_selector_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover", |
| 832 | + 'fields_options' => [ | |
| 833 | + 'text_shadow_type' => [ | |
| 834 | + 'label' => esc_html__( 'Shadow', 'elementor' ), | |
| 835 | + ], | |
| 836 | + ], | |
| 834 | 837 | ] |
| 835 | 838 | ); |
| 836 | 839 | |
| 837 | 840 | $this->add_group_control( |
| @@ -838,8 +841,13 @@ | ||
| 838 | 841 | Group_Control_Text_Stroke::get_type(), |
| 839 | 842 | [ |
| 840 | 843 | 'name' => 'title_text_stroke_active', |
| 841 | 844 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"true\"] :is( span, a, i ), {$heading_selector_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover :is( span, a, i )", |
| 845 | + 'fields_options' => [ | |
| 846 | + 'text_stroke_type' => [ | |
| 847 | + 'label' => esc_html__( 'Stroke', 'elementor' ), | |
| 848 | + ], | |
| 849 | + ], | |
| 842 | 850 | ] |
| 843 | 851 | ); |
| 844 | 852 | |
| 845 | 853 | $this->end_controls_tab(); |
| @@ -1064,9 +1072,9 @@ | ||
| 1064 | 1072 | |
| 1065 | 1073 | $this->end_controls_section(); |
| 1066 | 1074 | } |
| 1067 | 1075 | |
| 1068 | - protected function render_tab_titles_html( $item_settings ): void { | |
| 1076 | + protected function render_tab_titles_html( $item_settings ): string { | |
| 1069 | 1077 | $setting_key = $this->get_repeater_setting_key( 'tab_title', 'tabs', $item_settings['index'] ); |
| 1070 | 1078 | $title = $item_settings['item']['tab_title']; |
| 1071 | 1079 | $css_classes = [ 'e-n-tab-title' ]; |
| 1072 | 1080 | |
| @@ -1075,9 +1083,8 @@ | ||
| 1075 | 1083 | } |
| 1076 | 1084 | |
| 1077 | 1085 | $this->add_render_attribute( $setting_key, [ |
| 1078 | 1086 | 'id' => $item_settings['tab_id'], |
| 1079 | - 'data-tab-title-id' => $item_settings['tab_title_id'], | |
| 1080 | 1087 | 'class' => $css_classes, |
| 1081 | 1088 | 'aria-selected' => 1 === $item_settings['tab_count'] ? 'true' : 'false', |
| 1082 | 1089 | 'data-tab-index' => $item_settings['tab_count'], |
| 1083 | 1090 | 'role' => 'tab', |
| @@ -1084,41 +1091,39 @@ | ||
| 1084 | 1091 | 'tabindex' => 1 === $item_settings['tab_count'] ? '0' : '-1', |
| 1085 | 1092 | 'aria-controls' => $item_settings['container_id'], |
| 1086 | 1093 | 'style' => '--n-tabs-title-order: ' . $item_settings['tab_count'] . ';', |
| 1087 | 1094 | ] ); |
| 1088 | - ?> | |
| 1089 | - <button <?php $this->print_render_attribute_string( $setting_key ); ?>> | |
| 1090 | - <?php $this->maybe_render_tab_icons_html( $item_settings ); ?> | |
| 1091 | - <span <?php $this->print_render_attribute_string( 'tab-title-text' ); ?>> | |
| 1092 | - <?php echo wp_kses_post( $title ); ?> | |
| 1093 | - </span> | |
| 1094 | - </button> | |
| 1095 | - <?php | |
| 1096 | - } | |
| 1097 | 1095 | |
| 1098 | - protected function maybe_render_tab_icons_html( $item_settings ): void { | |
| 1099 | - $icon_settings = $item_settings['item']['tab_icon']; | |
| 1096 | + $render_attributes = $this->get_render_attribute_string( $setting_key ); | |
| 1097 | + $text_class = $this->get_render_attribute_string( 'tab-title-text' ); | |
| 1098 | + $icon_class = $this->get_render_attribute_string( 'tab-icon' ); | |
| 1100 | 1099 | |
| 1101 | - if ( empty( $icon_settings['value'] ) ) { | |
| 1102 | - return; | |
| 1100 | + $icon_html = Icons_Manager::try_get_icon_html( $item_settings['item']['tab_icon'], [ 'aria-hidden' => 'true' ] ); | |
| 1101 | + $icon_active_html = $icon_html; | |
| 1102 | + | |
| 1103 | + if ( $this->is_active_icon_exist( $item_settings['item'] ) ) { | |
| 1104 | + $icon_active_html = Icons_Manager::try_get_icon_html( $item_settings['item']['tab_icon_active'], [ 'aria-hidden' => 'true' ] ); | |
| 1103 | 1105 | } |
| 1104 | 1106 | |
| 1105 | - $active_icon_settings = $this->is_active_icon_exist( $item_settings['item'] ) | |
| 1106 | - ? $item_settings['item']['tab_icon_active'] | |
| 1107 | - : $icon_settings; | |
| 1107 | + ob_start(); | |
| 1108 | 1108 | ?> |
| 1109 | - <span <?php $this->print_render_attribute_string( 'tab-icon' ); ?>> | |
| 1110 | - <?php Icons_Manager::render_icon( $icon_settings, [ 'aria-hidden' => 'true' ] ); ?> | |
| 1111 | - <?php Icons_Manager::render_icon( $active_icon_settings, [ 'aria-hidden' => 'true' ] ); ?> | |
| 1112 | - </span> | |
| 1109 | + <button <?php echo $render_attributes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>> | |
| 1110 | + <span <?php echo $icon_class; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>> | |
| 1111 | + <?php echo $icon_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 1112 | + <?php echo $icon_active_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 1113 | + </span> | |
| 1114 | + <span <?php echo $text_class; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>> | |
| 1115 | + <?php echo wp_kses_post( $title ); ?> | |
| 1116 | + </span> | |
| 1117 | + </button> | |
| 1113 | 1118 | <?php |
| 1119 | + return ob_get_clean(); | |
| 1114 | 1120 | } |
| 1115 | 1121 | |
| 1116 | - protected function render_tab_containers_html( $settings ): void { | |
| 1117 | - foreach ( $settings['tabs'] as $index => $item ) { | |
| 1118 | - $item_settings = $this->tab_item_settings[ $index ]; | |
| 1119 | - $this->print_child( $item_settings['index'], $item_settings ); | |
| 1120 | - } | |
| 1122 | + protected function render_tab_containers_html( $item_settings ): string { | |
| 1123 | + ob_start(); | |
| 1124 | + $this->print_child( $item_settings['index'], $item_settings ); | |
| 1125 | + return ob_get_clean(); | |
| 1121 | 1126 | } |
| 1122 | 1127 | |
| 1123 | 1128 | |
| 1124 | 1129 | /** |
| @@ -1123,9 +1128,9 @@ | ||
| 1123 | 1128 | |
| 1124 | 1129 | /** |
| 1125 | 1130 | * Print the content area. |
| 1126 | 1131 | * |
| 1127 | - * @param int $index | |
| 1132 | + * @param int $index | |
| 1128 | 1133 | * @param array $item_settings |
| 1129 | 1134 | */ |
| 1130 | 1135 | public function print_child( $index, $item_settings = [] ) { |
| 1131 | 1136 | $children = $this->get_children(); |
| @@ -1163,9 +1168,9 @@ | ||
| 1163 | 1168 | } |
| 1164 | 1169 | |
| 1165 | 1170 | protected function render() { |
| 1166 | 1171 | $settings = $this->get_settings_for_display(); |
| 1167 | - $widget_number = $this->get_id_int(); | |
| 1172 | + $widget_number = substr( $this->get_id_int(), 0, 3 ); | |
| 1168 | 1173 | |
| 1169 | 1174 | if ( ! empty( $settings['link'] ) ) { |
| 1170 | 1175 | $this->add_link_attributes( 'elementor-tabs', $settings['link'] ); |
| 1171 | 1176 | } |
| @@ -1178,38 +1183,39 @@ | ||
| 1178 | 1183 | |
| 1179 | 1184 | $this->add_render_attribute( 'tab-title-text', 'class', 'e-n-tab-title-text' ); |
| 1180 | 1185 | $this->add_render_attribute( 'tab-icon', 'class', 'e-n-tab-icon' ); |
| 1181 | 1186 | $this->add_render_attribute( 'tab-icon-active', 'class', [ 'e-n-tab-icon' ] ); |
| 1187 | + | |
| 1188 | + $tab_titles_html = ''; | |
| 1189 | + $tab_containers_html = ''; | |
| 1190 | + | |
| 1191 | + foreach ( $settings['tabs'] as $index => $item ) { | |
| 1192 | + $tab_count = $index + 1; | |
| 1193 | + | |
| 1194 | + $tab_id = empty( $item['element_id'] ) | |
| 1195 | + ? 'e-n-tabs-title-' . $widget_number . $tab_count | |
| 1196 | + : $item['element_id']; | |
| 1197 | + | |
| 1198 | + $item_settings = [ | |
| 1199 | + 'index' => $index, | |
| 1200 | + 'tab_count' => $tab_count, | |
| 1201 | + 'tab_id' => $tab_id, | |
| 1202 | + 'container_id' => 'e-n-tab-content-' . $widget_number . $tab_count, | |
| 1203 | + 'widget_number' => $widget_number, | |
| 1204 | + 'item' => $item, | |
| 1205 | + 'settings' => $settings, | |
| 1206 | + ]; | |
| 1207 | + | |
| 1208 | + $tab_titles_html .= $this->render_tab_titles_html( $item_settings ); | |
| 1209 | + $tab_containers_html .= $this->render_tab_containers_html( $item_settings ); | |
| 1210 | + } | |
| 1182 | 1211 | ?> |
| 1183 | 1212 | <div <?php $this->print_render_attribute_string( 'elementor-tabs' ); ?>> |
| 1184 | 1213 | <div class="e-n-tabs-heading" role="tablist"> |
| 1185 | - <?php | |
| 1186 | - foreach ( $settings['tabs'] as $index => $item ) { | |
| 1187 | - $tab_count = $index + 1; | |
| 1188 | - $tab_title_id = 'e-n-tab-title-' . $widget_number . $tab_count; | |
| 1189 | - $tab_id = empty( $item['element_id'] ) | |
| 1190 | - ? $tab_title_id | |
| 1191 | - : $item['element_id']; | |
| 1192 | - | |
| 1193 | - $item_settings = [ | |
| 1194 | - 'index' => $index, | |
| 1195 | - 'tab_count' => $tab_count, | |
| 1196 | - 'tab_id' => $tab_id, | |
| 1197 | - 'tab_title_id' => $tab_title_id, | |
| 1198 | - 'container_id' => 'e-n-tab-content-' . $widget_number . $tab_count, | |
| 1199 | - 'widget_number' => $widget_number, | |
| 1200 | - 'item' => $item, | |
| 1201 | - 'settings' => $settings, | |
| 1202 | - ]; | |
| 1203 | - | |
| 1204 | - $this->tab_item_settings[] = $item_settings; | |
| 1205 | - | |
| 1206 | - $this->render_tab_titles_html( $item_settings ); | |
| 1207 | - } | |
| 1208 | - ?> | |
| 1214 | + <?php echo $tab_titles_html;// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 1209 | 1215 | </div> |
| 1210 | 1216 | <div class="e-n-tabs-content"> |
| 1211 | - <?php $this->render_tab_containers_html( $settings ); ?> | |
| 1217 | + <?php echo $tab_containers_html;// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 1212 | 1218 | </div> |
| 1213 | 1219 | </div> |
| 1214 | 1220 | <?php |
| 1215 | 1221 | } |
| @@ -1214,111 +1220,136 @@ | ||
| 1214 | 1220 | <?php |
| 1215 | 1221 | } |
| 1216 | 1222 | |
| 1217 | 1223 | protected function get_initial_config(): array { |
| 1218 | - return array_merge( parent::get_initial_config(), [ | |
| 1219 | - 'support_improved_repeaters' => true, | |
| 1220 | - 'target_container' => [ '.e-n-tabs-heading' ], | |
| 1221 | - 'node' => 'button', | |
| 1222 | - ] ); | |
| 1224 | + if ( Plugin::$instance->experiments->is_feature_active( 'e_nested_atomic_repeaters' ) ) { | |
| 1225 | + return array_merge( parent::get_initial_config(), [ | |
| 1226 | + 'support_improved_repeaters' => true, | |
| 1227 | + 'target_container' => [ '.e-n-tabs-heading' ], | |
| 1228 | + 'node' => 'button', | |
| 1229 | + ] ); | |
| 1230 | + } | |
| 1231 | + | |
| 1232 | + return parent::get_initial_config(); | |
| 1223 | 1233 | } |
| 1224 | 1234 | |
| 1225 | 1235 | protected function content_template_single_repeater_item() { |
| 1226 | 1236 | ?> |
| 1227 | 1237 | <# |
| 1228 | - const tabIndex = view.collection.length, | |
| 1229 | - elementUid = view.getIDInt().toString(), | |
| 1230 | - item = data, | |
| 1231 | - hoverAnimationSetting = view?.container?.settings?.attributes?.hover_animation; | |
| 1232 | - hoverAnimationClass = hoverAnimationSetting | |
| 1233 | - ? `elementor-animation-${ hoverAnimationSetting }` | |
| 1234 | - : ''; | |
| 1235 | - #> | |
| 1236 | - <?php $this->content_template_single_item( '{{ tabIndex }}', '{{ item }}', '{{ elementUid }}', '{{ hoverAnimationClass }}' ); | |
| 1237 | - } | |
| 1238 | + const tabCount = view.collection.length + 1, | |
| 1239 | + elementUid = view.getIDInt().toString().substring( 0, 3 ) + tabCount, | |
| 1240 | + tabIcon = elementor.helpers.renderIcon( view, data.tab_icon, { 'aria-hidden': true }, 'i' , 'object' ); | |
| 1238 | 1241 | |
| 1239 | - protected function content_template() { | |
| 1240 | - ?> | |
| 1241 | - <# const elementUid = view.getIDInt().toString(); #> | |
| 1242 | - <div class="e-n-tabs" data-widget-number="{{ elementUid }}" aria-label="<?php echo esc_html__( 'Tabs. Open items with Enter or Space, close with Escape and navigate using the Arrow keys.', 'elementor' ); ?>"> | |
| 1243 | - <# if ( settings['tabs'] ) { #> | |
| 1244 | - <div class="e-n-tabs-heading" role="tablist"> | |
| 1245 | - <# _.each( settings['tabs'], function( item, index ) { | |
| 1246 | - const tabIndex = index, | |
| 1247 | - hoverAnimationSetting = settings['hover_animation'], | |
| 1248 | - hoverAnimationClass = hoverAnimationSetting | |
| 1249 | - ? `elementor-animation-${ hoverAnimationSetting }` | |
| 1250 | - : ''; | |
| 1251 | - #> | |
| 1252 | - <?php $this->content_template_single_item( '{{ tabIndex }}', '{{ item }}', '{{ elementUid }}', '{{ hoverAnimationClass }}' ); ?> | |
| 1253 | - <# } ); #> | |
| 1254 | - </div> | |
| 1255 | - <div class="e-n-tabs-content"></div> | |
| 1256 | - <# } #> | |
| 1257 | - </div> | |
| 1258 | - <?php | |
| 1259 | - } | |
| 1242 | + let tabActiveIcon = tabIcon, | |
| 1243 | + tabId = 'e-n-tab-title-' + elementUid; | |
| 1260 | 1244 | |
| 1261 | - private function content_template_single_item( $tab_index, $item, $element_uid, $hover_animation_class ) { | |
| 1262 | - ?> | |
| 1263 | - <# | |
| 1264 | - const tabCount = tabIndex + 1, | |
| 1265 | - tabTitleId = 'e-n-tab-title-' + elementUid + tabCount, | |
| 1266 | - tabId = item.element_id | |
| 1267 | - ? item.element_id | |
| 1268 | - : tabTitleId, | |
| 1269 | - tabUid = elementUid + tabCount, | |
| 1270 | - tabIcon = elementor.helpers.renderIcon( view, item.tab_icon, { 'aria-hidden': true }, 'i' , 'object' ), | |
| 1271 | - activeTabIcon = item.tab_icon_active.value | |
| 1272 | - ? elementor.helpers.renderIcon( view, item.tab_icon_active, { 'aria-hidden': true }, 'i' , 'object' ) | |
| 1273 | - : tabIcon, | |
| 1274 | - escapedHoverAnimationClass = _.escape( hoverAnimationClass ); | |
| 1245 | + if ( '' !== data.tab_icon_active.value ) { | |
| 1246 | + tabActiveIcon = elementor.helpers.renderIcon( view, data.tab_icon_active, { 'aria-hidden': true }, 'i' , 'object' ); | |
| 1247 | + } | |
| 1275 | 1248 | |
| 1276 | - view.addRenderAttribute( 'tab-title', { | |
| 1277 | - 'id': tabId, | |
| 1278 | - 'data-tab-title-id': tabTitleId, | |
| 1279 | - 'class': [ 'e-n-tab-title',escapedHoverAnimationClass ], | |
| 1249 | + const tabWrapperKey = { | |
| 1250 | + 'id': 'e-n-tab-title-' + elementUid, | |
| 1251 | + 'class': [ 'e-n-tab-title' ], | |
| 1280 | 1252 | 'data-tab-index': tabCount, |
| 1281 | 1253 | 'role': 'tab', |
| 1282 | 1254 | 'aria-selected': 1 === tabCount ? 'true' : 'false', |
| 1283 | 1255 | 'tabindex': 1 === tabCount ? '0' : '-1', |
| 1284 | - 'aria-controls': 'e-n-tab-content-' + tabUid, | |
| 1256 | + 'aria-controls': 'e-n-tab-content-' + elementUid, | |
| 1285 | 1257 | 'style': '--n-tabs-title-order: ' + tabCount + ';', |
| 1286 | - }, null, true ); | |
| 1258 | + }; | |
| 1287 | 1259 | |
| 1288 | - view.addRenderAttribute( 'tab-title-text', { | |
| 1289 | - 'class': [ 'e-n-tab-title-text' ], | |
| 1260 | + const tabIconKey = { | |
| 1261 | + 'class': [ 'e-n-tab-icon' ], | |
| 1290 | 1262 | 'data-binding-type': 'repeater-item', |
| 1291 | 1263 | 'data-binding-repeater-name': 'tabs', |
| 1292 | - 'data-binding-setting': [ 'tab_title', 'element_id' ], | |
| 1264 | + 'data-binding-setting': [ data.tab_icon.value, data.tab_icon_active.value ], | |
| 1293 | 1265 | 'data-binding-index': tabCount, |
| 1294 | - 'data-binding-config': JSON.stringify({ | |
| 1295 | - 'element_id': { | |
| 1296 | - attr: 'id', | |
| 1297 | - selector: 'button', | |
| 1298 | - editType: 'attribute', | |
| 1299 | - }, | |
| 1300 | - 'tab_title': { | |
| 1301 | - editType: 'text', | |
| 1302 | - }, | |
| 1303 | - }), | |
| 1304 | - }, null, true ); | |
| 1266 | + }; | |
| 1305 | 1267 | |
| 1306 | - view.addRenderAttribute( 'tab-icon', { | |
| 1307 | - 'class': [ 'e-n-tab-icon' ], | |
| 1268 | + const tabTitleKey = { | |
| 1269 | + 'class': [ 'e-n-tab-title-text' ], | |
| 1308 | 1270 | 'data-binding-type': 'repeater-item', |
| 1309 | 1271 | 'data-binding-repeater-name': 'tabs', |
| 1272 | + 'data-binding-setting': [ 'tab_title' ], | |
| 1310 | 1273 | 'data-binding-index': tabCount, |
| 1311 | - }, null, true ); | |
| 1274 | + }; | |
| 1275 | + | |
| 1276 | + view.addRenderAttribute( 'button-container', tabWrapperKey, null, true ); | |
| 1277 | + view.addRenderAttribute( 'tab-title-container', tabTitleKey, null, true ); | |
| 1278 | + view.addRenderAttribute( 'tab-icon-key-container', tabIconKey, null, true ); | |
| 1312 | 1279 | #> |
| 1313 | 1280 | |
| 1314 | - <button {{{ view.getRenderAttributeString( 'tab-title' ) }}}> | |
| 1315 | - <# if ( !! item.tab_icon.value ) { #> | |
| 1316 | - <span {{{ view.getRenderAttributeString( 'tab-icon' ) }}}>{{{ tabIcon.value }}}{{{ activeTabIcon.value }}}</span> | |
| 1281 | + <button {{{ view.getRenderAttributeString( 'button-container' ) }}}> | |
| 1282 | + <span {{{ view.getRenderAttributeString( 'tab-icon-key-container' ) }}}> | |
| 1283 | + {{{ tabIcon.value }}}{{{ tabActiveIcon.value }}} | |
| 1284 | + </span> | |
| 1285 | + <span {{{ view.getRenderAttributeString( 'tab-title-container' ) }}}>{{{ data.tab_title }}}</span> | |
| 1286 | + </button> | |
| 1287 | + <?php | |
| 1288 | + } | |
| 1289 | + | |
| 1290 | + protected function content_template() { | |
| 1291 | + ?> | |
| 1292 | + <# const elementUid = view.getIDInt().toString().substr( 0, 3 ); #> | |
| 1293 | + <div class="e-n-tabs" data-widget-number="{{ elementUid }}" aria-label="<?php echo esc_html__( 'Tabs. Open items with Enter or Space, close with Escape and navigate using the Arrow keys.', 'elementor' ); ?>"> | |
| 1294 | + <# if ( settings['tabs'] ) { #> | |
| 1295 | + <div class="e-n-tabs-heading" role="tablist"> | |
| 1296 | + <# _.each( settings['tabs'], function( item, index ) { | |
| 1297 | + const tabCount = index + 1, | |
| 1298 | + tabUid = elementUid + tabCount, | |
| 1299 | + tabWrapperKey = tabUid, | |
| 1300 | + tabTitleKey = 'tab-title-' + tabUid, | |
| 1301 | + tabIconKey = 'tab-icon-' + tabUid, | |
| 1302 | + tabIcon = elementor.helpers.renderIcon( view, item.tab_icon, { 'aria-hidden': true }, 'i' , 'object' ), | |
| 1303 | + hoverAnimationClass = settings['hover_animation'] ? `elementor-animation-${ settings['hover_animation'] }` : ''; | |
| 1304 | + | |
| 1305 | + let tabActiveIcon = tabIcon, | |
| 1306 | + tabId = 'e-n-tab-title-' + tabUid; | |
| 1307 | + | |
| 1308 | + if ( '' !== item.tab_icon_active.value ) { | |
| 1309 | + tabActiveIcon = elementor.helpers.renderIcon( view, item.tab_icon_active, { 'aria-hidden': true }, 'i' , 'object' ); | |
| 1310 | + } | |
| 1311 | + | |
| 1312 | + if ( '' !== item.element_id ) { | |
| 1313 | + tabId = item.element_id; | |
| 1314 | + } | |
| 1315 | + | |
| 1316 | + view.addRenderAttribute( tabWrapperKey, { | |
| 1317 | + 'id': tabId, | |
| 1318 | + 'class': [ 'e-n-tab-title',hoverAnimationClass ], | |
| 1319 | + 'data-tab-index': tabCount, | |
| 1320 | + 'role': 'tab', | |
| 1321 | + 'aria-selected': 1 === tabCount ? 'true' : 'false', | |
| 1322 | + 'tabindex': 1 === tabCount ? '0' : '-1', | |
| 1323 | + 'aria-controls': 'e-n-tab-content-' + tabUid, | |
| 1324 | + 'style': '--n-tabs-title-order: ' + tabCount + ';', | |
| 1325 | + } ); | |
| 1326 | + | |
| 1327 | + view.addRenderAttribute( tabTitleKey, { | |
| 1328 | + 'class': [ 'e-n-tab-title-text' ], | |
| 1329 | + 'data-binding-type': 'repeater-item', | |
| 1330 | + 'data-binding-repeater-name': 'tabs', | |
| 1331 | + 'data-binding-setting': [ 'tab_title' ], | |
| 1332 | + 'data-binding-index': tabCount, | |
| 1333 | + } ); | |
| 1334 | + | |
| 1335 | + view.addRenderAttribute( tabIconKey, { | |
| 1336 | + 'class': [ 'e-n-tab-icon' ], | |
| 1337 | + 'data-binding-type': 'repeater-item', | |
| 1338 | + 'data-binding-repeater-name': 'tabs', | |
| 1339 | + 'data-binding-setting': [ 'tab_icon.value', 'tab_icon_active.value' ], | |
| 1340 | + 'data-binding-index': tabCount, | |
| 1341 | + } ); | |
| 1342 | + #> | |
| 1343 | + <button {{{ view.getRenderAttributeString( tabWrapperKey ) }}}> | |
| 1344 | + <span {{{ view.getRenderAttributeString( tabIconKey ) }}}>{{{ tabIcon.value }}}{{{ tabActiveIcon.value }}}</span> | |
| 1345 | + <span {{{ view.getRenderAttributeString( tabTitleKey ) }}}>{{{ item.tab_title }}}</span> | |
| 1346 | + </button> | |
| 1347 | + <# } ); #> | |
| 1348 | + </div> | |
| 1349 | + <div class="e-n-tabs-content"></div> | |
| 1317 | 1350 | <# } #> |
| 1318 | - | |
| 1319 | - <span {{{ view.getRenderAttributeString( 'tab-title-text' ) }}}>{{{ item.tab_title }}}</span> | |
| 1320 | - </button> | |
| 1351 | + </div> | |
| 1321 | 1352 | <?php |
| 1322 | 1353 | } |
| 1323 | 1354 | |
| 1324 | 1355 | /** |