Auto-display labels whenever possible

Translation is yet to be done...
yuki24 · Jul 6, 2022 · c1e3a95 · c1e3a95
1 parent 1f38be7
commit c1e3a95
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/app/helpers/shoelace/form_helper.rb b/app/helpers/shoelace/form_helper.rb
@@ -201,7 +201,7 @@ def color_field(method, **options)
       alias color_picker color_field
 
       def range_field(method, **options)
-        ShoelaceRange.new(object_name, method, @template, options.with_defaults(object: @object)).render
+        ShoelaceRange.new(object_name, method, @template, options.with_defaults(object: @object, label: method.to_s.humanize)).render
       end
       alias range range_field
 
@@ -211,19 +211,19 @@ def switch_field(method, **options, &block)
       alias switch switch_field
 
       def text_area(method, **options, &block)
-        ShoelaceTextArea.new(object_name, method, @template, options.with_defaults(object: @object, resize: 'auto')).render(&block)
+        ShoelaceTextArea.new(object_name, method, @template, options.with_defaults(object: @object, label: method.to_s.humanize, resize: 'auto')).render(&block)
       end
 
       def check_box(method, options = {}, checked_value = "1", unchecked_value = "0", &block)
         ShoelaceCheckBox.new(object_name, method, @template, checked_value, unchecked_value, options.merge(object: @object)).render(&block)
       end
 
       def select(method, choices = nil, options = {}, html_options = {}, &block)
-        ShoelaceSelect.new(object_name, method, @template, choices, options.with_defaults(object: @object), html_options, &block).render
+        ShoelaceSelect.new(object_name, method, @template, choices, options.with_defaults(object: @object, label: method.to_s.humanize), html_options, &block).render
       end
 
       def collection_select(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
-        ShoelaceCollectionSelect.new(object_name, method, @template, collection, value_method, text_method, options.with_defaults(object: @object), html_options, &block).render
+        ShoelaceCollectionSelect.new(object_name, method, @template, collection, value_method, text_method, options.with_defaults(object: @object, label: method.to_s.humanize), html_options, &block).render
       end
 
       def collection_radio_buttons(method, collection, value_method, text_method, options = {}, html_options = {}, &block)

diff --git a/test/helpers/form_helper_test.rb b/test/helpers/form_helper_test.rb
@@ -163,6 +163,14 @@ class FormHelperTest < ActionView::TestCase
   test "#range_field" do
     sl_form_for(User.new, url: "/") do |form|
       assert_dom_equal <<~HTML, form.range_field(:name)
+        <sl-range label="Name" name="user[name]" id="user_name"></sl-range>
+      HTML
+    end
+  end
+
+  test "#range_field without a label" do
+    sl_form_for(User.new, url: "/") do |form|
+      assert_dom_equal <<~HTML, form.range_field(:name, label: nil)
         <sl-range name="user[name]" id="user_name"></sl-range>
       HTML
     end
@@ -179,6 +187,14 @@ class FormHelperTest < ActionView::TestCase
   test "#text_area" do
     sl_form_for(User.new, url: "/") do |form|
       assert_dom_equal <<~HTML, form.text_area(:name)
+        <sl-textarea label="Name" resize="auto" name="user[name]" id="user_name"></sl-textarea>
+      HTML
+    end
+  end
+
+  test "#text_area without a label" do
+    sl_form_for(User.new, url: "/") do |form|
+      assert_dom_equal <<~HTML, form.text_area(:name, label: nil)
         <sl-textarea resize="auto" name="user[name]" id="user_name"></sl-textarea>
       HTML
     end
@@ -187,7 +203,7 @@ class FormHelperTest < ActionView::TestCase
   test "#text_area with a block" do
     sl_form_for(User.new, url: "/") do |form|
       expected = <<~HTML
-        <sl-textarea resize="auto" name="user[name]" id="user_name">
+        <sl-textarea label="Name" resize="auto" name="user[name]" id="user_name">
           <div slot="help-text">Name can not be blank.</div>
         </sl-textarea>
       HTML