ui_bibz 3.0.0.alpha5 → 3.0.0.alpha11

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
 module UiBibz::Ui::Core::Forms::Surrounds
-  class SurroundButton < UiBibz::Ui::Core::Forms::Buttons::Button
-    # See UiBibz::Ui::Core::Dropdown.initialize
-
-    def pre_render
-      content_tag :div, class: 'input-group-btn' do
-        button_html_tag
-      end
-    end
-  end
+  class SurroundButton < UiBibz::Ui::Core::Forms::Buttons::Button; end
 end

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
 module UiBibz::Ui::Core::Forms::Surrounds
-  class SurroundButtonLink < UiBibz::Ui::Core::Forms::Buttons::ButtonLink
-    # See UiBibz::Ui::Core::Dropdown.initialize
-
-    def pre_render
-      content_tag :div, class: 'input-group-btn' do
-        button_link_html_tag
-      end
-    end
-  end
+  class SurroundButtonLink < UiBibz::Ui::Core::Forms::Buttons::ButtonLink; end
 end

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

@@ -4,10 +4,11 @@ module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundDropdown < UiBibz::Ui::Core::Forms::Dropdowns::Dropdown
     # See UiBibz::Ui::Core::Dropdown.initialize
 
-    private
-
-    def component_html_classes
-      super << 'input-group-btn'
+    def pre_render
+      capture do
+        concat button_html
+        concat ul_html
+      end
     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

@@ -60,7 +60,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def link_html
-      content_tag :a, 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

@@ -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

@@ -82,7 +82,7 @@ module UiBibz::Ui::Core::Navigations
     # Add nav link items
     # See UiBibz::Ui::Core::Navigations::NavLink
     def link(content = nil, options = {}, html_options = nil, &block)
-      if block_given?
+      if block
         content[:nav_type] = type
         content[:nav_tags] = nav_tags
       else
@@ -93,7 +93,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def text(content = nil, options = {}, html_options = nil, &block)
-      block_given? ? content[:nav_type] = type : options[:nav_type] = type
+      block ? content[:nav_type] = type : options[:nav_type] = type
       @items << NavText.new(content, options, html_options, &block)
     end
 
@@ -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

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

@@ -67,7 +67,7 @@ module UiBibz::Ui::Core::Navigations
     # Add nav link items
     # See UiBibz::Ui::Core::Navigations::NavLink
     def tab(content = nil, options = {}, html_options = nil, &block)
-      if block_given?
+      if block
         content[:nav_type] = type
         content[:tag_type] = @options[:tag_type]
       else
@@ -83,6 +83,10 @@ module UiBibz::Ui::Core::Navigations
       ['nav', 'nav-tabs', position, justify, fill]
     end
 
+    def component_html_options
+      { role: 'tablist' }
+    end
+
     def type
       'nav-tabs'
     end

data/lib/ui_bibz/ui/core/notifications/components/toast_header.rb

@@ -31,12 +31,13 @@ module UiBibz::Ui::Core::Notifications::Components
   #   end.render
   #
   class ToastHeader < UiBibz::Ui::Core::Component
+    include Webpacker::Helper if defined?(Webpacker)
     # See UiBibz::Ui::Core::Component.initialize
 
     def pre_render
       content_tag :div, html_options do
         concat UiBibz::Ui::Core::Icons::Glyph.new(options[:glyph], class: 'mr-2').render unless options[:glyph].nil?
-        concat image_tag(options[:img], class: 'rounded mr-2') unless options[:img].nil?
+        concat image unless options[:image].nil?
         concat content_tag(:strong, content, class: 'mr-auto')
         concat content_tag(:small, options[:time], class: 'text-muted') unless options[:time].nil?
         concat close_button
@@ -45,6 +46,19 @@ module UiBibz::Ui::Core::Notifications::Components
 
     private
 
+    def image
+      if options[:image].is_a?(String)
+        image_tag(options[:image], class: 'rounded mr-2', alt: sanitize_text(options[:image])) unless options[:image].nil?
+      else
+        options[:image][:class] = UiBibz::Utils::Screwdriver.join_classes(options[:image][:class], 'rounded mr-2')
+        if options[:image].delete(:pack)
+          image_pack_tag(options[:image].delete(:href), **options[:image])
+        else
+          image_tag(options[:image].delete(:href), **options[:image])
+        end
+      end
+    end
+
     def close_button
       content_tag :button, '', class: 'ml-2 mb-1 btn-close', "data-dismiss": 'toast', "aria-label": 'Close'
     end

data/lib/ui_bibz/ui/core/windows/modal.rb

@@ -88,7 +88,7 @@ module UiBibz::Ui::Core::Windows
     private
 
     def modal_dialog_classes
-      UiBibz::Utils::Screwdriver.join_classes('modal-dialog', size, position, scrollable)
+      UiBibz::Utils::Screwdriver.join_classes('modal-dialog', fullscreen_size, size, position, scrollable)
     end
 
     def component_html_classes
@@ -105,10 +105,14 @@ module UiBibz::Ui::Core::Windows
     end
 
     # :xl, :lg, :sm or :xs
-    def size
+    def fullscreen_size
       [modal, fullscreen, @options[:size], down].compact.join('-')
     end
 
+    def size
+      [modal, @options[:size]].compact.join('-') if @options[:size]
+    end
+
     def fullscreen
       'fullscreen' if @options[:fullscreen]
     end

data/lib/ui_bibz/ui/extensions/core/component/glyph_extension.rb

@@ -3,39 +3,26 @@
 module GlyphExtension
   # Render glyph and content html
   def glyph_and_content_html(content_html = nil)
-    [glyph_with_space, ct_html(content_html)].compact.join(' ').html_safe
-  end
-
-  def ct_html(content_html)
-    content_html || content if options[:text].nil? || options[:text] == true
-  end
-
-  # Render glyph with space html
-  def glyph_with_space
-    out = [glyph]
-    out << ' ' if options[:text] != false
-    out << content_tag(:span, ' ', class: 'empty-space') if options[:text] == false
-    out.join unless glyph.nil?
+    options[:glyph] ? generate_glyph(content_html) : content_html || content
   end
 
   # Render glyph html
-  def glyph
-    options[:content] = content if options[:text] == false
-
-    glyph_options = case options[:glyph]
-                    when Hash
+  def generate_glyph(content_html)
+    glyph_options = if options[:glyph].is_a?(Hash)
                       options[:glyph]
-                    when String
+                    elsif options[:glyph]
                       { name: options[:glyph] }
                     else
                       {}
                     end
 
-    glyph_options[:text]       = options[:text] unless options[:text].nil?
-    glyph_options[:content]    = options[:content] unless options[:content].nil?
-    glyph_options[:shortcut]   = options[:shortcut] unless options[:shortcut].nil?
-    glyph_options[:html_options] = options[:html_options]  unless options[:html_options].nil?
+    glyph_options = glyph_options.tap do |h|
+      h[:text] = options[:text]
+      h[:label] = options[:label] || content_html || content
+      h[:shortcut] = options[:shortcut] unless options[:shortcut].nil?
+    end
 
-    UiBibz::Utils::GlyphChanger.new(glyph_options[:name], glyph_options).render unless glyph_options[:name].nil?
+    # UiBibz::Utils::GlyphChanger.new(glyph_options[:name], glyph_options).render unless glyph_options[:name].nil?
+    UiBibz::Ui::Core::Icons::Glyph.new(glyph_options[:name], glyph_options).render if glyph_options[:name].present?
   end
 end

data/lib/ui_bibz/ui/extensions/core/component/popover_extension.rb

@@ -28,7 +28,7 @@ module PopoverExtension
       TOOLTIP_METHODS.each { |mth| add_html_data(mth, value: options[:tooltip].try(:[], mth)) unless options[:tooltip].try(:[], mth).nil? }
       add_html_data :placement, value: options[:tooltip].try(:[], :position) unless options[:tooltip].try(:[], :position).nil?
     else
-      add_html_data :title, value: options[:tooltip]
+      add_html_data :title, value: options[:tooltip] == true ? sanitize_text(content) : options[:tooltip]
     end
   end
 end

data/lib/ui_bibz/ui/extensions/core/forms/surround_extension.rb

@@ -7,7 +7,7 @@ module SurroundExtension
   private
 
   def surrounded?
-    !options[:append].nil? || !options[:prepend].nil? || !options[:refresh].nil? || !options[:surrounded].nil?
+    options[:append].present? || options[:prepend].present? || options[:refresh].present? || options[:surrounded].present?
   end
 
   def surround_wrapper_tag(ct_tag)

