ui_bibz 3.0.0.beta14 → 3.0.0.beta19

data/lib/ui_bibz/inputs/ui_bibz_inputs/collection_input.rb

@@ -60,14 +60,12 @@ module UiBibzInputs
     end
 
     def collection
-      @collection ||= begin
-        if options[:grouped]
-          grouped_collection.map { |collection| collection.try(:send, group_method) }.detect(&:present?) || []
-        else
-          collection = options.delete(:collection) || self.class.boolean_collection
-          collection.respond_to?(:call) ? collection.call : collection.to_a
-        end
-      end
+      @collection ||= if options[:grouped]
+                        grouped_collection.map { |collection| collection.try(:send, group_method) }.detect(&:present?) || []
+                      else
+                        collection = options.delete(:collection) || self.class.boolean_collection
+                        collection.respond_to?(:call) ? collection.call : collection.to_a
+                      end
     end
 
     def group_method

data/lib/ui_bibz/ui/concerns/navigation_concern.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Concerns::NavigationConcern #:nodoc:
+  extend ActiveSupport::Concern
+
+  included do
+    def spacer(num = 'auto')
+      kls = " me-#{num}"
+      @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
+    end
+  end
+end

data/lib/ui_bibz/ui/concerns/notification_concern.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Concerns::NotificationConcern #:nodoc:
+  extend ActiveSupport::Concern
+
+  included do
+    def data_attributes
+      self.class.const_get('DATA_ATTRIBUTES').filter_map do |data_attribute|
+        options[data_attribute].to_s.blank? ? nil : { "data-bs-#{data_attribute}" => data_attribute_value(data_attribute) }
+      end.reduce(&:merge) || {}
+    end
+  end
+end

data/lib/ui_bibz/ui/core/boxes/card.rb

@@ -90,7 +90,7 @@ module UiBibz::Ui::Core::Boxes
   class Card < UiBibz::Ui::Core::Component
     include UiBibz::Ui::Concerns::CardItemableConcern
 
-    # See UiBibz::Ui::Core::Component.initialize
+    # (see UiBibz::Ui::Core::Component#initialize)
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
       @items = @content.nil? ? [] : [UiBibz::Ui::Core::Boxes::Components::CardBody.new(@content).render]

data/lib/ui_bibz/ui/core/boxes/components/card_body.rb

@@ -46,7 +46,7 @@ module UiBibz::Ui::Core::Boxes::Components
     # Render html tag
     def pre_render
       if options[:collapse]
-        content_tag :div, class: join_classes('collapse', show), id: options[:collapse], "data-bs-parent": "##{options[:parent_collapse]}" do
+        content_tag :div, class: join_classes('collapse', show), id: options[:collapse], 'data-bs-parent': "##{options[:parent_collapse]}" do
           content_tag :div, @items.join.html_safe, html_options
         end
       else

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

@@ -122,6 +122,10 @@ module UiBibz::Ui::Core
       # To turbolinks
       data_turbolinks = html_options.try(:[], :data).try(:[], :turbolinks) || options.try(:delete, :turbolinks)
       add_html_data(:turbolinks, value: data_turbolinks) unless data_turbolinks.nil?
+
+      # To Turbo
+      data_turbo = html_options.try(:[], :data).try(:[], :turbo) || options.try(:delete, :turbo)
+      add_html_data(:turbo, value: data_turbo) unless data_turbo.nil?
     end
 
     # Override this method to add html Options
@@ -145,7 +149,7 @@ module UiBibz::Ui::Core
     def add_html_data(name, value: true)
       html_options[:data] = {} if html_options[:data].nil?
       value = value.is_a?(String) ? value.strip : value
-      html_options[:data].update(Hash[name, value])
+      html_options[:data].update({ name => value })
     end
 
     def disabled?

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

