| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | <?php |
| 2 | + | |
| 2 | 3 | namespace UiCoreElements; |
| 3 | 4 | |
| 4 | 5 | use Elementor\Repeater; |
| 5 | 6 | use Elementor\Controls_Manager; |
| @@ -51,12 +52,13 @@ | ||
| 51 | 52 | public function get_scripts() |
| 52 | 53 | { |
| 53 | 54 | return ['accordion']; |
| 54 | 55 | } |
| 55 | - // TODO: remove or set as false, after 3.30, when the full deprecation of widget innet wrapper is ready | |
| 56 | - public function has_widget_inner_wrapper(): bool { | |
| 57 | - return true; | |
| 58 | - } | |
| 56 | + // TODO: remove after Optmized Markup experiment is merged to the core | |
| 57 | + public function has_widget_inner_wrapper(): bool | |
| 58 | + { | |
| 59 | + return true; | |
| 60 | + } | |
| 59 | 61 | protected function register_controls() |
| 60 | 62 | { |
| 61 | 63 | $this->start_controls_section( |
| 62 | 64 | 'section_title', |
| @@ -103,19 +105,19 @@ | ||
| 103 | 105 | ] |
| 104 | 106 | ); |
| 105 | 107 | |
| 106 | 108 | $repeater->add_control( |
| 107 | - 'section_id', | |
| 108 | - [ | |
| 109 | - 'label' => esc_html__( 'Section ID', 'uicore-elements' ), | |
| 110 | - 'type' => Controls_Manager::TEXT, | |
| 111 | - 'placeholder' => esc_html__( 'CSS ID from an element', 'uicore-elements' ), | |
| 109 | + 'section_id', | |
| 110 | + [ | |
| 111 | + 'label' => esc_html__('Section ID', 'uicore-elements'), | |
| 112 | + 'type' => Controls_Manager::TEXT, | |
| 113 | + 'placeholder' => esc_html__('CSS ID from an element', 'uicore-elements'), | |
| 112 | 114 | 'condition' => [ |
| 113 | 115 | 'source' => 'sectionId' |
| 114 | 116 | ], |
| 115 | 117 | 'dynamic' => ['active' => true], |
| 116 | - ] | |
| 117 | - ); | |
| 118 | + ] | |
| 119 | + ); | |
| 118 | 120 | |
| 119 | 121 | $repeater->add_control( |
| 120 | 122 | 'repeater_icon', |
| 121 | 123 | [ |
| @@ -386,9 +388,9 @@ | ||
| 386 | 388 | 'tab' => Controls_Manager::TAB_STYLE, |
| 387 | 389 | ] |
| 388 | 390 | ); |
| 389 | 391 | |
| 390 | - $this->add_control( | |
| 392 | + $this->add_responsive_control( | |
| 391 | 393 | 'item_spacing', |
| 392 | 394 | [ |
| 393 | 395 | 'label' => __('Item Gap', 'uicore-elements'), |
| 394 | 396 | 'type' => Controls_Manager::SLIDER, |
| @@ -408,154 +410,154 @@ | ||
| 408 | 410 | ); |
| 409 | 411 | |
| 410 | 412 | $this->start_controls_tabs('tabs_item_style'); |
| 411 | 413 | |
| 412 | - $this->start_controls_tab( | |
| 413 | - 'tab_item_normal', | |
| 414 | - [ | |
| 415 | - 'label' => __('Normal', 'uicore-elements'), | |
| 416 | - ] | |
| 417 | - ); | |
| 414 | + $this->start_controls_tab( | |
| 415 | + 'tab_item_normal', | |
| 416 | + [ | |
| 417 | + 'label' => __('Normal', 'uicore-elements'), | |
| 418 | + ] | |
| 419 | + ); | |
| 418 | 420 | |
| 419 | - $this->add_group_control( | |
| 420 | - Group_Control_Background::get_type(), | |
| 421 | - [ | |
| 422 | - 'name' => 'item_background', | |
| 423 | - 'selector' => '{{WRAPPER}} .ui-e-accordion-item', | |
| 424 | - ] | |
| 425 | - ); | |
| 421 | + $this->add_group_control( | |
| 422 | + Group_Control_Background::get_type(), | |
| 423 | + [ | |
| 424 | + 'name' => 'item_background', | |
| 425 | + 'selector' => '{{WRAPPER}} .ui-e-accordion-item', | |
| 426 | + ] | |
| 427 | + ); | |
| 426 | 428 | |
| 427 | - $this->add_group_control( | |
| 428 | - Group_Control_Border::get_type(), | |
| 429 | - [ | |
| 430 | - 'name' => 'item_border', | |
| 431 | - 'placeholder' => '1px', | |
| 432 | - 'default' => '1px', | |
| 433 | - 'selector' => '{{WRAPPER}} .ui-e-accordion-item', | |
| 434 | - ] | |
| 435 | - ); | |
| 429 | + $this->add_group_control( | |
| 430 | + Group_Control_Border::get_type(), | |
| 431 | + [ | |
| 432 | + 'name' => 'item_border', | |
| 433 | + 'placeholder' => '1px', | |
| 434 | + 'default' => '1px', | |
| 435 | + 'selector' => '{{WRAPPER}} .ui-e-accordion-item', | |
| 436 | + ] | |
| 437 | + ); | |
| 436 | 438 | |
| 437 | - $this->add_responsive_control( | |
| 438 | - 'item_radius', | |
| 439 | - [ | |
| 440 | - 'label' => __('Border Radius', 'uicore-elements'), | |
| 441 | - 'type' => Controls_Manager::DIMENSIONS, | |
| 442 | - 'size_units' => ['px', '%'], | |
| 443 | - 'selectors' => [ | |
| 444 | - '{{WRAPPER}} .ui-e-accordion-item' => 'border-radius: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};', | |
| 445 | - ], | |
| 446 | - ] | |
| 447 | - ); | |
| 439 | + $this->add_responsive_control( | |
| 440 | + 'item_radius', | |
| 441 | + [ | |
| 442 | + 'label' => __('Border Radius', 'uicore-elements'), | |
| 443 | + 'type' => Controls_Manager::DIMENSIONS, | |
| 444 | + 'size_units' => ['px', '%'], | |
| 445 | + 'selectors' => [ | |
| 446 | + '{{WRAPPER}} .ui-e-accordion-item' => 'border-radius: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};', | |
| 447 | + ], | |
| 448 | + ] | |
| 449 | + ); | |
| 448 | 450 | |
| 449 | - $this->add_responsive_control( | |
| 450 | - 'item_padding', | |
| 451 | - [ | |
| 452 | - 'label' => __('Padding', 'uicore-elements'), | |
| 453 | - 'type' => Controls_Manager::DIMENSIONS, | |
| 454 | - 'size_units' => ['px', 'em', '%'], | |
| 455 | - 'default' => [ | |
| 456 | - 'top' => 15, | |
| 457 | - 'right' => 15, | |
| 458 | - 'bottom' => 15, | |
| 459 | - 'left' => 15, | |
| 460 | - 'unit' => 'px', | |
| 461 | - 'isLinked' => true, | |
| 462 | - ], | |
| 463 | - 'selectors' => [ | |
| 464 | - '{{WRAPPER}} .ui-e-accordion-item' => 'padding: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};', | |
| 465 | - ], | |
| 466 | - ] | |
| 467 | - ); | |
| 451 | + $this->add_responsive_control( | |
| 452 | + 'item_padding', | |
| 453 | + [ | |
| 454 | + 'label' => __('Padding', 'uicore-elements'), | |
| 455 | + 'type' => Controls_Manager::DIMENSIONS, | |
| 456 | + 'size_units' => ['px', 'em', '%'], | |
| 457 | + 'default' => [ | |
| 458 | + 'top' => 15, | |
| 459 | + 'right' => 15, | |
| 460 | + 'bottom' => 15, | |
| 461 | + 'left' => 15, | |
| 462 | + 'unit' => 'px', | |
| 463 | + 'isLinked' => true, | |
| 464 | + ], | |
| 465 | + 'selectors' => [ | |
| 466 | + '{{WRAPPER}} .ui-e-accordion-item' => 'padding: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};', | |
| 467 | + ], | |
| 468 | + ] | |
| 469 | + ); | |
| 468 | 470 | |
| 469 | - $this->add_group_control( | |
| 470 | - Group_Control_Box_Shadow::get_type(), | |
| 471 | - [ | |
| 472 | - 'name' => 'item_shadow', | |
| 473 | - 'selector' => '{{WRAPPER}} .ui-e-accordion-item', | |
| 474 | - ] | |
| 475 | - ); | |
| 471 | + $this->add_group_control( | |
| 472 | + Group_Control_Box_Shadow::get_type(), | |
| 473 | + [ | |
| 474 | + 'name' => 'item_shadow', | |
| 475 | + 'selector' => '{{WRAPPER}} .ui-e-accordion-item', | |
| 476 | + ] | |
| 477 | + ); | |
| 476 | 478 | |
| 477 | - $this->end_controls_tab(); | |
| 479 | + $this->end_controls_tab(); | |
| 478 | 480 | |
| 479 | - $this->start_controls_tab( | |
| 480 | - 'tab_item_hover', | |
| 481 | - [ | |
| 482 | - 'label' => __('Hover', 'uicore-elements'), | |
| 483 | - ] | |
| 484 | - ); | |
| 481 | + $this->start_controls_tab( | |
| 482 | + 'tab_item_hover', | |
| 483 | + [ | |
| 484 | + 'label' => __('Hover', 'uicore-elements'), | |
| 485 | + ] | |
| 486 | + ); | |
| 485 | 487 | |
| 486 | - $this->add_group_control( | |
| 487 | - Group_Control_Background::get_type(), | |
| 488 | - [ | |
| 489 | - 'name' => 'hover_item_background', | |
| 490 | - 'selector' => '{{WRAPPER}} .ui-e-accordion-item:hover', | |
| 491 | - ] | |
| 492 | - ); | |
| 488 | + $this->add_group_control( | |
| 489 | + Group_Control_Background::get_type(), | |
| 490 | + [ | |
| 491 | + 'name' => 'hover_item_background', | |
| 492 | + 'selector' => '{{WRAPPER}} .ui-e-accordion-item:hover', | |
| 493 | + ] | |
| 494 | + ); | |
| 493 | 495 | |
| 494 | - $this->add_control( | |
| 495 | - 'item_hover_border_color', | |
| 496 | - [ | |
| 497 | - 'label' => __('Border Color', 'uicore-elements'), | |
| 498 | - 'type' => Controls_Manager::COLOR, | |
| 499 | - 'condition' => [ | |
| 500 | - 'item_border_border!' => '', | |
| 501 | - ], | |
| 502 | - 'selectors' => [ | |
| 503 | - '{{WRAPPER}} .ui-e-accordion-item:hover' => 'border-color: {{VALUE}};', | |
| 504 | - ], | |
| 505 | - ] | |
| 506 | - ); | |
| 496 | + $this->add_control( | |
| 497 | + 'item_hover_border_color', | |
| 498 | + [ | |
| 499 | + 'label' => __('Border Color', 'uicore-elements'), | |
| 500 | + 'type' => Controls_Manager::COLOR, | |
| 501 | + 'condition' => [ | |
| 502 | + 'item_border_border!' => '', | |
| 503 | + ], | |
| 504 | + 'selectors' => [ | |
| 505 | + '{{WRAPPER}} .ui-e-accordion-item:hover' => 'border-color: {{VALUE}};', | |
| 506 | + ], | |
| 507 | + ] | |
| 508 | + ); | |
| 507 | 509 | |
| 508 | - $this->end_controls_tab(); | |
| 510 | + $this->end_controls_tab(); | |
| 509 | 511 | |
| 510 | - $this->start_controls_tab( | |
| 511 | - 'tab_item_active', | |
| 512 | - [ | |
| 513 | - 'label' => __('Active', 'uicore-elements'), | |
| 514 | - ] | |
| 515 | - ); | |
| 512 | + $this->start_controls_tab( | |
| 513 | + 'tab_item_active', | |
| 514 | + [ | |
| 515 | + 'label' => __('Active', 'uicore-elements'), | |
| 516 | + ] | |
| 517 | + ); | |
| 516 | 518 | |
| 517 | - $this->add_group_control( | |
| 518 | - Group_Control_Background::get_type(), | |
| 519 | - [ | |
| 520 | - 'name' => 'active_item_background', | |
| 521 | - 'selector' => '{{WRAPPER}} .ui-e-accordion-item.ui-open', | |
| 522 | - ] | |
| 523 | - ); | |
| 519 | + $this->add_group_control( | |
| 520 | + Group_Control_Background::get_type(), | |
| 521 | + [ | |
| 522 | + 'name' => 'active_item_background', | |
| 523 | + 'selector' => '{{WRAPPER}} .ui-e-accordion-item.ui-open', | |
| 524 | + ] | |
| 525 | + ); | |
| 524 | 526 | |
| 525 | - $this->add_group_control( | |
| 526 | - Group_Control_Box_Shadow::get_type(), | |
| 527 | - [ | |
| 528 | - 'name' => 'active_item_shadow', | |
| 529 | - 'selector' => '{{WRAPPER}} .ui-e-accordion-item.ui-open', | |
| 530 | - ] | |
| 531 | - ); | |
| 527 | + $this->add_group_control( | |
| 528 | + Group_Control_Box_Shadow::get_type(), | |
| 529 | + [ | |
| 530 | + 'name' => 'active_item_shadow', | |
| 531 | + 'selector' => '{{WRAPPER}} .ui-e-accordion-item.ui-open', | |
| 532 | + ] | |
| 533 | + ); | |
| 532 | 534 | |
| 533 | - $this->add_group_control( | |
| 534 | - Group_Control_Border::get_type(), | |
| 535 | - [ | |
| 536 | - 'name' => 'active_item_border', | |
| 537 | - 'placeholder' => '1px', | |
| 538 | - 'default' => '1px', | |
| 539 | - 'selector' => '{{WRAPPER}} .ui-e-accordion-item.ui-open', | |
| 540 | - ] | |
| 541 | - ); | |
| 535 | + $this->add_group_control( | |
| 536 | + Group_Control_Border::get_type(), | |
| 537 | + [ | |
| 538 | + 'name' => 'active_item_border', | |
| 539 | + 'placeholder' => '1px', | |
| 540 | + 'default' => '1px', | |
| 541 | + 'selector' => '{{WRAPPER}} .ui-e-accordion-item.ui-open', | |
| 542 | + ] | |
| 543 | + ); | |
| 542 | 544 | |
| 543 | - $this->add_responsive_control( | |
| 544 | - 'active_item_radius', | |
| 545 | - [ | |
| 546 | - 'label' => __('Border Radius', 'uicore-elements'), | |
| 547 | - 'type' => Controls_Manager::DIMENSIONS, | |
| 548 | - 'size_units' => ['px', '%'], | |
| 549 | - 'selectors' => [ | |
| 550 | - '{{WRAPPER}} .ui-e-accordion-item.ui-open' => 'border-radius: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}}; overflow: hidden;', | |
| 551 | - ], | |
| 552 | - ] | |
| 553 | - ); | |
| 545 | + $this->add_responsive_control( | |
| 546 | + 'active_item_radius', | |
| 547 | + [ | |
| 548 | + 'label' => __('Border Radius', 'uicore-elements'), | |
| 549 | + 'type' => Controls_Manager::DIMENSIONS, | |
| 550 | + 'size_units' => ['px', '%'], | |
| 551 | + 'selectors' => [ | |
| 552 | + '{{WRAPPER}} .ui-e-accordion-item.ui-open' => 'border-radius: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}}; overflow: hidden;', | |
| 553 | + ], | |
| 554 | + ] | |
| 555 | + ); | |
| 554 | 556 | |
| 555 | - $this->end_controls_tab(); | |
| 557 | + $this->end_controls_tab(); | |
| 556 | 558 | |
| 557 | - $this->end_controls_tabs(); | |
| 559 | + $this->end_controls_tabs(); | |
| 558 | 560 | |
| 559 | 561 | $this->end_controls_section(); |
| 560 | 562 | |
| 561 | 563 | $this->start_controls_section( |
| @@ -585,9 +587,8 @@ | ||
| 585 | 587 | 'icon' => 'eicon-text-align-right', |
| 586 | 588 | ], |
| 587 | 589 | ], |
| 588 | 590 | 'default' => is_rtl() ? 'flex-end' : 'flex-start', |
| 589 | - 'default' => 'flex-start', | |
| 590 | 591 | 'toggle' => false, |
| 591 | 592 | 'label_block' => false, |
| 592 | 593 | 'selectors' => [ |
| 593 | 594 | '{{WRAPPER}} .ui-e-accordion-title-text' => 'justify-content: {{VALUE}};', |
| @@ -836,11 +837,11 @@ | ||
| 836 | 837 | 'max' => 50, |
| 837 | 838 | ], |
| 838 | 839 | ], |
| 839 | 840 | 'default' => [ |
| 840 | - 'unit' => 'px', | |
| 841 | - 'size' => 5, | |
| 842 | - ], | |
| 841 | + 'unit' => 'px', | |
| 842 | + 'size' => 5, | |
| 843 | + ], | |
| 843 | 844 | 'selectors' => [ |
| 844 | 845 | '{{WRAPPER}} .ui-e-custom-icon' => '--ui-e-margin-right:{{SIZE}}{{UNIT}};', |
| 845 | 846 | ], |
| 846 | 847 | ] |
| @@ -999,11 +1000,11 @@ | ||
| 999 | 1000 | 'max' => 100, |
| 1000 | 1001 | ], |
| 1001 | 1002 | ], |
| 1002 | 1003 | 'default' => [ |
| 1003 | - 'unit' => 'px', | |
| 1004 | - 'size' => 15, | |
| 1005 | - ], | |
| 1004 | + 'unit' => 'px', | |
| 1005 | + 'size' => 15, | |
| 1006 | + ], | |
| 1006 | 1007 | 'selectors' => [ |
| 1007 | 1008 | '{{WRAPPER}} .ui-e-accordion-title .ui-e-accordion-icon' => '--ui-e-icon-size: {{SIZE}}{{UNIT}};', |
| 1008 | 1009 | ], |
| 1009 | 1010 | ] |
| @@ -1197,11 +1198,11 @@ | ||
| 1197 | 1198 | 'max' => 100, |
| 1198 | 1199 | ], |
| 1199 | 1200 | ], |
| 1200 | 1201 | 'default' => [ |
| 1201 | - 'unit' => 'px', | |
| 1202 | - 'size' => 15, | |
| 1203 | - ], | |
| 1202 | + 'unit' => 'px', | |
| 1203 | + 'size' => 15, | |
| 1204 | + ], | |
| 1204 | 1205 | 'selectors' => [ |
| 1205 | 1206 | '{{WRAPPER}} .ui-e-accordion-content' => 'margin-top: {{SIZE}}{{UNIT}};', |
| 1206 | 1207 | ], |
| 1207 | 1208 | ] |
| @@ -1242,8 +1243,9 @@ | ||
| 1242 | 1243 | 'title' => __('Right', 'uicore-elements'), |
| 1243 | 1244 | 'icon' => 'eicon-text-align-right', |
| 1244 | 1245 | ], |
| 1245 | 1246 | ], |
| 1247 | + 'default' => is_rtl() ? 'right' : 'left', | |
| 1246 | 1248 | 'selectors' => [ |
| 1247 | 1249 | '{{WRAPPER}} .ui-e-accordion-content' => 'text-align: {{VALUE}};', |
| 1248 | 1250 | ], |
| 1249 | 1251 | ] |
| @@ -1251,78 +1253,78 @@ | ||
| 1251 | 1253 | |
| 1252 | 1254 | $this->end_controls_section(); |
| 1253 | 1255 | |
| 1254 | 1256 | $this->start_controls_section( |
| 1255 | - 'section_animation', | |
| 1256 | - [ | |
| 1257 | - 'label' => esc_html__('Animations', 'uicore-elements'), | |
| 1258 | - 'tab' => Controls_Manager::TAB_STYLE, | |
| 1259 | - ] | |
| 1260 | - ); | |
| 1257 | + 'section_animation', | |
| 1258 | + [ | |
| 1259 | + 'label' => esc_html__('Animations', 'uicore-elements'), | |
| 1260 | + 'tab' => Controls_Manager::TAB_STYLE, | |
| 1261 | + ] | |
| 1262 | + ); | |
| 1261 | 1263 | |
| 1262 | - $this->add_control( | |
| 1263 | - 'accordion_animation', | |
| 1264 | - [ | |
| 1265 | - 'label' => esc_html__( 'Accordion Animation', 'uicore-elements' ), | |
| 1266 | - 'type' => \Elementor\Controls_Manager::SELECT, | |
| 1267 | - 'default' => 'ui-e-animation-acc-basic', | |
| 1268 | - 'options' => [ | |
| 1269 | - '' => esc_html__( 'None', 'uicore-elements' ), | |
| 1270 | - 'ui-e-animation-acc-basic' => esc_html__( 'Basic', 'uicore-elements' ), | |
| 1271 | - 'ui-e-animation-acc-slow' => esc_html__( 'Slow', 'uicore-elements' ), | |
| 1272 | - 'ui-e-animation-acc-expand' => esc_html__( 'Expand', 'uicore-elements' ), | |
| 1273 | - 'ui-e-animation-acc-overshadow' => esc_html__( 'Overshadow', 'uicore-elements'), | |
| 1274 | - ], | |
| 1275 | - 'prefix_class' => '', | |
| 1264 | + $this->add_control( | |
| 1265 | + 'accordion_animation', | |
| 1266 | + [ | |
| 1267 | + 'label' => esc_html__('Accordion Animation', 'uicore-elements'), | |
| 1268 | + 'type' => \Elementor\Controls_Manager::SELECT, | |
| 1269 | + 'default' => 'ui-e-animation-acc-basic', | |
| 1270 | + 'options' => [ | |
| 1271 | + '' => esc_html__('None', 'uicore-elements'), | |
| 1272 | + 'ui-e-animation-acc-basic' => esc_html__('Basic', 'uicore-elements'), | |
| 1273 | + 'ui-e-animation-acc-slow' => esc_html__('Slow', 'uicore-elements'), | |
| 1274 | + 'ui-e-animation-acc-expand' => esc_html__('Expand', 'uicore-elements'), | |
| 1275 | + 'ui-e-animation-acc-overshadow' => esc_html__('Overshadow', 'uicore-elements'), | |
| 1276 | + ], | |
| 1277 | + 'prefix_class' => '', | |
| 1276 | 1278 | 'render_type' => 'template', |
| 1277 | - 'frontend_available' => true, | |
| 1278 | - ] | |
| 1279 | - ); | |
| 1279 | + 'frontend_available' => true, | |
| 1280 | + ] | |
| 1281 | + ); | |
| 1280 | 1282 | |
| 1281 | 1283 | $this->add_control( |
| 1282 | - 'icon_animation', | |
| 1283 | - [ | |
| 1284 | - 'label' => esc_html__( 'Icon Animation', 'uicore-elements' ), | |
| 1285 | - 'type' => \Elementor\Controls_Manager::SELECT, | |
| 1286 | - 'default' => 'ui-e-animation-ico-fade', | |
| 1287 | - 'options' => [ | |
| 1288 | - '' => esc_html__( 'None', 'uicore-elements' ), | |
| 1289 | - 'ui-e-animation-ico-fade' => esc_html__( 'Fade', 'uicore-elements' ), | |
| 1290 | - 'ui-e-animation-ico-spin' => esc_html__( 'Spin', 'uicore-elements' ), | |
| 1291 | - 'ui-e-animation-ico-slide' => esc_html__( 'Slide', 'uicore-elements' ), | |
| 1292 | - ], | |
| 1293 | - 'prefix_class' => '', | |
| 1284 | + 'icon_animation', | |
| 1285 | + [ | |
| 1286 | + 'label' => esc_html__('Icon Animation', 'uicore-elements'), | |
| 1287 | + 'type' => \Elementor\Controls_Manager::SELECT, | |
| 1288 | + 'default' => 'ui-e-animation-ico-fade', | |
| 1289 | + 'options' => [ | |
| 1290 | + '' => esc_html__('None', 'uicore-elements'), | |
| 1291 | + 'ui-e-animation-ico-fade' => esc_html__('Fade', 'uicore-elements'), | |
| 1292 | + 'ui-e-animation-ico-spin' => esc_html__('Spin', 'uicore-elements'), | |
| 1293 | + 'ui-e-animation-ico-slide' => esc_html__('Slide', 'uicore-elements'), | |
| 1294 | + ], | |
| 1295 | + 'prefix_class' => '', | |
| 1294 | 1296 | 'render_type' => 'template', |
| 1295 | - ] | |
| 1296 | - ); | |
| 1297 | + ] | |
| 1298 | + ); | |
| 1297 | 1299 | |
| 1298 | 1300 | $this->add_control( |
| 1299 | - 'icon_spin_value', | |
| 1300 | - [ | |
| 1301 | - 'label' => esc_html__( 'Icon Rotation', 'uicore-elements' ), | |
| 1302 | - 'type' => \Elementor\Controls_Manager::SLIDER, | |
| 1303 | - 'size_units' => ['deg', ''], | |
| 1304 | - 'range' => [ | |
| 1305 | - 'deg' => [ | |
| 1306 | - 'min' => 0, | |
| 1307 | - 'max' => 360, | |
| 1308 | - 'step' => 1, | |
| 1309 | - ], | |
| 1310 | - ], | |
| 1311 | - 'default' => [ | |
| 1312 | - 'unit' => 'deg', | |
| 1313 | - 'size' => 315, | |
| 1314 | - ], | |
| 1315 | - 'selectors' => [ | |
| 1316 | - '{{WRAPPER}} .ui-e-accordion-icon' => '--ui-e-spin:{{SIZE}}deg;', | |
| 1317 | - ], | |
| 1318 | - 'condition' =>[ | |
| 1301 | + 'icon_spin_value', | |
| 1302 | + [ | |
| 1303 | + 'label' => esc_html__('Icon Rotation', 'uicore-elements'), | |
| 1304 | + 'type' => \Elementor\Controls_Manager::SLIDER, | |
| 1305 | + 'size_units' => ['deg', ''], | |
| 1306 | + 'range' => [ | |
| 1307 | + 'deg' => [ | |
| 1308 | + 'min' => 0, | |
| 1309 | + 'max' => 360, | |
| 1310 | + 'step' => 1, | |
| 1311 | + ], | |
| 1312 | + ], | |
| 1313 | + 'default' => [ | |
| 1314 | + 'unit' => 'deg', | |
| 1315 | + 'size' => 315, | |
| 1316 | + ], | |
| 1317 | + 'selectors' => [ | |
| 1318 | + '{{WRAPPER}} .ui-e-accordion-icon' => '--ui-e-spin:{{SIZE}}deg;', | |
| 1319 | + ], | |
| 1320 | + 'condition' => [ | |
| 1319 | 1321 | 'icon_animation' => 'ui-e-animation-ico-spin', |
| 1320 | 1322 | ] |
| 1321 | - ] | |
| 1322 | - ); | |
| 1323 | + ] | |
| 1324 | + ); | |
| 1323 | 1325 | |
| 1324 | - $this->end_controls_section(); | |
| 1326 | + $this->end_controls_section(); | |
| 1325 | 1327 | } |
| 1326 | 1328 | protected function render() |
| 1327 | 1329 | { |
| 1328 | 1330 | |
| @@ -1329,9 +1331,9 @@ | ||
| 1329 | 1331 | $settings = $this->get_settings_for_display(); |
| 1330 | 1332 | $ID = 'ui-e-accordion-' . $this->get_id(); |
| 1331 | 1333 | |
| 1332 | 1334 | // Sets schema atts if active |
| 1333 | - if ( $this->is_option('schema_activity', 'yes')) { | |
| 1335 | + if ($this->is_option('schema_activity', 'yes')) { | |
| 1334 | 1336 | $this->add_render_attribute('accordion', 'itemscope'); |
| 1335 | 1337 | $this->add_render_attribute('accordion', ['itemtype' => 'https://schema.org/FAQPage']); |
| 1336 | 1338 | } |
| 1337 | 1339 | |
| @@ -1336,153 +1338,155 @@ | ||
| 1336 | 1338 | } |
| 1337 | 1339 | |
| 1338 | 1340 | $titleTag = $settings['title_html_tag'] . ' '; // HTML tag |
| 1339 | 1341 | |
| 1340 | - ?> | |
| 1341 | - <div class="ui-e-accordion" <?php $this->print_render_attribute_string('accordion');?>> | |
| 1342 | +?> | |
| 1343 | + <div class="ui-e-accordion" <?php $this->print_render_attribute_string('accordion'); ?>> | |
| 1342 | 1344 | |
| 1343 | - <?php foreach ($settings['tabs'] as $index => $item) : | |
| 1345 | + <?php foreach ($settings['tabs'] as $index => $item) : | |
| 1344 | 1346 | |
| 1345 | - $loopCounter = $index + 1; | |
| 1347 | + $loopCounter = $index + 1; | |
| 1346 | 1348 | |
| 1347 | - // Builds the accordion ID | |
| 1348 | - $acc_id = $item['tab_title'] | |
| 1349 | - ? 'ui-e-' . sanitize_title($item['tab_title']) | |
| 1350 | - : $ID . $loopCounter; | |
| 1349 | + // Builds the accordion ID | |
| 1350 | + $acc_id = $item['tab_title'] | |
| 1351 | + ? 'ui-e-' . sanitize_title($item['tab_title']) | |
| 1352 | + : $ID . $loopCounter; | |
| 1351 | 1353 | |
| 1352 | - // Build the Aria ID | |
| 1353 | - if('sectionId' == $item['source']){ | |
| 1354 | - $aria_id = 'ui-' . preg_replace('/#/', '', $item['section_id']); | |
| 1355 | - } else { | |
| 1356 | - $aria_id = 'ui-e-acc-' . $loopCounter; | |
| 1357 | - } | |
| 1354 | + // Build the Aria ID | |
| 1355 | + if ('sectionId' == $item['source']) { | |
| 1356 | + $aria_id = 'ui-' . preg_replace('/#/', '', $item['section_id']); | |
| 1357 | + } else { | |
| 1358 | + $aria_id = 'ui-e-acc-' . $loopCounter; | |
| 1359 | + } | |
| 1358 | 1360 | |
| 1359 | - // Creates the title and content atts | |
| 1360 | - $tab_title_setting_key = $this->get_repeater_setting_key('tab_title', 'tabs', $index); | |
| 1361 | - $tab_content_setting_key = $this->get_repeater_setting_key('tab_content', 'tabs', $index); | |
| 1361 | + // Creates the title and content atts | |
| 1362 | + $tab_title_setting_key = $this->get_repeater_setting_key('tab_title', 'tabs', $index); | |
| 1363 | + $tab_content_setting_key = $this->get_repeater_setting_key('tab_content', 'tabs', $index); | |
| 1362 | 1364 | |
| 1363 | - // Render title atts | |
| 1364 | - // TODO: remove `ui-e-title` class after, at least, 3 releases from 1.2.1. Kept for compatibility purposes | |
| 1365 | - $this->add_render_attribute($tab_title_setting_key, [ | |
| 1366 | - 'class' => ['ui-e-accordion-title ui-e-title'], | |
| 1367 | - ]); | |
| 1368 | - $this->add_render_attribute($tab_title_setting_key, 'class', ('right' == $settings['icon_align']) ? 'ui-right' : ''); | |
| 1365 | + // Render title atts | |
| 1366 | + // TODO: remove `ui-e-title` class after, at least, 3 releases from 1.2.1. Kept for compatibility purposes | |
| 1367 | + $this->add_render_attribute($tab_title_setting_key, [ | |
| 1368 | + 'class' => ['ui-e-accordion-title ui-e-title'], | |
| 1369 | + ]); | |
| 1370 | + $this->add_render_attribute($tab_title_setting_key, 'class', ('right' == $settings['icon_align']) ? 'ui-right' : ''); | |
| 1369 | 1371 | |
| 1370 | - // Render content atts | |
| 1371 | - // TODO: remove `ui-e-content` class after, at least, 3 releases from 1.2.1. Kept for compatibility purposes | |
| 1372 | - $this->add_render_attribute($tab_content_setting_key, [ | |
| 1373 | - 'class' => ['ui-e-accordion-content ui-e-content'], | |
| 1374 | - 'style' => ($loopCounter === $settings['active_item']) ? '' : 'display:none;', // keep content hide if item not active (has to be set inline so jquery can take control over it) | |
| 1375 | - 'aria-labelledby' => $acc_id, | |
| 1376 | - 'id' => $aria_id | |
| 1377 | - ]); | |
| 1372 | + // Render content atts | |
| 1373 | + // TODO: remove `ui-e-content` class after, at least, 3 releases from 1.2.1. Kept for compatibility purposes | |
| 1374 | + $this->add_render_attribute($tab_content_setting_key, [ | |
| 1375 | + 'class' => ['ui-e-accordion-content ui-e-content'], | |
| 1376 | + 'style' => ($loopCounter === $settings['active_item']) ? '' : 'display:none;', // keep content hide if item not active (has to be set inline so jquery can take control over it) | |
| 1377 | + 'aria-labelledby' => $acc_id, | |
| 1378 | + 'id' => $aria_id | |
| 1379 | + ]); | |
| 1378 | 1380 | |
| 1379 | - // Check if the current accordion item uses sectionId as source | |
| 1380 | - if ('sectionId' == $item['source']) { | |
| 1381 | - // and also check if an ID was set | |
| 1382 | - if($item['section_id'] != ''){ | |
| 1383 | - $this->add_render_attribute($tab_content_setting_key, ['class' => ['ui-section-id']]); // class used by JS | |
| 1384 | - $sectionWarning = "The element with ID <em>{$item['section_id']}</em> is going to be inserted here on the front-end"; | |
| 1385 | - } else { | |
| 1386 | - $sectionWarning = esc_html__( "You didn't define an ID.", 'uicore-elements' ); | |
| 1387 | - } | |
| 1381 | + // Check if the current accordion item uses sectionId as source | |
| 1382 | + if ('sectionId' == $item['source']) { | |
| 1383 | + // and also check if an ID was set | |
| 1384 | + if ($item['section_id'] != '') { | |
| 1385 | + $this->add_render_attribute($tab_content_setting_key, ['class' => ['ui-section-id']]); // class used by JS | |
| 1386 | + $sectionWarning = "The element with ID <em>{$item['section_id']}</em> is going to be inserted here on the front-end"; | |
| 1387 | + } else { | |
| 1388 | + $sectionWarning = esc_html__("You didn't define an ID.", 'uicore-elements'); | |
| 1388 | 1389 | } |
| 1390 | + } | |
| 1389 | 1391 | |
| 1390 | - // Render item atts | |
| 1391 | - // TODO: remove `ui-e-item` class after, at least, 3 releases from 1.2.1. Kept for compatibility purposes | |
| 1392 | - $item_key = 'ui-e-item-' . $index; | |
| 1393 | - $this->add_render_attribute($item_key, [ | |
| 1394 | - 'class' => ($loopCounter === $settings['active_item']) ? 'ui-e-accordion-item ui-e-item ui-open' : 'ui-e-accordion-item ui-e-item', | |
| 1395 | - 'role' => 'button', | |
| 1396 | - 'tabindex' => '0', | |
| 1397 | - 'aria-expanded' => ($loopCounter === $settings['active_item']) ? 'true' : 'false', | |
| 1398 | - 'aria-controls' => $aria_id, | |
| 1399 | - 'id' => $acc_id, | |
| 1400 | - ]); | |
| 1392 | + // Render item atts | |
| 1393 | + // TODO: remove `ui-e-item` class after, at least, 3 releases from 1.2.1. Kept for compatibility purposes | |
| 1394 | + $item_key = 'ui-e-item-' . $index; | |
| 1395 | + $this->add_render_attribute($item_key, [ | |
| 1396 | + 'class' => ($loopCounter === $settings['active_item']) ? 'ui-e-accordion-item ui-e-item ui-open' : 'ui-e-accordion-item ui-e-item', | |
| 1397 | + 'role' => 'button', | |
| 1398 | + 'tabindex' => '0', | |
| 1399 | + 'aria-expanded' => ($loopCounter === $settings['active_item']) ? 'true' : 'false', | |
| 1400 | + 'aria-controls' => $aria_id, | |
| 1401 | + 'id' => $acc_id, | |
| 1402 | + ]); | |
| 1401 | 1403 | |
| 1402 | - // Render schema atts if active | |
| 1403 | - if ( $this->is_option('schema_activity', 'yes') ) { | |
| 1404 | - $this->add_render_attribute($item_key, 'itemscope'); | |
| 1405 | - $this->add_render_attribute($item_key, 'itemprop', 'mainEntity'); | |
| 1406 | - $this->add_render_attribute($item_key, 'itemtype', 'https://schema.org/Question'); | |
| 1404 | + // Render schema atts if active | |
| 1405 | + if ($this->is_option('schema_activity', 'yes')) { | |
| 1406 | + $this->add_render_attribute($item_key, 'itemscope'); | |
| 1407 | + $this->add_render_attribute($item_key, 'itemprop', 'mainEntity'); | |
| 1408 | + $this->add_render_attribute($item_key, 'itemtype', 'https://schema.org/Question'); | |
| 1407 | 1409 | |
| 1408 | - $this->add_render_attribute($tab_content_setting_key, 'itemscope'); | |
| 1409 | - $this->add_render_attribute($tab_content_setting_key, 'itemprop', 'acceptedAnswer', true); | |
| 1410 | - $this->add_render_attribute($tab_content_setting_key, 'itemtype', 'https://schema.org/Answer', true); | |
| 1410 | + $this->add_render_attribute($tab_content_setting_key, 'itemscope'); | |
| 1411 | + $this->add_render_attribute($tab_content_setting_key, 'itemprop', 'acceptedAnswer', true); | |
| 1412 | + $this->add_render_attribute($tab_content_setting_key, 'itemtype', 'https://schema.org/Answer', true); | |
| 1411 | 1413 | |
| 1412 | - $schema_text = $this->get_repeater_setting_key('schema_text', 'tabs', $index); | |
| 1413 | - $schema_name = $this->get_repeater_setting_key('schema_name', 'tabs', $index); | |
| 1414 | - $this->add_render_attribute($schema_text, 'itemprop', 'text'); | |
| 1415 | - $this->add_render_attribute($schema_name, 'itemprop', 'name'); | |
| 1414 | + $schema_text = $this->get_repeater_setting_key('schema_text', 'tabs', $index); | |
| 1415 | + $schema_name = $this->get_repeater_setting_key('schema_name', 'tabs', $index); | |
| 1416 | + $this->add_render_attribute($schema_text, 'itemprop', 'text'); | |
| 1417 | + $this->add_render_attribute($schema_name, 'itemprop', 'name'); | |
| 1416 | 1418 | |
| 1417 | 1419 | // Sets the variables to empty to avoid undefined variable problems |
| 1418 | - } else { | |
| 1419 | - $schema_text = $schema_name = ''; | |
| 1420 | - } | |
| 1421 | - ?> | |
| 1422 | - <div <?php $this->print_render_attribute_string($item_key);?>> | |
| 1420 | + } else { | |
| 1421 | + $schema_text = $schema_name = ''; | |
| 1422 | + } | |
| 1423 | + ?> | |
| 1424 | + <div <?php $this->print_render_attribute_string($item_key); ?>> | |
| 1423 | 1425 | |
| 1424 | - <<?php echo esc_html($titleTag)?> <?php $this->print_render_attribute_string($tab_title_setting_key);?>> | |
| 1426 | + <<?php echo Helper::esc_tag($titleTag) ?> <?php $this->print_render_attribute_string($tab_title_setting_key); ?>> | |
| 1425 | 1427 | |
| 1426 | - <?php if ($settings['accordion_icon']['value']) : | |
| 1427 | - // TODO: remove `ui-e-icon` class after, at least, 3 releases from 1.2.1. Kept for compatibility purposes | |
| 1428 | - ?> | |
| 1429 | - <span class="ui-e-accordion-icon ui-e-icon ui-e-<?php echo esc_attr($settings['icon_align']); ?>" aria-hidden="true"> | |
| 1428 | + <?php if ($settings['accordion_icon']['value']) : | |
| 1429 | + // TODO: remove `ui-e-icon` class after, at least, 3 releases from 1.2.1. Kept for compatibility purposes | |
| 1430 | + ?> | |
| 1431 | + <span class="ui-e-accordion-icon ui-e-icon ui-e-<?php echo esc_attr($settings['icon_align']); ?>" aria-hidden="true"> | |
| 1430 | 1432 | |
| 1431 | - <span class="ui-e-accordion-icon-closed"> | |
| 1432 | - <?php Icons_Manager::render_icon($settings['accordion_icon'], ['aria-hidden' => 'true']); ?> | |
| 1433 | - </span> | |
| 1434 | - | |
| 1435 | - <?php if($settings['icon_animation'] != 'ui-e-animation-ico-spin') : //spin animation dismiss the opened accordion icon ?> | |
| 1436 | - <span class="ui-e-accordion-icon-opened"> | |
| 1437 | - <?php Icons_Manager::render_icon($settings['accordion_active_icon'], ['aria-hidden' => 'true']); ?> | |
| 1438 | - </span> | |
| 1439 | - <?php endif; ?> | |
| 1440 | - | |
| 1433 | + <span class="ui-e-accordion-icon-closed"> | |
| 1434 | + <?php Icons_Manager::render_icon($settings['accordion_icon'], ['aria-hidden' => 'true']); ?> | |
| 1441 | 1435 | </span> |
| 1442 | - <?php endif; ?> | |
| 1443 | 1436 | |
| 1444 | - <?php // TODO: remove `ui-e-title-text` class after, at least, 3 releases from 1.2.1. Kept for compatibility purposes ?> | |
| 1445 | - <span class="ui-e-accordion-title-text ui-e-title-text" <?php $this->print_render_attribute_string($schema_name) ;?>> | |
| 1446 | - <?php if ( !empty($item['repeater_icon']['value']) && $this->is_option('show_custom_icon', 'yes') ) : ?> | |
| 1447 | - <span class="ui-e-custom-icon"> | |
| 1448 | - <?php Icons_Manager::render_icon($item['repeater_icon'], ['aria-hidden' => 'true']); ?> | |
| 1437 | + <?php if ($settings['icon_animation'] != 'ui-e-animation-ico-spin') : //spin animation dismiss the opened accordion icon | |
| 1438 | + ?> | |
| 1439 | + <span class="ui-e-accordion-icon-opened"> | |
| 1440 | + <?php Icons_Manager::render_icon($settings['accordion_active_icon'], ['aria-hidden' => 'true']); ?> | |
| 1449 | 1441 | </span> |
| 1450 | 1442 | <?php endif; ?> |
| 1451 | - <?php echo esc_html($item['tab_title']); ?> | |
| 1443 | + | |
| 1452 | 1444 | </span> |
| 1445 | + <?php endif; ?> | |
| 1453 | 1446 | |
| 1454 | - </<?php echo esc_html($titleTag)?>> | |
| 1447 | + <?php // TODO: remove `ui-e-title-text` class after, at least, 3 releases from 1.2.1. Kept for compatibility purposes | |
| 1448 | + ?> | |
| 1449 | + <span class="ui-e-accordion-title-text ui-e-title-text" <?php $this->print_render_attribute_string($schema_name); ?>> | |
| 1450 | + <?php if (!empty($item['repeater_icon']['value']) && $this->is_option('show_custom_icon', 'yes')) : ?> | |
| 1451 | + <span class="ui-e-custom-icon"> | |
| 1452 | + <?php Icons_Manager::render_icon($item['repeater_icon'], ['aria-hidden' => 'true']); ?> | |
| 1453 | + </span> | |
| 1454 | + <?php endif; ?> | |
| 1455 | + <?php echo esc_html($item['tab_title']); ?> | |
| 1456 | + </span> | |
| 1455 | 1457 | |
| 1456 | - <div <?php $this->print_render_attribute_string($tab_content_setting_key); ?>> | |
| 1457 | - <?php | |
| 1458 | - if ('custom' == $item['source'] && !empty($item['tab_content'])) { | |
| 1458 | + </<?php echo Helper::esc_tag($titleTag) ?>> | |
| 1459 | 1459 | |
| 1460 | - // if schema is active, creates a wrapper for the itemprop structure | |
| 1461 | - if( $this->is_option('schema_activity', 'yes') ) { | |
| 1462 | - ?> | |
| 1463 | - <div <?php $this->print_render_attribute_string($schema_text);?> > | |
| 1464 | - <?php | |
| 1465 | - } | |
| 1460 | + <div <?php $this->print_render_attribute_string($tab_content_setting_key); ?>> | |
| 1461 | + <?php | |
| 1462 | + if ('custom' == $item['source'] && !empty($item['tab_content'])) { | |
| 1466 | 1463 | |
| 1467 | - echo $this->parse_text_editor($item['tab_content']);// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 1464 | + // if schema is active, creates a wrapper for the itemprop structure | |
| 1465 | + if ($this->is_option('schema_activity', 'yes')) { | |
| 1466 | + ?> | |
| 1467 | + <div <?php $this->print_render_attribute_string($schema_text); ?>> | |
| 1468 | + <?php | |
| 1469 | + } | |
| 1468 | 1470 | |
| 1469 | - if( $this->is_option('schema_activity', 'yes') ) { | |
| 1470 | - ?> | |
| 1471 | - </div> | |
| 1472 | - <?php | |
| 1473 | - } | |
| 1474 | - } | |
| 1475 | - // if source is sectionId and we're inside editor, returns a warning for context. The sectionId content is moved via JS | |
| 1476 | - if ('sectionId' == $item['source'] && $this->is_edit_mode()) { | |
| 1477 | - echo wp_kses($sectionWarning, ['em' => []]); | |
| 1478 | - } | |
| 1479 | - ?> | |
| 1480 | - </div> | |
| 1471 | + echo wp_kses_post($this->parse_text_editor($item['tab_content'])); | |
| 1481 | 1472 | |
| 1473 | + if ($this->is_option('schema_activity', 'yes')) { | |
| 1474 | + ?> | |
| 1475 | + </div> | |
| 1476 | + <?php | |
| 1477 | + } | |
| 1478 | + } | |
| 1479 | + // if source is sectionId and we're inside editor, returns a warning for context. The sectionId content is moved via JS | |
| 1480 | + if ('sectionId' == $item['source'] && $this->is_edit_mode()) { | |
| 1481 | + echo wp_kses($sectionWarning, ['em' => []]); | |
| 1482 | + } | |
| 1483 | + ?> | |
| 1482 | 1484 | </div> |
| 1483 | - <?php endforeach; ?> | |
| 1484 | - </div> | |
| 1485 | - <?php | |
| 1485 | + | |
| 1486 | + </div> | |
| 1487 | + <?php endforeach; ?> | |
| 1488 | + </div> | |
| 1489 | +<?php | |
| 1486 | 1490 | } |
| 1487 | 1491 | } |
| 1488 | 1492 | \Elementor\Plugin::instance()->widgets_manager->register(new Accordion()); |
