effective_bootstrap 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 456bfec1d309b5a42655fc3cc6f0974aa652447c03b5bb4087fac75234b5224b
-  data.tar.gz: 6cc6d0f44fe7e6e5e70252c12f00d28ab2f5d068ea55f327e6e134b4771e7edb
+  metadata.gz: a09d2f8d91357f5486377ae6a31483533bf214f4c8f1ba536bc9061828529370
+  data.tar.gz: e6a42b55fc5b377d7ccebf1b7418c41df907ed4b66de6ee58407690e46e82767
 SHA512:
-  metadata.gz: c74d48645ebb72fcc48cc64a528bb712b1217df473620a789788bb8055c8e55c4987e329d74bc69362891af23df7d2eaaa95655de5ba8e7cae16b76b596bff14
-  data.tar.gz: daffd96de52135a3c5b977bb1c4df77d6a32777b36c894d96ba951bda5b2005e1ce186a283bb0cc3be0942f6711b7c61a690f8d0b3c10ffec638e0b5e4978efe
+  metadata.gz: 95b1495a52b26a3970754866ef7d35735be448daa675c3f21745ec8ff6298d893d8ecc912d37b28d1dd03ffad3fed29fa3adbcc26e6a278a050a6565bb052dbb
+  data.tar.gz: 174be86ba9a4064b21a3dcdbe4c13787165a574a31f93773ac12de60d20212e37edea12793197afa360502f95f6f2fd8941281696f114f881c2aa61da6fea470

data/app/helpers/effective_bootstrap_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Boostrap4 Helpers
 
 module EffectiveBootstrapHelper
@@ -72,15 +74,27 @@ module EffectiveBootstrapHelper
   # variations can be :dropup, :dropleft, :dropright
   # split can be true, false
   # right is to right align things
+  DROPDOWN_SPLIT_OPTS = {class: "btn dropdown-toggle dropdown-toggle-split btn-sm btn-outline-primary", type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false}
+  DROPDOWN_UNSPLIT_OPTS= {class: "btn dropdown-toggle btn-sm btn-outline-primary", type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false}
+
+  DROPDOWN_DROPLEFT_GROUP_OPTS = {class: 'btn-group'}
+  DROPDOWN_DROPLEFT_OPTS = {class: 'btn-group dropleft', role: 'group'}
+
+  DROPDOWN_MENU_OPTS = {class: 'dropdown-menu'}
+  DROPDOWN_MENU_RIGHT_OPTS = {class: 'dropdown-menu dropdown-menu-right'}
+
+  DROPDOWN_BTN_CLASS = 'btn-sm btn-outline-primary'
+  DROPDOWN_TOGGLE_DROPDOWN = "<span class='sr-only'>Toggle Dropdown</span>".html_safe
+
   def dropdown(variation: nil, split: true, btn_class: nil, btn_content: nil, right: false, &block)
     raise 'expected a block' unless block_given?
 
-    btn_class = btn_class.presence || 'btn-outline-primary'
+    btn_class ||= DROPDOWN_BTN_CLASS
 
+    # Process all dropdown_link_tos
     @_dropdown_link_tos = []
     @_dropdown_split = split
-
-    # process dropdown_link_tos
+    @_dropdown_button_class = btn_class
     yield
 
     return @_dropdown_link_tos.first if @_dropdown_link_tos.length <= 1
@@ -88,31 +102,37 @@ module EffectiveBootstrapHelper
     # Build tags
     first = @_dropdown_link_tos.first
 
-    button = content_tag(:button, class: "btn #{btn_class} dropdown-toggle" + (split ? " dropdown-toggle-split" : ''), type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) do
-      btn_content || content_tag(:span, 'Toggle Dropdown', class: 'sr-only')
+    button_opts = (split ? DROPDOWN_SPLIT_OPTS : DROPDOWN_UNSPLIT_OPTS)
+
+    if btn_class != DROPDOWN_BTN_CLASS
+      button_opts[:class] = button_opts[:class].sub(DROPDOWN_BTN_CLASS, btn_class)
+    end
+
+    button = content_tag(:button, button_opts) do
+      btn_content || DROPDOWN_TOGGLE_DROPDOWN
     end
 
+    menu_opts = (right ? DROPDOWN_MENU_RIGHT_OPTS : DROPDOWN_MENU_OPTS)
+
     menu = if split
-      content_tag(:div, @_dropdown_link_tos[1..-1].join.html_safe, class: ['dropdown-menu', ('dropdown-menu-right' if right)].compact.join(' '))
+      content_tag(:div, @_dropdown_link_tos[1..-1].join.html_safe, menu_opts)
     else
-      content_tag(:div, @_dropdown_link_tos.join.html_safe, class: ['dropdown-menu', ('dropdown-menu-right' if right)].compact.join(' '))
+      content_tag(:div, @_dropdown_link_tos.join.html_safe, menu_opts)
     end
 
-    retval = if split
+    @_dropdown_link_tos = nil
+
+    if split && variation == :dropleft
+      content_tag(:div, DROPDOWN_DROPLEFT_GROUP_OPTS) do
+        content_tag(:div, (button + menu), DROPDOWN_DROPLEFT_OPTS) + first.html_safe
+      end
+    elsif split
       content_tag(:div, class: 'btn-group') do
-        content_tag(:div, class: ['btn-group', variation.to_s.presence].compact.join(' '), role: 'group') do
-          [:dropleft].include?(variation) ? (button + menu) : (first + button + menu)
-        end + ([:dropleft].include?(variation) ? first : '').html_safe
+        content_tag(:div, (first + button + menu), class: "btn-group #{variation}", role: 'group')
       end
     else
-      content_tag(:div, class: 'dropdown') do
-        button + menu
-      end
+      content_tag(:div, (button + menu), class: 'dropdown')
     end
-
-    @_dropdown_link_tos = nil
-
-    retval
   end
 
   # This is a special variant of dropdown
@@ -135,17 +155,17 @@ module EffectiveBootstrapHelper
 
   # Works with dots do and dropdown do
   def dropdown_link_to(label, path, options = {})
-    btn_class = options.delete(:btn_class).presence || 'btn-outline-primary'
+    btn_class = options.delete(:btn_class).presence || @_dropdown_button_class || 'btn-outline-primary'
 
     unless @_dropdown_link_tos
-      options[:class] = [options[:class], 'dropdown-item'].compact.join(' ')
+      options[:class] = (options[:class] ? "dropdown-item #{options[:class]}" : 'dropdown-item')
       return link_to(label, path, options)
     end
 
     if @_dropdown_link_tos.length == 0 && @_dropdown_split
-      options[:class] = [options[:class], 'btn', btn_class].compact.join(' ')
+      options[:class] = (options[:class] ? "btn #{btn_class} #{options[:class]}" : "btn #{btn_class}")
     else
-      options[:class] = [options[:class], 'dropdown-item'].compact.join(' ')
+      options[:class] = (options[:class] ? "dropdown-item #{options[:class]}" : 'dropdown-item')
     end
 
     @_dropdown_link_tos << link_to(label, path, options)

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.1'.freeze
+  VERSION = '0.9.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails