| @@ -14,19 +14,18 @@ | ||
| 14 | 14 | use Elementor\Modules\NestedElements\Base\Widget_Nested_Base; |
| 15 | 15 | use Elementor\Modules\NestedElements\Controls\Control_Nested_Repeater; |
| 16 | 16 | use Elementor\Plugin; |
| 17 | 17 | use Elementor\Repeater; |
| 18 | +use Elementor\Modules\DynamicTags\Module as TagsModule; | |
| 19 | +use Elementor\Utils; | |
| 20 | +use Elementor\Core\Breakpoints\Manager as Breakpoints_Manager; | |
| 18 | 21 | |
| 19 | 22 | if ( ! defined( 'ABSPATH' ) ) { |
| 20 | - exit; // Exit if accessed directly. | |
| 23 | + exit; // Exit if accessed directly | |
| 21 | 24 | } |
| 22 | 25 | |
| 23 | 26 | class NestedTabs extends Widget_Nested_Base { |
| 24 | 27 | |
| 25 | - private $tab_item_settings = []; | |
| 26 | - private $optimized_markup = null; | |
| 27 | - private $widget_container_selector = ''; | |
| 28 | - | |
| 29 | 28 | public function get_name() { |
| 30 | 29 | return 'nested-tabs'; |
| 31 | 30 | } |
| 32 | 31 | |
| @@ -41,29 +40,13 @@ | ||
| 41 | 40 | public function get_keywords() { |
| 42 | 41 | return [ 'nested', 'tabs', 'accordion', 'toggle' ]; |
| 43 | 42 | } |
| 44 | 43 | |
| 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 | 44 | protected function tab_content_container( int $index ) { |
| 58 | 45 | return [ |
| 59 | 46 | 'elType' => 'container', |
| 60 | 47 | 'settings' => [ |
| 61 | - '_title' => sprintf( | |
| 62 | - /* translators: %d: Tab index. */ | |
| 63 | - __( 'Tab #%d', 'elementor' ), | |
| 64 | - $index | |
| 65 | - ), | |
| 48 | + '_title' => sprintf( __( 'Tab #%s', 'elementor' ), $index ), | |
| 66 | 49 | 'content_width' => 'full', |
| 67 | 50 | ], |
| 68 | 51 | ]; |
| 69 | 52 | } |
| @@ -80,9 +63,8 @@ | ||
| 80 | 63 | return 'tab_title'; |
| 81 | 64 | } |
| 82 | 65 | |
| 83 | 66 | protected function get_default_children_title() { |
| 84 | - /* translators: %d: Tab index. */ | |
| 85 | 67 | return esc_html__( 'Tab #%d', 'elementor' ); |
| 86 | 68 | } |
| 87 | 69 | |
| 88 | 70 | protected function get_default_children_placeholder_selector() { |
| @@ -93,21 +75,18 @@ | ||
| 93 | 75 | return 'elementor-widget-n-tabs'; |
| 94 | 76 | } |
| 95 | 77 | |
| 96 | 78 | 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 | 79 | $start = is_rtl() ? 'right' : 'left'; |
| 103 | 80 | $end = is_rtl() ? 'left' : 'right'; |
| 104 | 81 | $start_logical = is_rtl() ? 'end' : 'start'; |
| 105 | 82 | $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"; | |
| 83 | + $logical_dimensions_inline_start = is_rtl() ? '{{RIGHT}}{{UNIT}}' : '{{LEFT}}{{UNIT}}'; | |
| 84 | + $logical_dimensions_inline_end = is_rtl() ? '{{LEFT}}{{UNIT}}' : '{{RIGHT}}{{UNIT}}'; | |
| 85 | + $heading_selector_non_touch_device = '{{WRAPPER}} > .elementor-widget-container > .e-n-tabs[data-touch-mode="false"] > .e-n-tabs-heading'; | |
| 86 | + $heading_selector_touch_device = '{{WRAPPER}} > .elementor-widget-container > .e-n-tabs[data-touch-mode="true"] > .e-n-tabs-heading'; | |
| 87 | + $heading_selector = '{{WRAPPER}} > .elementor-widget-container > .e-n-tabs > .e-n-tabs-heading'; | |
| 88 | + $content_selector = ':where( {{WRAPPER}} > .elementor-widget-container > .e-n-tabs > .e-n-tabs-content ) > .e-con'; | |
| 110 | 89 | |
| 111 | 90 | $this->start_controls_section( 'section_tabs', [ |
| 112 | 91 | 'label' => esc_html__( 'Tabs', 'elementor' ), |
| 113 | 92 | ] ); |
| @@ -183,9 +162,9 @@ | ||
| 183 | 162 | 'tab_title' => esc_html__( 'Tab #3', 'elementor' ), |
| 184 | 163 | ], |
| 185 | 164 | ], |
| 186 | 165 | 'title_field' => '{{{ tab_title }}}', |
| 187 | - 'button_text' => esc_html__( 'Add Tab', 'elementor' ), | |
| 166 | + 'button_text' => 'Add Tab', | |
| 188 | 167 | ] ); |
| 189 | 168 | |
| 190 | 169 | $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 | 170 | $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'; |
| @@ -227,9 +206,8 @@ | ||
| 227 | 206 | ], |
| 228 | 207 | 'selectors' => [ |
| 229 | 208 | '{{WRAPPER}}' => '{{VALUE}}', |
| 230 | 209 | ], |
| 231 | - 'control_type' => 'content', | |
| 232 | 210 | ] ); |
| 233 | 211 | |
| 234 | 212 | $this->add_responsive_control( 'tabs_justify_horizontal', [ |
| 235 | 213 | 'label' => esc_html__( 'Justify', 'elementor' ), |
| @@ -360,11 +338,11 @@ | ||
| 360 | 338 | 'icon' => 'eicon-text-align-right', |
| 361 | 339 | ], |
| 362 | 340 | ], |
| 363 | 341 | 'selectors_dictionary' => [ |
| 364 | - 'start' => '--n-tabs-title-justify-content: flex-start; --n-tabs-title-align-items: flex-start; --n-tabs-title-text-align: start;', | |
| 365 | - 'center' => '--n-tabs-title-justify-content: center; --n-tabs-title-align-items: center; --n-tabs-title-text-align: center;', | |
| 366 | - 'end' => '--n-tabs-title-justify-content: flex-end; --n-tabs-title-align-items: flex-end; --n-tabs-title-text-align: end;', | |
| 342 | + 'start' => '--n-tabs-title-justify-content: flex-start; --n-tabs-title-align-items: flex-start;', | |
| 343 | + 'center' => '--n-tabs-title-justify-content: center; --n-tabs-title-align-items: center;', | |
| 344 | + 'end' => '--n-tabs-title-justify-content: flex-end; --n-tabs-title-align-items: flex-end;', | |
| 367 | 345 | ], |
| 368 | 346 | 'selectors' => [ |
| 369 | 347 | '{{WRAPPER}}' => '{{VALUE}}', |
| 370 | 348 | ], |
| @@ -452,20 +430,15 @@ | ||
| 452 | 430 | |
| 453 | 431 | $this->add_responsive_control( 'tabs_title_space_between', [ |
| 454 | 432 | 'label' => esc_html__( 'Gap between tabs', 'elementor' ), |
| 455 | 433 | 'type' => Controls_Manager::SLIDER, |
| 456 | - 'size_units' => [ 'px', 'em', 'rem', 'custom' ], | |
| 457 | 434 | 'range' => [ |
| 458 | 435 | 'px' => [ |
| 436 | + 'min' => 0, | |
| 459 | 437 | 'max' => 400, |
| 460 | 438 | ], |
| 461 | - 'em' => [ | |
| 462 | - 'max' => 40, | |
| 463 | - ], | |
| 464 | - 'rem' => [ | |
| 465 | - 'max' => 40, | |
| 466 | - ], | |
| 467 | 439 | ], |
| 440 | + 'size_units' => [ 'px' ], | |
| 468 | 441 | 'selectors' => [ |
| 469 | 442 | '{{WRAPPER}}' => '--n-tabs-title-gap: {{SIZE}}{{UNIT}}', |
| 470 | 443 | ], |
| 471 | 444 | ] ); |
| @@ -472,20 +445,15 @@ | ||
| 472 | 445 | |
| 473 | 446 | $this->add_responsive_control( 'tabs_title_spacing', [ |
| 474 | 447 | 'label' => esc_html__( 'Distance from content', 'elementor' ), |
| 475 | 448 | 'type' => Controls_Manager::SLIDER, |
| 476 | - 'size_units' => [ 'px', 'em', 'rem', 'custom' ], | |
| 477 | 449 | 'range' => [ |
| 478 | 450 | 'px' => [ |
| 451 | + 'min' => 0, | |
| 479 | 452 | 'max' => 400, |
| 480 | 453 | ], |
| 481 | - 'em' => [ | |
| 482 | - 'max' => 40, | |
| 483 | - ], | |
| 484 | - 'rem' => [ | |
| 485 | - 'max' => 40, | |
| 486 | - ], | |
| 487 | 454 | ], |
| 455 | + 'size_units' => [ 'px' ], | |
| 488 | 456 | 'selectors' => [ |
| 489 | 457 | '{{WRAPPER}}' => '--n-tabs-gap: {{SIZE}}{{UNIT}}', |
| 490 | 458 | ], |
| 491 | 459 | ] ); |
| @@ -504,9 +472,9 @@ | ||
| 504 | 472 | [ |
| 505 | 473 | 'name' => 'tabs_title_background_color', |
| 506 | 474 | 'types' => [ 'classic', 'gradient' ], |
| 507 | 475 | '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 )", | |
| 476 | + 'selector' => '{{WRAPPER}} > .elementor-widget-container > .e-n-tabs > .e-n-tabs-heading > .e-n-tab-title[aria-selected="false"]:not( :hover )', | |
| 509 | 477 | 'fields_options' => [ |
| 510 | 478 | 'color' => [ |
| 511 | 479 | 'label' => esc_html__( 'Background Color', 'elementor' ), |
| 512 | 480 | 'selectors' => [ |
| @@ -536,8 +504,9 @@ | ||
| 536 | 504 | $this->add_group_control( |
| 537 | 505 | Group_Control_Box_Shadow::get_type(), |
| 538 | 506 | [ |
| 539 | 507 | 'name' => 'tabs_title_box_shadow', |
| 508 | + 'label' => esc_html__( 'Shadow', 'elementor' ), | |
| 540 | 509 | 'separator' => 'after', |
| 541 | 510 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"false\"]:not( :hover )", |
| 542 | 511 | ] |
| 543 | 512 | ); |
| @@ -594,8 +563,9 @@ | ||
| 594 | 563 | $this->add_group_control( |
| 595 | 564 | Group_Control_Box_Shadow::get_type(), |
| 596 | 565 | [ |
| 597 | 566 | 'name' => 'tabs_title_box_shadow_hover', |
| 567 | + 'label' => esc_html__( 'Shadow', 'elementor' ), | |
| 598 | 568 | 'separator' => 'after', |
| 599 | 569 | 'selector' => "{$heading_selector_non_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover", |
| 600 | 570 | ] |
| 601 | 571 | ); |
| @@ -617,9 +587,8 @@ | ||
| 617 | 587 | '{{WRAPPER}}' => '--n-tabs-title-transition: {{SIZE}}s', |
| 618 | 588 | ], |
| 619 | 589 | 'range' => [ |
| 620 | 590 | 'px' => [ |
| 621 | - 'min' => 0, | |
| 622 | 591 | 'max' => 3, |
| 623 | 592 | 'step' => 0.1, |
| 624 | 593 | ], |
| 625 | 594 | ], |
| @@ -678,8 +647,9 @@ | ||
| 678 | 647 | $this->add_group_control( |
| 679 | 648 | Group_Control_Box_Shadow::get_type(), |
| 680 | 649 | [ |
| 681 | 650 | 'name' => 'tabs_title_box_shadow_active', |
| 651 | + 'label' => esc_html__( 'Shadow', 'elementor' ), | |
| 682 | 652 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"true\"], {$heading_selector_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover", |
| 683 | 653 | ] |
| 684 | 654 | ); |
| 685 | 655 | |
| @@ -706,9 +676,9 @@ | ||
| 706 | 676 | 'label' => esc_html__( 'Padding', 'elementor' ), |
| 707 | 677 | 'type' => Controls_Manager::DIMENSIONS, |
| 708 | 678 | 'size_units' => [ 'px', '%', 'em', 'rem', 'vw', 'custom' ], |
| 709 | 679 | 'selectors' => [ |
| 710 | - '{{WRAPPER}}' => '--n-tabs-title-padding-top: {{TOP}}{{UNIT}}; --n-tabs-title-padding-right: {{RIGHT}}{{UNIT}}; --n-tabs-title-padding-bottom: {{BOTTOM}}{{UNIT}}; --n-tabs-title-padding-left: {{LEFT}}{{UNIT}};', | |
| 680 | + '{{WRAPPER}}' => "--n-tabs-title-padding-block-start: {{TOP}}{{UNIT}}; --n-tabs-title-padding-inline-end: $logical_dimensions_inline_end; --n-tabs-title-padding-block-end: {{BOTTOM}}{{UNIT}}; --n-tabs-title-padding-inline-start: $logical_dimensions_inline_start;", | |
| 711 | 681 | ], |
| 712 | 682 | ] |
| 713 | 683 | ); |
| 714 | 684 | |
| @@ -758,8 +728,13 @@ | ||
| 758 | 728 | Group_Control_Text_Shadow::get_type(), |
| 759 | 729 | [ |
| 760 | 730 | 'name' => 'title_text_shadow', |
| 761 | 731 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"false\"]:not( :hover )", |
| 732 | + 'fields_options' => [ | |
| 733 | + 'text_shadow_type' => [ | |
| 734 | + 'label' => esc_html_x( 'Shadow', 'Text Shadow Control', 'elementor' ), | |
| 735 | + ], | |
| 736 | + ], | |
| 762 | 737 | ] |
| 763 | 738 | ); |
| 764 | 739 | |
| 765 | 740 | $this->add_group_control( |
| @@ -766,8 +741,13 @@ | ||
| 766 | 741 | Group_Control_Text_Stroke::get_type(), |
| 767 | 742 | [ |
| 768 | 743 | 'name' => 'title_text_stroke', |
| 769 | 744 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"false\"]:not( :hover ) :is( span, a, i )", |
| 745 | + 'fields_options' => [ | |
| 746 | + 'text_stroke_type' => [ | |
| 747 | + 'label' => esc_html__( 'Stroke', 'elementor' ), | |
| 748 | + ], | |
| 749 | + ], | |
| 770 | 750 | ] |
| 771 | 751 | ); |
| 772 | 752 | |
| 773 | 753 | $this->end_controls_tab(); |
| @@ -794,8 +774,14 @@ | ||
| 794 | 774 | Group_Control_Text_Shadow::get_type(), |
| 795 | 775 | [ |
| 796 | 776 | 'name' => 'title_text_shadow_hover', |
| 797 | 777 | 'selector' => "{$heading_selector_non_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover", |
| 778 | + 'fields_options' => [ | |
| 779 | + 'text_shadow_type' => [ | |
| 780 | + 'label' => esc_html_x( 'Shadow', 'Text Shadow Control', 'elementor' ), | |
| 781 | + ], | |
| 782 | + ], | |
| 783 | + | |
| 798 | 784 | ] |
| 799 | 785 | ); |
| 800 | 786 | |
| 801 | 787 | $this->add_group_control( |
| @@ -802,8 +788,13 @@ | ||
| 802 | 788 | Group_Control_Text_Stroke::get_type(), |
| 803 | 789 | [ |
| 804 | 790 | 'name' => 'title_text_stroke_hover', |
| 805 | 791 | 'selector' => "{$heading_selector_non_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover :is( span, a, i )", |
| 792 | + 'fields_options' => [ | |
| 793 | + 'text_stroke_type' => [ | |
| 794 | + 'label' => esc_html__( 'Stroke', 'elementor' ), | |
| 795 | + ], | |
| 796 | + ], | |
| 806 | 797 | ] |
| 807 | 798 | ); |
| 808 | 799 | |
| 809 | 800 | $this->end_controls_tab(); |
| @@ -830,8 +821,13 @@ | ||
| 830 | 821 | Group_Control_Text_Shadow::get_type(), |
| 831 | 822 | [ |
| 832 | 823 | 'name' => 'title_text_shadow_active', |
| 833 | 824 | 'selector' => "{$heading_selector} > .e-n-tab-title[aria-selected=\"true\"], {$heading_selector_touch_device} > .e-n-tab-title[aria-selected=\"false\"]:hover", |
| 825 | + 'fields_options' => [ | |
| 826 | + 'text_shadow_type' => [ | |
| 827 | + 'label' => esc_html_x( 'Shadow', 'Text Shadow Control', 'elementor' ), | |
| 828 | + ], | |
| 829 | + ], | |
| 834 | 830 | ] |
| 835 | 831 | ); |
| 836 | 832 | |
| 837 | 833 | $this->add_group_control( |
| @@ -838,8 +834,13 @@ | ||
| 838 | 834 | Group_Control_Text_Stroke::get_type(), |
| 839 | 835 | [ |
| 840 | 836 | 'name' => 'title_text_stroke_active', |
| 841 | 837 | '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 )", |
| 838 | + 'fields_options' => [ | |
| 839 | + 'text_stroke_type' => [ | |
| 840 | + 'label' => esc_html__( 'Stroke', 'elementor' ), | |
| 841 | + ], | |
| 842 | + ], | |
| 842 | 843 | ] |
| 843 | 844 | ); |
| 844 | 845 | |
| 845 | 846 | $this->end_controls_tab(); |
| @@ -900,15 +901,20 @@ | ||
| 900 | 901 | 'label' => esc_html__( 'Size', 'elementor' ), |
| 901 | 902 | 'type' => Controls_Manager::SLIDER, |
| 902 | 903 | 'range' => [ |
| 903 | 904 | 'px' => [ |
| 905 | + 'min' => 0, | |
| 904 | 906 | 'max' => 100, |
| 905 | 907 | ], |
| 906 | 908 | 'em' => [ |
| 909 | + 'min' => 0, | |
| 907 | 910 | 'max' => 10, |
| 911 | + 'step' => 0.1, | |
| 908 | 912 | ], |
| 909 | 913 | 'rem' => [ |
| 914 | + 'min' => 0, | |
| 910 | 915 | 'max' => 10, |
| 916 | + 'step' => 0.1, | |
| 911 | 917 | ], |
| 912 | 918 | ], |
| 913 | 919 | 'size_units' => [ 'px', 'em', 'rem', 'vw', 'custom' ], |
| 914 | 920 | 'selectors' => [ |
| @@ -920,11 +926,13 @@ | ||
| 920 | 926 | 'label' => esc_html__( 'Spacing', 'elementor' ), |
| 921 | 927 | 'type' => Controls_Manager::SLIDER, |
| 922 | 928 | 'range' => [ |
| 923 | 929 | 'px' => [ |
| 930 | + 'min' => 0, | |
| 924 | 931 | 'max' => 400, |
| 925 | 932 | ], |
| 926 | 933 | 'vw' => [ |
| 934 | + 'min' => 0, | |
| 927 | 935 | 'max' => 50, |
| 928 | 936 | 'step' => 0.1, |
| 929 | 937 | ], |
| 930 | 938 | ], |
| @@ -1056,9 +1064,9 @@ | ||
| 1056 | 1064 | 'label' => esc_html__( 'Padding', 'elementor' ), |
| 1057 | 1065 | 'type' => Controls_Manager::DIMENSIONS, |
| 1058 | 1066 | 'size_units' => [ 'px', '%', 'em', 'rem', 'vw', 'custom' ], |
| 1059 | 1067 | 'selectors' => [ |
| 1060 | - $content_selector => '--padding-top: {{TOP}}{{UNIT}}; --padding-right: {{RIGHT}}{{UNIT}}; --padding-bottom: {{BOTTOM}}{{UNIT}}; --padding-left: {{LEFT}}{{UNIT}};', | |
| 1068 | + $content_selector => "--padding-block-start: {{TOP}}{{UNIT}}; --padding-inline-end: $logical_dimensions_inline_end; --padding-block-end: {{BOTTOM}}{{UNIT}}; --padding-inline-start: $logical_dimensions_inline_start;", | |
| 1061 | 1069 | ], |
| 1062 | 1070 | ] |
| 1063 | 1071 | ); |
| 1064 | 1072 | |
| @@ -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', |
| @@ -1082,43 +1089,42 @@ | ||
| 1082 | 1089 | 'data-tab-index' => $item_settings['tab_count'], |
| 1083 | 1090 | 'role' => 'tab', |
| 1084 | 1091 | 'tabindex' => 1 === $item_settings['tab_count'] ? '0' : '-1', |
| 1085 | 1092 | 'aria-controls' => $item_settings['container_id'], |
| 1093 | + 'aria-label' => esc_html__( 'Open tab (Enter or Space) | Return (Escape)', 'elementor' ), | |
| 1086 | 1094 | 'style' => '--n-tabs-title-order: ' . $item_settings['tab_count'] . ';', |
| 1087 | 1095 | ] ); |
| 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 | 1096 | |
| 1098 | - protected function maybe_render_tab_icons_html( $item_settings ): void { | |
| 1099 | - $icon_settings = $item_settings['item']['tab_icon']; | |
| 1097 | + $render_attributes = $this->get_render_attribute_string( $setting_key ); | |
| 1098 | + $text_class = $this->get_render_attribute_string( 'tab-title-text' ); | |
| 1099 | + $icon_class = $this->get_render_attribute_string( 'tab-icon' ); | |
| 1100 | 1100 | |
| 1101 | - if ( empty( $icon_settings['value'] ) ) { | |
| 1102 | - return; | |
| 1101 | + $icon_html = Icons_Manager::try_get_icon_html( $item_settings['item']['tab_icon'], [ 'aria-hidden' => 'true' ] ); | |
| 1102 | + $icon_active_html = $icon_html; | |
| 1103 | + | |
| 1104 | + if ( $this->is_active_icon_exist( $item_settings['item'] ) ) { | |
| 1105 | + $icon_active_html = Icons_Manager::try_get_icon_html( $item_settings['item']['tab_icon_active'], [ 'aria-hidden' => 'true' ] ); | |
| 1103 | 1106 | } |
| 1104 | 1107 | |
| 1105 | - $active_icon_settings = $this->is_active_icon_exist( $item_settings['item'] ) | |
| 1106 | - ? $item_settings['item']['tab_icon_active'] | |
| 1107 | - : $icon_settings; | |
| 1108 | + ob_start(); | |
| 1108 | 1109 | ?> |
| 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> | |
| 1110 | + <button <?php echo $render_attributes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>> | |
| 1111 | + <span <?php echo $icon_class; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>> | |
| 1112 | + <?php echo $icon_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 1113 | + <?php echo $icon_active_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 1114 | + </span> | |
| 1115 | + <span <?php echo $text_class; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>> | |
| 1116 | + <?php echo esc_html( $title ); ?> | |
| 1117 | + </span> | |
| 1118 | + </button> | |
| 1113 | 1119 | <?php |
| 1120 | + return ob_get_clean(); | |
| 1114 | 1121 | } |
| 1115 | 1122 | |
| 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 | - } | |
| 1123 | + protected function render_tab_containers_html( $item_settings ): string { | |
| 1124 | + ob_start(); | |
| 1125 | + $this->print_child( $item_settings['index'], $item_settings ); | |
| 1126 | + return ob_get_clean(); | |
| 1121 | 1127 | } |
| 1122 | 1128 | |
| 1123 | 1129 | |
| 1124 | 1130 | /** |
| @@ -1123,9 +1129,9 @@ | ||
| 1123 | 1129 | |
| 1124 | 1130 | /** |
| 1125 | 1131 | * Print the content area. |
| 1126 | 1132 | * |
| 1127 | - * @param int $index | |
| 1133 | + * @param int $index | |
| 1128 | 1134 | * @param array $item_settings |
| 1129 | 1135 | */ |
| 1130 | 1136 | public function print_child( $index, $item_settings = [] ) { |
| 1131 | 1137 | $children = $this->get_children(); |
| @@ -1144,11 +1150,9 @@ | ||
| 1144 | 1150 | return $should_render; |
| 1145 | 1151 | }; |
| 1146 | 1152 | |
| 1147 | 1153 | add_filter( 'elementor/frontend/container/should_render', $add_attribute_to_container, 10, 3 ); |
| 1148 | - if ( isset( $children[ $index ] ) ) { | |
| 1149 | - $children[ $index ]->print_element(); | |
| 1150 | - } | |
| 1154 | + $children[ $index ]->print_element(); | |
| 1151 | 1155 | remove_filter( 'elementor/frontend/container/should_render', $add_attribute_to_container ); |
| 1152 | 1156 | } |
| 1153 | 1157 | |
| 1154 | 1158 | protected function add_attributes_to_container( $container, $item_settings ) { |
| @@ -1163,9 +1167,9 @@ | ||
| 1163 | 1167 | } |
| 1164 | 1168 | |
| 1165 | 1169 | protected function render() { |
| 1166 | 1170 | $settings = $this->get_settings_for_display(); |
| 1167 | - $widget_number = $this->get_id_int(); | |
| 1171 | + $widget_number = substr( $this->get_id_int(), 0, 3 ); | |
| 1168 | 1172 | |
| 1169 | 1173 | if ( ! empty( $settings['link'] ) ) { |
| 1170 | 1174 | $this->add_link_attributes( 'elementor-tabs', $settings['link'] ); |
| 1171 | 1175 | } |
| @@ -1172,153 +1176,113 @@ | ||
| 1172 | 1176 | |
| 1173 | 1177 | $this->add_render_attribute( 'elementor-tabs', [ |
| 1174 | 1178 | 'class' => 'e-n-tabs', |
| 1175 | 1179 | 'data-widget-number' => $widget_number, |
| 1176 | - 'aria-label' => esc_html__( 'Tabs. Open items with Enter or Space, close with Escape and navigate using the Arrow keys.', 'elementor' ), | |
| 1180 | + 'aria-label' => esc_html__( 'Tabs', 'elementor' ), | |
| 1177 | 1181 | ] ); |
| 1178 | 1182 | |
| 1179 | 1183 | $this->add_render_attribute( 'tab-title-text', 'class', 'e-n-tab-title-text' ); |
| 1180 | 1184 | $this->add_render_attribute( 'tab-icon', 'class', 'e-n-tab-icon' ); |
| 1181 | 1185 | $this->add_render_attribute( 'tab-icon-active', 'class', [ 'e-n-tab-icon' ] ); |
| 1186 | + | |
| 1187 | + $tab_titles_html = ''; | |
| 1188 | + $tab_containers_html = ''; | |
| 1189 | + | |
| 1190 | + foreach ( $settings['tabs'] as $index => $item ) { | |
| 1191 | + $tab_count = $index + 1; | |
| 1192 | + | |
| 1193 | + $tab_id = empty( $item['element_id'] ) | |
| 1194 | + ? 'e-n-tabs-title-' . $widget_number . $tab_count | |
| 1195 | + : $item['element_id']; | |
| 1196 | + | |
| 1197 | + $item_settings = [ | |
| 1198 | + 'index' => $index, | |
| 1199 | + 'tab_count' => $tab_count, | |
| 1200 | + 'tab_id' => $tab_id, | |
| 1201 | + 'container_id' => 'e-n-tab-content-' . $widget_number . $tab_count, | |
| 1202 | + 'widget_number' => $widget_number, | |
| 1203 | + 'item' => $item, | |
| 1204 | + 'settings' => $settings, | |
| 1205 | + ]; | |
| 1206 | + | |
| 1207 | + $tab_titles_html .= $this->render_tab_titles_html( $item_settings ); | |
| 1208 | + $tab_containers_html .= $this->render_tab_containers_html( $item_settings ); | |
| 1209 | + } | |
| 1182 | 1210 | ?> |
| 1183 | 1211 | <div <?php $this->print_render_attribute_string( 'elementor-tabs' ); ?>> |
| 1184 | 1212 | <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 | - ?> | |
| 1213 | + <?php echo $tab_titles_html;// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 1209 | 1214 | </div> |
| 1210 | 1215 | <div class="e-n-tabs-content"> |
| 1211 | - <?php $this->render_tab_containers_html( $settings ); ?> | |
| 1216 | + <?php echo $tab_containers_html;// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 1212 | 1217 | </div> |
| 1213 | 1218 | </div> |
| 1214 | 1219 | <?php |
| 1215 | 1220 | } |
| 1216 | 1221 | |
| 1217 | - 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 | - ] ); | |
| 1223 | - } | |
| 1224 | - | |
| 1225 | - protected function content_template_single_repeater_item() { | |
| 1226 | - ?> | |
| 1227 | - <# | |
| 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 | - | |
| 1239 | 1222 | protected function content_template() { |
| 1240 | 1223 | ?> |
| 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' ); ?>"> | |
| 1224 | + <# const elementUid = view.getIDInt().toString().substr( 0, 3 ); #> | |
| 1225 | + <div class="e-n-tabs" data-widget-number="{{ elementUid }}" aria-label="<?php echo esc_html__( 'Tabs', 'elementor' ); ?>"> | |
| 1243 | 1226 | <# if ( settings['tabs'] ) { #> |
| 1244 | 1227 | <div class="e-n-tabs-heading" role="tablist"> |
| 1245 | 1228 | <# _.each( settings['tabs'], function( item, index ) { |
| 1246 | - const tabIndex = index, | |
| 1247 | - hoverAnimationSetting = settings['hover_animation'], | |
| 1248 | - hoverAnimationClass = hoverAnimationSetting | |
| 1249 | - ? `elementor-animation-${ hoverAnimationSetting }` | |
| 1250 | - : ''; | |
| 1229 | + const tabCount = index + 1, | |
| 1230 | + tabUid = elementUid + tabCount, | |
| 1231 | + tabWrapperKey = tabUid, | |
| 1232 | + tabTitleKey = 'tab-title-' + tabUid, | |
| 1233 | + tabIconKey = 'tab-icon-' + tabUid, | |
| 1234 | + tabIcon = elementor.helpers.renderIcon( view, item.tab_icon, { 'aria-hidden': true }, 'i' , 'object' ), | |
| 1235 | + hoverAnimationClass = settings['hover_animation'] ? `elementor-animation-${ settings['hover_animation'] }` : ''; | |
| 1236 | + | |
| 1237 | + let tabActiveIcon = tabIcon, | |
| 1238 | + tabId = 'e-n-tab-title-' + tabUid; | |
| 1239 | + | |
| 1240 | + if ( '' !== item.tab_icon_active.value ) { | |
| 1241 | + tabActiveIcon = elementor.helpers.renderIcon( view, item.tab_icon_active, { 'aria-hidden': true }, 'i' , 'object' ); | |
| 1242 | + } | |
| 1243 | + | |
| 1244 | + if ( '' !== item.element_id ) { | |
| 1245 | + tabId = item.element_id; | |
| 1246 | + } | |
| 1247 | + | |
| 1248 | + view.addRenderAttribute( tabWrapperKey, { | |
| 1249 | + 'id': tabId, | |
| 1250 | + 'class': [ 'e-n-tab-title',hoverAnimationClass ], | |
| 1251 | + 'data-tab-index': tabCount, | |
| 1252 | + 'role': 'tab', | |
| 1253 | + 'aria-selected': 1 === tabCount ? 'true' : 'false', | |
| 1254 | + 'tabindex': 1 === tabCount ? '0' : '-1', | |
| 1255 | + 'aria-controls': 'e-n-tab-content-' + tabUid, | |
| 1256 | + 'aria-label': '<?php echo esc_html__( 'Open tab (Enter or Space) | Return (Escape)', 'elementor' ); ?>', | |
| 1257 | + 'style': '--n-tabs-title-order: ' + tabCount + ';', | |
| 1258 | + } ); | |
| 1259 | + | |
| 1260 | + view.addRenderAttribute( tabTitleKey, { | |
| 1261 | + 'class': [ 'e-n-tab-title-text' ], | |
| 1262 | + 'data-binding-type': 'repeater-item', | |
| 1263 | + 'data-binding-repeater-name': 'tabs', | |
| 1264 | + 'data-binding-setting': [ 'tab_title' ], | |
| 1265 | + 'data-binding-index': tabCount, | |
| 1266 | + } ); | |
| 1267 | + | |
| 1268 | + view.addRenderAttribute( tabIconKey, { | |
| 1269 | + 'class': [ 'e-n-tab-icon' ], | |
| 1270 | + 'data-binding-type': 'repeater-item', | |
| 1271 | + 'data-binding-repeater-name': 'tabs', | |
| 1272 | + 'data-binding-setting': [ 'tab_icon.value', 'tab_icon_active.value' ], | |
| 1273 | + 'data-binding-index': tabCount, | |
| 1274 | + } ); | |
| 1251 | 1275 | #> |
| 1252 | - <?php $this->content_template_single_item( '{{ tabIndex }}', '{{ item }}', '{{ elementUid }}', '{{ hoverAnimationClass }}' ); ?> | |
| 1276 | + <button {{{ view.getRenderAttributeString( tabWrapperKey ) }}}> | |
| 1277 | + <span {{{ view.getRenderAttributeString( tabIconKey ) }}}>{{{ tabIcon.value }}}{{{ tabActiveIcon.value }}}</span> | |
| 1278 | + <span {{{ view.getRenderAttributeString( tabTitleKey ) }}}>{{{ item.tab_title }}}</span> | |
| 1279 | + </button> | |
| 1253 | 1280 | <# } ); #> |
| 1254 | 1281 | </div> |
| 1255 | 1282 | <div class="e-n-tabs-content"></div> |
| 1256 | 1283 | <# } #> |
| 1257 | 1284 | </div> |
| 1258 | - <?php | |
| 1259 | - } | |
| 1260 | - | |
| 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 ); | |
| 1275 | - | |
| 1276 | - view.addRenderAttribute( 'tab-title', { | |
| 1277 | - 'id': tabId, | |
| 1278 | - 'data-tab-title-id': tabTitleId, | |
| 1279 | - 'class': [ 'e-n-tab-title',escapedHoverAnimationClass ], | |
| 1280 | - 'data-tab-index': tabCount, | |
| 1281 | - 'role': 'tab', | |
| 1282 | - 'aria-selected': 1 === tabCount ? 'true' : 'false', | |
| 1283 | - 'tabindex': 1 === tabCount ? '0' : '-1', | |
| 1284 | - 'aria-controls': 'e-n-tab-content-' + tabUid, | |
| 1285 | - 'style': '--n-tabs-title-order: ' + tabCount + ';', | |
| 1286 | - }, null, true ); | |
| 1287 | - | |
| 1288 | - view.addRenderAttribute( 'tab-title-text', { | |
| 1289 | - 'class': [ 'e-n-tab-title-text' ], | |
| 1290 | - 'data-binding-type': 'repeater-item', | |
| 1291 | - 'data-binding-repeater-name': 'tabs', | |
| 1292 | - 'data-binding-setting': [ 'tab_title', 'element_id' ], | |
| 1293 | - '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 ); | |
| 1305 | - | |
| 1306 | - view.addRenderAttribute( 'tab-icon', { | |
| 1307 | - 'class': [ 'e-n-tab-icon' ], | |
| 1308 | - 'data-binding-type': 'repeater-item', | |
| 1309 | - 'data-binding-repeater-name': 'tabs', | |
| 1310 | - 'data-binding-index': tabCount, | |
| 1311 | - }, null, true ); | |
| 1312 | - #> | |
| 1313 | - | |
| 1314 | - <button {{{ view.getRenderAttributeString( 'tab-title' ) }}}> | |
| 1315 | - <# if ( !! item.tab_icon.value ) { #> | |
| 1316 | - <span {{{ view.getRenderAttributeString( 'tab-icon' ) }}}>{{{ tabIcon.value }}}{{{ activeTabIcon.value }}}</span> | |
| 1317 | - <# } #> | |
| 1318 | - | |
| 1319 | - <span {{{ view.getRenderAttributeString( 'tab-title-text' ) }}}>{{{ item.tab_title }}}</span> | |
| 1320 | - </button> | |
| 1321 | 1285 | <?php |
| 1322 | 1286 | } |
| 1323 | 1287 | |
| 1324 | 1288 | /** |
