ui_bibz 3.0.0.alpha2 → 3.0.0.alpha9

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

@@ -69,7 +69,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     private
 
     def component_html_classes
-      ['btn-group', type]
+      ['btn-group', position, alignment, open, inline, keep_open]
     end
 
     def button_html
@@ -77,13 +77,18 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def split_html
-      content_tag :button, split_content, class: join_classes('btn', button_status, size, 'dropdown-toggle', 'dropdown-toggle-split'), type: 'button', 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false
+      content_tag :button, split_content, class: split_classes, type: 'button',
+                                          'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false
     end
 
     def split_content
       src_only
     end
 
+    def split_classes
+      join_classes('btn', button_status, size, 'dropdown-toggle', 'dropdown-toggle-split')
+    end
+
     def src_only
       content_tag :span, 'Toggle Dropdown', class: 'sr-only'
     end

data/lib/ui_bibz/ui/core/forms/numbers/formula_field.rb

@@ -49,10 +49,12 @@ module UiBibz::Ui::Core::Forms::Numbers
 
     def formula_field_html_tag
       UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new(class: join_classes('formula_field', state, size)).tap do |sf|
+        sf.addon @options[:append] unless @options[:append].nil?
         sf.text_field formula_field_name, nil, text_field_formula_html_options
         sf.addon '=', class: 'formula-field-sign'
         sf.text_field content, nil, text_field_input_html_options
         sf.addon formula_field_alert_glyph, { class: 'formula-field-alert' }, { data: { toggle: 'tooltip' } }
+        sf.addon @options[:prepend] unless @options[:prepend].nil?
       end.render
     end
 

data/lib/ui_bibz/ui/core/forms/numbers/range_field.rb

@@ -20,6 +20,12 @@ module UiBibz::Ui::Core::Forms::Numbers
   # * +step+ - [Float, Integer]
   # * +in+ - Array
   # * +within+ - Array
+  # * +status+ - status of element with symbol value:
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
+  # * +thumb_status+ - status of the thumb:
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
+  # * +track_status+ - status of track:
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
   #
   # ==== Signatures
   #
@@ -75,7 +81,19 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def component_html_classes
-      'form-range'
+      ['form-range', status, thumb_status, track_status]
+    end
+
+    def status
+      "form-range-#{options[:status]}" if options[:status]
+    end
+
+    def thumb_status
+      "form-range-thumb-#{options[:thumb_status]}" if options[:thumb_status]
+    end
+
+    def track_status
+      "form-range-track-#{options[:track_status]}" if options[:track_status]
     end
 
     def option_label(value)

data/lib/ui_bibz/ui/core/forms/numbers/slider_field.rb

@@ -20,6 +20,10 @@ module UiBibz::Ui::Core::Forms::Numbers
   # * +step+ - [Float, Integer]
   # * +in+ - Array
   # * +within+ - Array
+  # * +status+ - status of element with symbol value:
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
+  # * +track_status+ - status of track:
+  #   (+:primary+, +:secondary+, +:success+, :info+, +:warning+, +:danger+, +:light+, +:dark+)
   #
   # ==== Signatures
   #
@@ -114,16 +118,24 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def component_html_classes
-      ['slider', ('disabled' if disabled)]
+      ['slider', status, track_status, ('disabled' if disabled)]
     end
 
     def disabled
       'disabled' if options[:state] == :disabled || html_options[:disabled]
     end
 
+    def status
+      "slider-#{options[:status]}" if options[:status]
+    end
+
+    def track_status
+      "slider-track-#{options[:track_status]}" if options[:track_status]
+    end
+
     def range_name(suffix)
       if content.end_with?(']')
-        content.clone.insert(-2, suffix)
+        content.dup.insert(-2, suffix)
       else
         "#{content}#{suffix}"
       end

data/lib/ui_bibz/ui/core/forms/numbers/slider_header.rb

@@ -53,14 +53,14 @@ module UiBibz::Ui::Core::Forms::Numbers
     def header_min
       content_tag :div, class: 'slider-header-min' do
         concat content_tag :label, options[:label_min] || 'Min: '
-        concat content_tag :span, options[:thumb_min]
+        concat content_tag :span, options[:thumb_min], "data-unit": options[:unit] || options[:unit_min]
       end
     end
 
     def header_max
       content_tag :div, class: 'slider-header-max' do
-        concat content_tag :label, options[:label_max] || 'max: '
-        concat content_tag :span, options[:thumb_max]
+        concat content_tag :label, options[:label_max] || 'Max: '
+        concat content_tag :span, options[:thumb_max], "data-unit": options[:unit] || options[:unit_max]
       end
     end
 

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,77 +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
+    # 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', value: 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', value: 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', value: "btn-#{options[:status] || :secondary}")
+    def number_displayed
+      add_html_data('number_displayed') if options[:number_displayed]
     end
 
