turbo_boost-elements 0.0.13 → 0.0.14

data/app/javascript/elements/toggle_elements/target_element/index.js

@@ -59,6 +59,7 @@ export default class ToggleTargetElement extends ToggleElement {
 
   collapse (delay = 250) {
     clearTimeout(this.collapseTimeout)
+    if (this.busy) return
     if (typeof delay !== 'number') delay = 250
 
     if (delay > 0)
@@ -78,7 +79,7 @@ export default class ToggleTargetElement extends ToggleElement {
 
   collapseMatches () {
     document.querySelectorAll(this.collapseSelector).forEach(el => {
-      if (el === this) return
+      if (el.id === this.id) return
       if (el.collapse) el.collapse(0)
     })
   }
@@ -94,10 +95,17 @@ export default class ToggleTargetElement extends ToggleElement {
     return this.getAttribute('focus-selector')
   }
 
+  // the active trigger
   get triggerElement () {
     return document.getElementById(this.labeledBy)
   }
 
+  // all triggers
+  get triggerElements () {
+    return document.querySelectorAll(`[aria-controls="${this.id}"]`)
+  }
+
+  // the dom id of the active trigger
   get labeledBy () {
     return this.getAttribute('aria-labeledby')
   }
@@ -113,10 +121,14 @@ export default class ToggleTargetElement extends ToggleElement {
   }
 
   get expanded () {
-    return this.triggerElement.expanded
+    return this.triggerElement ? this.triggerElement.expanded : false
   }
 
   set expanded (value) {
-    return (this.triggerElement.expanded = value)
+    this.triggerElements.forEach(el => (el.expanded = value))
+  }
+
+  get busy () {
+    return this.triggerElement && this.triggerElement.busy
   }
 }

data/app/javascript/elements/toggle_elements/trigger_element/index.js

@@ -68,7 +68,6 @@ export default class ToggleTriggerElement extends ToggleElement {
     currentFocusSelector = this.focusSelector
     this.targetElement.labeledBy = this.id
     this.targetElement.collapseMatches()
-    this.targetElement.busy = true
     this.busy = true
     // TODO: implement cache - this.targetElement.renderCachedHTML()
   }
@@ -92,8 +91,7 @@ export default class ToggleTriggerElement extends ToggleElement {
     // runs before the morph is executed
     setTimeout(() => {
       this.busy = false
-      this.targetElement.busy = false
-      this.morphToggleElements.forEach(el => (el.busy = false))
+      this.morphToggleTriggerElements.forEach(el => (el.busy = false))
     }, delay - 10)
 
     // runs after the morph is executed
@@ -131,11 +129,9 @@ export default class ToggleTriggerElement extends ToggleElement {
   }
 
   // all toggle elements contained by the `morphElement`
-  get morphToggleElements () {
+  get morphToggleTriggerElements () {
     return Array.from(
-      this.morphElement.querySelectorAll(
-        'turbo-boost-toggle-trigger,turbo-boost-toggle-target'
-      )
+      this.morphElement.querySelectorAll('turbo-boost-toggle-trigger')
     )
   }
 

data/lib/turbo_boost/elements/version.rb

@@ -2,6 +2,6 @@
 
 module TurboBoost
   module Elements
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo_boost-elements
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Nate Hopkins (hopsoft)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails