satis 2.1.10 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c555864ef12ead60d3c49092fd523d24fd5f1778f5c4ad834a12e2bda16d7c67
-  data.tar.gz: b0347be5e202f0fc3843b994379b42f7f96b3b5ac5f2efef34d5433eba35a959
+  metadata.gz: c26f92789c969a70a78e755e1e4524ce60eb66e4072e668347a043dfbec44035
+  data.tar.gz: fd1bcf71ddb41868eef1f4832851a7cfd5c0a9d758c1fabff852cae2ef20b140
 SHA512:
-  metadata.gz: a5082b696cc734bd44c6f1ad497135d8d64512cd8964fb778dd6377fbea08b62c78be0c42ced5971e9196f1078c8c457154251fcdbd980116f9d98750112e12d
-  data.tar.gz: c81ac8c1b03041cf1e31464339f98de4dd93783ab3f6d9d1beac95a7dce7516460ac044b14817a2e67d76cd3558fc117fec204410a91ee510e4f004fe9fbffa1
+  metadata.gz: a05e0503425e84529bf1a0c07a0de2d5a2704178a745854ea1a10c29345c580cedff250ed16a3e6839ce91a0d2e45f43b400000666ce3f56bfb7bd49097400b6
+  data.tar.gz: 1775ac23357c5d75fe779c2514fa54a7458be686796a07f17a79a8ee14f8d626797eb18a34d5b13caac8a4e0c114dfbbb971eda24223bd22232233435d45dbdd

data/app/components/satis/sidebar_menu_item/component_controller.js

@@ -36,13 +36,11 @@ export default class SidebarMenuItemComponentController extends ApplicationContr
         this.showSubmenu()
         event.preventDefault()
       } else {
-        this.hideSubmenu()
+        if(!this.hasLink || this.linkInUrl()) this.hideSubmenu()
       }
 
-      if (this.linkTarget.classList.contains("focus")) {
+      if(this.linkInUrl()){
         event.preventDefault()
-      } else {
-        this.linkTarget.classList.toggle("focus", true)
       }
     }
   }
@@ -70,8 +68,12 @@ export default class SidebarMenuItemComponentController extends ApplicationContr
     this.element.classList.toggle("active", false)
   }
 
+  get hasLink(){
+    return this.hasLinkTarget && this.linkTarget.hasAttribute("href")
+  }
+
   updateFocus(scroll = false) {
-    if (!this.hasLinkTarget) return
+    if (!this.hasLink) return
     const focusedItem =  this.element.closest('nav.sidebar').querySelector('a.focus')
     const linkInUrl = this.linkInUrl()
     if (linkInUrl && (!focusedItem || linkInUrl > this.linkInUrl(focusedItem))) {
@@ -83,7 +85,7 @@ export default class SidebarMenuItemComponentController extends ApplicationContr
   }
 
   linkInUrl(target = this.linkTarget) {
-    if(!target || target.href.length === 0  || target.pathname !== window.location.pathname || target.origin !== window.location.origin)
+    if(!target || target.getAttribute('href') === null  || target.pathname !== window.location.pathname || target.origin !== window.location.origin)
       return 0
 
     let c = 1;

data/lib/satis/version.rb

@@ -1,3 +1,3 @@
 module Satis
-  VERSION = "2.1.10"
+  VERSION = "2.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satis
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.1.11
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser