anchor_view_components 0.45.0 → 0.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02e14b9cbe3088a320100d337b3f23f92c97e03f659bd16d42ac21655838cc07
-  data.tar.gz: 4323338bfdedf4ed58101ee366bd21726bc1f3d910d7c824a3bc8eae5ff93d59
+  metadata.gz: e70ad5e5ff2eb34b41352d913159bfa0baae9417393ce24007ef061a7eae1c8a
+  data.tar.gz: 4245d65fc162e270dc8d4711b17159d1ef271eb8b283c6d75ed4d59b77faf1cf
 SHA512:
-  metadata.gz: 2c89ce43a18e3072e0a24d30ac43a4f489cfeea27c318dff78d4f02769c8c2418f1d179b2a71158eb44bc680cf1bd4b2f7d7cde0fe93948b2e2a55c523b7b645
-  data.tar.gz: 35f880936914bd255eec0d3cc77f95352aef81b0dbe60feaada58877100e3c2b45468cd61fe6c0b471bf9836f0055aaff74fa16803cfccf7bfd917fab36542b3
+  metadata.gz: 383e4c7e44d61c1346d192fbe0fb6362b112b97854f87a98f7ea506ea2a5cd9449c68c4d80cd77020d2ad950d69e652e81b9b46980fb5cdc8c8a2c9c484bb485
+  data.tar.gz: cff07e92d9e67bb1d8228eea11d950cbef4420505c6f349203d3bcd3dd98c9d80ac7a0cd51f80980da60aadf1403fd797d5bc9420e2555ae12592c094ba080ce

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.45.1
+
+### Patch Changes
+
+- 73f1bd0: Reverted commit b050620b45f0ef6e73cfae2d2fe106c4831e7587, which was causing issues with some forms in the BuoyRails app.
+
 ## 0.45.0
 
 ### Minor Changes

data/app/components/anchor/autocomplete_component.html.erb

@@ -1,25 +1,25 @@
-<%= tag.div(**merge_options(wrapper_options,
+<%= tag.div(
   data: { controller: "autocomplete", autocomplete_url_value: src },
   role: "combobox",
   class: "group relative"
-)) do %>
+) do %>
   <% if form_builder.class.module_parent_name == "Anchor" %>
     <%= form_builder.text_field(
       name,
       **merge_options(input_options, default_input_options)
     ) %>
     <%= form_builder.text_field(
-      :"#{name}_id",
+      "#{name}_id".to_sym,
       { class: "hidden", data: { autocomplete_target: "hidden" }}
     ) %>
   <% else %>
     <%= form_builder.input(
-      :"#{name}_search",
+      "#{name}_search".to_sym,
       input_html: merge_options(input_options, default_input_options)
     ) %>
     <div class="hidden">
       <%= form_builder.input(
-        :"#{name}_id",
+        "#{name}_id".to_sym,
         input_html: { data: { autocomplete_target: "hidden" } }
       ) %>
     </div>

data/app/components/anchor/error_message_component.rb

@@ -13,8 +13,8 @@ module Anchor
       text-sm
     ).freeze
 
-    def initialize(object:, attribute:, **kwargs)
-      @object = object
+    def initialize(form_builder:, attribute:, **kwargs)
+      @form_builder = form_builder
       @attribute = attribute
 
       super(**kwargs)
@@ -22,14 +22,16 @@ module Anchor
 
     private
 
-    attr_reader :attribute
+    attr_reader :attribute, :form_builder
+
+    delegate :object, to: :form_builder
 
     def error_message
-      @object.errors.full_messages_for(attribute).to_sentence
+      object.errors.full_messages_for(attribute).to_sentence
     end
 
     def render?
-      @object.errors.has_key?(attribute)
+      object.errors.has_key?(attribute)
     end
   end
 end

data/app/components/anchor/input_component.rb

@@ -20,19 +20,23 @@ module Anchor
     ).freeze
 
     def initialize(
+      form_builder:,
       attribute:,
+      type:,
       starting_icon: nil,
       ending_icon: nil,
       **kwargs
     )
