effective_bootstrap 0.9.39 → 0.9.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac9e0d6013b991db010ef717fe181ea041d2d9e756e0bb477d9ff7544248b718
-  data.tar.gz: f212aea0848dd0d7d50b0186b798ce9cb52d8c5e17bba7f4cfd63b69cc716861
+  metadata.gz: 3ec7aa9c72ddbc58533cf76bf8eb8843f957bc2f79be9604f35a41948bbd03e4
+  data.tar.gz: 064e9a0da7b7d2721953348524dcc38f16cd9fb0bffcaca88fe181aa4d7b9e6e
 SHA512:
-  metadata.gz: a87134d9311b1837d06e9e37857c03930a52cb0c211a2bd1dd05276ecd7eca76d57615e71cea80b271b9f11a7469647ff4915f790330f19ddd8a2c185a0604c6
-  data.tar.gz: 35fca4a527a44b58237cc6e71ab8846aa4da76d0f1c7e82078d272323bfb90be12ca16c4f27574603b118a90f5831753fb0e010bc7e5586626c982cf8be33901
+  metadata.gz: 1237917f4abb0ab752d26a6c7af13169ed0a971c048cfeb1b984912dc54bfa58e7f6bdf312a9b54fa1108d8cf725fba038e0a876ee492522a7a53345ce99537b
+  data.tar.gz: 368f386c0683a11fb99060a79a60cd9d6b6870cf9299173b7a1cb7da865ce23c976af625397f6f2fd0c715999d6b266387efb66b8af02ef73792ac6d88696ace

data/app/assets/stylesheets/effective_bootstrap/base.scss

@@ -1,4 +1,4 @@
+@import './collapse';
 @import './forms';
 @import './icons';
 @import './overrides';
-

data/app/assets/stylesheets/effective_bootstrap/collapse.scss

@@ -0,0 +1,7 @@
+.effective-collapse-actions {
+  .collapse-label-expand { display: none; }
+  .collapse-label-collapse { display: inline-block; }
+
+  &.collapsed .collapse-label-expand { display: inline-block; }
+  &.collapsed .collapse-label-collapse { display: none; }
+}

data/app/helpers/effective_bootstrap_helper.rb

@@ -18,6 +18,31 @@ module EffectiveBootstrapHelper
     content
   end
 
+  def accordion_collapse(label, opts = {}, &block)
+    raise 'expected a block' unless block_given?
+
+    id = "collapse-#{effective_bootstrap_unique_id}"
+    show = (opts.delete(:show) == true)
+
+    link_opts = { 'data-toggle': 'collapse', role: 'button', href: "##{id}", 'aria-controls': "##{id}", 'aria-expanded': show }
+
+    link_opts[:class] = opts.delete(:link_class) || 'btn btn-link'
+    div_class = opts.delete(:div_class)
+    card_class = opts.delete(:card_class) || 'card card-body my-2'
+
+    # Accordion collapse
+    content_tag(:div, class: "card mb-0") do
+      content_tag(:div, class: "card-header") do
+        content_tag(:h2, class: "mb-0") do
+          content_tag(:button, label, link_opts.merge(class: "btn btn-link"))
+        end
+      end +
+      content_tag(:div, id: id, class: ['collapse', div_class, ('show' if show)].compact.join(' '), "data-parent": "##{@_accordion_active}") do
+        content_tag(:div, capture(&block), class: "card-body")
+      end
+    end
+  end
+
   # https://getbootstrap.com/docs/4.0/components/card/
   # = card('title do')
   #   %p Stuff
@@ -56,40 +81,67 @@ module EffectiveBootstrapHelper
   # = collapse('already expanded', show: true) do
   #   %p Something Expanded
 
+  # the word 'show' will automatically be replaced with hide and an icon added
+  # = collapse('show items') do
+  #   %p Something Expanded
+
+  # Override the expand and collapse labels directly
+  # = collapse('show items', expand: "Show items" + icon('ok'), collapse: "Hide items" + icon('x')) do
+  #   %p Something Expanded
+
   # collapse(items.length, class: 'btn btn-primary', class: 'mt-2') do
   #   items.map { |item| content_tag(:div, item.to_s) }.join.html_safe
   # end
+
+  COLLAPSE_SUBSTITUTIONS = {
+    'Show ' => 'Hide ',
+    'show ' => 'hide ',
+    'Expand ' => 'Collapse ',
+    'expand ' => 'collapse ',
+    ' More' => ' Less',
+    ' more' => ' less'
+  }
+
   def collapse(label, opts = {}, &block)
     raise 'expected a block' unless block_given?
 
+    return accordian_collapse(label, opts, &block) if @_accordion_active
+
     id = "collapse-#{effective_bootstrap_unique_id}"
     show = (opts.delete(:show) == true)
 
+    # Figure out all the button / link options
     link_opts = { 'data-toggle': 'collapse', role: 'button', href: "##{id}", 'aria-controls': "##{id}", 'aria-expanded': show }
 
+    # Two link labels
+    label_expand = opts.delete(:expand) || label.to_s.tap do |label|
+      COLLAPSE_SUBSTITUTIONS.each { |show, hide| label.sub!(hide, show) }
+    end + icon('chevron-down')
+
+    label_collapse = opts.delete(:collapse) || label.to_s.tap do |label|
+      COLLAPSE_SUBSTITUTIONS.each { |show, hide| label.sub!(show, hide) }
+    end + icon('chevron-up')
+
+    # The link html classes
     link_opts[:class] = opts.delete(:link_class) || 'btn btn-link'
+    link_opts[:class] += ' effective-collapse-actions hidden-print'
+    link_opts[:class] += ' collapsed' unless show
+
+    # The div and the card now
     div_class = opts.delete(:div_class)
     card_class = opts.delete(:card_class) || 'card card-body my-2'
 
-    if @_accordion_active
-      # Accordion collapse
-      content_tag(:div, class: "card mb-0") do
-        content_tag(:div, class: "card-header") do
-          content_tag(:h2, class: "mb-0") do
-            content_tag(:button, label, link_opts.merge(class: "btn btn-link"))
-          end
-        end +
-        content_tag(:div, id: id, class: ['collapse', div_class, ('show' if show)].compact.join(' '), "data-parent": "##{@_accordion_active}") do
-          content_tag(:div, capture(&block), class: "card-body")
-        end
-      end
-    else
-      # Normal collapse
-      content_tag(:a, label, link_opts) +
-      content_tag(:div, id: id, class: ['collapse', div_class, ('show' if show)].compact.join(' ')) do
-        content_tag(:div, capture(&block), class: card_class)
-      end
+    # Normal collapse
+    link_tag = content_tag(:a, link_opts) do
+      content_tag(:div, label_expand.html_safe, class: 'collapse-label-expand') +
+      content_tag(:div, label_collapse.html_safe, class: 'collapse-label-collapse')
+    end
+
+    div_tag = content_tag(:div, id: id, class: ['effective-collapse collapse', div_class, ('show' if show)].compact.join(' ')) do
+      content_tag(:div, capture(&block), class: card_class)
     end
+
+    link_tag + div_tag
   end
 
   # Button Dropdowns

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.39'.freeze
+  VERSION = '0.9.40'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.39
+  version: 0.9.40
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -615,6 +615,7 @@ files:
 - app/assets/stylesheets/effective_article_editor/input.scss
 - app/assets/stylesheets/effective_bootstrap.scss
 - app/assets/stylesheets/effective_bootstrap/base.scss
+- app/assets/stylesheets/effective_bootstrap/collapse.scss
 - app/assets/stylesheets/effective_bootstrap/forms.scss
 - app/assets/stylesheets/effective_bootstrap/icons.scss
 - app/assets/stylesheets/effective_bootstrap/overrides.scss