css-zero 0.0.47 → 0.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2efe1919888b0e11a440ada88d32d728814c3a96f67e877e87009836a5c9e3a
-  data.tar.gz: eac6e9c80a23b456a92dec265859959fadb0e34298904308714df91bb3220d84
+  metadata.gz: 2c2fa4f9172129b3e90a0a4cdcb7870f5467d8cbee3fd8d9d621eebd65212912
+  data.tar.gz: 0ddf2089702a14920122e9ce9d421dc8017e6a2c3fe9aa42284b83700b83a357
 SHA512:
-  metadata.gz: 9180e92a3179e523600fe9c2a1090a56fc1625798f9d261262f0d2fe6e998e11b777db777c9a3982d7ca76570bc8d43bc68c48efc6016879462adcd23c300cab
-  data.tar.gz: e05418691df476b525df12b6df0e4a1159947bc45cc21b3d2f7378dfb7767dd235bb20f3d4fdb4dd6c481851ac60b0d2255101b3f09dd01d323bdbd27a9d7acc
+  metadata.gz: a98928f94335f61b029d53858d524919c940f14012bdaa9af96b22c924f03d6bff5b79c1aa774caebb4d7b494de2a9392f4e6315dc7445c9734244f09e88313f
+  data.tar.gz: d682b0a2a721c13c04e250ca332eaf1bd531b173b96552b60fd1f93f8cb94813a139b4926fdb718c423412d9151be3b18242235d0e51cc21886411ad28ab2a93

data/lib/css_zero/version.rb

@@ -1,3 +1,3 @@
 module CssZero
-  VERSION = "0.0.47"
+  VERSION = "0.0.48"
 end

data/lib/generators/css_zero/add/templates/app/javascript/controllers/menu_controller.js

@@ -4,37 +4,29 @@ export default class extends Controller {
   static targets = [ "item" ]
   static values  = { index: Number }
 
-  indexValueChanged() {
-    this.#removeTabstops()
+  indexValueChanged(index, previousIndex) {
+    this.#updateTabstops(previousIndex !== undefined)
   }
 
   prev() {
-    const hasPrevious = this.indexValue > 0
-    hasPrevious && this.indexValue--
-    hasPrevious && this.#focusCurrentItem()
+    this.indexValue > 0 && this.indexValue--
   }
 
   next() {
-    const hasNext = this.indexValue < this.#lastIndex
-    hasNext && this.indexValue++
-    hasNext && this.#focusCurrentItem()
+    this.indexValue < this.itemTargets.length -1 && this.indexValue++
   }
 
   reset() {
     this.indexValue = 0
-    this.#focusCurrentItem()
   }
 
-  #removeTabstops() {
-    this.itemTargets.forEach(item => item.tabIndex = -1)
-  }
-
-  #focusCurrentItem() {
-    this.itemTargets[this.indexValue].tabIndex = 0
-    this.itemTargets[this.indexValue].focus()
-  }
+  #updateTabstops(shouldFocus) {
+    this.itemTargets.forEach((element, index) => {
+      element.tabIndex = index == this.indexValue ? 0 : -1
+    })
 
-  get #lastIndex() {
-    return this.itemTargets.length -1
+    if (shouldFocus) {
+      this.itemTargets[this.indexValue].focus()
+    }
   }
 }

data/lib/generators/css_zero/add/templates/app/javascript/controllers/popover_controller.js

@@ -6,10 +6,7 @@ export default class extends Controller {
   static targets = [ "button", "menu" ]
   static classes = [ "flip" ]
 
-  #closeTimer
-
   show() {
-    this.#resetTimer()
     this.menuTarget.show()
     this.#updateExpanded()
     this.#orient()
@@ -20,10 +17,6 @@ export default class extends Controller {
     this.#updateExpanded()
   }
 
-  closeLater() {
-    this.#closeTimer = setTimeout(() => this.close(), 300)
-  }
-
   toggle() {
     this.menuTarget.open ? this.close() : this.show()
   }
@@ -32,10 +25,6 @@ export default class extends Controller {
     !this.element.contains(target) && this.close()
   }
 
-  #resetTimer() {
-    clearTimeout(this.#closeTimer)
-  }
-
   #orient() {
     this.menuTarget.classList.toggle(this.flipClass, this.#distanceToBottom < BOTTOM_THRESHOLD)
   }

data/lib/generators/css_zero/add/templates/app/javascript/controllers/tabs_controller.js

@@ -4,8 +4,8 @@ export default class extends Controller {
   static targets = [ "button", "tab" ]
   static values  = { index: Number }
 
-  indexValueChanged() {
-    this.#showCurrentTab()
+  indexValueChanged(index, previousIndex) {
+    this.#showCurrentTab(previousIndex !== undefined)
   }
 
   select({ target }) {
@@ -13,33 +13,25 @@ export default class extends Controller {
   }
 
   prev() {
-    const hasPrevious = this.indexValue > 0
-    hasPrevious && this.indexValue--
-    hasPrevious && this.#focusCurrentButton()
+    this.indexValue > 0 && this.indexValue--
   }
 
   next() {
-    const hasNext = this.indexValue < this.#lastIndex
-    hasNext && this.indexValue++
-    hasNext && this.#focusCurrentButton()
+    this.indexValue < this.tabTargets.length -1 && this.indexValue++
   }
 
-  #showCurrentTab() {
-    this.buttonTargets.forEach((button, index) => {
-      button.ariaSelected = index == this.indexValue
-      button.tabIndex     = index == this.indexValue ? 0 : -1
+  #showCurrentTab(shouldFocus) {
+    this.buttonTargets.forEach((element, index) => {
+      element.ariaSelected = index == this.indexValue
+      element.tabIndex     = index == this.indexValue ? 0 : -1
     })
 
-    this.tabTargets.forEach((tab, index) => {
-      tab.hidden = index !== this.indexValue
+    this.tabTargets.forEach((element, index) => {
+      element.hidden = index !== this.indexValue
     })
-  }
-
-  #focusCurrentButton() {
-    this.buttonTargets[this.indexValue].focus()
-  }
 
-  get #lastIndex() {
-    return this.tabTargets.length -1
+    if (shouldFocus) {
+      this.buttonTargets[this.indexValue].focus()
+    }
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css-zero
 version: !ruby/object:Gem::Version
-  version: 0.0.47
+  version: 0.0.48
 platform: ruby
 authors:
 - Lázaro Nixon