satis 2.1.62 → 2.1.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2140ef631e3f79034be38c47c204c5261cd8045a4da09bfa781002d2ed858a0
-  data.tar.gz: 875613115ccdea9a294c08f6bba283316a4fb2ea4b5300a538bd20506b971b8a
+  metadata.gz: ff21f5583a4c95286eabbc1c46ce61ccd07c2f0a502cb91f2c2974f724f778c7
+  data.tar.gz: ec24f62f291123c431ab91b5bb0d22cfe99aa50f168bdfac5dc6ad9948fd30bd
 SHA512:
-  metadata.gz: b860a1fcdaa917ba2626db31bc06026fb41ef621439cc96b3ba17010f84ce8f7834370fefbd79ea1bf278d28c583db54d4cbfcabc10698da72cb253dafe28a0a
-  data.tar.gz: 7c7aa7776086015f8aa60757473f832fe946d7a982e94c40d3f3fd635c157624c0787fc37747203c6fa2494987918f7691ed638b2efeada2f5df108d69dc5c98
+  metadata.gz: 34a0a9515ee8979f88e5e91ee447b2b598d7aac2e1b5f143403c43288ec215e8c00065864fdc1166d51ddf3da129a2ba87994d0f3be3edf1d2b4fa5885c9a895
+  data.tar.gz: 2ac93fca741cad0c6f06a8cb5570fafd17f28ef0e5ee7ca7862372631d53653bdb5cb934b5a6f1cf0057b41f15dc1de25cd595c747c03476a37859de04105d1d

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

@@ -1,7 +1,7 @@
 div.satis-date-time-picker data-controller="satis-date-time-picker" data-satis-date-time-picker-time-picker-value=time_picker.to_s data-satis-date-time-picker-clearable-value=clearable.to_s data-satis-date-time-picker-locale-value="" data-satis-date-time-picker-range-value=range.to_s data-satis-date-time-picker-multiple-value=multiple.to_s data-satis-date-time-picker-week-start-value=week_start data-satis-date-time-picker-inline-value=inline.to_s data-satis-date-time-picker-format-value=JSON.dump(format)
   .relative.flex.items-center
     = form.text_field attribute, options[:input_html].merge(class: 'hidden')
-    input.form-control data-action="focus->satis-date-time-picker#showCalendar input->satis-date-time-picker#dateTimeEntered" data-satis-date-time-picker-target="input" type="text"
+    input.form-control class=input_class data-action="focus->satis-date-time-picker#showCalendar input->satis-date-time-picker#dateTimeEntered" data-satis-date-time-picker-target="input" type="text"
     .absolute.inset-y-0.right-0.flex.py-1.5.pr-1.5
       button.cursor-pointer.w-6.h-full.flex.items-center.text-gray-400.outline-none.focus:outline-none data-satis-date-time-picker-target="clearButton" data-action="click->satis-date-time-picker#clear"
         i.fas.fa-xmark

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

@@ -43,6 +43,10 @@ module Satis
       def week_start
         Date::DAYS_INTO_WEEK[Date.beginning_of_week] || 1
       end
+
+      def input_class
+        [@options.fetch(:input_html, {}).fetch(:class, ""), form.has_error?(attribute) ? "is-invalid" : ""].join(" ")
+      end
     end
   end
 end

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

