satis 2.1.9 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc6031f7746bd883c8cd678ce58740dc3aad06c3a092a6da92bac2c92d3c0d18
-  data.tar.gz: ba326c73a8ec4b5595c11a4ffe038c3af707a483ace1953fb745da46d11c20c0
+  metadata.gz: c26f92789c969a70a78e755e1e4524ce60eb66e4072e668347a043dfbec44035
+  data.tar.gz: fd1bcf71ddb41868eef1f4832851a7cfd5c0a9d758c1fabff852cae2ef20b140
 SHA512:
-  metadata.gz: 923734b20873685e94daf82265875d5d28b0366c7cee5e3b64e7eacc6b0b5051ebb119ca53e2cca8b71a621a6a2bd8a4b88e88e07dec94fab380e88a60af559c
-  data.tar.gz: 4b6c5bdd8f2ef8dfc27e2efaaadce747eea5eec3d6464a4c2aa8623d80956aecf4310f549dab4db6b59901965804cfd2b20b640608793e1a2ea44db362fcccbd
+  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/forms/builder.rb

@@ -27,13 +27,13 @@ module Satis
       end
 
       # Regular input
-      def input(method, options = {}, &)
+      def input(method, options = {}, &block)
         @form_options = options
 
         options[:input_html] ||= {}
         options[:input_html][:disabled] = options.delete(:disabled)
 
-        send(input_type_for(method, options), method, options, &)
+        send(input_type_for(method, options), method, options, &block)
       end
 
       # NOTE: TDG - seems to be overwritten below
@@ -44,14 +44,14 @@ module Satis
       # end
 
       # A codemirror editor, backed by a text-area
-      def editor(method, options = {}, &)
+      def editor(method, options = {}, &block)
         @form_options = options
 
-        editor_input(method, options, &)
+        editor_input(method, options, &block)
       end
 
       # Simple-form like association
-      def association(name, options, &)
+      def association(name, options, &block)
         @form_options = options
 
         @association = name
@@ -59,7 +59,7 @@ module Satis
 
         method = reflection.join_foreign_key
 
-        send(input_type_for(method, options), method, options, &)
+        send(input_type_for(method, options), method, options, &block)
       end
 
       alias_method :rails_fields_for, :fields_for
@@ -73,7 +73,7 @@ module Satis
       #       printers_form.input :name
       #     end
       #   end
-      def fields_for(*args, &)
+      def fields_for(*args, &block)
         options = args.extract_options!
         name = args.first
         template_object = args.second
@@ -121,7 +121,7 @@ module Satis
           end
           safe_join [
             invalid_feedback,
-            rails_fields_for(*args, options, &)
+            rails_fields_for(*args, options, &block)
           ].compact
         end
       end
@@ -137,17 +137,17 @@ module Satis
       end
 
       # A switch backed by a hidden value
-      def switch(method, options = {}, &)
+      def switch(method, options = {}, &block)
         @form_options = options
 
-        switch_input(method, options, &)
+        switch_input(method, options, &block)
       end
 
       # A hidden input
-      def hidden(method, options = {}, &)
+      def hidden(method, options = {}, &block)
         @form_options = options
 
-        hidden_input(method, options, &)
+        hidden_input(method, options, &block)
       end
 
       # Non public

data/lib/satis/version.rb

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

metadata

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