FIX: accordion and faq

wp-content/plugins/elementor/assets/js/accordion.8799675460c73eb48972.bundle.min.js

@@ -1,2 +1,195 @@
 /*! elementor - v3.17.0 - 08-11-2023 */
-"use strict";(self.webpackChunkelementor=self.webpackChunkelementor||[]).push([[209],{8470:(e,t,a)=>{var i=a(3203);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var s=i(a(9728));class Accordion extends s.default{getDefaultSettings(){return{...super.getDefaultSettings(),showTabFn:"slideDown",hideTabFn:"slideUp"}}}t.default=Accordion},9728:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;class baseTabs extends elementorModules.frontend.handlers.Base{getDefaultSettings(){return{selectors:{tablist:'[role="tablist"]',tabTitle:".elementor-tab-title",tabContent:".elementor-tab-content"},classes:{active:"elementor-active"},showTabFn:"show",hideTabFn:"hide",toggleSelf:!0,hidePrevious:!0,autoExpand:!0,keyDirection:{ArrowLeft:elementorFrontendConfig.is_rtl?1:-1,ArrowUp:-1,ArrowRight:elementorFrontendConfig.is_rtl?-1:1,ArrowDown:1}}}getDefaultElements(){const e=this.getSettings("selectors");return{$tabTitles:this.findElement(e.tabTitle),$tabContents:this.findElement(e.tabContent)}}activateDefaultTab(){const e=this.getSettings();if(!e.autoExpand||"editor"===e.autoExpand&&!this.isEdit)return;const t=this.getEditSettings("activeItemIndex")||1,a={showTabFn:e.showTabFn,hideTabFn:e.hideTabFn};this.setSettings({showTabFn:"show",hideTabFn:"hide"}),this.changeActiveTab(t),this.setSettings(a)}handleKeyboardNavigation(e){const t=e.currentTarget,a=jQuery(t.closest(this.getSettings("selectors").tablist)),i=a.find(this.getSettings("selectors").tabTitle),s="vertical"===a.attr("aria-orientation");switch(e.key){case"ArrowLeft":case"ArrowRight":if(s)return;break;case"ArrowUp":case"ArrowDown":if(!s)return;e.preventDefault();break;case"Home":return e.preventDefault(),void i.first().trigger("focus");case"End":return e.preventDefault(),void i.last().trigger("focus");default:return}const n=t.getAttribute("data-tab")-1,r=this.getSettings("keyDirection")[e.key],o=i[n+r];o?o.focus():-1===n+r?i.last().trigger("focus"):i.first().trigger("focus")}deactivateActiveTab(e){const t=this.getSettings(),a=t.classes.active,i=e?'[data-tab="'+e+'"]':"."+a,s=this.elements.$tabTitles.filter(i),n=this.elements.$tabContents.filter(i);s.add(n).removeClass(a),s.attr({tabindex:"-1","aria-selected":"false","aria-expanded":"false"}),n[t.hideTabFn](),n.attr("hidden","hidden")}activateTab(e){const t=this.getSettings(),a=t.classes.active,i=this.elements.$tabTitles.filter('[data-tab="'+e+'"]'),s=this.elements.$tabContents.filter('[data-tab="'+e+'"]'),n="show"===t.showTabFn?0:400;i.add(s).addClass(a),i.attr({tabindex:"0","aria-selected":"true","aria-expanded":"true"}),s[t.showTabFn](n,(()=>elementorFrontend.elements.$window.trigger("elementor-pro/motion-fx/recalc"))),s.removeAttr("hidden")}isActiveTab(e){return this.elements.$tabTitles.filter('[data-tab="'+e+'"]').hasClass(this.getSettings("classes.active"))}bindEvents(){this.elements.$tabTitles.on({keydown:e=>{jQuery(e.target).is("a")&&"Enter"===e.key&&e.preventDefault(),["End","Home","ArrowUp","ArrowDown"].includes(e.key)&&this.handleKeyboardNavigation(e)},keyup:e=>{switch(e.code){case"ArrowLeft":case"ArrowRight":this.handleKeyboardNavigation(e);break;case"Enter":case"Space":e.preventDefault(),this.changeActiveTab(e.currentTarget.getAttribute("data-tab"))}},click:e=>{e.preventDefault(),this.changeActiveTab(e.currentTarget.getAttribute("data-tab"))}})}onInit(){super.onInit(...arguments),this.activateDefaultTab()}onEditSettingsChange(e){"activeItemIndex"===e&&this.activateDefaultTab()}changeActiveTab(e){const t=this.isActiveTab(e),a=this.getSettings();!a.toggleSelf&&t||!a.hidePrevious||this.deactivateActiveTab(),!a.hidePrevious&&t&&this.deactivateActiveTab(e),t||this.activateTab(e)}}t.default=baseTabs}}]);
+'use strict'
+;(self.webpackChunkelementor = self.webpackChunkelementor || []).push([
+	[209],
+	{
+		8470: (e, t, a) => {
+			var i = a(3203)
+			Object.defineProperty(t, '__esModule', { value: !0 }),
+				(t.default = void 0)
+			var s = i(a(9728))
+			class Accordion extends s.default {
+				getDefaultSettings() {
+					return {
+						...super.getDefaultSettings(),
+						showTabFn: 'slideDown',
+						hideTabFn: 'slideUp',
+					}
+				}
+			}
+			t.default = Accordion
+		},
+		9728: (e, t) => {
+			Object.defineProperty(t, '__esModule', { value: !0 }),
+				(t.default = void 0)
+			class baseTabs extends elementorModules.frontend.handlers.Base {
+				getDefaultSettings() {
+					return {
+						selectors: {
+							tablist: '[role="tablist"]',
+							tabTitle: '.elementor-tab-title',
+							tabContent: '.elementor-tab-content',
+						},
+						classes: { active: 'elementor-active' },
+						showTabFn: 'show',
+						hideTabFn: 'hide',
+						toggleSelf: !0,
+						hidePrevious: !0,
+						autoExpand: !0,
+						keyDirection: {
+							ArrowLeft: elementorFrontendConfig.is_rtl ? 1 : -1,
+							ArrowUp: -1,
+							ArrowRight: elementorFrontendConfig.is_rtl ? -1 : 1,
+							ArrowDown: 1,
+						},
+					}
+				}
+				getDefaultElements() {
+					const e = this.getSettings('selectors')
+					return {
+						$tabTitles: this.findElement(e.tabTitle),
+						$tabContents: this.findElement(e.tabContent),
+					}
+				}
+				activateDefaultTab() {
+					const e = this.getSettings()
+					if (!e.autoExpand || ('editor' === e.autoExpand && !this.isEdit))
+						return
+					const t = this.getEditSettings('activeItemIndex') || 1,
+						a = { showTabFn: e.showTabFn, hideTabFn: e.hideTabFn }
+					this.setSettings({ showTabFn: 'show', hideTabFn: 'hide' }),
+						this.changeActiveTab(t),
+						this.setSettings(a)
+				}
+				handleKeyboardNavigation(e) {
+					const t = e.currentTarget,
+						a = jQuery(t.closest(this.getSettings('selectors').tablist)),
+						i = a.find(this.getSettings('selectors').tabTitle),
+						s = 'vertical' === a.attr('aria-orientation')
+					switch (e.key) {
+						case 'ArrowLeft':
+						case 'ArrowRight':
+							if (s) return
+							break
+						case 'ArrowUp':
+						case 'ArrowDown':
+							if (!s) return
+							e.preventDefault()
+							break
+						case 'Home':
+							return e.preventDefault(), void i.first().trigger('focus')
+						case 'End':
+							return e.preventDefault(), void i.last().trigger('focus')
+						default:
+							return
+					}
+					const n = t.getAttribute('data-tab') - 1,
+						r = this.getSettings('keyDirection')[e.key],
+						o = i[n + r]
+					o
+						? o.focus()
+						: -1 === n + r
+						? i.last().trigger('focus')
+						: i.first().trigger('focus')
+				}
+				deactivateActiveTab(e) {
+					const t = this.getSettings(),
+						a = t.classes.active,
+						i = e ? '[data-tab="' + e + '"]' : '.' + a,
+						s = this.elements.$tabTitles.filter(i),
+						n = this.elements.$tabContents.filter(i)
+					s.add(n).removeClass(a),
+						s.attr({
+							tabindex: '-1',
+							'aria-selected': 'false',
+							'aria-expanded': 'false',
+						}),
+						n[t.hideTabFn](),
+						n.attr('hidden', 'hidden')
+				}
+				activateTab(e) {
+					const t = this.getSettings(),
+						a = t.classes.active,
+						i = this.elements.$tabTitles.filter('[data-tab="' + e + '"]'),
+						s = this.elements.$tabContents.filter('[data-tab="' + e + '"]'),
+						n = 'show' === t.showTabFn ? 0 : 400
+					i.add(s).addClass(a),
+						i.attr({
+							tabindex: '0',
+							'aria-selected': 'true',
+							'aria-expanded': 'true',
+						}),
+						s[t.showTabFn](n, () =>
+							elementorFrontend.elements.$window.trigger(
+								'elementor-pro/motion-fx/recalc'
+							)
+						),
+						s.removeAttr('hidden')
+				}
+				isActiveTab(e) {
+					return this.elements.$tabTitles
+						.filter('[data-tab="' + e + '"]')
+						.hasClass(this.getSettings('classes.active'))
+				}
+				bindEvents() {
+					this.elements.$tabTitles.on({
+						keydown: (e) => {
+							jQuery(e.target).is('a') &&
+								'Enter' === e.key &&
+								e.preventDefault(),
+								['End', 'Home', 'ArrowUp', 'ArrowDown'].includes(e.key) &&
+									this.handleKeyboardNavigation(e)
+						},
+						keyup: (e) => {
+							switch (e.code) {
+								case 'ArrowLeft':
+								case 'ArrowRight':
+									this.handleKeyboardNavigation(e)
+									break
+								case 'Enter':
+								case 'Space':
+									e.preventDefault(),
+										this.changeActiveTab(
+											e.currentTarget.getAttribute('data-tab')
+										)
+							}
+						},
+						click: (e) => {
+							e.preventDefault(),
+								this.changeActiveTab(e.currentTarget.getAttribute('data-tab'))
+						},
+					})
+				}
+				onInit() {
+					super.onInit(...arguments), this.activateDefaultTab()
+				}
+				onEditSettingsChange(e) {
+					'activeItemIndex' === e && this.activateDefaultTab()
+				}
+				changeActiveTab(e) {
+                    const t = this.isActiveTab(e),
+                        a = this.getSettings();
+
+                    if (t) {
+                        this.deactivateActiveTab(e);
+                    } else {
+                        if (a.toggleSelf) {
+                            this.activateTab(e);
+                        }
+                    }
+
+                    
+                    
+					// const t = this.isActiveTab(e),
+                    //     a = this.getSettings()
+                    // ;(!a.toggleSelf && t) ||
+                    //     !a.hidePrevious ||
+                    //     this.deactivateActiveTab(),
+                    //     !a.hidePrevious && t && this.deactivateActiveTab(e),
+                    //     t || this.activateTab(e)
+				}
+			}
+			t.default = baseTabs
+		},
+	},
+])