@@ -26,7 +26,8 @@ export default class DropdownComponentController extends ApplicationController {
     pageSize: Number,
     url: String,
     urlParams: Object,
-    isMultiple: Boolean
+    isMultiple: Boolean,
+    minSearchQueryLength: Number
   }
 
   connect() {
@@ -48,8 +49,6 @@ export default class DropdownComponentController extends ApplicationController {
     // To remember what the last search was we did
     this.searchQueryValue = null
     this.lastSearch = null
-    this.minSearchQueryLength = 2
-
     // To remember what the last options were we got from the server to prevent unnecessary refreshes
     // and unexpected events
     this.lastServerRefreshOptions = new Set()
@@ -241,8 +240,8 @@ export default class DropdownComponentController extends ApplicationController {
   search(event) {
     this.searchQueryValue = this.searchInputTarget.value
 
-    if(this.searchInputTarget.value.length === 0 && !this.isMultipleValue){
-      if(this.nrOfItems === 1) this.lowLightSelected();
+    if (this.searchInputTarget.value.length === 0 && !this.isMultipleValue) {
+      if (this.nrOfItems === 1) this.lowLightSelected()
       this.hiddenSelectTarget.innerHTML = ""
       this.hiddenSelectTarget.add(this.createOption())
     }
@@ -279,7 +278,7 @@ export default class DropdownComponentController extends ApplicationController {
     this.lastPage = null
     this.endPage = null
 
-    this.lowLightSelected();
+    this.lowLightSelected()
     this.selectedIndex = -1
 
     if (this.hasUrlValue) {
@@ -421,9 +420,9 @@ export default class DropdownComponentController extends ApplicationController {
     } else {
       this.filterResultsChainTo()
 
-      if(this.hasResults && !this.searchQueryChanged){
+      if (this.hasResults && !this.searchQueryChanged) {
         this.showResultsList(event)
-      }else {
+      } else {
         if (this.hasUrlValue)
           this.fetchResults(event)
         else
@@ -492,7 +491,7 @@ export default class DropdownComponentController extends ApplicationController {
 
   localResults(event) {
     if (!this.searchQueryChanged) {
-      if(!this.resultsShown) {
+      if (!this.resultsShown) {
         if (this.hasResults)
           this.showResultsList(event)
         else this.showSelectedItem()
@@ -511,7 +510,7 @@ export default class DropdownComponentController extends ApplicationController {
       } else {
         previouslyVisibleItemsCount++
       }
-    });
+    })
 
     this.filterResultsChainTo()
 
@@ -520,7 +519,7 @@ export default class DropdownComponentController extends ApplicationController {
     let matches = []
     this.itemTargets.forEach((item) => {
       const text = item.getAttribute("data-satis-dropdown-item-text")
-      const matched = this.needsExactMatchValue ? searchValue.localeCompare(text, undefined, {sensitivity: 'base'}) === 0 : text.toLowerCase().includes(searchValue.toLowerCase())
+      const matched = this.needsExactMatchValue ? searchValue.localeCompare(text, undefined, { sensitivity: 'base' }) === 0 : text.toLowerCase().includes(searchValue.toLowerCase())
 
       const isHidden = item.classList.contains("hidden")
       if (!isHidden) {
@@ -541,9 +540,9 @@ export default class DropdownComponentController extends ApplicationController {
     }
 
     // auto select if there is only one match and we are not in freetext mode
-    if(!this.freeTextValue) {
+    if (!this.freeTextValue) {
       if (matches.length === 1) {
-        if (this.filteredSearchQuery.length >= this.minSearchQueryLength &&
+        if (this.filteredSearchQuery.length >= this.minSearchQueryLengthValue &&
           matches[0].getAttribute("data-satis-dropdown-item-text").toLowerCase().indexOf(this.lastSearch.toLowerCase()) >= 0) {
           const dataDiv = matches[0].closest('[data-satis-dropdown-target="item"]')
           this.selectItem(dataDiv)
@@ -553,7 +552,7 @@ export default class DropdownComponentController extends ApplicationController {
           this.showSelectedItem()
         }
         // the selected item if there was only 1 item visible before
-      } else if(previouslyVisibleItemsCount === 1 && matches.length > 1) {
+      } else if (previouslyVisibleItemsCount === 1 && matches.length > 1) {
         this.setSelectedItem()
       }
     }
@@ -569,7 +568,7 @@ export default class DropdownComponentController extends ApplicationController {
           (this.currentPage == this.lastPage || this.currentPage == this.endPage)) ||
         !this.hasUrlValue
       ) {
-        if(!this.resultsShown) {
+        if (!this.resultsShown) {
           if (this.hasResults)
             this.showResultsList(event)
           else this.showSelectedItem()
@@ -608,19 +607,23 @@ export default class DropdownComponentController extends ApplicationController {
           }
 
           // auto select when there is only 1 value
-          if (this.filteredSearchQuery.length >= this.minSearchQueryLength && this.nrOfItems === 1 && !this.freeTextValue) {
+          if (this.filteredSearchQuery.length >= this.minSearchQueryLengthValue && this.nrOfItems === 1 && !this.freeTextValue) {
             const dataDiv = this.itemTargets[0].closest('[data-satis-dropdown-target="item"]')
             this.selectItem(dataDiv)
             this.setSelectedItem(dataDiv.getAttribute("data-satis-dropdown-item-value"))
             this.searchQueryValue = ""
-          } else if(this.searchQueryValue?.length > 0) {
+          } else if (this.searchQueryValue?.length > 0) {
             // hide all items that don't match the search query
             const searchValue = this.searchQueryValue
             let matches = []
             this.itemTargets.forEach((item) => {
               const text = item.getAttribute("data-satis-dropdown-item-text")
-              const matched = this.needsExactMatchValue
-                ? searchValue.localeCompare(text, undefined, { sensitivity: "base" }) === 0 : text.toLowerCase().includes(searchValue.toLowerCase())
+              let matched
+              if (this.needsExactMatchValue) {
+                matched = searchValue.localeCompare(text, undefined, { sensitivity: "base" }) === 0
+              } else {
+                matched = searchValue.split(" ").every((term) => { return text?.toLowerCase().includes(term.toLowerCase()) })
+              }
 
               const isHidden = item.classList.contains("hidden")
               if (!isHidden) {
@@ -688,8 +691,8 @@ export default class DropdownComponentController extends ApplicationController {
     return promise
   }
 
-  get filteredSearchQuery(){
-    if(this.searchQueryValue < this.minSearchQueryLength) return ""
+  get filteredSearchQuery() {
+    if (this.searchQueryValue < this.minSearchQueryLengthValue) return ""
     return this.searchQueryValue
   }
 
@@ -866,9 +869,9 @@ export default class DropdownComponentController extends ApplicationController {
       this.selectedIndex = -1
       return
     }
-    const itemTargets = this.itemTargets;
-    const visibleItems = itemTargets.filter(item => !item.classList.contains("hidden"));
-    this.selectedIndex = visibleItems.findIndex(item => item.getAttribute("data-satis-dropdown-item-value") === value);
+    const itemTargets = this.itemTargets
+    const visibleItems = itemTargets.filter(item => !item.classList.contains("hidden"))
+    this.selectedIndex = visibleItems.findIndex(item => item.getAttribute("data-satis-dropdown-item-value") === value)
     this.highLightSelected()
   }
 
@@ -884,9 +887,9 @@ export default class DropdownComponentController extends ApplicationController {
     this.highLightSelected()
   }
   validateSearchQuery() {
-    const trimmedValue = this.searchInputTarget.value.trim();
-    const elements = this.selectedItemsTemplateTarget.content.querySelectorAll(`[data-satis-dropdown-item-text*="${trimmedValue}"]`);
-    const selected = Array.from(elements).find(element => element.getAttribute('data-satis-dropdown-item-text').trim() === trimmedValue);
+    const trimmedValue = this.searchInputTarget.value.trim()
+    const elements = this.selectedItemsTemplateTarget.content.querySelectorAll(`[data-satis-dropdown-item-text*="${trimmedValue}"]`)
+    const selected = Array.from(elements).find(element => element.getAttribute('data-satis-dropdown-item-text').trim() === trimmedValue)
     if (!selected && this.searchInputTarget.value.length > 0 && !this.freeTextValue) {
       this.searchInputTarget.closest(".sts-dropdown").classList.toggle("warning", true)
     } else {
@@ -955,13 +958,13 @@ export default class DropdownComponentController extends ApplicationController {
   }
 
   get hasFocus() {
-    const activeElement = document.activeElement;
+    const activeElement = document.activeElement
     if (activeElement === this.element ||
       this.element.contains(activeElement) ||
       this.element.querySelector(':focus') !== null) {
-      return true;
+      return true
     }
-    return false;
+    return false
   }
 
   // Selected items are being cached in selectItemsTemplate. Sometimes we want to show the selected item in the results list
@@ -971,7 +974,7 @@ export default class DropdownComponentController extends ApplicationController {
       || this.freeTextValue
       || this.hiddenSelectTarget.options.length === 0
       || !this.hasFocus
-    ) return false;
+    ) return false
 
     const option = this.hiddenSelectTarget.options[0]
     let item = this.itemsTarget.querySelector(`[data-satis-dropdown-item-value="${option.value}"]`)
@@ -988,12 +991,12 @@ export default class DropdownComponentController extends ApplicationController {
       }
     }
 
-    if(item) {
+    if (item) {
       if (!this.resultsShown)
         this.showResultsList()
       this.setSelectedItem(option.value)
     }
 
-    return item != null;
+    return item != null
   }
 }

data/lib/satis/version.rb

@@ -1,3 +1,3 @@
 module Satis
-  VERSION = "2.1.62"
+  VERSION = "2.1.64"
 end

metadata

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