ui_bibz 4.0.0.beta15 → 4.0.0.beta17

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

@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Core::Forms::Dropdowns::Components
+  # Create DropdownDropdown
+  #
+  # This element is an extend of UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.
+  #
+  # ==== 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:
+  # * +state+ - status of element with symbol value:
+  #   (+:active+)
+  # * +url+ - String
+  # * +glyph+ - Add glyph with name or hash options
+  #   * +name+ - String
+  #   * +size+ - Integer
+  #   * +type+ - Symbol
+  # * +link_html_options+ - Hash
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Forms::DropdownDropdown.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Forms::DropdownDropdown.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Forms::DropdownDropdown.new('Home', { glyph: 'home', state: :active, url: '#home', link_html_options: { class: 'link1' }},{ class: 'test' }).render
+  #
+  #   UiBibz::Ui::Core::Forms::DropdownDropdown.new({ glyph: { name: 'eye', size: 3 }, url: '#home' }, { class: 'test' }) do
+  #     'Home'
+  #   end.render
+  #
+  class DropdownDropdown < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
+
+    def initialize(...)
+      super
+      @items = []
+      @status = @options.delete(:status)
+    end
+
+    # Render html tag
+    def pre_render
+      content_tag :div, html_options do
+        concat button_html
+        concat ul_html
+      end
+    end
+
+    # Add dropdown header
+    # See UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownHeader
+    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
+    # See UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownDivider
+    def divider
+      @items << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownDivider.new.render
+    end
+
+    # Add dropdown link in list
+    # See UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink
+    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 dropdown(content = nil, options = nil, html_options = nil, &)
+      @items << new(content, options, html_options, &).render
+    end
+
+    def id
+      @id ||= html_options[:id] || generate_id('dropdown')
+    end
+
+    protected
+
+    def component_html_classes
+      ['dropdown-item', hover, position, open, inline, without_caret, keep_open]
+    end
+
+    def button_content
+      glyph_and_content_html(@content)
+    end
+
+    def button_html
+      content_tag :a, button_content, { class: join_classes(state, 'dropdown-toggle'), role: 'button', 'data-bs-toggle' => 'dropdown', 'aria-expanded' => false, 'id' => id }
+    end
+
+    def ul_html
+      content_tag :div, @items.join.html_safe, class: join_classes('dropdown-menu', theme, alignment, open), 'arial-labelledby' => id
+    end
+
+    def alignment
+      return nil if @options[:alignment].nil?
+
+      if @options[:alignment].is_a? Hash
+        ['dropdown-menu', @options[:alignment][:size], match_direction[@options[:alignment][:direction]]].join('-')
+      else
+        "dropdown-menu-#{match_direction[@options[:alignment]]}"
+      end
+    end
+
+    def position
+      "drop#{match_direction[@options[:position] || :right]}"
+    end
+
+    def open
+      'show' if @options[:open]
+    end
+
+    def keep_open
+      'keep-open' if @options[:keep_open]
+    end
+
+    def inline
+      'btn-group' if @options[:inline] || @options[:alignment]
+    end
+
+    def without_caret
+      'without-caret' if @options[:caret] == false
+    end
+
+    def outline
+      'outline' if @options[:outline]
+    end
+
+    def hover
+      'dropdown-hover' if @options[:hover]
+    end
+
+    def theme
+      'dropdown-menu-dark' if @options[:theme]
+    end
+
+    # Match end and start directions
+    def match_direction
+      {
+        up: 'up',
+        right: 'end',
+        down: 'down',
+        left: 'start',
+        start: 'start',
+        end: 'end'
+      }.with_indifferent_access
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 require 'ui_bibz/ui/core/forms/dropdowns/components/dropdown_header'
 require 'ui_bibz/ui/core/forms/dropdowns/components/dropdown_divider'
 require 'ui_bibz/ui/core/forms/dropdowns/components/dropdown_link'
+require 'ui_bibz/ui/core/forms/dropdowns/components/dropdown_dropdown'
 module UiBibz::Ui::Core::Forms::Dropdowns
   # Create a dropdown
   #
@@ -102,6 +103,10 @@ module UiBibz::Ui::Core::Forms::Dropdowns
       @items << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(content, options, html_options, &).render
     end
 
+    def dropdown(name = nil, options = nil, html_options = nil, &)
+      @items << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownDropdown.new(name, options, html_options).tap(&).render
+    end
+
     def id
       @id ||= html_options[:id] || generate_id('dropdown')
     end

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

@@ -67,7 +67,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def text
-      @options[:text].nil? ? true : @options[:text]
+      @options[:text].nil? || @options[:text]
     end
   end
 end

data/lib/ui_bibz/ui/ux/tables/components/store.rb

@@ -16,45 +16,25 @@ module UiBibz::Ui::Ux::Tables
       @model   = store.model
     end
 