data/lib/ui_bibz/ui/ux/containers/components/panel_header.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ui_bibz/ui/ux/containers/components/panel_tab_group'
+require 'ui_bibz/ui/ux/containers/components/panel_header_title'
 module UiBibz::Ui::Ux::Containers::Components
   # Create a panel header
   #
@@ -42,8 +43,8 @@ module UiBibz::Ui::Ux::Containers::Components
       end
     end
 
-    def title(text)
-      @content = content_tag :div, text, class: 'panel-title'
+    def title(content = nil, options = nil, html_options = nil, &block)
+      @content = PanelHeaderTitle.new(content, options, html_options, &block).render
     end
 
     def actions(content = nil, options = nil, html_options = nil, &block)

data/lib/ui_bibz/ui/ux/containers/components/panel_header_title.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Ux::Containers::Components
+  # Create a panel header
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelHeader.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Boxes::CarHeader.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelHeader.new.render
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelHeader.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class PanelHeaderTitle < UiBibz::Ui::Core::Component
+    # See UiBibz::Ui::Core::Component.initialize
+
+    # Render html tag
+    def pre_render
+      content_tag :div, @content, html_options
+    end
+
+    private
+
+    def component_html_classes
+      'panel-title'
+    end
+  end
+end

data/lib/ui_bibz/ui/ux/tables/table_pagination_per_page.rb

@@ -34,12 +34,12 @@ module UiBibz::Ui::Ux::Tables
 
     # Render html tag
     def render
-      if @per_page_field.options[:wrap_form] != false
+      if @per_page_field.options[:wrap_form] == false
+        per_page_html
+      else
         form_tag(url_for(url_parameters), method: :get) do
           per_page_html_in_wrap
         end
-      else
-        per_page_html
       end
     end
 

data/lib/ui_bibz/ui/ux/tables/table_search_field.rb

@@ -13,12 +13,12 @@ module UiBibz::Ui::Ux::Tables
 
     # Render html tag
     def pre_render
-      if options[:wrap_form] != false
+      if options[:wrap_form] == false
+        search_field_html
+      else
         form_tag(url_for(url_parameters), method: :get, class: 'form-table-search-field') do
           search_field_html_in_wrap
         end
-      else
-        search_field_html
       end
     end
 
@@ -69,7 +69,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def clear_button
-      content_tag :button, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, type: :button, class: 'btn btn-secondary input-group-btn clear-search-btn'
+      content_tag :button, UiBibz::Ui::Core::Icons::Glyph.new('times-circle', text: false, label: 'Clear Search').render, type: :button, class: 'btn btn-secondary input-group-btn clear-search-btn'
     end
 
     def component_html_classes

data/lib/ui_bibz/utils/breakdown_class_name_generator.rb

@@ -12,6 +12,8 @@ module UiBibz::Utils
       @klass_name = klass_name
     end
 
+    # Possible options
+    # 3 or md: 3 or md: { num: 3 }, xs: { num: 4 }
     def class_names
       return @klass_name unless col_options?
 
@@ -19,9 +21,9 @@ module UiBibz::Utils
       @options.each do |key, value|
         kl << write_classes(key.to_sym, value) if BREAKPOINTS.include?(key.to_sym)
       end
-      kl << write_classes(nil, @options) if kl.empty? || @options.key?('num')
+      kl << write_classes(nil, @options)
 
-      kl
+      kl.delete_if(&:blank?)
     end
 
     private
@@ -30,11 +32,17 @@ module UiBibz::Utils
       (@options.keys.map(&:to_sym) & PARAMETERS).present?
     end
 
+    # md: 8 or md: { num: 3}, xs: { num: 4 }
     def write_classes(size, opts)
-      @position = opts[:position]
-      opts.map do |k, v|
-        send(k, size, v) if POSITIONING.include?(k.to_sym)
-      end.compact.join(' ')
+      if opts.is_a?(Hash)
+        @position = opts[:position]
+
+        opts.map do |k, v|
+          send(k, size, v) if POSITIONING.include?(k.to_sym)
+        end.compact.join(' ')
+      else
+        send('num', size, opts)
+      end
     end
 
     # col-md-9