phlexi-form 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6b1a5926f08261bf0fa3c607395ddd570c52417636f559b7f11a87a46e8c06d
-  data.tar.gz: ca036dc0035a0161fe4a0411dddbff11d7b1edea529b266ac3b29b1caded91e5
+  metadata.gz: 6c0832db88c6c818befeb3eb29ab0c27cfd6283c6bb76356fe100d7b90cc4471
+  data.tar.gz: 1567a41dbfb954ab71c4f47625955d95253c0af56340fa250a6e82fb651f26ef
 SHA512:
-  metadata.gz: 94a54baa5507d3309efbf06dc8aa230ec8814be37fe7a99e72b294c9d3ed0528e90ea5f782b1333179a5fef8b3b244355b22f38b8bd4d98a661d40440adc52ad
-  data.tar.gz: bea9112fe8131a517381b1a2d4715b266b09fe82a608e96495366e43d4a565ae0bd60296e455118ad515ea41d795e49218a917367dcd3c7478fc88d2ce0cd1da
+  metadata.gz: 32645119292a9042dba8e9f8593377d8f75e58f02d423c47188331d43d695a6f950060aab0ed9b458bd6638c8b9d72b215e83d9ffc657ddbadb2f78d61bc8e71
+  data.tar.gz: 8dc3b74c1d8c856c7b06599bb82e0d15a1649aec515ec855533073e3c86ea8ace4c177220b35f0be1d60c558a400c403d8bbddcb6debde7c5f01d4966ad18774

data/lib/phlexi/form/builder.rb

@@ -256,16 +256,13 @@ module Phlexi
       protected
 
       def create_component(component_class, theme_key, **attributes, &)
-        theme_attributes = apply_component_theme(attributes, theme_key)
+        attributes = apply_component_theme(attributes, theme_key)
         # TODO: refactor all this type checking code such that, the concerns will perform these actions.
         # Basically, invert control so that the component asks for the extra attributes
         # or calls #has_file_input!
-        extra_attributes = if component_class.include?(Phlexi::Form::Components::Concerns::HandlesInput)
-          input_attributes
-        else
-          {}
+        if component_class.include?(Phlexi::Form::Components::Concerns::HandlesInput)
+          attributes = mix(input_attributes, attributes)
         end
-        attributes = mix(theme_attributes, extra_attributes, attributes)
         component = component_class.new(self, **attributes, &)
         if component_class.include?(Components::Concerns::ExtractsInput) 
           raise "input component already defined: #{@field_input_extractor.inspect}" if @field_input_extractor
@@ -278,10 +275,10 @@ module Phlexi
       end
 
       def apply_component_theme(attributes, theme_key)
-        return {} if attributes.key?(:class!)
+        return attributes if attributes.key?(:class!)
 
         theme_key = attributes.delete(:theme) || theme_key
-        {class: themed(theme_key, self)}
+        mix({class: themed(theme_key, self)}, attributes)
       end
 
       def determine_initial_value(value)

data/lib/phlexi/form/options/inferred_types.rb

@@ -7,7 +7,7 @@ module Phlexi
         private
 
         def infer_field_component
-          return :select if choices
+          return :select if inferred_field_type != :association && choices
           
           case inferred_field_type
           when :string, :text

data/lib/phlexi/form/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Form
-    VERSION = "0.5.2"
+    VERSION = "0.5.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-form
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex