hotwire_combobox 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8eaa849ad87e3edaaced39ab2cddddd2de2c4b57c112024c13706055df674eb
-  data.tar.gz: 9668cf95d8b4b6e994acd852ba6fbac8db3c491959ce40ed520479074d2d326a
+  metadata.gz: 99cf62ece0c5bf6182ab759cbab18c4f561c22215babfdf00eed7329f5797eb9
+  data.tar.gz: dcca7ddceca4e3b7f840716bf789b641d62ffaea589b9bf86da39e4445c6a9cf
 SHA512:
-  metadata.gz: f4f143a0aeafc3fcc7b6f76447ff464342cbffe40f59d55502cc619bcda27bcaba066cf4927a87cf1e551d563c84f0b1ef0bba90ab5d596c9d0e2b3bcfb9a37c
-  data.tar.gz: f0adeb1d14897243d9b87daa9a67f779765a1c59a9862113928f9b521959a824fafa955d9fe7580e0acef0c841c821ea377c4507208f6dc698adb1f53976a1d2
+  metadata.gz: fb5f896deae2dde8b36d91d7eaee8ec27abfd00b07a94d64c094d8da865e4cd2723c6349a9fe49296f8e20cde933ed698f2f64b1e65909ed1fca889517213773
+  data.tar.gz: 31ce6c44d91feb634fd16349ed0f89ab58975a3a6744f36c6f05f6ea207d6caa1317267b1892ae602b48daf5f4182a3908681c7746e05bd19ae9b489bcf9696b

data/app/assets/javascripts/controllers/combobox_controller.js

@@ -1,7 +1,7 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static classes = [ "selected" ]
+  static classes = [ "selected", "invalid" ]
   static targets = [ "combobox", "listbox", "valueField" ]
   static values = { expanded: Boolean, filterableAttribute: String, autocompletableAttribute: String }
 
@@ -16,12 +16,13 @@ export default class extends Controller {
   }
 
   close() {
+    this.commitSelection()
     this.expandedValue = false
   }
 
   selectOption(event) {
     this.select(event.currentTarget)
-    this.commitSelection()
+    this.close()
   }
 
   filter(event) {
@@ -76,14 +77,13 @@ export default class extends Controller {
       cancel(event)
     },
     Enter(event) {
-      this.commitSelection()
+      this.close()
       cancel(event)
     }
   }
 
   commitSelection() {
     this.select(this.selectedOptionElement, { force: true })
-    this.close()
   }
 
   expandedValueChanged() {
@@ -109,8 +109,17 @@ export default class extends Controller {
 
     if (option) {
       if (this.hasSelectedClass) option.classList.add(this.selectedClass)
+      if (this.hasInvalidClass) this.comboboxTarget.classList.remove(this.invalidClass)
+
       this.maybeAutocompleteWith(option, { force })
       this.executeSelect(option, { selected: true })
+    } else {
+      if (this.valueIsInvalid) {
+        if (this.hasInvalidClass) this.comboboxTarget.classList.add(this.invalidClass)
+
+        this.comboboxTarget.setAttribute("aria-invalid", true)
+        this.comboboxTarget.setAttribute("aria-errormessage", `Please select a valid option for ${this.comboboxTarget.name}`)
+      }
     }
   }
 
@@ -176,6 +185,11 @@ export default class extends Controller {
   get isOpen() {
     return this.expandedValue
   }
+
+  get valueIsInvalid() {
+    const isRequiredAndEmpty = this.comboboxTarget.required && !this.valueFieldTarget.value
+    return isRequiredAndEmpty
+  }
 }
 
 function applyFilter(query, { matching }) {

data/lib/combobox/version.rb

@@ -1,3 +1,3 @@
 module Combobox
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotwire_combobox
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jose Farias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-description: A combobox implementation for Ruby on Rails.
+description: A combobox implementation for Ruby on Rails apps running on Hotwire.
 email:
 - jose@farias.mx
 executables: []
@@ -62,7 +62,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/application.js
+- app/assets/javascripts/combobox_application.js
 - app/assets/javascripts/controllers/application.js
 - app/assets/javascripts/controllers/combobox_controller.js
 - app/assets/javascripts/controllers/index.js
@@ -97,5 +97,5 @@ requirements: []
 rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
-summary: A combobox implementation for Ruby on Rails
+summary: A combobox implementation for Ruby on Rails apps running on Hotwire
 test_files: []