ui_bibz 3.0.13 → 4.0.0.beta3

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

@@ -93,42 +93,42 @@ module UiBibz::Ui::Core::Forms::Selects
     end
 
     def clickable_opt_group
-      add_html_data('enable_clickable_opt_groups') if options[:clickable_opt_group]
+      @data_html_options_builder.add('enable_clickable_opt_groups', value: options[:clickable_opt_group])
     end
 
     def collapsible_opt_group
-      add_html_data('enable_collapsible_opt_groups') if options[:collapsible_opt_group]
+      @data_html_options_builder.add('enable_collapsible_opt_groups', value: options[:collapsible_opt_group])
     end
 
     def searchable
-      add_html_data('enable_filtering') if options[:searchable]
-      add_html_data('fuzzy_search') if options[:searchable] == :fuzzy
+      @data_html_options_builder.add('enable_filtering') if options[:searchable]
+      @data_html_options_builder.add('fuzzy_search') if options[:searchable] == :fuzzy
     end
 
     def n_selected_text
-      add_html_data('n_selected_text', value: options[:n_selected_text]) if options[:n_selected_text]
+      @data_html_options_builder.add('n_selected_text', value: options[:n_selected_text])
     end
 
     def number_displayed
-      add_html_data('number_displayed') if options[:number_displayed]
+      @data_html_options_builder.add('number_displayed', value: options[:number_displayed])
     end
 
     def select_all_options
