ui_bibz 2.5.6 → 3.0.0.alpha8

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

@@ -51,7 +51,7 @@ module UiBibz::Ui::Core::Notifications
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
-      header(@content) if @options[:tap].nil?
+      header(@content, tap: false) unless @tapped
     end
 
     # Render html tag
@@ -82,7 +82,7 @@ module UiBibz::Ui::Core::Notifications
 
     def component_html_data
       super
-      add_html_data 'timeout', options[:timeout] if options[:timeout]
+      add_html_data 'timeout', value: options[:timeout] if options[:timeout]
     end
 
     def component_html_classes

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

@@ -49,9 +49,6 @@ module UiBibz::Ui::Core::Notifications
   #
   class Badge < 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
@@ -69,11 +66,11 @@ module UiBibz::Ui::Core::Notifications
     end
 
     def status
-      "badge-#{@options[:status] || :default}"
+      "bg-#{@options[:status] || :default}"
     end
 
     def type
-      'badge-pill' if @options[:type] == :pill
+      'rounded-pill' if @options[:type] == :pill
     end
   end
 end

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

@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Notifications::Components
   #
   class AlertBody < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     def pre_render
       tag(:hr) + content_tag(:p, content, html_options)

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

@@ -32,15 +32,12 @@ module UiBibz::Ui::Core::Notifications::Components
   #
   class AlertHeader < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     def pre_render
-      if options[:tap]
-        content_tag :h4, html_content, html_options
-      else
+      if options[:tap] == false
         html_content
+      else
+        content_tag :h4, html_content, html_options
       end
     end
 
@@ -57,10 +54,7 @@ module UiBibz::Ui::Core::Notifications::Components
     end
 
     def close_html
-      content_tag :button, type: 'button', class: 'close', 'data-dismiss' => 'alert', 'aria-label' => 'Close' do
-        concat content_tag :span, '×', 'aria-hidden' => true
-        concat content_tag :span, 'Close', class: 'sr-only'
-      end
+      content_tag :button, '', type: 'button', class: 'btn-close', 'data-dismiss' => 'alert', 'aria-label' => 'Close'
     end
   end
 end

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

@@ -43,9 +43,6 @@ module UiBibz::Ui::Core::Notifications::Components
   #
   class Bar < 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/notifications/components/toast_body.rb

@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Notifications::Components
   #
   class ToastBody < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     def pre_render
       content_tag :div, content, html_options

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

@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Notifications::Components
   #
   class ToastHeader < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      super
-    end
 
     def pre_render
       content_tag :div, html_options do
@@ -49,9 +46,7 @@ module UiBibz::Ui::Core::Notifications::Components
     private
 
     def close_button
-      content_tag :button, class: 'ml-2 mb-1 close', "data-dismiss": 'toast', "aria-label": 'Close' do
-        content_tag(:span, '×', "aria-hidden": true).html_safe
-      end
+      content_tag :button, '', class: 'ml-2 mb-1 btn-close', "data-dismiss": 'toast', "aria-label": 'Close'
     end
 
     def component_html_classes

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

@@ -47,7 +47,7 @@ module UiBibz::Ui::Core::Notifications
   #
   #   ui_progress_bar(integer, options = {}, html_options = {})
   #
-  #   ui_progress_bar(options = { tap: true }, html_options = {}) do |pb|
+  #   ui_progress_bar(options = {}, html_options = {}) do |pb|
   #     pb.bar(integer, options = {}, html_options = {})
   #     pb.bar(options = {}, html_options = {}) do
   #       integer
@@ -55,10 +55,12 @@ module UiBibz::Ui::Core::Notifications
   #   end
   #
   class ProgressBar < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
-      @bars = []
+      @items = []
     end
 
     # Render html tag
@@ -67,7 +69,7 @@ module UiBibz::Ui::Core::Notifications
     end
 
     def bar(content = nil, options = nil, html_options = nil, &block)
-      @bars << UiBibz::Ui::Core::Notifications::Components::Bar.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Notifications::Components::Bar.new(content, options, html_options, &block).render
     end
 
     private
@@ -77,8 +79,8 @@ module UiBibz::Ui::Core::Notifications
     end
 
     def bars
-      if !@bars.empty?
-        @bars
+      if !@items.empty?
+        @items
       elsif options[:stacked]
         stacked_bars
       else

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

@@ -48,9 +48,6 @@ module UiBibz::Ui::Core::Notifications
   #
   class Spinner < 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/notifications/toast.rb

@@ -49,7 +49,7 @@ module UiBibz::Ui::Core::Notifications
   #
   # ==== Helper
   #
-  #   ui_toast(options = { tap: true }, html_options = {}) do |t|
+  #   ui_toast(options = {}, html_options = {}) do |t|
   #     t.header "My header toast", glyph: 'eye', time: 'now'
   #     t.body "My body toast"
   #   end
@@ -58,6 +58,7 @@ module UiBibz::Ui::Core::Notifications
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
+      body(@content) unless @tapped
     end
 
     # Render html tag
@@ -81,7 +82,7 @@ module UiBibz::Ui::Core::Notifications
     private
 
     def component_html_classes
-      super << 'toast'
+      super << ['toast', status, white_text_color]
     end
 
     def component_html_options
@@ -90,7 +91,17 @@ module UiBibz::Ui::Core::Notifications
 
     def component_html_data
       super
-      add_html_data 'autohide', options[:auto_hide] if options[:auto_hide]
+      add_html_data 'autohide', value: options[:auto_hide] if options[:auto_hide]
+    end
+
+    def status
+      "bg-#{options[:status]}" if options[:status]
+    end
+
+    def white_text_color
+      return if options[:status].nil?
+
+      'text-white' unless %i[info warning info light].include?(options[:status])
     end
   end
 end

data/lib/ui_bibz/ui/core/windows/components/modal_body.rb

@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Windows::Components
   #
   class ModalBody < 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/windows/components/modal_footer.rb

@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Windows::Components
   #
   class ModalFooter < 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/windows/components/modal_header.rb

@@ -32,9 +32,6 @@ module UiBibz::Ui::Core::Windows::Components
   #
   class ModalHeader < 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
@@ -51,10 +48,7 @@ module UiBibz::Ui::Core::Windows::Components
     end
 
     def close_button_html
-      content_tag :button, class: 'close', 'data-dismiss' => 'modal', 'aria-label' => 'Close' do
-        concat content_tag :span, '×', 'aria-hidden' => true
-        concat content_tag :span, 'Close', class: 'sr-only'
-      end
+      content_tag :button, '', class: 'btn-close', 'data-dismiss' => 'modal', 'aria-label' => 'Close'
     end
   end
 end

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

@@ -19,7 +19,11 @@ module UiBibz::Ui::Core::Windows
   # You can add HTML attributes using the +html_options+.
   # You can pass arguments in options attribute:
   # * +size+
-  #   (+:sm+, +:lg+)
+  #   (+:xl:,+:lg+, +:md+, +:sm+)
+  # * +fullscreen+ - Boolean
+  # * +backdrop+ - Symbol (+:static+)
+  # * +scrollable+ - Boolean
+  # * +position+ - Symbol (+:centered+)
   #
   # ==== Signatures
   #
@@ -55,48 +59,95 @@ module UiBibz::Ui::Core::Windows
   #
   class Modal < 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
-      content_tag :div, html_options do
-        content_tag :div, class: "modal-dialog #{size}", role: 'document' do
+      content_tag :div, modal_html_options do
+        content_tag :div, class: modal_dialog_classes do
           content_tag :div, class: 'modal-content' do
-            concat @header
-            concat @body
-            concat @footer
+            concat @header&.render
+            concat @body&.render
+            concat @footer&.render
           end
         end
       end
     end
 
     def header(content = nil, options = nil, html_options = nil, &block)
-      @header = UiBibz::Ui::Core::Windows::Components::ModalHeader.new(content, options, html_options, &block).render
+      @header = UiBibz::Ui::Core::Windows::Components::ModalHeader.new(content, options, html_options, &block)
     end
 
     def footer(content = nil, options = nil, html_options = nil, &block)
-      @footer = UiBibz::Ui::Core::Windows::Components::ModalFooter.new(content, options, html_options, &block).render
+      @footer = UiBibz::Ui::Core::Windows::Components::ModalFooter.new(content, options, html_options, &block)
     end
 
     def body(content = nil, options = nil, html_options = nil, &block)
-      @body = UiBibz::Ui::Core::Windows::Components::ModalBody.new(content, options, html_options, &block).render
+      @body = UiBibz::Ui::Core::Windows::Components::ModalBody.new(content, options, html_options, &block)
     end
 
     private
 
