ui_bibz 3.0.13 → 4.0.0.beta4

data/lib/ui_bibz/strategies/component_initialize_hash_strategy.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module UiBibz
+  module Strategies
+    # Class to initialize component
+    class ComponentInitializeHashStrategy < UiBibz::Strategies::ComponentInitializeAbstractStrategy
+      def content; end
+
+      def options
+        with_indifferent_access(@content)
+      end
+
+      def html_options
+        with_indifferent_access(@options)
+      end
+    end
+  end
+end

data/lib/ui_bibz/strategies/component_initialize_standard_strategy.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module UiBibz
+  module Strategies
+    # Class to initialize component
+    class ComponentInitializeStandardStrategy < UiBibz::Strategies::ComponentInitializeAbstractStrategy
+      attr_reader :content
+
+      def options
+        with_indifferent_access(@options)
+      end
+
+      def html_options
+        with_indifferent_access(@html_options)
+      end
+    end
+  end
+end

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

@@ -34,15 +34,15 @@ module UiBibz::Ui::Concerns::CardItemableConcern # :nodoc:
     end
 
     # Add List group which is a component
-    def list_group(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Boxes::Components::CardListGroup.new(content, options, html_options).tap(&block).render
+    def list_group(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Boxes::Components::CardListGroup.new(content, options, html_options).tap(&).render
     end
 
     # Add Image which is a component
-    def image(content = nil, options = nil, html_options = nil, &block)
+    def image(content = nil, options = nil, html_options = nil, &)
       # Add position top to the image if the image is in top of the card
       options = (options || {}).merge(position: :top) if @header.nil? && @items.empty? && options.try(:[], :position).nil?
-      @items << UiBibz::Ui::Core::Boxes::Components::CardImage.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Boxes::Components::CardImage.new(content, options, html_options, &).render
     end
 
     # Add a row whih is a component

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

@@ -5,7 +5,7 @@ module UiBibz::Ui::Concerns::NotificationConcern # :nodoc:
 
   included do
     def data_attributes
-      self.class.const_get('DATA_ATTRIBUTES').filter_map do |data_attribute|
+      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

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

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

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

@@ -34,7 +34,7 @@ module UiBibz::Ui::Core::Boxes
     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
@@ -44,9 +44,9 @@ module UiBibz::Ui::Core::Boxes
       content_tag :div, @items.join.html_safe, html_options
     end
 
-    def card(content = nil, options = nil, html_options = nil, &block)
+    def card(content = nil, options = nil, html_options = nil, &)
       content = (content || {}).merge({ parent_collapse: id })
-      @items << UiBibz::Ui::Core::Boxes::Card.new(content, options, html_options).tap(&block).render
+      @items << UiBibz::Ui::Core::Boxes::Card.new(content, options, html_options).tap(&).render
     end
 
     private
@@ -60,7 +60,7 @@ module UiBibz::Ui::Core::Boxes
     end
 
     def component_html_options
-      { id: id }
+      { id: }
     end
   end
 end

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

@@ -34,7 +34,7 @@ module UiBibz::Ui::Core::Boxes
     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

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

@@ -34,7 +34,7 @@ module UiBibz::Ui::Core::Boxes
     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

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

@@ -34,9 +34,6 @@ module UiBibz::Ui::Core::Boxes
     include UiBibz::Ui::Concerns::HtmlConcern
 
     # 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/boxes/card_group.rb

@@ -34,7 +34,7 @@ module UiBibz::Ui::Core::Boxes
     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

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

@@ -38,7 +38,7 @@ module UiBibz::Ui::Core::Boxes::Components
     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 = [@content]
     end
@@ -54,20 +54,20 @@ module UiBibz::Ui::Core::Boxes::Components
       end
     end
 
-    def title(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Boxes::Components::Body::CardBodyTitle.new(content, options, html_options, &block).render
+    def title(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Boxes::Components::Body::CardBodyTitle.new(content, options, html_options, &).render
     end
 
-    def subtitle(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Boxes::Components::Body::CardBodySubtitle.new(content, options, html_options, &block).render
+    def subtitle(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Boxes::Components::Body::CardBodySubtitle.new(content, options, html_options, &).render
     end
 
-    def link(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Boxes::Components::Body::CardBodyLink.new(content, options, html_options, &block).render
+    def link(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Boxes::Components::Body::CardBodyLink.new(content, options, html_options, &).render
     end
 
-    def text(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Boxes::Components::Body::CardBodyText.new(content, options, html_options, &block).render
+    def text(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Boxes::Components::Body::CardBodyText.new(content, options, html_options, &).render
     end
 
     def row(content = nil, options = nil, html_options = nil, &block)

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

@@ -46,8 +46,8 @@ module UiBibz::Ui::Core::Boxes::Components
     include UiBibz::Ui::Concerns::CardItemableConcern
 
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
-      content = { num: content } if content.is_a?(Integer)
+    def initialize(...)
+      { num: content } if content.is_a?(Integer)
       super
       @items = [@content]
     end

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

@@ -32,7 +32,7 @@ module UiBibz::Ui::Core::Boxes::Components
   #
   class CardListGroup < UiBibz::Ui::Core::Lists::ListGroup
     # 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/boxes/components/card_row.rb

@@ -45,7 +45,7 @@ module UiBibz::Ui::Core::Boxes::Components
   #
   class CardRow < UiBibz::Ui::Core::Layouts::Row
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @items = [@content]
     end

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

@@ -3,7 +3,6 @@
 require 'haml'
 require 'ui_bibz/ui/extensions/core/component/klass_extension'
 require 'ui_bibz/ui/extensions/core/component/glyph_extension'
-require 'ui_bibz/ui/extensions/core/component/popover_extension'
 module UiBibz::Ui::Core
   # Creates a component of the given +name+ using options created by the set of +options+.
   #
@@ -44,7 +43,6 @@ module UiBibz::Ui::Core
   class Component < UiBibz::Ui::Base
     include KlassExtension
     include GlyphExtension
-    include PopoverExtension
 
     # Constants
     STATUSES = %i[primary secondary success danger warning info light dark].freeze
@@ -59,27 +57,13 @@ module UiBibz::Ui::Core
     # * Options of component is defined in hash options
     # * Html options is defined in hash html_options
     def initialize(content = nil, options = nil, html_options = nil, &block)
-      if !block.nil?
-        @tapped = tapped?(block)
-        @html_options = options
-        @options = content
-        read_cache = Rails.cache.read(@options.try(:[], :cache))
-        if read_cache.nil?
-          context  = eval('self', block.binding) # rubocop:disable Style/EvalWithLocation
-          @content = context.capture(&block)
-        else
-          @content = read_cache
-        end
-      elsif content.is_a?(Hash)
-        @html_options = options
-        @options = content
-      else
-        @html_options = html_options
-        @options = options
-        @content = content
-      end
-      @html_options = (@html_options || {}).with_indifferent_access
-      @options      = (@options || {}).with_indifferent_access
+      component_initialize_factory_method = UiBibz::FactoryMethods::ComponentInitializeFactoryMethod.new(self, self.binding).make
+      @content = component_initialize_factory_method.content
+      @html_options = component_initialize_factory_method.html_options
+      @options      = component_initialize_factory_method.options
+
+      @data_html_options_builder = UiBibz::Builders::DataHtmlOptionsBuilder.new(@html_options, @options)
+
       init_options
       init_component_html_options
     end
@@ -108,25 +92,7 @@ module UiBibz::Ui::Core
     end
 
     # Override this method to add html data
-    def component_html_data
-      # To stimulusjs
-      data_target = html_options.try(:[], :data).try(:[], :target) || options.try(:delete, :target)
-      add_html_data(:target, value: data_target) unless data_target.nil?
-
-      data_controller = html_options.try(:[], :data).try(:[], :controller) || options.try(:delete, :controller)
-      add_html_data(:controller, value: data_controller) unless data_controller.nil?
-
-      data_action = html_options.try(:[], :data).try(:[], :action) || options.try(:delete, :action)
-      add_html_data(:action, value: data_action) unless data_action.nil?
-
-      # 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
+    def component_html_data; end
 
     # Override this method to add html Options
     # Accept Hash
@@ -145,13 +111,6 @@ module UiBibz::Ui::Core
       []
     end
 
-    # Add html data arguments
-    def add_html_data(name, value: true)
-      html_options[:data] = {} if html_options[:data].nil?
-      value = value.strip if value.is_a?(String)
-      html_options[:data].update({ name => value })
-    end
-
     def disabled?
       options[:state] == :disabled || html_options[:disabled]
     end
@@ -181,20 +140,12 @@ module UiBibz::Ui::Core
       @options = component_options.merge(@options).with_indifferent_access
     end
 
-    def initialize_component_html_data
-      component_html_data
-      popover_data_html
-      tooltip_data_html
-    end
-
-    def initialize_component_html_options
-      html_options.merge!(component_html_options)
-    end
-
     def init_component_html_options
-      initialize_component_html_data
-      initialize_component_html_classes
-      initialize_component_html_options
+      component_html_data
+      html_options_builder = UiBibz::Builders::HtmlOptionsBuilder.new(@data_html_options_builder.output, options)
+      html_options_builder.initialize_component_html_classes initialize_component_html_classes
+      html_options_builder.initialize_component_html_options component_html_options
+      @html_options = html_options_builder.html_options
     end
   end
 end

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

@@ -52,6 +52,8 @@ module UiBibz::Ui::Core::Forms::Buttons
   #    content
   #  end
   class Button < UiBibz::Ui::Core::Component
+    include GlyphExtension
+
     # Render html tag
     def pre_render
       button_html_tag
@@ -107,7 +109,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     end
 
     def action
-      add_html_data('action', value: options[:action]) unless options[:action].nil?
+      @data_html_options_builder.add('action', value: options[:action])
     end
 
     def badge_html

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

@@ -50,7 +50,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     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
@@ -80,28 +80,28 @@ module UiBibz::Ui::Core::Forms::Buttons
       @items << ButtonLink.new(content, options, html_options, &block)
     end
 
-    def dropdown(content, options = {}, html_options = nil, &block)
+    def dropdown(content, options = {}, html_options = nil, &)
       options = @options.merge(options)
-      @items << ButtonGroupDropdown.new(content, options, html_options).tap(&block)
+      @items << ButtonGroupDropdown.new(content, options, html_options).tap(&)
     end
 
-    def split_dropdown(content, options = {}, html_options = nil, &block)
+    def split_dropdown(content, options = {}, html_options = nil, &)
       options = @options.merge(options)
-      @items << ButtonGroupSplitDropdown.new(content, options, html_options).tap(&block)
+      @items << ButtonGroupSplitDropdown.new(content, options, html_options).tap(&)
     end
 
-    def input(attribute_name, options = {}, &block)
+    def input(attribute_name, options = {}, &)
       options = @options.merge(options)
 
-      @items << @options[:form].input(attribute_name, options.merge({ label: false, wrapper: false }), &block)
+      @items << @options[:form].input(attribute_name, options.merge({ label: false, wrapper: false }), &)
     end
 
-    def html(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Component.new(content, options, html_options, &block)
+    def html(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Component.new(content, options, html_options, &)
     end
 
-    def choice_group(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Forms::Choices::ChoiceGroup.new(content, options, html_options).tap(&block)
+    def choice_group(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Forms::Choices::ChoiceGroup.new(content, options, html_options).tap(&)
     end
 
     private

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

@@ -88,7 +88,7 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # '', 'mini', 'small', 'normal', 'large'
     def size
-      add_html_data('size', value: matching_size[options[:size]]) unless options[:size].nil?
+      @data_html_options_builder.add('size', value: matching_size[options[:size]])
     end
 
     def matching_size
@@ -97,7 +97,7 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # true, false => default : true
     def animate
-      add_html_data('animate', value: options.delete(:animate)) unless options[:animate].nil?
+      @data_html_options_builder.add('animate', value: options.delete(:animate)) unless options[:animate].nil?
     end
 
     # active, disabled => default : active
@@ -107,27 +107,27 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # 'primary', 'info', 'success', 'warning', 'danger', 'default' => default : default
     def left_color
-      add_html_data('on_color', value: options[:left_color]) unless options[:left_color].nil?
+      @data_html_options_builder.add('on_color', value: options[:left_color])
     end
 
     # 'primary', 'info', 'success', 'warning', 'danger', 'default' => default : default
     def right_color
-      add_html_data('off_color', value: options[:right_color]) unless options[:right_color].nil?
+      @data_html_options_builder.add('off_color', value: options[:right_color])
     end
 
     # String => default : "ON"
     def left_text
-      add_html_data('on_text', value: options[:left_text]) unless options[:left_text].nil?
+      @data_html_options_builder.add('on_text', value: options[:left_text])
     end
 
     # String => default : "OFF"
     def right_text
-      add_html_data('off_text', value: options[:right_text]) unless options[:right_text].nil?
+      @data_html_options_builder.add('off_text', value: options[:right_text])
     end
 
     # String => default : ' '
     def middle_text
-      add_html_data('label_text', value: options[:middle_text]) unless options[:middle_text].nil?
+      @data_html_options_builder.add('label_text', value: options[:middle_text])
     end
 
     def inline

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

@@ -65,13 +65,13 @@ module UiBibz::Ui::Core::Forms::Choices
 
     def wrapper_html_options
       (options[:wrapper_html] || {}).tap do |option|
-        option[:class] = UiBibz::Utils::Screwdriver.join_classes(wrapper_classes, inline, options[:wrapper_html].try(:[], :class))
+        option[:class] = UiBibz::Builders::HtmlClassesBuilder.join_classes(wrapper_classes, inline, options[:wrapper_html].try(:[], :class))
       end
     end
 
     def label_html_options
       (options[:label_html] || {}).tap do |option|
-        option[:class] = UiBibz::Utils::Screwdriver.join_classes(label_classes, options[:label_html].try(:[], :class))
+        option[:class] = UiBibz::Builders::HtmlClassesBuilder.join_classes(label_classes, options[:label_html].try(:[], :class))
       end
     end
 

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

@@ -52,7 +52,7 @@ module UiBibz::Ui::Core::Forms::Choices
 
     # See UiBibz::Ui::Core::Forms::Choices::Button.initialize
     #
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @items = []
       @errors = []
@@ -72,14 +72,14 @@ module UiBibz::Ui::Core::Forms::Choices
       @items << Choice.new(content, opts, html_options, &block)
     end
 
-    def input(attribute_name, options = {}, &block)
+    def input(attribute_name, options = {}, &)
       new_options = options.merge(old_label: options[:label], label: false, wrapper: false, error: false)
       new_options = new_options.merge(name: @radio_name, type: :radio) if @options[:type] == :radio
 
-      @items << @options[:form].input(attribute_name, new_options, &block)
+      @items << @options[:form].input(attribute_name, new_options, &)
       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
 
     private
@@ -93,8 +93,7 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     def component_html_data
-      super
-      add_html_data 'toggle', value: 'buttons' if @options[:form].nil?
+      @data_html_options_builder.add('toggle', value: 'buttons') if @options[:form].nil?
     end
   end
 end

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

@@ -61,7 +61,7 @@ module UiBibz::Ui::Core::Forms::Choices
     end
 
     def input_options
-      @input_options ||= { type: type, autocomplete: :off, class: 'btn-check' }
+      @input_options ||= { type:, autocomplete: :off, class: 'btn-check' }
                          .merge(checked)
                          .merge(value)
                          .merge(name)

data/lib/ui_bibz/ui/core/forms/dates/date_picker_field.rb

@@ -95,15 +95,15 @@ module UiBibz::Ui::Core::Forms::Dates
     end
 
     def date_locale
-      add_html_data 'date_locale', value: I18n.locale.to_s
+      @data_html_options_builder.add 'date_locale', value: I18n.locale.to_s
     end
 
     def provide
-      add_html_data 'provide', value: 'datepicker'
+      @data_html_options_builder.add 'provide', value: 'datepicker'
     end
 
     def format
-      add_html_data 'date_format', value: picker_pattern
+      @data_html_options_builder.add 'date_format', value: picker_pattern
     end
 
     def picker_pattern
@@ -111,51 +111,51 @@ module UiBibz::Ui::Core::Forms::Dates
     end
 
     def today_btn
-      add_html_data 'date_today_btn', value: 'linked'
+      @data_html_options_builder.add 'date_today_btn', value: 'linked'
     end
 
     def today_highlight
-      add_html_data('date_today_highlight') if options[:today_highlight]
+      @data_html_options_builder.add('date_today_highlight') if options[:today_highlight]
     end
 
     def calendar_weeks
-      add_html_data('date_calendar_weeks') if options[:calendar_weeks]
+      @data_html_options_builder.add('date_calendar_weeks') if options[:calendar_weeks]
     end
 
     def autoclose
-      add_html_data('date_autoclose') if options[:autoclose]
+      @data_html_options_builder.add('date_autoclose') if options[:autoclose]
     end
 
     def dates_disabled
-      add_html_data('dates_disabled', value: [options[:dates_disabled]].flatten) if options[:dates_disabled]
+      @data_html_options_builder.add('dates_disabled', value: [options[:dates_disabled]].flatten) if options[:dates_disabled]
     end
 
     def toggle_active
-      add_html_data('date_toggle_active')
+      @data_html_options_builder.add('date_toggle_active')
     end
 
     def display_mode
-      add_html_data('date_start_view', value: views[options[:display_mode]]) if options[:display_mode]
+      @data_html_options_builder.add('date_start_view', value: views[options[:display_mode]]) if options[:display_mode]
     end
 
     def display_mode_min
-      add_html_data('date_min_view_mode', value: views[options[:display_mode_min]]) if options[:display_mode_min]
+      @data_html_options_builder.add('date_min_view_mode', value: views[options[:display_mode_min]]) if options[:display_mode_min]
     end
 
     def display_mode_max
-      add_html_data('date_max_view_mode', value: views[options[:display_mode_max]]) if options[:display_mode_max]
+      @data_html_options_builder.add('date_max_view_mode', value: views[options[:display_mode_max]]) if options[:display_mode_max]
     end
 
     def days_of_week_disabled
-      add_html_data('date_days_of_week_disabled', value: [options[:days_of_week_disabled]].flatten) if options[:days_of_week_disabled]
+      @data_html_options_builder.add('date_days_of_week_disabled', value: [options[:days_of_week_disabled]].flatten) if options[:days_of_week_disabled]
     end
 
     def days_of_week_highlighted
-      add_html_data('date_days_of_week_highlighted', value: [options[:days_of_week_highlighted]].flatten) if options[:days_of_week_highlighted]
+      @data_html_options_builder.add('date_days_of_week_highlighted', value: [options[:days_of_week_highlighted]].flatten) if options[:days_of_week_highlighted]
     end
 
     def multiple
-      add_html_data('date_multidate', value: options[:multiple]) if options[:multiple]
+      @data_html_options_builder.add('date_multidate', value: options[:multiple])
     end
 
     # :lg, :sm or :xs

data/lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_link.rb

@@ -42,7 +42,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns::Components
   #
   class DropdownLink < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize(content = nil, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @html_options = @html_options.merge(link_html_options)
     end

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

@@ -70,7 +70,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
   class Dropdown < UiBibz::Ui::Core::Component
     include UiBibz::Ui::Concerns::HtmlConcern
 
-    def initialize(content, options = nil, html_options = nil, &block)
+    def initialize(...)
       super
       @items = []
       @status = @options.delete(:status)
@@ -86,8 +86,8 @@ module UiBibz::Ui::Core::Forms::Dropdowns
 
     # Add dropdown header
     # See UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownHeader
-    def header(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownHeader.new(content, options, html_options, &block).render
+    def header(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownHeader.new(content, options, html_options, &).render
     end
 
     # Add dropdown Separator
@@ -98,8 +98,8 @@ module UiBibz::Ui::Core::Forms::Dropdowns
 
     # Add dropdown link in list
     # See UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink
-    def link(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(content, options, html_options, &block).render
+    def link(content = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(content, options, html_options, &).render
     end
 
     def id