-      add_html_data('include_select_all_option') if options[:select_all_options]
+      @data_html_options_builder.add('include_select_all_option', value: 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]
+      @data_html_options_builder.add('non_selected_text', value: 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_html_options_builder.add('dropdown_menu_classes', value: classes&.join(' '))
     end
 
     def dropdown_classes
       classes = join_classes(position, open)
-      add_html_data('dropdown_classes', value: classes.nil? ? nil : classes.join(' '))
+      @data_html_options_builder.add('dropdown_classes', value: classes&.join(' '))
     end
 
     def position

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

@@ -71,11 +71,11 @@ module UiBibz::Ui::Core::Forms::Selects
     end
 
     def searchable
-      add_html_data('searchable') if options[:searchable]
+      @data_html_options_builder.add('searchable', value: options[:searchable])
     end
 
     def selectable_opt_group
-      add_html_data('selectable_optgroup') if options[:selectable_opt_group]
+      @data_html_options_builder.add('selectable_optgroup', value: options[:selectable_opt_group])
     end
 
     def status

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

@@ -52,7 +52,7 @@ module UiBibz::Ui::Core::Forms::Surrounds
     attr_reader :errors, :required_fields
 
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @items = []
       @errors = []
@@ -64,68 +64,68 @@ module UiBibz::Ui::Core::Forms::Surrounds
       content_tag :div, @items.join.html_safe, html_options
     end
 
-    def dropdown(content, options = nil, html_options = nil, &block)
-      @items << SurroundDropdown.new(content, options, html_options).tap(&block).render
+    def dropdown(content, options = nil, html_options = nil, &)
+      @items << SurroundDropdown.new(content, options, html_options).tap(&).render
     end
 
-    def input(attribute_name, options = {}, &block)
-      @items << @options[:form].input(attribute_name, options.merge({ label: false, wrapper: false, error: false }), &block)
+    def input(attribute_name, options = {}, &)
+      @items << @options[:form].input(attribute_name, options.merge({ label: false, wrapper: false, error: false }), &)
       obj = @options[:form].object
       @errors << obj.errors[attribute_name] unless obj.errors[attribute_name].empty?
-      @required_fields << (obj._validators[attribute_name].try(:first).class.to_s == 'ActiveRecord::Validations::PresenceValidator')
+      @required_fields << (obj._validators[attribute_name].try(:first).instance_of?(::ActiveRecord::Validations::PresenceValidator))
     end
 
-    def glyph(content = nil, options = {}, html_options = nil, &block)
-      @items << SurroundAddon.new(UiBibz::Ui::Core::Icons::Glyph.new(content, options, html_options, &block).render).render
+    def glyph(content = nil, options = {}, html_options = nil, &)
+      @items << SurroundAddon.new(UiBibz::Ui::Core::Icons::Glyph.new(content, options, html_options, &).render).render
     end
 
-    def addon(content = nil, options = {}, html_options = nil, &block)
-      @items << SurroundAddon.new(content, options, html_options, &block).render
+    def addon(content = nil, options = {}, html_options = nil, &)
+      @items << SurroundAddon.new(content, options, html_options, &).render
     end
 
-    def button(content = nil, options = nil, html_options = nil, &block)
-      @items << SurroundButton.new(content, options, html_options, &block).render
+    def button(content = nil, options = nil, html_options = nil, &)
+      @items << SurroundButton.new(content, options, html_options, &).render
     end
 
-    def button_group(content = nil, options = nil, html_options = nil, &block)
-      @items << SurroundButtonGroup.new(content, options, html_options).tap(&block).render
+    def button_group(content = nil, options = nil, html_options = nil, &)
+      @items << SurroundButtonGroup.new(content, options, html_options).tap(&).render
     end
 
-    def button_link(content = nil, options = nil, html_options = nil, &block)
-      @items << SurroundButtonLink.new(content, options, html_options, &block).render
+    def button_link(content = nil, options = nil, html_options = nil, &)
+      @items << SurroundButtonLink.new(content, options, html_options, &).render
     end
 
-    def button_refresh(content = nil, options = nil, html_options = nil, &block)
-      @items << SurroundButtonRefresh.new(content, options, html_options, &block).render
+    def button_refresh(content = nil, options = nil, html_options = nil, &)
+      @items << SurroundButtonRefresh.new(content, options, html_options, &).render
     end
 
-    def checkbox_field(content = nil, options = nil, html_options = nil, &block)
-      @items << SurroundCheckboxField.new(content, options, html_options, &block).render
+    def checkbox_field(content = nil, options = nil, html_options = nil, &)
+      @items << SurroundCheckboxField.new(content, options, html_options, &).render
     end
 
-    def radio_field(content = nil, options = nil, html_options = nil, &block)
-      @items << SurroundRadioField.new(content, options, html_options, &block).render
+    def radio_field(content = nil, options = nil, html_options = nil, &)
+      @items << SurroundRadioField.new(content, options, html_options, &).render
     end
 
-    def text_field(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Forms::Texts::TextField.new(content, options, html_options, &block).render
+    def text_field(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Forms::Texts::TextField.new(content, options, html_options, &).render
     end
 
-    def date_picker_field(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Forms::Dates::DatePickerField.new(content, options, html_options, &block).render
+    def date_picker_field(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Forms::Dates::DatePickerField.new(content, options, html_options, &).render
     end
 
-    def dropdown_select_field(content = nil, options = nil, html_options = nil, &block)
+    def dropdown_select_field(content = nil, options = nil, html_options = nil, &)
       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
+      @items << UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new(content, options, html_options, &).render
     end
 
-    def select_field(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Forms::Selects::SelectField.new(content, options, html_options, &block).render
+    def select_field(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Forms::Selects::SelectField.new(content, options, html_options, &).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
+    def auto_complete_field(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(content, options, html_options, &).render
     end
 
     # Not correctly implemented

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

@@ -56,7 +56,6 @@ module UiBibz::Ui::Core::Forms::Textareas
     private
 
     def component_html_data
-      super
       provide
       autofocus
       savable
@@ -67,31 +66,31 @@ module UiBibz::Ui::Core::Forms::Textareas
     end
 
     def provide
-      add_html_data('provide', value: 'markdown')
+      @data_html_options_builder.add('provide', value: 'markdown')
     end
 
     def autofocus
-      add_html_data('autofocus') if options[:autofocus]
+      @data_html_options_builder.add('autofocus', value: options[:autofocus])
     end
 
     def savable
-      add_html_data('savable') if options[:savable]
+      @data_html_options_builder.add('savable', value: options[:savable])
     end
 
     def hideable
-      add_html_data('hideable') if options[:hideable]
+      @data_html_options_builder.add('hideable', value: options[:hideable])
     end
 
     def icon_library
-      add_html_data('iconlibrary', value: 'fa')
+      @data_html_options_builder.add('iconlibrary', value: 'fa')
     end
 
     def hidden_buttons
-      add_html_data('hiddenButtons', value: options[:hidden_buttons]) if options[:hidden_buttons]
+      @data_html_options_builder.add('hiddenButtons', value: options[:hidden_buttons])
     end
 
     def disabled_buttons
-      add_html_data('disabledButtons', value: options[:disabled_buttons]) if options[:disabled_buttons]
+      @data_html_options_builder.add('disabledButtons', value: options[:disabled_buttons])
     end
 
     def status

data/lib/ui_bibz/ui/core/icons/components/glyph_text.rb

@@ -21,7 +21,7 @@ module UiBibz::Ui::Core::Icons::Components
     end
 
     def transform
-      add_html_data 'fa_transform', value: options[:transform] if options[:transform]
+      @data_html_options_builder.add 'fa_transform', value: options[:transform] if options[:transform]
     end
   end
 end

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

@@ -67,7 +67,7 @@ module UiBibz::Ui::Core::Icons
     private
 
     def component_html_classes
-      join_classes(classes)
+      UiBibz::Builders::HtmlClassesBuilder.join_classes(classes)
     end
 
     def component_html_data
@@ -124,7 +124,7 @@ module UiBibz::Ui::Core::Icons
     end
 
     def transform
-      add_html_data 'fa_transform', value: options[:transform] if options[:transform]
+      @data_html_options_builder.add 'fa_transform', value: options[:transform]
     end
 
     def content
@@ -136,7 +136,8 @@ module UiBibz::Ui::Core::Icons
     end
 
     def match_style
-      { solid: 'fas', regular: 'far', light: 'fal', brands: 'fab' }
+      { solid: 'fa-solid', regular: 'fa-regular', light: 'fa-light',
+        brands: 'fa-brands', duotone: 'fa-duotone', thin: 'fa-thin' }
     end
 
     def label

data/lib/ui_bibz/ui/core/layouts/row.rb

@@ -60,8 +60,8 @@ module UiBibz::Ui::Core::Layouts
       content_tag :div, @items.join.html_safe, html_options
     end
 
-    def col(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Layouts::Col.new(content, options, html_options, &block).render
+    def col(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Layouts::Col.new(content, options, html_options, &).render
     end
 
     private

data/lib/ui_bibz/ui/core/lists/components/list.rb

@@ -71,13 +71,13 @@ module UiBibz::Ui::Core::Lists::Components
     end
 
     # Add header which is a component
-    def header(content = nil, options = nil, html_options = nil, &block)
-      @header = UiBibz::Ui::Core::Lists::Components::ListHeader.new content, options, html_options, &block
+    def header(content = nil, options = nil, html_options = nil, &)
+      @header = UiBibz::Ui::Core::Lists::Components::ListHeader.new(content, options, html_options, &)
     end
 
     # Add body which is a component
-    def body(content = nil, options = nil, html_options = nil, &block)
-      @body = UiBibz::Ui::Core::Lists::Components::ListBody.new content, options, html_options, &block
+    def body(content = nil, options = nil, html_options = nil, &)
+      @body = UiBibz::Ui::Core::Lists::Components::ListBody.new(content, options, html_options, &)
     end
 
     private

data/lib/ui_bibz/ui/core/lists/list_group.rb

@@ -74,7 +74,7 @@ module UiBibz::Ui::Core::Lists
     include UiBibz::Ui::Concerns::HtmlConcern
 
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @lists = []
     end

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

@@ -71,7 +71,7 @@ module UiBibz::Ui::Core::Navigations
     include UiBibz::Ui::Concerns::HtmlConcern
 
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @links = []
       generate_links unless @content.nil?
@@ -86,14 +86,16 @@ module UiBibz::Ui::Core::Navigations
 
     # Add breadcrumb link items
     # See UiBibz::Ui::Core::BreadcrumbLink
-    def link(content = nil, options = nil, html_options = nil, &block)
-      @links << UiBibz::Ui::Core::Navigations::Components::BreadcrumbLink.new(content, options, html_options, &block).render
+    def link(content = nil, options = nil, html_options = nil, &)
+      @links << UiBibz::Ui::Core::Navigations::Components::BreadcrumbLink.new(content, options, html_options, &).render
     end
 
     private
 
     def component_html_options
-      super.merge({ 'arial-label': 'breadcrumb' })
+      html_opts = super.merge({ 'arial-label': 'breadcrumb' })
+      html_opts = html_opts.merge(style: "--bs-breadcrumb-divider: '#{@options[:divider]}';") unless @options[:divider].nil?
+      html_opts
     end
 
     def model_name

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

@@ -40,8 +40,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def component_html_data
-      super
-      add_html_data 'link', value: options[:link] if options[:link]
+      @data_html_options_builder.add 'link', value: options[:link]
     end
   end
 end

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

@@ -49,7 +49,7 @@ module UiBibz::Ui::Core::Navigations
     attr_accessor :html_options
 
     def initialize(model_or_url, options = {}, &block)
-      init_haml_helpers
+      # init_haml_helpers
       @content      = block
       @model_or_url = model_or_url
       @options      = options
@@ -60,22 +60,23 @@ module UiBibz::Ui::Core::Navigations
     def render
       case type
       when :form_for
-        @form = form_for(@model_or_url, html_options, &@content)
+        form_for(@model_or_url, html_options, &@content)
       when :ui_form_for
         begin
-          @form = ui_form_for(@model_or_url, html_options, &@content)
+          ui_form_for(@model_or_url, html_options, &@content)
         rescue e
           raise 'You must install simple form to use ui_form_for.'
         end
       else
-        @form = form_tag_with_body(html_options, capture(&@content))
+        context = eval('self', @content.binding, __FILE__, __LINE__)
+        form_tag_with_body(html_options, context.capture(&@content))
       end
     end
 
     private
 
     def new_option
-      (@options || {}).merge({ class: UiBibz::Utils::Screwdriver.join_classes('d-flex', @options[:class]) })
+      (@options || {}).merge({ class: UiBibz::Builders::HtmlClassesBuilder.join_classes('d-flex', @options[:class]) })
     end
 
     def protect_against_forgery?

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

@@ -49,7 +49,7 @@ module UiBibz::Ui::Core::Navigations
     attr_accessor :html_options
 
     def initialize(model_or_url, options = {}, &block)
-      init_haml_helpers
+      # init_haml_helpers
       @content      = block
       @model_or_url = model_or_url
       @options      = options
@@ -75,7 +75,7 @@ module UiBibz::Ui::Core::Navigations
     private
 
     def new_option
-      (@options || {}).merge({ class: UiBibz::Utils::Screwdriver.join_classes('btn-group', @options[:class]) })
+      (@options || {}).merge({ class: UiBibz::Builders::HtmlClassesBuilder.join_classes('btn-group', @options[:class]) })
     end
 
     def protect_against_forgery?

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

@@ -70,7 +70,7 @@ module UiBibz::Ui::Core::Navigations
     include UiBibz::Ui::Concerns::NavigationConcern
 
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @items = []
     end
@@ -99,20 +99,20 @@ module UiBibz::Ui::Core::Navigations
     end
 
     # Add nav in nav
-    def nav(content = nil, options = {}, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Component.new(Nav.new(content, options).tap(&block).render, {}, html_options)
+    def nav(content = nil, options = {}, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Component.new(Nav.new(content, options).tap(&).render, {}, html_options)
     end
 
     # Add nav dropdown items
     # See UiBibz::Ui::Core::Navigations::NavDropdown
-    def dropdown(content = nil, options = {}, html_options = nil, &block)
-      @items << NavDropdown.new(content, options, html_options).tap(&block)
+    def dropdown(content = nil, options = {}, html_options = nil, &)
+      @items << NavDropdown.new(content, options, html_options).tap(&)
     end
 
     protected
 
     def component_html_classes
-      [nav_class, type, position, stacked, justify, fill]
+      [nav_class, type, position, stacked, justify, fill, underline]
     end
 
     def component_html_options
@@ -173,5 +173,9 @@ module UiBibz::Ui::Core::Navigations
     def nav_tags
       @options[:nav_tags]
     end
+
+    def underline
+      'nav-underline' if @options[:underline]
+    end
   end
 end

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

@@ -78,7 +78,7 @@ module UiBibz::Ui::Core::Navigations
     include UiBibz::Ui::Concerns::NavigationConcern
 
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @items = []
     end
@@ -87,42 +87,44 @@ module UiBibz::Ui::Core::Navigations
     def pre_render
       content_tag :nav, html_options do
         UiBibz::Ui::Core::Layouts::Container.new(options[:container], options[:container_html]) do
-          if brand_position == :left
-            concat title
-            concat @navbar_toggle_html
+          capture do
+            if brand_position == :left
+              concat title
+              concat @navbar_toggle_html
+            end
+            concat navbar_toggle_button_html
+            if brand_position == :right
+              concat title
+              concat @navbar_toggle_html
+            end
+            concat body_html
           end
-          concat navbar_toggle_button_html
-          if brand_position == :right
-            concat title
-            concat @navbar_toggle_html
-          end
-          concat body_html
         end.render
       end
     end
 
     # Add navbar nav items
     # See UiBibz::Ui::Core::NavbarNav
-    def nav(content = nil, options = nil, html_options = nil, &block)
+    def nav(content = nil, options = nil, html_options = nil, &)
       options ||= {}
-      @items << UiBibz::Ui::Core::Navigations::NavbarNav.new(content, options, html_options).tap(&block)
+      @items << UiBibz::Ui::Core::Navigations::NavbarNav.new(content, options, html_options).tap(&)
     end
 
     # Add navbar form items
     # See UiBibz::Ui::Core::NavbarForm
-    def form(model_or_url, options = {}, &block)
-      @items << UiBibz::Ui::Core::Navigations::NavbarForm.new(model_or_url, options, &block)
+    def form(model_or_url, options = {}, &)
+      @items << UiBibz::Ui::Core::Navigations::NavbarForm.new(model_or_url, options, &)
     end
 
     # Not use !!!!!
     # Add navbar text items
     # See UiBibz::Ui::Core::NavbarText
-    def text(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Navigations::NavbarText.new(content, options, html_options, &block)
+    def text(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Navigations::NavbarText.new(content, options, html_options, &)
     end
 
-    def brand(content = nil, options = nil, html_options = nil, &block)
-      @brand = UiBibz::Ui::Core::Navigations::NavbarBrand.new(content, options, html_options, &block).render
+    def brand(content = nil, options = nil, html_options = nil, &)
+      @brand = UiBibz::Ui::Core::Navigations::NavbarBrand.new(content, options, html_options, &).render
     end
 
     def id
@@ -153,7 +155,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def body_html
-      content_tag :div, class: 'navbar-collapse collapse', id: id do
+      content_tag(:div, class: 'navbar-collapse collapse', id:) do
         concat @items.map(&:render).join.html_safe
       end
     end

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

@@ -56,7 +56,7 @@ module UiBibz::Ui::Core::Navigations
     include UiBibz::Ui::Concerns::HtmlConcern
 
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @items = []
     end
@@ -70,8 +70,8 @@ module UiBibz::Ui::Core::Navigations
 
     # Add nav link items
     # See UiBibz::Ui::Core::Navigations::NavLink
-    def link(content = nil, options = {}, html_options = nil, &block)
-      @items << PaginationLink.new(content, options, html_options, &block).render
+    def link(content = nil, options = {}, html_options = nil, &)
+      @items << PaginationLink.new(content, options, html_options, &).render
     end
 
     private

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

@@ -55,7 +55,7 @@ module UiBibz::Ui::Core::Navigations
     include UiBibz::Ui::Concerns::HtmlConcern
 
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @items = []
     end
@@ -65,10 +65,10 @@ module UiBibz::Ui::Core::Navigations
       content_tag :div, @items.map(&:render).join.html_safe, html_options
     end
 
-    def button_group(cont = nil, opt = nil, hopt = nil, &block)
+    def button_group(cont = nil, opt = nil, hopt = nil, &)
       cont = @options.merge(cont || {})
       (cont || {}).delete(:class)
-      @items << UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(cont, opt, hopt).tap(&block)
+      @items << UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(cont, opt, hopt).tap(&)
     end
 
     def spacer(num = 'auto')
@@ -78,8 +78,8 @@ module UiBibz::Ui::Core::Navigations
 
     # Add navbar form items
     # See UiBibz::Ui::Core::ToolbarForm
-    def form(model_or_url, options = {}, &block)
-      @items << UiBibz::Ui::Core::Navigations::ToolbarForm.new(model_or_url, options, &block)
+    def form(model_or_url, options = {}, &)
+      @items << UiBibz::Ui::Core::Navigations::ToolbarForm.new(model_or_url, options, &)
     end
 
     private

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

@@ -49,7 +49,7 @@ module UiBibz::Ui::Core::Notifications
   #
   class Alert < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       header(@content, tap: false) unless @tapped
     end
@@ -74,15 +74,14 @@ module UiBibz::Ui::Core::Notifications
     end
 
     # Add Body which is a component
-    def body(content = nil, options = nil, html_options = nil, &block)
-      @body = UiBibz::Ui::Core::Notifications::Components::AlertBody.new(content, options, html_options, &block).render
+    def body(content = nil, options = nil, html_options = nil, &)
+      @body = UiBibz::Ui::Core::Notifications::Components::AlertBody.new(content, options, html_options, &).render
     end
 
     private
 
     def component_html_data
-      super
-      add_html_data 'timeout', value: options[:timeout] if options[:timeout]
+      @data_html_options_builder.add 'timeout', value: options[:timeout]
     end
 
     def component_html_classes

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

@@ -62,15 +62,19 @@ module UiBibz::Ui::Core::Notifications
     end
 
     def component_html_classes
-      ['badge', type]
+      ['badge', type, corner]
     end
 
     def status
-      "bg-#{@options[:status] || :default}"
+      "bg-#{@options[:status] || :secondary}"
     end
 
     def type
       'rounded-pill' if @options[:type] == :pill
     end
+
+    def corner
+      'position-absolute top-0 start-100 translate-middle' if @options[:corner]
+    end
   end
 end

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

@@ -50,7 +50,7 @@ module UiBibz::Ui::Core::Notifications::Components
       if options[:image].is_a?(String)
         image_tag(options[:image], class: 'rounded me-2', alt: sanitize_text(options[:image])) unless options[:image].nil?
       else
-        options[:image][:class] = UiBibz::Utils::Screwdriver.join_classes(options[:image][:class], 'rounded me-2')
+        options[:image][:class] = UiBibz::Builders::HtmlClassesBuilder.join_classes(options[:image][:class], 'rounded me-2')
         if options[:image].delete(:pack)
           image_pack_tag(options[:image].delete(:href), **options[:image])
         else