-    def total_pages
-      @records.total_pages
-    end
+    delegate :total_pages, to: :@records
 
-    def per_page
-      @records.per_page
-    end
+    delegate :per_page, to: :@records
 
-    def total_entries
-      @records.total_entries
-    end
+    delegate :total_entries, to: :@records
 
-    def id
-      @store.id
-    end
+    delegate :id, to: :@store
 
-    def sort
-      @store.sort
-    end
+    delegate :sort, to: :@store
 
-    def column_id
-      @store.column_id
-    end
+    delegate :column_id, to: :@store
 
-    def direction
-      @store.direction
-    end
+    delegate :direction, to: :@store
 
-    def searchable_attributes
-      @store.searchable_attributes
-    end
+    delegate :searchable_attributes, to: :@store
 
-    def current_page
-      @records.current_page
-    end
+    delegate :current_page, to: :@records
 
-    def limit_value
-      @records.limit_value
-    end
+    delegate :limit_value, to: :@records
 
     def columns
       @columns ||= Columns.new(model.attribute_names.map { |attribute_name| Column.new(attribute_name, { name: attribute_name.humanize }) })
@@ -62,17 +42,11 @@ module UiBibz::Ui::Ux::Tables
 
     attr_reader :model
 
-    def search
-      @store.search
-    end
+    delegate :search, to: :@store
 
-    def controller
-      @store.controller
-    end
+    delegate :controller, to: :@store
 
-    def actions_controller
-      @store.actions_controller
-    end
+    delegate :actions_controller, to: :@store
 
     def params
       @store.params || {}
@@ -82,16 +56,10 @@ module UiBibz::Ui::Ux::Tables
       @store.params.to_h
     end
 
-    def action
-      @store.action
-    end
+    delegate :action, to: :@store
 
-    def param_id
-      @store.param_id
-    end
+    delegate :param_id, to: :@store
 
-    def id_key
-      @store.id_key
-    end
+    delegate :id_key, to: :@store
   end
 end

data/lib/ui_bibz/ui/ux/tables/extensions/actionable.rb

@@ -9,7 +9,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def actionable?
-      @options[:actionable].nil? ? true : @options[:actionable]
+      @options[:actionable].nil? || @options[:actionable]
     end
 
     def header(ths)
@@ -25,7 +25,7 @@ module UiBibz::Ui::Ux::Tables
     private
 
     def default_actions?
-      @options[:default_actions].nil? ? true : @options[:default_actions]
+      @options[:default_actions].nil? || @options[:default_actions]
     end
 
     def dropdown_action(record)

data/lib/ui_bibz/ui/ux/tables/extensions/paginable.rb

@@ -19,7 +19,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def paginable?
-      @options[:paginable].nil? ? true : @options[:paginable]
+      @options[:paginable].nil? || @options[:paginable]
     end
 
     private

data/lib/ui_bibz/ui/ux/tables/extensions/searchable.rb

@@ -18,7 +18,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def searchable?
-      @options[:searchable].nil? ? true : @options[:searchable]
+      @options[:searchable].nil? || @options[:searchable]
     end
 
     private

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

@@ -140,9 +140,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     # for test
-    def actions_list
-      @table.actions_list
-    end
+    delegate :actions_list, to: :@table
 
     private
 

data/test/ui/ux/tables/table_test.rb

@@ -26,7 +26,7 @@ class TableTest < ActionView::TestCase
 
   test 'table search field' do
     actual   = UiBibz::Ui::Ux::Tables::TableSearchField.new({ store: @users }).render
-    expected = "<form class=\"form-table-search-field\" action=\"/users?direction=asc&amp;page=1&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\" accept-charset=\"UTF-8\" method=\"get\"><div class=\"input-group input-group-sm table-search-field\"><span class=\"input-group-text\"><i class=\"glyph fa-solid fa-search\"></i></span><input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"page\" value=\"1\" /><input type=\"hidden\" name=\"only_path\" value=\"true\" /><input type=\"hidden\" name=\"store_id\" value=\"users\" /><input type=\"hidden\" name=\"link_type\" value=\"search\" /><input type=\"search\" value=\"Name fr\" name=\"search\" class=\"form-control\" placeholder=\"Search by Name fr and Name en...\" /><button type=\"button\" class=\"btn btn-secondary input-group-btn clear-search-btn\"><i class=\"glyph fa-solid fa-times-circle\"></i> <span class=\"visually-hidden\">Clear Search</span></button></div></form>"
+    expected = "<form class=\"form-table-search-field\" action=\"/users?direction=asc&amp;page=1&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\" accept-charset=\"UTF-8\" method=\"get\"><div class=\"input-group input-group-sm table-search-field\"><span class=\"input-group-text\"><i class=\"glyph fa-solid fa-search\"></i></span><input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"page\" value=\"1\" /><input type=\"hidden\" name=\"only_path\" value=\"true\" /><input type=\"hidden\" name=\"store_id\" value=\"users\" /><input type=\"hidden\" name=\"link_type\" value=\"search\" /><input type=\"search\" value=\"Name fr\" name=\"search\" class=\"form-control\" placeholder=\"Search by Name fr and Name en...\" /><button type=\"button\" class=\"clear-search-btn input-group-btn btn-secondary btn\" data-bs-toggle=\"tooltip\" data-bs-title=\"Clear Search\"><i class=\"glyph fa-solid fa-times-circle\"></i> <span class=\"visually-hidden\">Clear Search</span></button></div></form>"
 
     assert_equal expected, actual
   end
