katalyst-tables 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c5cc96bc55db7f0cf4c3a22659e6054607640e6d33af939805d4be6ca8f25c1
-  data.tar.gz: 1661c91c498d7c994afca1cb4a0bfcb69b6e2076a419ae71b138c5ae086e4a0d
+  metadata.gz: 5f13db4214a34d37ef3f5cdc1ce35b92d89102f627be22b31794496dad2ca4a7
+  data.tar.gz: 0d6f8dd7971eab72d20d3d1438e75daaf61ae1029c170e77653570312b07e150
 SHA512:
-  metadata.gz: e6f94b4a381ec3f9e952d594e1525b61b97d17d2d8c42fcc230fa81328303768d174f2778eb3918f681f28d38227cf9f3c83af340e0ea5ecc78857c6dad7c44d
-  data.tar.gz: 01a7fcf97aea5435986ab2b0357249bfd03bb60bc98fb22769aef88c154520753e9b340fe981edcf74f6bf4d32eafbd45bd318158cf92926fe3162f459928ff7
+  metadata.gz: c3bc64f42389475a49357b0c30236e854a8be2bcc81034d5be4a085a7e5bba54668ac7f0231ab55f8d63feb902620fb9019c9c1040f3422e5d0fd85512102abc
+  data.tar.gz: '09dcc5204e076d9e3e2e6d406d884b23d7bd3e8495bf3d8a6f4dfeb47c6d2109b4e8688d85de884d44d18f3cbe0c3696ce50bce8d0189ed45686c0f87c1e48fd'

data/README.md

@@ -281,8 +281,8 @@ def index
   table = Katalyst::Turbo::TableComponent.new(collection:, id: "people")
   
   respond_to do |format|
+    format.turbo_stream { render table } if self_referred?
     format.html { render locals: { table: table } }
-    format.turbo_stream { render table }
   end
 end
 ```

data/app/assets/javascripts/controllers/tables/turbo_collection_controller.js

@@ -1,4 +1,5 @@
 import { Controller } from "@hotwired/stimulus";
+import { Turbo } from "@hotwired/turbo";
 
 export default class TurboCollectionController extends Controller {
   static values = {
@@ -7,7 +8,7 @@ export default class TurboCollectionController extends Controller {
   }
 
   urlValueChanged(url) {
-    window.history.replaceState({}, "", this.urlValue);
+    Turbo.navigator.history.replace(this.#url(url));
   }
 
   sortValueChanged(sort) {
@@ -19,4 +20,14 @@ export default class TurboCollectionController extends Controller {
   get #sortSelector() {
     return "input[name='sort']";
   }
+
+  #url(relativeUrl) {
+    const frame = this.element.closest("turbo-frame");
+
+    if (frame) {
+      return new URL(relativeUrl, frame.baseURI);
+    } else {
+      return new URL(relativeUrl, window.location.href);
+    }
+  }
 }

data/app/components/concerns/katalyst/tables/turbo_replaceable.rb

@@ -47,10 +47,10 @@ module Katalyst
             component_class.alias_method(:vc_render_template_for, :render_template_for)
             component_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def render_template_for(variant = nil)
-              return vc_render_template_for(variant) unless turbo?
-              controller.respond_to do |format|
-                format.html { vc_render_template_for(variant) }
-                format.turbo_stream { turbo_stream.replace(id, vc_render_template_for(variant)) }
+              if turbo? && response.media_type.eql?("text/vnd.turbo-stream.html")
+                turbo_stream.replace(id, vc_render_template_for(variant))
+              else
+                vc_render_template_for(variant)
               end
             end
             RUBY

data/app/components/katalyst/tables/pagy_nav_component.rb

@@ -3,7 +3,9 @@
 module Katalyst
   module Tables
     class PagyNavComponent < ViewComponent::Base # :nodoc:
-      include Pagy::Frontend
+      # Pagy is not a required gem unless you're using pagination
+      # Expect to see NoMethodError failures if pagy is not available
+      "Pagy::Frontend".safe_constantize&.tap { |pagy| include(pagy) }
 
       attr_reader :pagy_options
 

data/app/models/concerns/katalyst/tables/collection/pagination.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "pagy/backend"
-
 module Katalyst
   module Tables
     module Collection
@@ -41,7 +39,9 @@ module Katalyst
         end
 
         class Paginate # :nodoc:
-          include Pagy::Backend
+          # Pagy is not a required gem unless you're using pagination
+          # Expect to see NoMethodError failures if pagy is not available
+          "Pagy::Backend".safe_constantize&.tap { |pagy| include(pagy) }
 
           def initialize(app)
             @app = app

data/app/models/concerns/katalyst/tables/collection/sorting.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "pagy/backend"
-
 module Katalyst
   module Tables
     module Collection

data/config/importmap.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
+pin "@hotwired/turbo", to: "turbo.min.js", preload: true
 
 pin_all_from Katalyst::Tables::Engine.root.join("app/assets/javascripts"),
              # preload in tests so that we don't start clicking before controllers load

data/lib/katalyst/tables/backend.rb

@@ -27,6 +27,11 @@ module Katalyst
                 .apply(collection)
       end
 
+      def self_referred?
+        request.referer.present? && URI.parse(request.referer).path == request.path
+      end
+      alias self_refered? self_referred?
+
       included do
         class_attribute :_default_table_component, instance_accessor: false
       end

data/lib/katalyst/tables/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Tables
-    VERSION = "2.1.1"
+    VERSION = "2.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-tables
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils