Fix value conditions not correctly applying filters on chained elements

wintercms · Nov 12, 2024 · 79eb0e9 · 79eb0e9
1 parent b7aacd8
commit 79eb0e9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/modules/system/assets/js/build/system.debug.js b/modules/system/assets/js/build/system.debug.js
diff --git a/modules/system/assets/js/build/system.js b/modules/system/assets/js/build/system.js
diff --git a/modules/system/assets/js/snowboard/extras/Trigger.js b/modules/system/assets/js/snowboard/extras/Trigger.js
@@ -539,29 +539,25 @@ export default class Trigger extends PluginBase {
             testElements.forEach((element) => {
                 if (element.matches('input[type=checkbox], input[type=radio]')) {
                     if (element.checked) {
-                        elementValues.add(element, element.value);
+                        elementValues.set(element, element.value);
                     }
                     return;
                 }
 
-                elementValues.add(element, element.value);
+                elementValues.set(element, element.value);
             });
 
             // Check if condition is met
-            let met = false;
-
-            if (all) {
-                met = values.every((value) => elementValues.values().has(value));
-            }
-
-            met = values.some((value) => elementValues.values().has(value));
+            const met = (all)
+                ? values.every((value) => elementValues.values().find((elementValue) => elementValue === value))
+                : values.some((value) => elementValues.values().find((elementValue) => elementValue === value));
 
             if (!met) {
                 return false;
             }
 
             // Return only elements who met the condition
-            return Array.from(elementValues.entries().filter(([, value]) => values.includes(value)).keys());
+            return Array.from(elementValues.entries().filter(([, value]) => values.includes(value)).map(([, element]) => element));
         };
     }