ui_bibz 2.5.2 → 3.0.0.alpha3

data/lib/ui_bibz/ui/core/forms/buttons/button_refresh.rb

@@ -53,9 +53,6 @@ module UiBibz::Ui::Core::Forms::Buttons
     include ConnectExtension
 
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     def pre_render
       button_refresh_html_tag

data/lib/ui_bibz/ui/core/forms/buttons/components/button_group_dropdown.rb

@@ -58,9 +58,6 @@ module UiBibz::Ui::Core::Forms::Buttons
   #
   class ButtonGroupDropdown < UiBibz::Ui::Core::Forms::Dropdowns::Dropdown
     # See UiBibz::Ui::Core::Forms::Buttons::Button.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

data/lib/ui_bibz/ui/core/forms/buttons/components/button_group_split_dropdown.rb

@@ -58,9 +58,6 @@ module UiBibz::Ui::Core::Forms::Buttons
   #
   class ButtonGroupSplitDropdown < UiBibz::Ui::Core::Forms::Dropdowns::SplitDropdown
     # See UiBibz::Ui::Core::Forms::Buttons::Button.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

data/lib/ui_bibz/ui/core/forms/choices/box_switch_field.rb

@@ -47,9 +47,6 @@ module UiBibz::Ui::Core::Forms::Choices
   #
   class BoxSwitchField < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
@@ -91,7 +88,7 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # '', 'mini', 'small', 'normal', 'large'
     def size
-      add_html_data('size', matching_size[options[:size]]) unless options[:size].nil?
+      add_html_data('size', value: matching_size[options[:size]]) unless options[:size].nil?
     end
 
     def matching_size
@@ -100,7 +97,7 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # true, false => default : true
     def animate
-      add_html_data('animate', options.delete(:animate)) unless options[:animate].nil?
+      add_html_data('animate', value: options.delete(:animate)) unless options[:animate].nil?
     end
 
     # active, disabled => default : active
@@ -110,27 +107,27 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # 'primary', 'info', 'success', 'warning', 'danger', 'default' => default : default
     def left_color
-      add_html_data('on_color', options[:left_color]) unless options[:left_color].nil?
+      add_html_data('on_color', value: options[:left_color]) unless options[:left_color].nil?
     end
 
     # 'primary', 'info', 'success', 'warning', 'danger', 'default' => default : default
     def right_color
-      add_html_data('off_color', options[:right_color]) unless options[:right_color].nil?
+      add_html_data('off_color', value: options[:right_color]) unless options[:right_color].nil?
     end
 
     # String => default : "ON"
     def left_text
-      add_html_data('on_text', options[:left_text]) unless options[:left_text].nil?
+      add_html_data('on_text', value: options[:left_text]) unless options[:left_text].nil?
     end
 
     # String => default : "OFF"
     def right_text
-      add_html_data('off_text', options[:right_text]) unless options[:right_text].nil?
+      add_html_data('off_text', value: options[:right_text]) unless options[:right_text].nil?
     end
 
     # String => default : '&nbsp;'
     def middle_text
-      add_html_data('label_text', options[:middle_text]) unless options[:middle_text].nil?
+      add_html_data('label_text', value: options[:middle_text]) unless options[:middle_text].nil?
     end
 
     def inline

data/lib/ui_bibz/ui/core/forms/choices/checkbox_field.rb

@@ -48,9 +48,6 @@ module UiBibz::Ui::Core::Forms::Choices
   #
   class CheckboxField < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
@@ -63,7 +60,7 @@ module UiBibz::Ui::Core::Forms::Choices
       content_tag(:div, html_options.except(:id, 'data-action')) do
         concat hidden_field_tag content, '0', id: "#{content}-hidden"
         concat check_box_tag content, options[:value] || '1', options[:checked] || html_options[:checked], checkbox_html_options
-        concat label_tag label_name, label_content, class: 'custom-control-label'
+        concat label_tag(label_name, label_content, class: 'form-check-label') if options[:label] != false
       end
     end
 
@@ -72,7 +69,7 @@ module UiBibz::Ui::Core::Forms::Choices
         disabled: disabled?,
         indeterminate: options[:indeterminate],
         "data-action": options[:action],
-        class: 'custom-control-input'
+        class: 'form-check-input'
       }
     end
 
@@ -92,11 +89,15 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     def component_html_classes
-      super << ['custom-control', 'custom-checkbox', inline]
+      super << component_wrapper_html_classes
     end
 
     def inline
-      'custom-control-inline' if options[:inline]
+      'form-check-inline' if options[:inline]
+    end
+
+    def component_wrapper_html_classes
+      ['form-check', inline]
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/choices/choice_group.rb

@@ -47,9 +47,17 @@ module UiBibz::Ui::Core::Forms::Choices
   #   end
   #
   class ChoiceGroup < UiBibz::Ui::Core::Forms::Buttons::ButtonGroup
+    include UiBibz::Ui::Concerns::HtmlConcern
+    attr_reader :errors, :required_fields, :items
+
     # See UiBibz::Ui::Core::Forms::Choices::Button.initialize
+    #
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
+      @items = []
+      @errors = []
+      @required_fields = []
+      @radio_name = @options[:name] || generate_id('choice')
     end
 
     def choice(content = nil, opts = nil, html_options = nil, &block)
@@ -59,7 +67,19 @@ module UiBibz::Ui::Core::Forms::Choices
         content = @options.merge(content || {})
       end
 
-      @items << Choice.new(content, opts, html_options, &block).render
+      opts = opts.merge(name: @radio_name) if opts[:type] == :radio
+
+      @items << Choice.new(content, opts, html_options, &block)
+    end
+
+    def input(attribute_name, options = {}, &block)
+      new_options = options.merge(old_label: options[:label], label: false, wrapper: false, error: false)
+      new_options = new_options.merge(name: @radio_name, type: :radio) if @options[:type] == :radio
+
+      @items << @options[:form].input(attribute_name, new_options, &block)
+      obj = @options[:form].object
+      @errors << obj.errors[attribute_name] unless obj.errors[attribute_name].empty?
+      @required_fields << (obj._validators[attribute_name].try(:first).class.to_s == 'ActiveRecord::Validations::PresenceValidator')
     end
 
     private
@@ -74,7 +94,7 @@ module UiBibz::Ui::Core::Forms::Choices
 
     def component_html_data
       super
-      add_html_data 'toggle', 'buttons'
+      add_html_data 'toggle', value: 'buttons'
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/choices/components/choice.rb

@@ -54,27 +54,39 @@ module UiBibz::Ui::Core::Forms::Choices
   #
   class Choice < UiBibz::Ui::Core::Forms::Buttons::Button
     # See UiBibz::Ui::Core::Forms::Choices::Button.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
       button_choice_html_tag
     end
 
+    def input_options
+      @input_options ||= { type: type, autocomplete: :off, class: 'btn-check' }
+                         .merge(checked)
+                         .merge(value)
+                         .merge(name)
+                         .merge({ id: input_id })
+                         .merge(input_html_options)
+    end
+
     private
 
     def button_choice_html_tag
-      content_tag :label, html_options do
+      capture do
         concat tag(:input, input_options)
-        concat glyph_and_content_html(options[:text].nil? ? @content : ' ')
-        concat badge_html unless options[:badge].nil?
+        concat label_tag
       end
     end
 
-    def input_options
-      { type: type, autocomplete: :off }.merge(checked).merge(value).merge(name).merge(id).merge(input_html_options)
+    def label_tag
+      if options[:label]
+        content_tag :label, options[:label], html_options.merge(for: input_id)
+      else
+        content_tag :label, html_options.merge(for: input_id) do
+          concat glyph_and_content_html(options[:text].nil? ? @content : ' ')
+          concat badge_html unless options[:badge].nil?
+        end
+      end
     end
 
     def checked