-    def menu_size
-      add_html_data('size', value: 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', value: 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', value: "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/surrounds/components/surround_button.rb

@@ -5,9 +5,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
     # See UiBibz::Ui::Core::Dropdown.initialize
 
     def pre_render
-      content_tag :div, class: 'input-group-btn' do
-        button_html_tag
-      end
+      button_html_tag
     end
   end
 end

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

@@ -5,9 +5,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
     # See UiBibz::Ui::Core::Dropdown.initialize
 
     def pre_render
-      content_tag :div, class: 'input-group-btn' do
-        button_link_html_tag
-      end
+      button_link_html_tag
     end
   end
 end

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
@@ -118,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
 
@@ -125,10 +124,6 @@ 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

data/lib/ui_bibz/ui/core/icons/glyph.rb

@@ -61,7 +61,7 @@ module UiBibz::Ui::Core::Icons
 
     # Render html tag
     def pre_render
-      [content_tag(:i, '', html_options), options[:label]].compact.join(' ').html_safe
+      [content_tag(:i, '', html_options), label].compact.join(' ').html_safe
     end
 
     private
@@ -138,5 +138,13 @@ module UiBibz::Ui::Core::Icons
     def match_style
       { solid: 'fas', regular: 'far', light: 'fal', brands: 'fab' }
     end
+
+    def label
+      if options[:text] == false
+        content_tag :span, options[:label], class: 'visually-hidden'
+      else
+        options[:label]
+      end
+    end
   end
 end

data/lib/ui_bibz/ui/core/navigations/components/nav_dropdown.rb

@@ -56,11 +56,11 @@ module UiBibz::Ui::Core::Navigations
     private
 
     def component_html_classes
-      [type, 'nav-item', without_caret]
+      [position, open, keep_open, 'nav-item', without_caret]
     end
 
     def link_html
-      link_to button_content, '#', class: join_classes(size, state, 'dropdown-toggle', 'nav-link'), 'data-toggle' => 'dropdown', 'aria-expanded' => false
+      content_tag :a, button_content, class: join_classes(size, state, 'dropdown-toggle', 'nav-link'), href: '#', 'data-toggle' => 'dropdown', 'aria-expanded' => false
     end
   end
 end

data/lib/ui_bibz/ui/core/navigations/components/nav_link_link.rb

@@ -23,7 +23,7 @@ module UiBibz::Ui::Core::Navigations
 
     # Render html tag
     def pre_render
-      link_to options[:url], html_options do
+      content_tag :a, { href: options[:url] }.merge(html_options) do
         concat glyph_and_content_html
         concat tag_html if options[:tag]
       end
@@ -45,7 +45,7 @@ module UiBibz::Ui::Core::Navigations
       when 'nav-tabs'
         html_tag_base
       when 'list-group'
-        html_tag_base.merge("aria-controls": sanitize_text(content))
+        html_tag_base.merge("aria-controls": sanitize_text(content).parameterize)
       else
         {}
       end.merge(options[:a_html] || {})

data/lib/ui_bibz/ui/core/navigations/nav.rb

@@ -120,7 +120,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def component_html_options
-      @options[:type] == :list ? { role: 'tablist' } : super
+      %i[tabs list].include?(@options[:type]) ? { role: 'tablist' } : super
     end
 
     # tabs or pills

data/lib/ui_bibz/ui/core/navigations/navbar.rb

@@ -31,6 +31,8 @@ module UiBibz::Ui::Core::Navigations
   # * +title+ - String
   # * +container+ - Hash container options
   # * +container_html+ - Hash container html options
+  # * +expand_size+ - Symbol size
+  # (+:sm+, +:md+, +:lg+, +:xl+, +:xxl+)
   #
   # ==== Signatures
   #
@@ -132,11 +134,11 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def navbar_toggle_html(content = nil, &block)
-      @navbar_toggle_html = if !block.nil?
+      @navbar_toggle_html = if block.nil?
+                              content
+                            else
                               context = eval('self', block.binding) # rubocop:disable Style/EvalWithLocation
                               context.capture(&block)
-                            else
-                              content
                             end
     end
 
@@ -165,7 +167,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def expand_size
-      "navbar-expand-#{@options[:expand_size] || :lg}" # unless @options[:expand_size].nil?
+      "navbar-expand-#{@options[:expand_size] || :lg}" unless options[:collapsible] == false
     end
 
     def position