wp-content/plugins/restlycore/elementor-widgets/faq-addon.php

@@ -412,11 +412,14 @@ class restly_faq_Widget extends Widget_Base {
     }
     //Render
     protected function render() {
+        $widget_id = $this->get_id();
         $settings = $this->get_settings_for_display();
         ob_start();
         ?>
         <div class="accordion accordion-flush faq-accordion" id="accordionFlushExample">
             <?php $count =0; foreach($settings['restly_faws'] as $faq ) : $count++;
+
+            $UUID = $widget_id.'-'.$count;
             
             if($faq['restly_faq_active'] == 'yes' ){
                 $active = 'collapse';
@@ -427,12 +430,12 @@ class restly_faq_Widget extends Widget_Base {
             }
             ?>
             <div class="accordion-item">
-                <h3 class="accordion-header" id="faq-<?php echo esc_attr($count); ?>">
+                <h3 class="accordion-header" id="faq-<?php echo esc_attr($UUID); ?>">
-                <button class="accordion-button <?php echo esc_attr($active); ?>" type="button" data-bs-toggle="collapse" data-bs-target="#faq-item-<?php echo esc_attr($count); ?>" aria-expanded="false" aria-controls="faq-item-<?php echo esc_attr($count); ?>">
+                <button class="accordion-button <?php echo esc_attr($active); ?>" type="button" data-bs-toggle="collapse" data-bs-target="#faq-item-<?php echo esc_attr($UUID); ?>" aria-expanded="false" aria-controls="faq-item-<?php echo esc_attr($UUID); ?>">
                    <?php echo esc_html($faq['restly_faq_title']); ?>
                 </button>
                 </h3>
-                <div id="faq-item-<?php echo esc_attr($count); ?>" class="accordion-collapse collapse <?php echo esc_attr($show); ?>" aria-labelledby="faq-<?php echo esc_attr($count); ?>" data-bs-parent="#accordionFlushExample">
+                <div id="faq-item-<?php echo esc_attr($UUID); ?>" class="accordion-collapse collapse <?php echo esc_attr($show); ?>" aria-labelledby="faq-<?php echo esc_attr($UUID); ?>" data-bs-parent="#accordionFlushExample">
                     <div class="accordion-body"><?php echo wp_kses_post($faq['restly_faq_content']); ?></div>
                 </div>
             </div>