@@ -83,10 +83,10 @@ module UiBibz::Ui::Core::Forms::Buttons
     def collapse
       # Must be flat hash not deep hash
       {
-        "data-bs-toggle": :collapse,
-        "data-bs-target": "##{options[:collapse]}",
-        "aria-controls": options[:collapse],
-        "aria-expanded": options[:expand_collapse].nil? ? false : options[:expand_collapse]
+        'data-bs-toggle': :collapse,
+        'data-bs-target': "##{options[:collapse]}",
+        'aria-controls': options[:collapse],
+        'aria-expanded': options[:expand_collapse].nil? ? false : options[:expand_collapse]
       }
     end
 

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

@@ -78,9 +78,9 @@ module UiBibz::Ui::Core::Forms::Buttons
     def collapse
       # Must be flat hash not deep hash
       {
-        "data-bs-toggle": :collapse,
-        "aria-controls": options[:collapse],
-        "aria-expanded": options[:expand_collaspe].nil? ? false : options[:expand_collaspe]
+        'data-bs-toggle': :collapse,
+        'aria-controls': options[:collapse],
+        'aria-expanded': options[:expand_collaspe].nil? ? false : options[:expand_collaspe]
       }
     end
   end

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

@@ -94,7 +94,7 @@ module UiBibz::Ui::Core::Forms::Choices
 
     def component_html_data
       super
-      add_html_data 'toggle', value: 'buttons'
+      add_html_data 'toggle', value: 'buttons' if @options[:form].nil?
     end
   end
 end

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

@@ -82,10 +82,14 @@ module UiBibz::Ui::Core::Forms::Choices
       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
+        generated_label
+      end
+    end
+
+    def generated_label
+      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
 

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

@@ -53,7 +53,7 @@ module UiBibz::Ui::Core::Forms::Numbers
         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: { "bs-toggle": 'tooltip' } }
+        sf.addon formula_field_alert_glyph, { class: 'formula-field-alert' }, { data: { 'bs-toggle': 'tooltip' } }
         sf.addon @options[:prepend] unless @options[:prepend].nil?
       end.render
     end
@@ -86,7 +86,7 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def content_formula_name
-      content.to_s.split('').count { |i| i == ']' }.positive? ? content.to_s.gsub(/]$/, '_formula]') : "#{content}_formula"
+      content.to_s.chars.count { |i| i == ']' }.positive? ? content.to_s.gsub(/]$/, '_formula]') : "#{content}_formula"
     end
 
     def state

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: ', for: options[:label_for_min]
-        concat content_tag :span, options[:thumb_min], "data-unit": options[:unit] || options[:unit_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: ', for: options[:label_for_max]
-        concat content_tag :span, options[:thumb_max], "data-unit": options[:unit] || options[:unit_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

@@ -25,6 +25,7 @@ module UiBibz::Ui::Core::Forms::Selects
   # * +searchable+ - Boolean
   # * +select_all_option+ - Boolean
   # * +append+ - String, Html
+  # * +non_selected_text+ - String
   # * +open+ - Boolean
   # * +theme+ - Symbol, defaut: +:dark+
   # * +prepend+ - String, Html
@@ -83,10 +84,12 @@ module UiBibz::Ui::Core::Forms::Selects
       clickable_opt_group
       collapsible_opt_group
       searchable
+      non_selected_text
       select_all_options
       number_displayed
       dropdown_menu_classes
       dropdown_classes
+      n_selected_text
     end
 
     def clickable_opt_group
@@ -101,6 +104,10 @@ module UiBibz::Ui::Core::Forms::Selects
       add_html_data('enable_filtering') if options[:searchable]
     end
 
+    def n_selected_text
+      add_html_data('n_selected_text', value: options[:n_selected_text]) if options[:n_selected_text]
+    end
+
     def number_displayed
       add_html_data('number_displayed') if options[:number_displayed]
     end
@@ -109,6 +116,10 @@ module UiBibz::Ui::Core::Forms::Selects
       add_html_data('include_select_all_option') if options[:select_all_options]
     end
 
+    def non_selected_text
+      add_html_data('non_selected_text', value: options[:non_selected_text]) if options[:non_selected_text]
+    end
+
     def dropdown_menu_classes
       classes = join_classes(theme, alignment, open)
       add_html_data('dropdown_menu_classes', value: classes.nil? ? nil : classes.join(' '))

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

@@ -116,7 +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')
+      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
 

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

@@ -93,7 +93,7 @@ module UiBibz::Ui::Core::Navigations
     private
 
     def component_html_options
-      super.merge({ "arial-label": 'breadcrumb' })
+      super.merge({ 'arial-label': 'breadcrumb' })
     end
 
     def model_name

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

@@ -50,7 +50,7 @@ module UiBibz::Ui::Core::Navigations::Components
     private
 
     def component_html_options
-      super.merge(options[:current] ? { "aria-current": 'page' } : {})
+      super.merge(options[:current] ? { 'aria-current': 'page' } : {})
     end
 
     def component_html_classes

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).parameterize)
+        html_tag_base.merge('aria-controls': sanitize_text(content).parameterize)
       else
         {}
       end.merge(options[:a_html] || {})

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

