[#62] Fix "up" key does not close open menu/accordion. (#114)

Co-authored-by: Joshua Fernandes <“joshua.1234511@yahoo.in”>
civictheme · Mar 15, 2024 · b3f22a2 · b3f22a2 · github-actions · Mar 15, 2024
1 parent 8909fa9
commit b3f22a2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/components/00-base/collapsible/collapsible.js b/components/00-base/collapsible/collapsible.js
@@ -201,7 +201,7 @@ CivicThemeCollapsible.prototype.keydownEvent = function (e) {
   if (this !== document) {
     // Up.
     if (e.which === 38 && !e.shiftKey) {
-      this.dispatchEvent(new CustomEvent('ct.collapsible.collapse', { bubbles: true, detail: { animate: true } }));
+      this.dispatchEvent(new CustomEvent('ct.collapsible.collapse', { bubbles: true, detail: { animate: true, keydown: true } }));
       return;
     }
 
@@ -255,7 +255,11 @@ CivicThemeCollapsible.prototype.collapse = function (animate, evt) {
   }
 
   if (evt && evt.target) {
-    if (evt.currentTarget !== t.el || evt.target !== t.el) {
+    if (evt.detail.keydown) {
+      if (evt.target.closest('[data-collapsible="true"]') !== t.el) {
+        return;
+      }
+    } else if (evt.currentTarget !== t.el || evt.target !== t.el) {
       return;
     }
   }