@@ -89,10 +101,6 @@ module UiBibz::Ui::Core::Forms::Choices
       @options[:name].nil? ? {} : { name: @options[:name] }
     end
 
-    def id
-      @options[:id].nil? ? {} : { id: @options[:id] }
-    end
-
     def input_html_options
       @options[:input_html_options].nil? ? {} : @options[:input_html_options]
     end
@@ -104,5 +112,9 @@ module UiBibz::Ui::Core::Forms::Choices
     def status
       ['btn', outline, options[:status] || :secondary].compact.join('-')
     end
+
+    def input_id
+      @input_id ||= @options[:id] || generate_id('choice')
+    end
   end
 end

data/lib/ui_bibz/ui/core/forms/choices/radio_field.rb

@@ -48,9 +48,6 @@ module UiBibz::Ui::Core::Forms::Choices
   #
   class RadioField < UiBibz::Ui::Core::Forms::Choices::CheckboxField
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
@@ -62,7 +59,7 @@ module UiBibz::Ui::Core::Forms::Choices
     def radio_field_html_tag
       content_tag :div, html_options.except(:id) do
         concat radio_button_tag content, options[:value], options[:checked] || false, checkbox_html_options
-        concat label_tag label_name, label_content, class: 'custom-control-label'
+        concat label_tag(label_name, label_content, class: 'form-check-label') if options[:label] != false
       end
     end
 
@@ -70,7 +67,7 @@ module UiBibz::Ui::Core::Forms::Choices
       {
         disabled: options[:state] == :disabled,
         "data-action": options[:action],
-        class: 'custom-control-input'
+        class: 'form-check-input'
       }
     end
 
@@ -79,7 +76,15 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     def component_html_classes
-      ['custom-control', 'custom-radio', inline]
+      super << component_wrapper_html_classes
+    end
+
+    def inline
+      'form-check-inline' if options[:inline]
+    end
+
+    def component_wrapper_html_classes
+      ['form-check', inline]
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/choices/switch_field.rb

@@ -41,14 +41,10 @@ module UiBibz::Ui::Core::Forms::Choices
   #   end
   #
   class SwitchField < UiBibz::Ui::Core::Forms::Choices::CheckboxField
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
-
     private
 
     def component_html_classes
-      ['custom-control', 'custom-switch', inline]
+      ['form-check', 'form-switch', inline]
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/dates/date_picker_field.rb

@@ -45,9 +45,6 @@ module UiBibz::Ui::Core::Forms::Dates
   #
   class DatePickerField < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
@@ -98,15 +95,15 @@ module UiBibz::Ui::Core::Forms::Dates
     end
 
     def date_locale
-      add_html_data 'date_locale', I18n.locale.to_s
+      add_html_data 'date_locale', value: I18n.locale.to_s
     end
 
     def provide
-      add_html_data 'provide', 'datepicker'
+      add_html_data 'provide', value: 'datepicker'
     end
 
     def format
-      add_html_data 'date_format', picker_pattern
+      add_html_data 'date_format', value: picker_pattern
     end
 
     def picker_pattern
@@ -114,7 +111,7 @@ module UiBibz::Ui::Core::Forms::Dates
     end
 
     def today_btn
-      add_html_data 'date_today_btn', 'linked'
+      add_html_data 'date_today_btn', value: 'linked'
     end
 
     def today_highlight
@@ -130,35 +127,35 @@ module UiBibz::Ui::Core::Forms::Dates
     end
 
     def dates_disabled
-      add_html_data('dates_disabled', [options[:dates_disabled]].flatten) if options[:dates_disabled]
+      add_html_data('dates_disabled', value: [options[:dates_disabled]].flatten) if options[:dates_disabled]
     end
 
     def toggle_active
-      add_html_data('date_toggle_active', true)
+      add_html_data('date_toggle_active')
     end
 
     def display_mode
-      add_html_data('date_start_view', views[options[:display_mode]]) if options[:display_mode]
+      add_html_data('date_start_view', value: views[options[:display_mode]]) if options[:display_mode]
     end
 
     def display_mode_min
-      add_html_data('date_min_view_mode', views[options[:display_mode_min]]) if options[:display_mode_min]
+      add_html_data('date_min_view_mode', value: views[options[:display_mode_min]]) if options[:display_mode_min]
     end
 
     def display_mode_max
-      add_html_data('date_max_view_mode', views[options[:display_mode_max]]) if options[:display_mode_max]
+      add_html_data('date_max_view_mode', value: views[options[:display_mode_max]]) if options[:display_mode_max]
     end
 
     def days_of_week_disabled
-      add_html_data('date_days_of_week_disabled', [options[:days_of_week_disabled]].flatten) if options[:days_of_week_disabled]
+      add_html_data('date_days_of_week_disabled', value: [options[:days_of_week_disabled]].flatten) if options[:days_of_week_disabled]
     end
 
     def days_of_week_highlighted
-      add_html_data('date_days_of_week_highlighted', [options[:days_of_week_highlighted]].flatten) if options[:days_of_week_highlighted]
+      add_html_data('date_days_of_week_highlighted', value: [options[:days_of_week_highlighted]].flatten) if options[:days_of_week_highlighted]
     end
 
     def multiple
-      add_html_data('date_multidate', options[:multiple]) if options[:multiple]
+      add_html_data('date_multidate', value: options[:multiple]) if options[:multiple]
     end
 
     # :lg, :sm or :xs

data/lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_divider.rb

@@ -5,7 +5,6 @@ module UiBibz::Ui::Core::Forms::Dropdowns::Components
   #
   class DropdownDivider < UiBibz::Ui::Base
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize; end
 
     # Render html tag
     def render

data/lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_header.rb

@@ -34,9 +34,6 @@ module UiBibz::Ui::Core::Forms::Dropdowns::Components
   #
   class DropdownHeader < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render

data/lib/ui_bibz/ui/core/forms/dropdowns/dropdown.rb

@@ -7,7 +7,6 @@ module UiBibz::Ui::Core::Forms::Dropdowns
   # Create a dropdown
   #
   # This element is an extend of UiBibz::Ui::Core::Component.
-  # You can use tap method to add list items.
   #
   # ==== Attributes
   #
@@ -50,7 +49,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
   #
   # ==== Helper
   #
-  #   dropdown(name, options = { tap: true }, html_options = {}) do |d|
+  #   dropdown(name, options = {}, html_options = {}) do |d|
   #     d.link(content, options = {}, html_options = {})
   #     d.link(options = {}, html_options = {}) do
   #       content
@@ -63,6 +62,8 @@ module UiBibz::Ui::Core::Forms::Dropdowns
   #   end
   #
   class Dropdown < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     def initialize(content, options = nil, html_options = nil, &block)
       super
       @items = []
@@ -95,16 +96,6 @@ module UiBibz::Ui::Core::Forms::Dropdowns
       @items << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(content, options, html_options, &block).render
     end
 
-    # Add html component
-    def html(content = nil, &block)
-      if !block.nil?
-        context = eval('self', block.binding) # rubocop:disable Style/EvalWithLocation
-        @items << context.capture(&block)
-      else
-        @items << content
-      end
-    end
-
     def id
       @id ||= html_options[:id] || generate_id('dropdown')
     end
@@ -129,7 +120,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def ul_html
-      content_tag :div, @items.join.html_safe, class: join_classes('dropdown-menu', position, open), 'arial-labelledby' => id
+      content_tag :div, @items.join.html_safe, class: join_classes('dropdown-menu', theme, position, open), 'arial-labelledby' => id
     end
 
     def dropdown_tag
@@ -172,5 +163,9 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     def size
       "btn-#{@options[:size]}" if @options[:size]
     end
+
+    def theme
+      'dropdown-menu-dark' if @options[:theme]
+    end
   end
 end