@@ -97,7 +97,7 @@ class TableTest < ActionView::TestCase
   test 'table searchable' do
     options  = { searchable: true }
     actual   = UiBibz::Ui::Ux::Tables::Searchable.new(@store, options).render
-    expected = "<div><div class=\"title\">Users list</div><form class=\"form-table-search-field\" action=\"/users?direction=asc&amp;page=1&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\" accept-charset=\"UTF-8\" method=\"get\"><div class=\"input-group input-group-sm table-search-field\"><span class=\"input-group-text\"><i class=\"glyph fa-solid fa-search\"></i></span><input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"page\" value=\"1\" /><input type=\"hidden\" name=\"only_path\" value=\"true\" /><input type=\"hidden\" name=\"store_id\" value=\"users\" /><input type=\"hidden\" name=\"link_type\" value=\"search\" /><input type=\"search\" value=\"Name fr\" name=\"search\" class=\"form-control\" placeholder=\"Search by Name fr and Name en...\" /><button type=\"button\" class=\"btn btn-secondary input-group-btn clear-search-btn\"><i class=\"glyph fa-solid fa-times-circle\"></i> <span class=\"visually-hidden\">Clear Search</span></button></div></form><br class=\"ui-bibz-clear\" /></div>"
+    expected = "<div><div class=\"title\">Users list</div><form class=\"form-table-search-field\" action=\"/users?direction=asc&amp;page=1&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\" accept-charset=\"UTF-8\" method=\"get\"><div class=\"input-group input-group-sm table-search-field\"><span class=\"input-group-text\"><i class=\"glyph fa-solid fa-search\"></i></span><input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"page\" value=\"1\" /><input type=\"hidden\" name=\"only_path\" value=\"true\" /><input type=\"hidden\" name=\"store_id\" value=\"users\" /><input type=\"hidden\" name=\"link_type\" value=\"search\" /><input type=\"search\" value=\"Name fr\" name=\"search\" class=\"form-control\" placeholder=\"Search by Name fr and Name en...\" /><button type=\"button\" class=\"clear-search-btn input-group-btn btn-secondary btn\" data-bs-toggle=\"tooltip\" data-bs-title=\"Clear Search\"><i class=\"glyph fa-solid fa-times-circle\"></i> <span class=\"visually-hidden\">Clear Search</span></button></div></form><br class=\"ui-bibz-clear\" /></div>"
 
     assert_equal expected, actual
   end

data/ui_bibz.gemspec

@@ -26,10 +26,9 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib vendor]
 
   # Rails gems
-  s.add_dependency 'rails', '>= 7.1.0'
-  # Switch to bootstrap 5.3.3 as soon as possible
-  s.add_dependency 'bootstrap-propshaft', '~> 5.3.2.2'
+  s.add_dependency 'bootstrap', '~> 5.3.3'
   s.add_dependency 'dartsass-rails'
+  s.add_dependency 'rails', '>= 7.1.0'
   s.add_dependency 'will_paginate'
   # Don't move factory_bot_rails to Gemfile else it will be loaded in test/dummy
   s.add_development_dependency 'factory_bot_rails', '~> 4.0' # rubocop:disable Gemspec/DevelopmentDependencies

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta15
+  version: 4.0.0.beta17
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-02 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 5.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 5.3.3
 - !ruby/object:Gem::Dependency
-  name: bootstrap-propshaft
+  name: dartsass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.2.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dartsass-rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - app/assets/javascripts/forms/formula.js
 - app/assets/javascripts/forms/input-connected.js
 - app/assets/javascripts/forms/jquery.multi-select-extend.js
+- app/assets/javascripts/forms/nested-dropdown.js
 - app/assets/javascripts/interfaces.js
 - app/assets/javascripts/tables.js
 - app/assets/javascripts/ui_bibz_js.js
@@ -239,6 +240,7 @@ files:
 - lib/ui_bibz/ui/core/forms/choices/switch_field.rb
 - lib/ui_bibz/ui/core/forms/dates/date_picker_field.rb
 - lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_divider.rb
+- lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_dropdown.rb
 - lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_header.rb
 - lib/ui_bibz/ui/core/forms/dropdowns/components/dropdown_link.rb
 - lib/ui_bibz/ui/core/forms/dropdowns/dropdown.rb