@@ -58,7 +58,7 @@ module UiBibz::Ui::Core::Navigations
     def collapse
       {
         role: 'button',
-        data: { "bs-toggle": :collapse },
+        data: { 'bs-toggle': :collapse },
         aria: {
           controls: options[:collapse],
           expanded: options[:active_collapse].nil? ? false : options[:active_collapse]

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

@@ -67,6 +67,7 @@ module UiBibz::Ui::Core::Navigations
   #
   class Nav < UiBibz::Ui::Core::Component
     include UiBibz::Ui::Concerns::HtmlConcern
+    include UiBibz::Ui::Concerns::NavigationConcern
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
@@ -108,11 +109,6 @@ module UiBibz::Ui::Core::Navigations
       @items << NavDropdown.new(content, options, html_options).tap(&block)
     end
 
-    def spacer(num = 'auto')
-      kls = " me-#{num}"
-      @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
-    end
-
     protected
 
     def component_html_classes

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

@@ -75,6 +75,7 @@ module UiBibz::Ui::Core::Navigations
   #
   class Navbar < UiBibz::Ui::Core::Component
     include UiBibz::Ui::Concerns::HtmlConcern
+    include UiBibz::Ui::Concerns::NavigationConcern
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
@@ -124,11 +125,6 @@ module UiBibz::Ui::Core::Navigations
       @brand = UiBibz::Ui::Core::Navigations::NavbarBrand.new(content, options, html_options, &block).render
     end
 
-    def spacer(num = 'auto')
-      kls = " me-#{num}"
-      @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
-    end
-
     def id
       @id ||= generate_id('navbar-id')
     end
@@ -163,7 +159,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def navbar_toggle_button_html
-      content_tag :button, '☰', class: 'navbar-toggler hidden-sm-up', type: :button, data: { "bs-toggle": 'collapse', "bs-target": "##{id}" }
+      content_tag :button, '☰', class: 'navbar-toggler hidden-sm-up', type: :button, data: { 'bs-toggle': 'collapse', 'bs-target': "##{id}" }
     end
 
     def expand_size

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

@@ -56,7 +56,7 @@ module UiBibz::Ui::Core::Notifications::Components
     end
 
     def component_html_options
-      { "aria-valuenow": value, "aria-valuemin": min, "aria-valuemax": max, style: "width: #{value}%", role: 'progressbar' }
+      { 'aria-valuenow': value, 'aria-valuemin': min, 'aria-valuemax': max, style: "width: #{value}%", role: 'progressbar' }
     end
 
     def striped

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

@@ -60,7 +60,7 @@ module UiBibz::Ui::Core::Notifications::Components
     end
 
     def close_button
-      content_tag :button, '', class: 'ml-2 mb-1 btn-close', "data-bs-dismiss": 'toast', "aria-label": 'Close'
+      content_tag :button, '', class: 'ml-2 mb-1 btn-close', 'data-bs-dismiss': 'toast', 'aria-label': 'Close'
     end
 
     def component_html_classes

data/lib/ui_bibz/ui/core/notifications/popover.rb

@@ -47,6 +47,8 @@ module UiBibz::Ui::Core::Notifications
   #   ui_glyph("diamond", popover: { title: "My content", position: :right})
   #
   class Popover < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::NotificationConcern
+
     # Note that for security reasons the sanitize, sanitizeFn, and allowList
     # options cannot be supplied using data attributes.
     # https://getbootstrap.com/docs/5.0/components/popovers/#options
@@ -76,12 +78,6 @@ module UiBibz::Ui::Core::Notifications
       end
     end
 
-    def data_attributes
-      DATA_ATTRIBUTES.map do |data_attribute|
-        options[data_attribute].to_s.blank? ? nil : { "data-bs-#{data_attribute}" => data_attribute_value(data_attribute) }
-      end.compact.reduce(&:merge) || {}
-    end
-
     def data_attribute_value(data_attribute)
       options[data_attribute].is_a?(String) ? options[data_attribute].html_safe : options[data_attribute]
     end

data/lib/ui_bibz/ui/core/notifications/toast.rb

@@ -76,17 +76,33 @@ module UiBibz::Ui::Core::Notifications
 
     # Add Body which is a component
     def body(content = nil, options = nil, html_options = nil, &block)
-      @body = UiBibz::Ui::Core::Notifications::Components::ToastBody.new(content, options, html_options, &block).render
+      @body = if @header.nil?
+                content_tag :div, class: 'd-flex' do
+                  concat UiBibz::Ui::Core::Notifications::Components::ToastBody.new(content, options, html_options, &block).render
+                  concat close_html if (options || {})[:closable]
+                end
+              else
+                UiBibz::Ui::Core::Notifications::Components::ToastBody.new(content, options, html_options, &block).render
+              end
     end
 
     private
 
+    def only_body_html
+      @body = UiBibz::Ui::Core::Notifications::Components::ToastBody.new(content, options, html_options, &block).render
+    end
+
+    def close_html
+      content_tag :button, '', type: 'button', class: close_button_classes,
+                               'data-bs-dismiss' => 'toast', 'aria-label' => 'Close'
+    end
+
     def component_html_classes
-      super << ['toast', status, white_text_color]
+      super << ['toast', status, white_text_color, align_items_center]
     end
 
     def component_html_options
-      { role: 'alert', "aria-live": 'assertive', "aria-atomic": true }
+      { role: 'alert', 'aria-live': 'assertive', 'aria-atomic': true }
     end
 
     def component_html_data
@@ -98,10 +114,24 @@ module UiBibz::Ui::Core::Notifications
       "bg-#{options[:status]}" if options[:status]
     end
 
+    def align_items_center
+      'align-items-center' if @header.nil?
+    end
+
     def white_text_color
       return if options[:status].nil?
 
       'text-white' unless %i[info warning info light].include?(options[:status])
     end
+
+    def white_btn_color
+      return if options[:status].nil?
+
+      'btn-close-white' unless %i[info warning info light].include?(options[:status])
+    end
+
+    def close_button_classes
+      UiBibz::Utils::Screwdriver.join_classes('btn-close', 'me-2', 'm-auto', white_btn_color)
+    end
   end
 end

data/lib/ui_bibz/ui/core/notifications/tooltip.rb

@@ -48,6 +48,8 @@ module UiBibz::Ui::Core::Notifications
   #   ui_glyph("diamond", tooltip: { title: "My content", position: :right})
   #
   class Tooltip < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::NotificationConcern
+
     # Note that for security reasons the sanitize, sanitizeFn, and allowList
     # options cannot be supplied using data attributes.
     # https://getbootstrap.com/docs/5.0/components/tooltips/#options
@@ -76,12 +78,6 @@ module UiBibz::Ui::Core::Notifications
       end
     end
 
-    def data_attributes
-      DATA_ATTRIBUTES.map do |data_attribute|
-        options[data_attribute].to_s.blank? ? nil : { "data-bs-#{data_attribute}" => data_attribute_value(data_attribute) }
-      end.compact.reduce(&:merge) || {}
-    end
-
     def data_attribute_value(data_attribute)
       options[data_attribute].is_a?(String) ? options[data_attribute].html_safe : options[data_attribute]
     end