Updates to menu and popover

lazaronixon · Oct 13, 2024 · 1942bda · 1942bda
1 parent 341aada
commit 1942bda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/lib/generators/css_zero/add/templates/app/javascript/controllers/menu_controller.js b/lib/generators/css_zero/add/templates/app/javascript/controllers/menu_controller.js
@@ -1,13 +1,12 @@
 import { Controller } from "@hotwired/stimulus"
-import { nextFrame } from "helpers/timing_helpers"
 
 export default class extends Controller {
   static targets = [ "item" ]
   static values  = { index: Number }
 
   indexValueChanged() {
     this.#removeTabstops()
-    this.#focusSelectedItem()
+    this.#focusCurrentItem()
   }
 
   prev() {
@@ -26,7 +25,7 @@ export default class extends Controller {
     this.itemTargets.forEach(item => item.tabIndex = -1)
   }
 
-  #focusSelectedItem() {
+  #focusCurrentItem() {
     this.itemTargets[this.indexValue].tabIndex = 0
     this.itemTargets[this.indexValue].focus()
   }

diff --git a/lib/generators/css_zero/add/templates/app/javascript/controllers/popover_controller.js b/lib/generators/css_zero/add/templates/app/javascript/controllers/popover_controller.js
@@ -8,14 +8,10 @@ export default class extends Controller {
 
   #closeTimer
 
-  connect() {
-    this.#updateExpanded()
-  }
-
   show() {
+    this.#resetTimer()
     this.menuTarget.show()
     this.#updateExpanded()
-    this.#resetTimer()
     this.#orient()
   }