card-mod-tabs 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2d4b228071c8c41c6c24b19721edbf5646fb7466da6ebf8488f44f0c0d0749
-  data.tar.gz: 606875c29b94286b3371b746a7699af77f651a21e1bdbd87ca96f3332df28bf3
+  metadata.gz: 30774695c9b5e4171245c9f4b855d25e3cd20c39f89a234a2e06742e711d63cb
+  data.tar.gz: 9fe40a0aa26794c46de1efcee44e4a92b005143edbd6bea286b1e293b881a12f
 SHA512:
-  metadata.gz: 821327b6de74e5fb1b679713a354432e8d289a2e47fbfe12b877cf2430efdf61120321abc55ed367741bbc6ae14295ea29835e581c5f0e66535a8f939202869a
-  data.tar.gz: 63449a861f19ed117e24bd7960253665f9c8be13863fd0a7d1e3cc7f5ea1d67a52cb891b72b7f1175d815d87e885135f48751ab11bf6a18c3ebffc5d076bfe12
+  metadata.gz: 8a1415f9a6febb005505f1cf192640b6a863b21d71f35dd498847245a659aeb2e368b1b13b37ace53722a65a0812723a91aec73c1dd898222a86bd9b509ef622
+  data.tar.gz: 54c7453f247d7ed6ea0f01193a4f686f98adf6ae77454e1f26ba337deab9e60fc6cb76a0c4171b67e2dad720685c3f5153dec29bba027103134e9383dace9efb

data/assets/script/tab.js.coffee

@@ -0,0 +1,10 @@
+$(window).ready ->
+  $('body').on 'show.bs.tab', 'a.load[data-bs-toggle="tab"][data-url]', (e) ->
+    tab_id = $(e.target).attr('href')
+    url    = $(e.target).data('url')
+    $(e.target).removeClass('load')
+    $.ajax
+      url: url
+      success: (html) ->
+        $(tab_id).append(html)
+        decko.contentLoaded($(tab_id), $(this))

data/data/files/mod_tabs_script_asset_output/file.js

@@ -0,0 +1,2 @@
+// tab.js.coffee
+(function(){$(window).ready(function(){return $("body").on("show.bs.tab",'a.load[data-bs-toggle="tab"][data-url]',function(t){var a,r;return a=$(t.target).attr("href"),r=$(t.target).data("url"),$(t.target).removeClass("load"),$.ajax({url:r,success:function(t){return $(a).append(t),decko.contentLoaded($(a),$(this))}})})})}).call(this);

data/lib/card/tab.rb

@@ -68,13 +68,13 @@ class Card
       link_to label, button_attrib.merge(
         path: "##{tab_id}",
         role: "tab",
-        "data-toggle" => "tab",
+        "data-bs-toggle" => "tab",
         "data-tab-name" => name
       )
     end
 
     def tab_id
-      @tab_id ||= "#{unique_id}-#{name.to_name.safe_key}"
+      @tab_id ||= "tab-#{unique_id}-#{name.to_name.safe_key}"
     end
 
     def active?

data/set/abstract/tab_badge.haml

@@ -0,0 +1,5 @@
+%span.tab-badge.clearfix{ class: klass }
+  %span.badge-label<
+    = label
+  %span.badge-count.badge.bg-secondary{ class: "bg-#{color}" }<
+    = number_with_delimiter count

data/set/abstract/tabs.rb

@@ -3,7 +3,7 @@ include_set Abstract::BsBadge
 format :html do
   view :tabs, cache: :never do
     tabs tab_map, default_tab, load: :lazy do
-      _render! "#{default_tab}_tab"
+      _render! tab_map.dig(default_tab, :view)
     end
   end
 
@@ -11,16 +11,6 @@ format :html do
     @tab_map ||= generate_tab_map
   end
 
-  def generate_tab_map
-    options = tab_options
-    tab_list.each_with_object({}) do |codename, hash|
-      hash[codename] = {
-        view: "#{codename}_tab",
-        title: tab_title(codename, options[codename])
-      }
-    end
-  end
-
   def tab_list
     []
   end
@@ -29,95 +19,69 @@ format :html do
     {}
   end
 
-  def one_line_tab?
-    false
-  end
-
   def default_tab
     tab_from_params || tab_map.keys.first
   end
 
-  def tab_from_params
-    return unless Env.params[:tab]
-    Env.params[:tab].to_sym
-  end
-
-  def tab_wrap
-    bs_layout do
-      row 12 do
-        col output(yield), class: "padding-top-10"
-      end
-    end
-  end
-
-  def tab_url tab
-    path tab: tab
+  def tab_badge count, label, opts={}
+    haml :tab_badge, badge_haml_opts(count, label, opts)
   end
 
-  def tab_title fieldcode, opts={}
+  def tab_title label, opts
     opts ||= {}
-    parts = tab_title_parts fieldcode, opts
-    info = tab_title_info parts[:icon], parts[:count]
-    wrapped_tab_title parts[:label], info
+    label = tab_badge opts[:count], label, opts if opts[:count]
+    wrap_with(:div, class: "tab-title") { label }
   end
 
-  def tab_title_info icon, count
-    if count
-      tab_count_badge count, icon
-    else
-      icon || tab_space
+  private
+
+  def generate_tab_map
+    options = tab_options
+    tab_list.each_with_object({}) do |tab_key, hash|
+      hash[tab_key] = {
+        view: (options.dig(tab_key, :view) || "#{tab_key}_tab"),
+        title: tab_title_from_map(tab_key, options[tab_key])
+      }
     end
   end
 
-  def tab_space
-    one_line_tab? ? :nil : " "
+  def tab_from_params
+    Env.params[:tab]&.to_sym
   end
 
-  def tab_count_badge count, icon_tag
-    klass = nil
-    if count.is_a? Card
-      klass = css_classes count.safe_set_keys
-      count = count.try(:cached_count) || count.count
-    end
-    tab_badge count, icon_tag, klass: klass
+  def tab_url tab
+    path tab: tab
   end
 
-  def tab_title_parts fieldcode, opts
-    %i[count icon label].each_with_object({}) do |part, hash|
-      hash[part] = opts.key?(part) ? opts[part] : send("tab_title_#{part}", fieldcode)
+  def tab_title_from_map tab_key, opts
+    opts ||= {}
+    if Codename.exists? tab_key
+      tab_title_from_fieldcode tab_key, opts
+    else
+      label = opts[:label] || tab_key
+      tab_title label, opts
     end
   end
 
-  def tab_title_count fieldcode
+  def tab_title_from_fieldcode fieldcode, opts={}
     field_card = card.fetch fieldcode, new: {}
-    field_card if field_card.respond_to? :count
-  end
 
-  def tab_title_icon fieldcode
-    tab_icon_tag fieldcode
-  end
+    %i[label count klass].each do |part|
+      opts[part] = send("tab_title_#{part}", field_card) unless opts.key? part
+    end
 
-  def tab_title_label fieldcode
-    fieldcode.cardname.vary :plural
+    tab_title opts[:label], opts
   end
 
-  def wrapped_tab_title label, info=nil
-    wrap_with :div, class: "tab-title text-center #{'one-line-tab' if one_line_tab?}" do
-      [wrapped_tab_title_info(info),
-       wrap_with(:span, label, class: "count-label")].compact
-    end
+  def tab_title_klass field_card
+    css_classes field_card.safe_set_keys
   end
 
-  def wrapped_tab_title_info info
-    info ||= tab_space
-    return unless info
-
-    klass = css_classes "count-number", "clearfix"
-    wrap_with :span, info, class: klass
+  def tab_title_count field_card
+    field_card.try(:cached_count) || field_card.try(:count)
   end
 
-  # TODO: handle mapped icon tagging in decko
-  def tab_icon_tag key
-    try :mapped_icon_tag, key
+  def tab_title_label field_card
+    field_card.name.right_name.vary :plural
   end
 end

data/set/all/tabs/tab_panel.haml

@@ -1,5 +1,5 @@
 .tabbable.tab-panel{ panel_attr.merge(role: "tabpanel") }
-  %ul{ class: "nav nav-#{tab_type}", role: "tablist" }
+  %ul{ class: "#{classy('nav')} nav-#{tab_type}", role: "tablist" }
     - tab_objects.each do |tab|
       = tab.tab_button
   .tab-content

data/set/all/tabs.rb

@@ -16,13 +16,13 @@ format :html do
   #
   # @param active_name [String] label of the tab that should be active at the
   #
-  # @param [Hash] args options
+  # @param args [Hash] options
   # @option args [String] :tab_type ('tabs') use pills or tabs
   # @option args [Hash] :panel_attr html args used for the panel div
   # @option args [Hash] :pane_attr html args used for the pane div
   # @option args [Hash] :load. `:lazy` for lazy-loading tabs
   #
-  # @param [Block] block content of the active tab (for lazy-loading)
+  # @param block [Block] content of the active tab (for lazy-loading)
   # beginning (default is the first)
   #
   # @return [HTML] bootstrap tabs element with all content preloaded
@@ -37,4 +37,55 @@ format :html do
     )
     haml :tab_panel, args
   end
+
+  view :tabs do
+    construct_tabs "tabs"
+  end
+
+  def construct_tabs tab_type
+    tabs = { active: {}, paths: {} }
+    voo.items[:view] ||= :content
+    card.each_item_name_with_options(_render_raw) do |name, options|
+      construct_tab tabs, name, options
+    end
+    tabs tabs[:paths], tabs[:active][:name], tab_type: tab_type, load: :lazy do
+      tabs[:active][:content]
+    end
+  end
+
+  def construct_tab tabs, name, explicit_options
+    tab_options = item_view_options explicit_options
+    tabs[:paths][name] = {
+      title: nest(name, view: :title, title: tab_options[:title]),
+      path: nest_path(name, tab_options).html_safe
+    }
+    return unless tabs[:active].empty?
+
+    tabs[:active] = { name: name, content: nest(name, tab_options) }
+  end
+
+  # def tab_title title, name
+  #   return name unless title
+  #   name.to_name.title title, @context_names
+  # end
+
+  view :pills do
+    construct_tabs "pills"
+  end
+
+  view :tabs_static do
+    construct_static_tabs "tabs"
+  end
+
+  view :pills_static do
+    construct_static_tabs "pills"
+  end
+
+  def construct_static_tabs tab_type
+    tabs = {}
+    card.item_cards.each do |item|
+      tabs[item.name] = nest item, item_view_options(args)
+    end
+    tabs tabs, nil, tab_type: tab_type
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-tabs
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.0
 - !ruby/object:Gem::Dependency
   name: card-mod-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
 description: ''
 email:
 - info@decko.org
@@ -47,8 +47,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- assets/script/tab.js.coffee
+- data/files/mod_tabs_script_asset_output/file.js
 - lib/card/lazy_tab.rb
 - lib/card/tab.rb
+- set/abstract/tab_badge.haml
 - set/abstract/tabs.rb
 - set/all/tabs.rb
 - set/all/tabs/tab_panel.haml
@@ -62,6 +66,7 @@ metadata:
   wiki_uri: https://decko.org
   documentation_url: http://docs.decko.org/
   card-mod: tabs
+  card-mod-group: gem-defaults
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -77,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: tabs