Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/form_props/inputs/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
module FormProps
module Inputs
class Base < ::ActionView::Helpers::Tags::Base
# Remove when no longer supporting Rails 7
if ActionView::VERSION::STRING < "8"
alias_method :add_default_name_and_field_for_value, :add_default_name_and_id_for_value
alias_method :add_default_name_and_field, :add_default_name_and_id
end

def json
@json ||= @template_object.instance_variable_get(:@__json)
end
Expand All @@ -13,7 +19,7 @@ def initialize(object_name, method_name, template_object, options = {})
@controlled = options.delete(:controlled)
@key = options.delete(:key)

super(object_name, method_name, template_object, options)
super
end

private
Expand Down
4 changes: 2 additions & 2 deletions lib/form_props/inputs/check_box.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ def render(flatten = false)

body_block = -> {
if options[:multiple]
add_default_name_and_id_for_value(@checked_value, options)
add_default_name_and_field_for_value(@checked_value, options)
options.delete(:multiple)
else
add_default_name_and_id(options)
add_default_name_and_field(options)
end

input_props(options)
Expand Down
2 changes: 1 addition & 1 deletion lib/form_props/inputs/radio_button.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def render(flatten = false)
@options[:checked] = true if input_checked?(@options)

body_block = -> {
add_default_name_and_id_for_value(@tag_value, @options)
add_default_name_and_field_for_value(@tag_value, @options)
input_props(@options)
}

Expand Down
2 changes: 1 addition & 1 deletion lib/form_props/inputs/text_area.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class TextArea < Base

def render
json.set!(sanitized_key) do
add_default_name_and_id(@options)
add_default_name_and_field(@options)
@options[:type] ||= field_type
@options[:value] = @options.fetch(:value) { value_before_type_cast }

Expand Down
2 changes: 1 addition & 1 deletion lib/form_props/inputs/text_field.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def render
@options[:value] = @options.fetch(:value) { value_before_type_cast } unless field_type == "file"

json.set!(sanitized_key) do
add_default_name_and_id(@options)
add_default_name_and_field(@options)
input_props(@options)
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/form_props/select_renderer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def add_options(option_tags, options, value = nil)

def select_content_props(option_tags, options, html_options)
html_options = html_options.stringify_keys
add_default_name_and_id(html_options)
add_default_name_and_field(html_options)

if placeholder_required?(html_options)
raise ArgumentError, "include_blank cannot be false for a required field." if options[:include_blank] == false
Expand Down
Loading