+      @form_builder = form_builder
       @attribute = attribute
+      @type = type
       @starting_icon = starting_icon
       @ending_icon = ending_icon
 
       super(**kwargs)
     end
 
-    attr_reader :attribute, :starting_icon, :ending_icon
+    attr_reader :attribute, :type, :starting_icon, :ending_icon
 
     def options
       {

data/app/components/anchor/label_component.rb

@@ -8,10 +8,14 @@ module Anchor
 
     attr_accessor :options
 
-    def initialize(object:, attribute:, required: nil)
-      @options = { class: LABEL_CLASSES }
+    def initialize(form_builder:, attribute:, **options)
+      @form_builder = form_builder
+      @attribute = attribute
+      @options = options.merge(
+        class: Array(options.delete(:class)) + LABEL_CLASSES
+      )
       @required = ModelValidators
-        .new(object, required:)
+        .new(@form_builder.object, options)
         .attribute_required?(attribute)
 
       super()

data/app/components/anchor/radio_button_collection_component.rb

@@ -1,7 +1,40 @@
 module Anchor
   class RadioButtonCollectionComponent < Component
+    attr_reader :attribute, :descriptions, :form_builder
+
+    def initialize(
+      form_builder:,
+      attribute:,
+      collection:,
+      value_method:,
+      text_method:,
+      descriptions: nil,
+      **options
+    )
+      @form_builder = form_builder
+      @attribute = attribute
+      @collection = collection
+      @value_method = value_method
+      @text_method = text_method
+      @descriptions = descriptions
+      @options = options
+
+      super()
+    end
+
     def options
-      { class: RadioButtonComponent::INPUT_CLASSES }
+      @options.merge(
+        class: Array(@options.delete(:class)) +
+          RadioButtonComponent::INPUT_CLASSES
+      )
+    end
+
+    def radio(radio:)
+      RadioButtonComponent.new(
+        radio:,
+        attribute:,
+        form_builder:
+      )
     end
   end
 end

data/app/components/anchor/radio_button_component.html.erb

@@ -5,7 +5,7 @@
   <% if description.present? %>
     <div class="flex flex-col gap-1">
       <%= radio.label %>
-      <%= tag.span description, id: description_id, class: DESCRIPTION_CLASSES %>
+      <%= description_span %>
     </div>
   <% else %>
     <%= tag.div radio.label, class: "self-center" %>

data/app/components/anchor/radio_button_component.rb

@@ -36,20 +36,24 @@ module Anchor
       text-sm
     ).freeze
 
-    def initialize(form_builder:, radio:, attribute:, **kwargs)
-      @form_builder = form_builder
+    def initialize(radio:, attribute:, form_builder:, **kwargs)
       @radio = radio
       @attribute = attribute
+      @form_builder = form_builder
 
       super(**kwargs)
     end
 
     private
 
-    attr_reader :form_builder, :radio, :attribute
+    attr_reader :radio, :attribute, :form_builder
 
     delegate :value, :object, to: :radio
 
+    def description_span
+      tag.span description, id: description_id, class: DESCRIPTION_CLASSES
+    end
+
     def radio_options
       {
         aria: description.present? && aria_description,

data/app/components/anchor/select_component.rb

@@ -1,11 +1,15 @@
 module Anchor
   class SelectComponent < Component
+    attr_reader :attribute
+
     def initialize(
+      form_builder:,
       attribute:,
       choices:,
       show_marker: true,
       **kwargs
     )
+      @form_builder = form_builder
       @attribute = attribute
       @choices = choices
       @show_marker = show_marker
@@ -20,7 +24,7 @@ module Anchor
     def html_options
       {
         class: InputComponent::INPUT_CLASSES,
-        data: { testid: "select-#{@attribute.to_s.dasherize}" },
+        data: { testid: "select-#{attribute.to_s.dasherize}" },
       }
     end
 

data/app/helpers/anchor/form_builder.rb

@@ -32,7 +32,15 @@ module Anchor
       options = {},
       html_options = {}
     )
-      render RadioButtonCollectionComponent.new do |component|
+      render RadioButtonCollectionComponent.new(
+        form_builder: self,
+        attribute:,
+        collection:,
+        value_method:,
+        text_method:,
+        **options,
+        **html_options
+      ) do |component|
         super(
           attribute,
           collection,
@@ -41,11 +49,7 @@ module Anchor
           options,
           component.options.merge(html_options),
         ) do |radio|
-          render RadioButtonComponent.new(
-            radio:,
-            attribute:,
-            form_builder: self
-          )
+          render component.radio(radio:)
         end
       end
     end
@@ -82,7 +86,9 @@ module Anchor
 
     def email_field(attribute, options = {})
       render InputComponent.new(
+        form_builder: self,
         attribute:,
+        type: :email,
         starting_icon: options.delete(:starting_icon),
         ending_icon: options.delete(:ending_icon)
       ) do |component|
@@ -92,7 +98,7 @@ module Anchor
 
     def error_message_for(attribute, options = {})
       render ErrorMessageComponent.new(
-        object:,
+        form_builder: self,
         attribute:,
         **options
       )
@@ -100,9 +106,10 @@ module Anchor
 
     def label(attribute, text = nil, options = {}, &block)
       render LabelComponent.new(
-        object:,
+        form_builder: self,
         attribute:,
-        required: options.delete(:required) { :if_has_validators }
+        text:,
+        **options
       ) do |component|
         if block.present?
           super
@@ -119,7 +126,9 @@ module Anchor
 
     def number_field(attribute, options = {})
       render InputComponent.new(
+        form_builder: self,
         attribute:,
+        type: :number,
         starting_icon: options.delete(:starting_icon),
         ending_icon: options.delete(:ending_icon)
       ) do |component|
@@ -129,7 +138,9 @@ module Anchor
 
     def search_field(attribute, options = {})
       render InputComponent.new(
+        form_builder: self,
         attribute:,
+        type: :search,
         starting_icon: options.delete(:starting_icon),
         ending_icon: options.delete(:ending_icon)
       ) do |component|
@@ -139,6 +150,7 @@ module Anchor
 
     def select(attribute, choices = nil, options = {}, html_options = {}, &)
       render SelectComponent.new(
+        form_builder: self,
         attribute:,
         choices:,
         show_marker: options.fetch(:show_marker, true),
@@ -156,7 +168,9 @@ module Anchor
 
     def text_field(attribute, options = {})
       render InputComponent.new(
+        form_builder: self,
         attribute:,
+        type: :text,
         starting_icon: options.delete(:starting_icon),
         ending_icon: options.delete(:ending_icon)
       ) do |component|

data/app/helpers/anchor/model_validators.rb

@@ -1,18 +1,13 @@
 module Anchor
   class ModelValidators
-    # Pass the value :if_has_validators to the required keyword argument to
-    # indicate an unspecified value. Passing any other value will result in
-    # `required`'s truthiness being used to determine whether the attribute is
-    # required, while passing :if_has_validators will check the model's
-    # validators.
-    def initialize(model, required: :if_has_validators)
+    def initialize(model, options)
       @model = model
-      @required = required
+      @options = options
     end
 
     def attribute_required?(attribute)
-      if required != :if_has_validators
-        required
+      if options.has_key?(:required)
+        options[:required]
       elsif has_validators?
         attribute_required_by_validators?(attribute)
       else
@@ -22,7 +17,7 @@ module Anchor
 
     private
 
-    attr_reader :model, :required
+    attr_reader :model, :options
 
     def has_validators?
       model.class.respond_to?(:validators_on)

data/lib/anchor/view_components/version.rb

@@ -1,5 +1,5 @@
 module Anchor
   module ViewComponents
-    VERSION = "0.45.0".freeze
+    VERSION = "0.45.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anchor_view_components
 version: !ruby/object:Gem::Version
-  version: 0.45.0
+  version: 0.45.1
 platform: ruby
 authors:
 - Buoy Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails