bs5 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f868555ef8de05ff2a59b42efd77e1e43a4322d896ba468075131178f0dc1a7
-  data.tar.gz: adbcd1e63ac16714e3b4ee5c5d72266fe687685449b08dbf87aa3b0ea359a8a7
+  metadata.gz: ba1fb14f4e08a3c9b6e8196fd306954c3e2bbe5e7f074ff018dbcf5adb9554cb
+  data.tar.gz: c7d797b046934929781283e825fcb74b3e9780faf544ce92dd2ca1b38cfbc60f
 SHA512:
-  metadata.gz: 46c4e2e6bcb0d65824c993daea510e230c891e3bf7808ed98bbbf9d57997c36b5d01b83864cda9e4bcfa26b6aaff2460ab7d3c153510f852e8c526b58855481b
-  data.tar.gz: 43a3f21f7527666fd7499a1e05d14f442976e9a1465f8a4f91d1e3b967f5eb3cff1a0bb8a42c9e4efd8486710039e723c03369df33a28236b83d36bdb26a6a00
+  metadata.gz: f11d2a95bc6dcfe8539feeb6eba85eaa873096c0cf725aa4d800b72f86e29c39817ae867739422f549f0c3a6be0b1f378de57e8d2e03ae62daa5d4594de6ee64
+  data.tar.gz: 1de41edf38036562b6fde14f20242926d557344875a4efdfc5a552d9a8cf7d2cc5d68fbe9cd2d815178fb2ae75f57a13be92aaf72fd9c19416ba8ee214967a4a

data/app/helpers/bs5/components_helper.rb

@@ -11,13 +11,12 @@ module Bs5
       end
     end
 
-    def bs5_tooltip(title, options = nil)
-      default_options = { toggle: :tooltip }
-      options = Hash(options).symbolize_keys.merge(default_options)
-      {
-        title: title,
-        data: options
-      }
+    def bs5_tooltip(*args)
+      TooltipService.new(*args).to_hash
+    end
+
+    def bs5_popover(*args)
+      PopoverService.new(*args).to_hash
     end
 
     def bs5_collapse(*args)

data/app/service/bs5/collapse_service.rb

@@ -2,6 +2,8 @@
 
 module Bs5
   class CollapseService
+    using HashRefinement
+
     CONTROLS_ERR_MSG = 'Please provide either a `controls` option' \
                        ' containing the id of the collapsible element' \
                        ' or an ID selector as `target` options.'
@@ -24,10 +26,10 @@ module Bs5
     private
 
     def data_options
-      options = { 'bs-toggle': :collapse }
-      options[:'bs-target'] = target if target
+      options = { toggle: :collapse }
+      options[:target] = target if target
 
-      options
+      options.prefix_keys_with_bs
     end
 
     def aria_options

data/app/service/bs5/popover_service.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Bs5
+  class PopoverService
+    using HashRefinement
+
+    attr_reader :title
+
+    def initialize(options = {})
+      @title = options.delete(:title)
+      @options = options
+    end
+
+    def to_hash
+      {
+        title: title,
+        data: options
+      }.compact
+    end
+
+    private
+
+    def options
+      @options.symbolize_keys.merge(default_options).prefix_keys_with_bs
+    end
+
+    def default_options
+      { toggle: :popover }
+    end
+  end
+end

data/app/service/bs5/tooltip_service.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Bs5
+  class TooltipService
+    using HashRefinement
+
+    attr_reader :title
+
+    def initialize(title, options = {})
+      @title = title
+      @options = options
+    end
+
+    def to_hash
+      {
+        title: title,
+        data: options
+      }
+    end
+
+    private
+
+    def options
+      @options.symbolize_keys.merge(default_options).prefix_keys_with_bs
+    end
+
+    def default_options
+      { toggle: :tooltip }
+    end
+  end
+end

data/app/views/bs5/examples/popovers/default/_example.html.erb

@@ -0,0 +1,2 @@
+<h2>Example</h2>
+<%= bs5_example(snippet: 'popovers/default/snippet') %>

data/app/views/bs5/examples/popovers/default/snippet.html.erb

@@ -0,0 +1 @@
+<%= bs5_button_tag('Click to toggle popover', bs5_popover(title: 'Popover title', content: "And here's some amazing content. It's very engaging. Right?").merge(type: 'button', style: :danger, size: :large)) %>

data/app/views/bs5/examples/popovers/disabled_elements/_example.html.erb

@@ -0,0 +1,2 @@
+<h2>Disabled elements</h2>
+<%= bs5_example(snippet: 'popovers/disabled_elements/snippet') %>

data/app/views/bs5/examples/popovers/disabled_elements/snippet.html.erb

@@ -0,0 +1,3 @@
+<%= tag.span(bs5_popover(content: 'Disabled popover').merge(class: 'd-inline-block')) do %>
+  <%= bs5_button_tag('Disabled button', disabled: true) %>
+<% end %>

data/app/views/bs5/examples/popovers/dismissable_on_next_click/_example.html.erb

@@ -0,0 +1,2 @@
+<h2>Dismissable on next click</h2>
+<%= bs5_example(snippet: 'popovers/dismissable_on_next_click/snippet') %>

data/app/views/bs5/examples/popovers/dismissable_on_next_click/snippet.html.erb

@@ -0,0 +1 @@
+<%= tag.a 'Dismissible popover', bs5_popover(title: 'Dismissible popover', content: "And here's some amazing content. It's very engaging. Right?", trigger: :focus).merge(class: 'btn btn-lg btn-danger', role: :button, tabindex: 0) %>

data/app/views/bs5/examples/popovers/four_directions/_example.html.erb

@@ -0,0 +1,2 @@
+<h2>Four directions</h2>
+<%= bs5_example(snippet: 'popovers/four_directions/snippet') %>

data/app/views/bs5/examples/popovers/four_directions/snippet.html.erb

@@ -0,0 +1,7 @@
+<%= bs5_button_tag('Popover on top', bs5_popover(content: "Vivamus sagittis lacus vel augue laoreet rutrum faucibus.", container: :body, placement: :top).merge(type: 'button', style: :secondary)) %>
+
+<%= bs5_button_tag('Popover on right', bs5_popover(content: "Vivamus sagittis lacus vel augue laoreet rutrum faucibus.", container: :body, placement: :right).merge(type: 'button', style: :secondary)) %>
+
+<%= bs5_button_tag('Popover on bottom', bs5_popover(content: "Vivamus sagittis lacus vel augue laoreet rutrum faucibus.", container: :body, placement: :bottom).merge(type: 'button', style: :secondary)) %>
+
+<%= bs5_button_tag('Popover on left', bs5_popover(content: "Vivamus sagittis lacus vel augue laoreet rutrum faucibus.", container: :body, placement: :left).merge(type: 'button', style: :secondary)) %>

data/app/views/bs5/pages/popovers.html.erb

@@ -0,0 +1,2 @@
+<h1>Popovers</h1>
+<%= render 'bs5/examples/popovers/default/example' %>

data/app/views/layouts/bs5/pages.html.erb

@@ -21,6 +21,7 @@
             <% lg.slot(:item, active: current_page?(pages_path('close_button'))) do %><%= link_to 'Close button', pages_path('close_button') %><% end %>
             <% lg.slot(:item, active: current_page?(pages_path('collapse'))) do %><%= link_to 'Collapse', pages_path('collapse') %><% end %>
             <% lg.slot(:item, active: current_page?(pages_path('list_group'))) do %><%= link_to 'List group', pages_path('list_group') %><% end %>
+            <% lg.slot(:item, active: current_page?(pages_path('popovers'))) do %><%= link_to 'Popovers', pages_path('popovers') %><% end %>
             <% lg.slot(:item, active: current_page?(pages_path('tooltips'))) do %><%= link_to 'Tooltips', pages_path('tooltips') %><% end %>
           <%- end %>
         </div>

data/config/initializers/hash_refinement.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module HashRefinement
+  refine Hash do
+    def prefix_keys_with_bs
+      transform_keys! { |k| "bs_#{k}".to_sym }
+    end
+  end
+end

data/lib/bs5/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bs5
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

data/lib/generators/bs5/install/templates/bs5.js

@@ -2,13 +2,23 @@ import * as bootstrap from "bootstrap";
 
 function tooltipify() {
   const tooltipTriggerList = [].slice.call(
-    document.querySelectorAll('[data-toggle="tooltip"]')
+    document.querySelectorAll('[data-bs-toggle="tooltip"]')
   );
   tooltipTriggerList.map(function (tooltipTriggerEl) {
     return new bootstrap.Tooltip(tooltipTriggerEl);
   });
 }
 
+function popoverify() {
+  const popoverTriggerList = [].slice.call(
+    document.querySelectorAll('[data-bs-toggle="popover"]')
+  );
+  popoverTriggerList.map(function (popoverTriggerEl) {
+    return new bootstrap.Popover(popoverTriggerEl);
+  });
+}
+
 export function start() {
+  popoverify();
   tooltipify();
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bs5
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Patrick Baselier
@@ -163,6 +163,8 @@ files:
 - app/helpers/bs5/examples_helper.rb
 - app/models/bs5/application_record.rb
 - app/service/bs5/collapse_service.rb
+- app/service/bs5/popover_service.rb
+- app/service/bs5/tooltip_service.rb
 - app/validators/style_validator.rb
 - app/views/bs5/examples/accordion/default/_example.html.erb
 - app/views/bs5/examples/accordion/default/snippet.html.erb
@@ -234,6 +236,14 @@ files:
 - app/views/bs5/examples/list_group/style/default.html.erb
 - app/views/bs5/examples/list_group/with_badges/_example.html.erb
 - app/views/bs5/examples/list_group/with_badges/default.html.erb
+- app/views/bs5/examples/popovers/default/_example.html.erb
+- app/views/bs5/examples/popovers/default/snippet.html.erb
+- app/views/bs5/examples/popovers/disabled_elements/_example.html.erb
+- app/views/bs5/examples/popovers/disabled_elements/snippet.html.erb
+- app/views/bs5/examples/popovers/dismissable_on_next_click/_example.html.erb
+- app/views/bs5/examples/popovers/dismissable_on_next_click/snippet.html.erb
+- app/views/bs5/examples/popovers/four_directions/_example.html.erb
+- app/views/bs5/examples/popovers/four_directions/snippet.html.erb
 - app/views/bs5/examples/tooltips/default/_example.html.erb
 - app/views/bs5/examples/tooltips/default/buttons.html.erb
 - app/views/bs5/examples/tooltips/default/disabled_elements.html.erb
@@ -246,10 +256,12 @@ files:
 - app/views/bs5/pages/close_button.html.erb
 - app/views/bs5/pages/collapse.html.erb
 - app/views/bs5/pages/list_group.html.erb
+- app/views/bs5/pages/popovers.html.erb
 - app/views/bs5/pages/tooltips.html.erb
 - app/views/layouts/bs5/application.html.erb
 - app/views/layouts/bs5/pages.html.erb
 - config/definitions.rb
+- config/initializers/hash_refinement.rb
 - config/locales/en.yml
 - config/routes.rb
 - lib/bs5.rb