satis 2.1.60 → 2.1.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9726463882df1d5b1d5e74c2b4f7800df64ca8ffae1b111d441500621686ba99
-  data.tar.gz: eda32cc883571354849bb912f7881a33020b93f58659a5794bf1982ffdd6d164
+  metadata.gz: 061bf1edddfde525ee223cd979a02df4d7fd1b7d3692d5618625c71db7181903
+  data.tar.gz: 95da7c206c9d6c5a652b7104619381aac17cc7817b30fb27093eaf09df4f541f
 SHA512:
-  metadata.gz: 838731d4216a2021639364a4584001243cad0038225ea38b40583588832af02e2dd3e8ccf3f779c0dd3a0b769913ebb886293a7004b320ae0be344c73b56450d
-  data.tar.gz: eaee6844cec69481c2388da70e32a31f24eda1ebdc51b7bfe95db173fa6c7b31b61ed1f9cc7da14e5dc95b42afbaaa4d582188c9404285c7166d0b0c1862bd38
+  metadata.gz: a32a57d5bfc6b3d42e81e53928d07d498e3ea115b11c4d573bb55f9d4dc436905d8c2ec7b0233445668df74b4353f238b5226f6f358bfcc727bb8019f520b423
+  data.tar.gz: 5c85fbbf5858d795f988561a171bf5b668b9aa63d0fd3ba96566727f059e7083c72d5405eec08f902fd7d3d9d35e2c469f0fbab1bf974b21ca306d85c89a2c83

data/app/assets/stylesheets/satis/components/form.css

@@ -62,6 +62,8 @@ form {
   input.is-invalid,
   select.is-invalid {
     @apply border-red-300 dark:border-red-500 text-red-900 placeholder-red-300 focus:outline-none focus:ring-red-500 focus:border-red-500;
+    border: 1px solid red;
+    border-radius: 0.375rem;
   }
 
   input[type="checkbox"].custom-control-input {

data/app/components/satis/dropdown/component.css

@@ -31,7 +31,7 @@
 }
 
 .topbar .satis-dropdown .sts-dropdown{
-  @apply bg-white dark:bg-gray-900 outline dark:outline-none outline-gray-200 outline-1 rounded-md shadow-none shadow-md;
+  @apply bg-white dark:bg-gray-900 outline dark:outline-none outline-gray-200 outline-1 rounded-md shadow-none;
 }
 
 .page_body .satis-dropdown .sts-dropdown{

data/app/components/satis/dropdown/component.html.slim

@@ -12,7 +12,7 @@ div.satis-dropdown data-action="keydown->satis-dropdown#dispatch" data-controlle
         .h-12.p-1.flex.rounded
           .flex.flex-auto.flex-wrap.sts-dropdown-input
             / Input where you can search
-            input.focus:ring-0.border-none.p-1.px-2.appearance-none.w-full.sts-dropdown-input.text-gray-800.dark:text-gray-300 data-action="input->satis-dropdown#search" data-satis-dropdown-target="searchInput" placeholder=placeholder autofocus=options[:autofocus]
+            input.focus:ring-0.border-none.p-1.px-2.appearance-none.w-full.sts-dropdown-input.text-gray-800.dark:text-gray-300 class=input_class data-action="input->satis-dropdown#search" data-satis-dropdown-target="searchInput" placeholder=placeholder autofocus=options[:autofocus]
           div
             / Reset button
             - unless @reset_button == false

data/app/components/satis/dropdown/component.rb

@@ -31,11 +31,11 @@ module Satis
 
         unless options[:input_html]["data-reflex"]
           actions = [options[:input_html]["data-action"], "change->satis-dropdown#display",
-                     "focus->satis-dropdown#focus"].join(" ")
+            "focus->satis-dropdown#focus"].join(" ")
         end
 
         options[:input_html].merge!("data-satis-dropdown-target" => "hiddenSelect",
-                                    "data-action" => actions)
+          "data-action" => actions)
 
         @block = block
         @page_size = options[:page_size] || 25
@@ -57,7 +57,7 @@ module Satis
         return [[]] unless obj
 
         if obj.is_a?(Array)
-          obj.filter_map {|item| option_value(item) }
+          obj.filter_map { |item| option_value(item) }
         else
           [option_value(obj)]
         end
@@ -69,10 +69,10 @@ module Satis
         if item.respond_to?(:id)
           value = item.send(:id)
           text = if item.respond_to?(:name)
-                    item.send(:name)
-                 else
-                    ""
-                 end
+            item.send(:name)
+          else
+            ""
+          end
         elsif item.is_a?(Array)
           value = item.first
           text = item.second
@@ -109,6 +109,10 @@ module Satis
       def item_html(item)
         form.template.capture { @block.call(item) }
       end
+
+      def input_class
+        [@options.fetch(:input_html, {}).fetch(:class, ""), "sts-input__input", form.has_error?(attribute) ? "is-invalid" : ""].join(" ")
+      end
     end
   end
 end

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

@@ -12,8 +12,10 @@ export default class TabsComponentController extends ApplicationController {
 
     let firstErrorIndex
     this.tabTargets.forEach((tab, index) => {
-      let hasErrors = this.contentTargets[index].querySelectorAll(".is-invalid,.invalid-feedback")
-      if (hasErrors.length > 0) {
+      let hasErrors = this.contentTargets[index].querySelectorAll(".is-invalid")
+      let invalidText = this.contentTargets[index].querySelector('.invalid-feedback')
+
+      if ((hasErrors.length > 0) || (invalidText && invalidText.textContent.trim() !== "")) {
         if (!firstErrorIndex) {
           firstErrorIndex = index
         }

data/lib/satis/forms/builder.rb

@@ -115,10 +115,10 @@ module Satis
           #        ))
         else
           invalid_feedback = nil
-          if @object.errors.messages[name].present?
-            invalid_feedback = tag.div(@object.errors.messages[name].join(", "),
-              class: "invalid-feedback")
-          end
+          # if @object.errors.messages[name].present?
+          #   invalid_feedback = tag.div(@object.errors.messages[name].join(", "),
+          #     class: "invalid-feedback")
+          # end
           safe_join [
             invalid_feedback,
             rails_fields_for(*args, options, &block)

data/lib/satis/version.rb

@@ -1,3 +1,3 @@
 module Satis
-  VERSION = "2.1.60"
+  VERSION = "2.1.61"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satis
 version: !ruby/object:Gem::Version
-  version: 2.1.60
+  version: 2.1.61
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-07 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser