fixing form components

Author: jonasjabari

app/concepts/matestack/ui/bootstrap/form/select.rb

@@ -6,20 +6,10 @@ class Matestack::Ui::Bootstrap::Form::Select < Matestack::Ui::Core::Form::Select
   optional :size
   optional :form_text
 
-  # %select{ html_attributes.merge(vue_attributes) }
-  #   - if placeholder
-  #     %option{value: placeholder_value, disabled: true, selected: init_value.nil?}= placeholder
-  #   - select_options.to_a.each do |item|
-  #     %option{value: item_value(item), disabled: item_disabled(item)}= item_label(item)
-  # = render_errors
-  # - if form_text
-  #   = render_form_text
-
   def response
     div class: "matestack-ui-bootstrap-form-select" do
       label for: attr_key,  class: "form-label", text: input_label if input_label
-      # id is missing!
-      select select_attributes.merge({ class: form_select_class, size: size_class }) do
+      select select_attributes.merge({ id: (options[:id] || attr_key), class: form_select_class, size: size_class }) do
         render_options
       end
       render_errors
@@ -42,26 +32,6 @@ def size_class
     size
   end
 
-  # def determine_init_value
-  #   if init_value
-  #     init_value
-  #   else
-  #     if multiple
-  #       []
-  #     else
-  #       nil
-  #     end
-  #   end
-  # end
-  #
-  # def placeholder_value
-  #   if multiple
-  #     '[]'
-  #   else
-  #     'null'
-  #   end
-  # end
-
   def render_errors
     unless @included_config[:errors] == false && (errors == false || errors.nil?) || errors == false
       div class: 'invalid-feedback', attributes: { 'v-for': "error in #{error_key}" } do

app/concepts/matestack/ui/bootstrap/form/submit.rb

@@ -11,7 +11,7 @@ def response
       bs_btn type: "submit", size: options[:size], class: "#{options[:class]}", variant: button_variant || :primary, attributes: { "v-if": "!loading()" } do
         plain text || "Submit"
       end
-      bs_btn type: "submit", size: options[:size], class: "#{loading_class}", variant: button_variant || :primary, attributes: { disabled: true, "v-if": "loading()" } do
+      bs_btn type: "submit", size: options[:size], class: "#{options[:class]} #{loading_class}", variant: button_variant || :primary, attributes: { disabled: true, "v-if": "loading()" } do
         bs_spinner variant: spinner_variant || :light, size: :sm
         plain loading_text || "Loading..."
       end

docs/api/form/README.md

@@ -20,6 +20,10 @@ Renders a Bootstrap button that acts as a form submit trigger.
 
 * `size` - Expects a symbol that defines the Bootstrap button size
 
+* `class` - Additional custom CSS class applied to button
+
+* `loading_class` - Additional custom CSS class applied to button during submission
+
 ## Examples
 
 ### Example 1: Basic usage without any configuration
@@ -45,8 +49,8 @@ bs_form_submit button_variant: :light, spinner_variant: :dark
 bs_form_submit size: :lg
 ```
 
-### Example 5: Non-default text, loading_text, button_variant, spinner_variant, size plus additional, custom class & class_loading
+### Example 5: Non-default text, loading_text, button_variant, spinner_variant, size plus additional, custom class & loading_class
 
 ```ruby
-bs_form_submit button_variant: :light, spinner_variant: :dark, class: "custom-submit", class_loading: "custom-submit-loading", size: :lg, text: "Submit!!", loading_text: "Getting submitted"
+bs_form_submit button_variant: :light, spinner_variant: :dark, class: "custom-submit", loading_class: "custom-submit-loading", size: :lg, text: "Submit!!", loading_text: "Getting submitted"
 ```