katalyst-tables 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddd6b87989959fe3bea80d3d061984ace8fbaa918033ae6d40f1fb41fa752a4f
-  data.tar.gz: c1fcff810e0c6e76ae8ae8df7a92f26d0badd1601b6fd091748249eaeebdc262
+  metadata.gz: 5f13db4214a34d37ef3f5cdc1ce35b92d89102f627be22b31794496dad2ca4a7
+  data.tar.gz: 0d6f8dd7971eab72d20d3d1438e75daaf61ae1029c170e77653570312b07e150
 SHA512:
-  metadata.gz: 39a50df893890ed53a0d54acc7ab5d23a0292c9e98ec82b4e6286325713e115d718cfcdaf8caf6c0b2ce211ec20ea514eb53b5dc275dfe04bf253ee00d094aa5
-  data.tar.gz: 919db4197193d5c4d2be8ea6c15642ff309819757c32ae6cb99266412029e0d250156220584442d048b97a40bcc9c5cce7660d141ac9fb157d12d8468b6fd268
+  metadata.gz: c3bc64f42389475a49357b0c30236e854a8be2bcc81034d5be4a085a7e5bba54668ac7f0231ab55f8d63feb902620fb9019c9c1040f3422e5d0fd85512102abc
+  data.tar.gz: '09dcc5204e076d9e3e2e6d406d884b23d7bd3e8495bf3d8a6f4dfeb47c6d2109b4e8688d85de884d44d18f3cbe0c3696ce50bce8d0189ed45686c0f87c1e48fd'

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/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/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Tables
-    VERSION = "2.1.2"
+    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.2
+  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