katalyst-tables 2.2.8 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 912bbde0db12fa0f5a6c6eda7958273f2d0b3efe4476d407ee19b6e6abb3abd1
-  data.tar.gz: a065eaa897a541fdf08e257d17147206b38e1af2f92cc1ce508f6be19de60acb
+  metadata.gz: d3e58b95b2dc1f01bdd97fd36a31b2f340d93928d939a7501b58e7fd96150571
+  data.tar.gz: a72ece66c7770865d2b5892b83d114a9fa90afc5d1f81751ea37be6c34406077
 SHA512:
-  metadata.gz: 7d3ed117d5cf77f50674fe097d2979fa19253965e2ac14104637eb503c38c80f087f3c05eb7f87df25336b61a380ae541fa35e037bf9923cf38bb393cd38d7a9
-  data.tar.gz: 96a3adcfb05be7dd131e68f5851fe960d92d2d57ed07bf0d2bbf9f571ae6a26a47f213ee2e2567baa2f478f267d53a61dcf29e4c1d331057ccd9bbcf7af99e05
+  metadata.gz: e353837d14ec65ca9391a5190615c8696d39a0b46a4099f5c4563b28963b0cd338eaf70d48187a485fbf2a747ed64d11d296da8805f3c4008ae4e02bbeacc768
+  data.tar.gz: 0d3837526230b4f95f9a1c235d6377c112b5d2edb820b0b56ca9f621c72a0019b735d206f9d39002340b1ce93c7efd3674013dbb1c96073d306c785562b4ad7c

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

@@ -1,14 +1,14 @@
 import { Controller } from "@hotwired/stimulus";
-import { Turbo } from "@hotwired/turbo";
+import { Turbo } from "@hotwired/turbo-rails";
 
 export default class TurboCollectionController extends Controller {
   static values = {
-    url: String,
+    query: String,
     sort: String,
   };
 
-  urlValueChanged(url) {
-    Turbo.navigator.history.replace(this.#url(url));
+  queryValueChanged(query) {
+    Turbo.navigator.history.replace(this.#url(query));
   }
 
   sortValueChanged(sort) {
@@ -21,13 +21,18 @@ export default class TurboCollectionController extends Controller {
     return "input[name='sort']";
   }
 
-  #url(relativeUrl) {
+  #url(query) {
     const frame = this.element.closest("turbo-frame");
+    let url;
 
     if (frame) {
-      return new URL(relativeUrl, frame.baseURI);
+      url = new URL(frame.baseURI);
     } else {
-      return new URL(relativeUrl, window.location.href);
+      url = new URL(window.location.href);
     }
+
+    url.search = query;
+
+    return url;
   }
 }

data/app/components/katalyst/turbo/table_component.rb

@@ -26,16 +26,15 @@ module Katalyst
       def default_html_attributes
         {
           data: {
-            controller:                          "tables--turbo-collection",
-            tables__turbo_collection_url_value:  current_path,
-            tables__turbo_collection_sort_value: collection.sort,
+            controller:                           "tables--turbo-collection",
+            tables__turbo_collection_query_value: current_query,
+            tables__turbo_collection_sort_value:  collection.sort,
           },
         }
       end
 
-      def current_path
-        params = collection.to_params
-        params.empty? ? "" : "?#{Rack::Utils.build_nested_query(params)}"
+      def current_query
+        Rack::Utils.build_nested_query(collection.to_params)
       end
 
       def default_header_options

data/config/importmap.rb

@@ -1,8 +1,5 @@
 # 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
              preload: Rails.env.test?

data/lib/katalyst/tables/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Tables
-    VERSION = "2.2.8"
+    VERSION = "2.2.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-tables
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.10
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils