ui_bibz 2.5.5 → 3.0.0.alpha6

data/lib/ui_bibz/ui/core/forms/selects/abstract_select.rb

@@ -71,9 +71,6 @@ module UiBibz::Ui::Core::Forms::Selects
     include SurroundExtension
 
     # 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/selects/dropdown_select_field.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require 'ui_bibz/ui/extensions/core/forms/surround_extension'
 module UiBibz::Ui::Core::Forms::Selects
   # Create a DropdownSelectField
   #
-  # This element is an extend of UiBibz::Ui::Core::Component.
-  # source : http://silviomoreto.github.io/bootstrap-select/examples/
+  # This element is an extend of UiBibz::Ui::Core::Forms::Buttons::Button
+  # source : http://loudev.com/
   #
   # ==== Attributes
   #
@@ -17,18 +16,14 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   # You can add HTML attributes using the +html_options+.
   # You can pass arguments in options attribute:
-  # * +status+ - status of element with symbol value:
-  #   (+:primary+, +:secondary+, +:info+, +:warning+, +:danger+, +:link+)
   # * +option_tags+ - Array, Object [required]
+  # * +multiple+ - Boolean
+  # * +outline+ - Boolean
+  # * +theme+ - String
+  # * +clickable_opt_group+ - Boolean
+  # * +collapsible_opt_group+ - Boolean
   # * +searchable+ - Boolean
-  # * +max_options+ - Integer
-  # * +selected_text_format+ - String
-  # * +menu_size+ - Integer
-  # * +header+ - String
-  # * +actions_box+ - Boolean
-  # * +show_tick+ - Boolean
-  # * +show_menu_arrow+ - Boolean
-  # * +dropup+ - Boolean
+  # * +select_all_option+ - Boolean
   # * +append+ - String, Html
   # * +prepend+ - String, Html
   # * +connect+ - Hash
@@ -38,13 +33,6 @@ module UiBibz::Ui::Core::Forms::Selects
   #     * +selector+ - String
   #     * +data+ - Array
   #     * +url+ - String
-  # * +refresh+ - Hash
-  #   * +event+ - String
-  #   * +mode+ - String
-  #   * +target+ - Hash
-  #     * +selector+ - String
-  #     * +data+ - Array
-  #     * +url+ - String
   #
   # ==== Signatures
   #
@@ -58,7 +46,7 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   #   UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('fruits', { option_tags: list_of_fruits, searchable: true }, { class: 'test' })
   #
-  #   UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new({ option_tags: list_of_fruits, actions_box: true }, { class: 'test' }) do
+  #   UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new({ option_tags: list_of_fruits, select_all_option: true }, { class: 'test' }) do
   #     'fruits'
   #   end
   #
@@ -67,80 +55,71 @@ module UiBibz::Ui::Core::Forms::Selects
   #   dropdown_select_field(content, options = {}, html_options = {})
   #
   class DropdownSelectField < UiBibz::Ui::Core::Forms::Selects::AbstractSelect
-    # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
+    # See UiBibz::Ui::Core::Forms::Buttons::Button.initialize
 
     private
 
     def component_html_options
-      super.merge({}.tap do |h|
-        h[:multiple] = true if options[:multiple]
-        h[:disabled] = options[:state] == :disabled
-        h[:include_blank] = options[:include_blank]
-        h[:title] = h.delete(:prompt) unless options[:prompt].nil?
-      end)
+      super.merge({
+                    multiple: options[:multiple],
+                    disabled: options[:state] == :disabled,
+                    include_blank: false,
+                    prompt: false
+                  })
     end
 
     def component_html_classes
-      super << ['dropdown-select-field', show_tick, dropup]
+      [size, type, button_status, 'multi-select-field']
     end
 
     def component_html_data
       super
+      clickable_opt_group
+      collapsible_opt_group
       searchable
-      max_options
-      selected_text_format
-      menu_size
-      style
-      header
-      actions_box
-      add_status
+      select_all_options
+      number_displayed
     end
 
-    ############################ Data html options
-
-    def max_options
-      add_html_data('max_options', options[:max_options]) if options[:max_options]
+    def clickable_opt_group
+      add_html_data('enable_clickable_opt_groups') if options[:clickable_opt_group]
     end
 
-    def selected_text_format
-      add_html_data('selected_text_format', options[:selected_text_format]) if options[:selected_text_format]
+    def collapsible_opt_group
+      add_html_data('enable_collapsible_opt_groups') if options[:collapsible_opt_group]
     end
 
     def searchable
-      add_html_data('live_search') if options[:searchable]
+      add_html_data('enable_filtering') if options[:searchable]
     end
 
-    def style
-      add_html_data('style', "btn-#{options[:status] || :secondary}")
+    def number_displayed
+      add_html_data('number_displayed') if options[:number_displayed]
     end
 
-    def menu_size
-      add_html_data('size', options[:menu_size]) if options[:menu_size]
+    def select_all_options
+      add_html_data('include_select_all_option') if options[:select_all_options]
     end
 
-    def actions_box
-      add_html_data('actions_box') if options[:actions_box]
+    def type
+      'btn-block' if options[:type] == :block
     end
 
-    def header
-      add_html_data('header', options[:header]) if options[:header]
+    # :lg, :sm or :xs
+    def size
+      "btn-#{options[:size]}" if options[:size]
     end
 
-    def add_status
-      add_html_data('style', "btn-#{options[:status]}") if options[:status]
+    def button_status
+      ['btn', outline, options[:status] || :secondary].compact.join('-')
     end
 
-    ############################# Css classes
-
-    def show_tick
-      'show-tick' if options[:show_tick]
+    def outline
+      'outline' if options[:outline]
     end
 
-    def dropup
-      'dropup' if options[:dropup]
+    def theme
+      'dropdown-menu-dark' if @options[:theme]
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/selects/multi_column_field.rb

@@ -48,9 +48,6 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   class MultiColumnField < UiBibz::Ui::Core::Forms::Selects::AbstractSelect
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

data/lib/ui_bibz/ui/core/forms/selects/select_field.rb

@@ -61,14 +61,11 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   class SelectField < UiBibz::Ui::Core::Forms::Selects::AbstractSelect
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 
     def component_html_classes
-      super << ['select-field', 'form-control', 'custom-select', size]
+      super << ['select-field', 'form-control', 'form-select', size]
     end
 
     def component_options
@@ -76,7 +73,7 @@ module UiBibz::Ui::Core::Forms::Selects
     end
 
     def size
-      "custom-select-#{options[:size]}" unless options[:size].nil?
+      "form-select-#{options[:size]}" unless options[:size].nil?
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_addon.rb

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundAddon < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     # Render html tag
     def pre_render
@@ -19,7 +16,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
     end
 
     def component_html_classes
-      'input-group-addon'
+      'input-group-text'
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button.rb

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundButton < UiBibz::Ui::Core::Forms::Buttons::Button
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     def pre_render
       content_tag :div, class: 'input-group-btn' do

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_group.rb

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

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_link.rb

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundButtonLink < UiBibz::Ui::Core::Forms::Buttons::ButtonLink
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     def pre_render
       content_tag :div, class: 'input-group-btn' do

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_refresh.rb

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
 module UiBibz::Ui::Core::Forms::Surrounds
-  class SurroundButtonRefresh < UiBibz::Ui::Core::Forms::Buttons::ButtonRefresh
-    # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
-
-    def pre_render
-      content_tag :div, class: 'input-group-btn' do
-        button_refresh_html_tag
-      end
-    end
-  end
+  class SurroundButtonRefresh < UiBibz::Ui::Core::Forms::Buttons::ButtonRefresh; end
 end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_checkbox_field.rb

@@ -3,14 +3,19 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundCheckboxField < UiBibz::Ui::Core::Forms::Choices::CheckboxField
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 
+    def component_html_options
+      { label: false }
+    end
+
+    def component_wrapper_html_classes
+      inline
+    end
+
     def component_html_classes
-      super << 'input-group-addon'
+      super << 'input-group-text'
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_dropdown.rb

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

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_radio_field.rb

@@ -3,14 +3,19 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundRadioField < UiBibz::Ui::Core::Forms::Choices::RadioField
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 
+    def component_html_options
+      { label: false }
+    end
+
+    def component_wrapper_html_classes
+      inline
+    end
+
     def component_html_classes
-      super << 'input-group-addon'
+      super << 'input-group-text'
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_switch_field.rb

@@ -3,9 +3,6 @@
 module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundSwitchField < UiBibz::Ui::Core::Forms::Choices::SwitchField
     # See UiBibz::Ui::Core::Dropdown.initialize
-    def initialize(content, options = nil, html_options = nil, &block)
-      super
-    end
 
     private
 

data/lib/ui_bibz/ui/core/forms/surrounds/surround_field.rb

@@ -29,10 +29,8 @@ module UiBibz::Ui::Core::Forms::Surrounds
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Forms::Texts::TextField.new(content, options = {}, html_options = {}).render
-  #
-  #   UiBibz::Ui::Core::Forms::Texts::TextField.new(options = {}, html_options = {}) do
-  #     content
+  #   UiBibz::Ui::Core::Forms::Surrounds::Surround.new(options = {}, html_options = {}) do |s|
+  #     s.
   #   end.render
   #
   # ==== Examples
@@ -50,6 +48,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
   #   end
   #
   class SurroundField < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
     attr_reader :errors, :required_fields
 
     # See UiBibz::Ui::Core::Component.initialize
@@ -117,6 +116,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
     end
 
     def dropdown_select_field(content = nil, options = nil, html_options = nil, &block)
+      html_options = (html_options || {}).merge("data-wrapper-classes": 'input-group-btn')
       @items << UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new(content, options, html_options, &block).render
     end
 
@@ -124,18 +124,10 @@ module UiBibz::Ui::Core::Forms::Surrounds
       @items << UiBibz::Ui::Core::Forms::Selects::SelectField.new(content, options, html_options, &block).render
     end
 
-    def multi_select_field(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Forms::Selects::MultiSelectField.new(content, options, html_options, &block).render
-    end
-
     def auto_complete_field(content = nil, options = nil, html_options = nil, &block)
       @items << UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(content, options, html_options, &block).render
     end
 
-    def html(content)
-      @items << content
-    end
-
     # Not correctly implemented
     # def switch_field content = nil, options = nil, html_options = nil, &block
     #   @items << SurroundSwitchField.new(content, options, html_options, &block).render

data/lib/ui_bibz/ui/core/forms/textareas/markdown_editor_field.rb

@@ -47,9 +47,6 @@ module UiBibz::Ui::Core::Forms::Textareas
   #
   class MarkdownEditorField < 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
@@ -70,7 +67,7 @@ module UiBibz::Ui::Core::Forms::Textareas
     end
 
     def provide
-      add_html_data('provide', 'markdown')
+      add_html_data('provide', value: 'markdown')
     end
 
     def autofocus
@@ -86,15 +83,15 @@ module UiBibz::Ui::Core::Forms::Textareas
     end
 
     def icon_library
-      add_html_data('iconlibrary', 'fa-5')
+      add_html_data('iconlibrary', value: 'fa')
     end
 
     def hidden_buttons
-      add_html_data('hiddenButtons', options[:hidden_buttons]) if options[:hidden_buttons]
+      add_html_data('hiddenButtons', value: options[:hidden_buttons]) if options[:hidden_buttons]
     end
 
     def disabled_buttons
-      add_html_data('disabledButtons', options[:disabled_buttons]) if options[:disabled_buttons]
+      add_html_data('disabledButtons', value: options[:disabled_buttons]) if options[:disabled_buttons]
     end
 
     def status

data/lib/ui_bibz/ui/core/forms/texts/auto_complete_field.rb

@@ -30,10 +30,10 @@ module UiBibz::Ui::Core::Forms::Texts
   #
   # ==== Examples
   #
-  #   options = options_for_select(2.times.map{ |i| "option #{i}" })
+  #   options = options_for_select(Array.new(2){ |i| "option #{i}" })
   #   UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('company', { option_tags: options }, { class: 'test' })
   #
-  #   options = options_for_select(2.times.map{ |i| "option #{i}" })
+  #   options = options_for_select(Array.new(2){ |i| "option #{i}" })
   #   UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(option_tags: options) do
   #     #content
   #   end
@@ -46,9 +46,6 @@ module UiBibz::Ui::Core::Forms::Texts
   #
   class AutoCompleteField < UiBibz::Ui::Core::Forms::Texts::TextField
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     private