From d295aef3323278e1d4ea7ced4ec158eb85a5f5d8 Mon Sep 17 00:00:00 2001
From: "ilian.iliev" <ilian.iliev@imperiaonline.org>
Date: Sun, 6 Oct 2024 16:55:40 +0300
Subject: [PATCH] FIxes for new dropdowns

---
 javascript/state.core.js  | 29 ++++++++++++-----------------
 javascript/state.utils.js | 16 +---------------
 2 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/javascript/state.core.js b/javascript/state.core.js
index 3dbe218..5e445f2 100644
--- a/javascript/state.core.js
+++ b/javascript/state.core.js
@@ -350,24 +350,19 @@ state.core = (function () {
     }
 
     function handleToggleButton(id, duplicateIds) {
-        let btn = gradioApp().querySelector(`button#${id}`);
-        if (! btn) { // New gradio version
-            btn = gradioApp().querySelector(`.input-accordion#${id} .label-wrap`);
-        }
-        if (! btn) {
-            state.logging.warn(`Button not found: ${id}`);
-            return;
-        }
-        if (store.get(id) === 'true') {
-            state.utils.clickToggleMenu(btn);
-        }
-        btn.addEventListener('click', function () {
-            let classList = Array.from(this.parentNode.classList);
-            if (btn.tagName === 'BUTTON') { // Old gradio version
-                store.set(id, classList.indexOf('secondary-down') === -1);
-            } else {
-                store.set(id, classList.indexOf('input-accordion-open') > -1);
+
+        let selector = duplicateIds ? `[id="${id}"]` : `#${id}`;
+
+        elements = gradioApp().querySelectorAll(`.input-accordion${selector}>.label-wrap`);
+
+        elements.forEach(function (element) {
+            if (store.get(id) === 'true') {
+                state.utils.clickToggleMenu(element);
             }
+            element.addEventListener('click', function () {
+                let classList = Array.from(this.parentNode.classList);
+                store.set(id, classList.indexOf('input-accordion-open') > -1);
+            });
         });
     }
 
diff --git a/javascript/state.utils.js b/javascript/state.utils.js
index 885ccb4..a2ad234 100644
--- a/javascript/state.utils.js
+++ b/javascript/state.utils.js
@@ -29,21 +29,7 @@ state.utils = {
             state.logging.warn('Toggle button not found');
             return;
         }
-        let mouseEvent = new MouseEvent('click', {
-            view: window,
-            bubbles: true,
-            cancelable: true
-        });
-        element.dispatchEvent(mouseEvent);
-        let icon = element.parentNode.querySelector('.icon');
-        if (icon) {
-            icon.dispatchEvent(mouseEvent);
-        }
-        let checkbox = element.parentNode.querySelector('input[type="checkbox"]');
-        if (checkbox) {
-            checkbox.checked = !checkbox.checked;
-            checkbox.dispatchEvent(mouseEvent);
-        }
+        element.click();
         return element;
     },
     setValue: function setValue(element, value, event) {