+    def modal_dialog_classes
+      UiBibz::Utils::Screwdriver.join_classes('modal-dialog', fullscreen_size, size, position, scrollable)
+    end
+
     def component_html_classes
       'modal'
     end
 
-    # :lg, :sm or :xs
+    def scrollable
+      'modal-dialog-scrollable' if @options[:scrollable]
+    end
+
+    # centered
+    def position
+      "modal-dialog-#{@options[:position]}" if @options[:position]
+    end
+
+    # :xl, :lg, :sm or :xs
+    def fullscreen_size
+      [modal, fullscreen, @options[:size], down].compact.join('-')
+    end
+
     def size
-      "modal-#{@options[:size]}" if @options[:size]
+      [modal, @options[:size]].compact.join('-') if @options[:size]
+    end
+
+    def fullscreen
+      'fullscreen' if @options[:fullscreen]
     end
 
     def effect
       @options[:effect] unless @options[:effect].nil?
     end
+
+    def down
+      'down' if @options[:size] && @options[:fullscreen]
+    end
+
+    def modal
+      'modal' if @options[:size] || @options[:fullscreen]
+    end
+
+    # Update html_options only during pre-render
+    def modal_html_options
+      html_options.merge({ tabindex: '-1', aria: { labelledby: labelled_by, hidden: 'true' } })
+    end
+
+    def component_html_data
+      super
+      backdrop
+    end
+
+    def labelled_by
+      sanitize_text(@header&.content || 'Modal')
+    end
+
+    def backdrop
+      return unless @options[:backdrop]
+
+      add_html_data 'backdrop', value: @options[:backdrop]
+      add_html_data 'keyboard', value: 'false'
+    end
   end
 end

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

@@ -13,7 +13,11 @@ module GlyphExtension
   # Render glyph with space html
   def glyph_with_space
     out = [glyph]
-    out << ' ' if options[:text] != false
+    out << if options[:text] == false
+             content_tag(:span, ' ', class: 'empty-space')
+           else
+             ' '
+           end
     out.join unless glyph.nil?
   end
 
@@ -23,7 +27,7 @@ module GlyphExtension
 
     glyph_options = if options[:glyph].is_a?(Hash)
                       options[:glyph]
-                    elsif options[:glyph].is_a?(String)
+                    elsif options[:glyph]
                       { name: options[:glyph] }
                     else
                       {}

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

@@ -8,27 +8,27 @@ module PopoverExtension
                        trigger offset fallback_placement boundary sanitize white_list sanitize_fn].freeze
 
   def popover_data_html
-    unless options[:popover].blank?
-      add_html_data :toggle, 'popover'
-      add_html_data :content, (options[:popover].is_a?(String) ? options[:popover] : options[:popover][:content])
+    if options[:popover].present?
+      add_html_data :toggle, value: 'popover'
+      add_html_data :content, value: (options[:popover].is_a?(String) ? options[:popover] : options[:popover][:content])
     end
 
     return unless options[:popover].is_a?(Hash)
 
-    POPOVER_METHODS.each { |mth| add_html_data(mth, options[:popover].try(:[], mth)) unless options[:popover].try(:[], mth).nil? }
-    add_html_data :placement, options[:popover].try(:[], :position) unless options[:popover].try(:[], :position).nil?
+    POPOVER_METHODS.each { |mth| add_html_data(mth, value: options[:popover].try(:[], mth)) unless options[:popover].try(:[], mth).nil? }
+    add_html_data :placement, value: options[:popover].try(:[], :position) unless options[:popover].try(:[], :position).nil?
   end
 
   def tooltip_data_html
     return if options[:tooltip].nil?
 
-    add_html_data :toggle, 'tooltip'
+    add_html_data :toggle, value: 'tooltip'
 
     if options[:tooltip].is_a?(Hash)
-      TOOLTIP_METHODS.each { |mth| add_html_data(mth, options[:tooltip].try(:[], mth)) unless options[:tooltip].try(:[], mth).nil? }
-      add_html_data :placement, options[:tooltip].try(:[], :position) unless options[:tooltip].try(:[], :position).nil?
+      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, options[:tooltip]
+      add_html_data :title, value: options[:tooltip]
     end
   end
 end