katalyst-tables 2.2.9 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf08d43e92a19b9ada1834020d34cffd41eae9c2621ecf8c5d2909186c180f2
-  data.tar.gz: ea9f5d9a8acbe840c03096e38eef0b6cd2ee6d71fdc95d18e1ac0908883347fd
+  metadata.gz: 93183f42b6a85c9ec376968ac1afd2c4481c16dc69d36bc0c42fc533ff73cb23
+  data.tar.gz: db5e89db2a8b56280a64c9183c51c984905d364e141d410e1f3718fad1353cc2
 SHA512:
-  metadata.gz: 922f28f297e834b1584275236524de22dbc94e56850fb575557ffcc7ad8061242fc96886bf128e55681f2b7f664c44c0aac8fe9adfeb26e043adba14f20b78c4
-  data.tar.gz: 0f3bcaed4e1c140fe2f3707df1979535ba2f394c0e0986b3e6320c194589daeb019397574c5d6eb0092955e95e1bb5f86e67b1f445df87f4daae1bb07cc4dc04
+  metadata.gz: 0b6354580e9abae55ab47491d4ac201a8f282c3fb13fc51bf8747e421eaa6aee7ff736cfcf2012ef4561f88f71a3f1acc66842e77a944cd3b582f17ee553c9cb
+  data.tar.gz: b87903d4dc31840d8c69fb7f9176bd597da008e297c18e045e2243bb85059281f818e275b8b2e874a56916035c729b04497afd309a6e82512cc21612376c5bee

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

@@ -3,12 +3,12 @@ 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/concerns/katalyst/tables/orderable.rb

@@ -11,7 +11,7 @@ module Katalyst
       ITEM_CONTROLLER = "tables--orderable--item"
       LIST_CONTROLLER = "tables--orderable--list"
 
-      using HasHtmlAttributes
+      using Katalyst::HtmlAttributes
 
       # Support for inclusion in a table component class
       # Adds an `orderable` slot and component configuration

data/app/components/katalyst/table_component.rb

@@ -11,8 +11,8 @@ module Katalyst
   # <% end %>
   # ```
   class TableComponent < ViewComponent::Base
+    include Katalyst::HtmlAttributes
     include Tables::ConfigurableComponent
-    include Tables::HasHtmlAttributes
     include Tables::HasTableContent
 
     attr_reader :collection, :object_name
@@ -86,5 +86,8 @@ module Katalyst
 
     define_html_attribute_methods(:thead_attributes)
     define_html_attribute_methods(:tbody_attributes)
+
+    # Backwards compatibility with tables 1.0
+    alias_method :options, :html_attributes=
   end
 end

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

@@ -3,7 +3,7 @@
 module Katalyst
   module Tables
     class BodyCellComponent < ViewComponent::Base # :nodoc:
-      include HasHtmlAttributes
+      include Katalyst::HtmlAttributes
 
       attr_reader :record
 
@@ -39,6 +39,9 @@ module Katalyst
       def inspect
         "#<#{self.class.name} attribute: #{@attribute.inspect}, value: #{value.inspect}>"
       end
+
+      # Backwards compatibility with tables 1.0
+      alias_method :options, :html_attributes=
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Katalyst
   module Tables
     class BodyRowComponent < ViewComponent::Base # :nodoc:
-      include HasHtmlAttributes
+      include Katalyst::HtmlAttributes
 
       renders_many :columns, ->(component) { component }
 
@@ -39,6 +39,9 @@ module Katalyst
       def inspect
         "#<#{self.class.name} record: #{record.inspect}>"
       end
+
+      # Backwards compatibility with tables 1.0
+      alias_method :options, :html_attributes=
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Katalyst
   module Tables
     class EmptyCaptionComponent < ViewComponent::Base # :nodoc:
-      include HasHtmlAttributes
+      include Katalyst::HtmlAttributes
 
       def initialize(table, **html_attributes)
         super(**html_attributes)

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

@@ -4,7 +4,7 @@ module Katalyst
   module Tables
     class HeaderCellComponent < ViewComponent::Base # :nodoc:
       include Frontend::Helper
-      include HasHtmlAttributes
+      include Katalyst::HtmlAttributes
       include Sortable
 
       delegate :object_name, :collection, :sorting, to: :@table
@@ -50,6 +50,9 @@ module Katalyst
         "#<#{self.class.name} attribute: #{@attribute.inspect}, value: #{value.inspect}>"
       end
 
+      # Backwards compatibility with tables 1.0
+      alias_method :options, :html_attributes=
+
       private
 
       def default_html_attributes

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

@@ -3,7 +3,7 @@
 module Katalyst
   module Tables
     class HeaderRowComponent < ViewComponent::Base # :nodoc:
-      include HasHtmlAttributes
+      include Katalyst::HtmlAttributes
 
       renders_many :columns, ->(component) { component }
 
@@ -39,6 +39,9 @@ module Katalyst
       def inspect
         "#<#{self.class.name} link_attributes: #{@link_attributes.inspect}>"
       end
+
+      # Backwards compatibility with tables 1.0
+      alias_method :options, :html_attributes=
     end
   end
 end

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/lib/katalyst/tables.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require "view_component"
+require "katalyst/html_attributes"
 
 require_relative "tables/backend"
 require_relative "tables/engine"
 require_relative "tables/frontend"
-require_relative "tables/version"
 
 require_relative "tables/engine" if Object.const_defined?(:Rails)
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-tables
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.11
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: html-attributes-utils
+  name: katalyst-html-attributes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,7 +55,6 @@ files:
 - app/assets/javascripts/controllers/tables/orderable/list_controller.js
 - app/assets/javascripts/controllers/tables/turbo_collection_controller.js
 - app/components/concerns/katalyst/tables/configurable_component.rb
-- app/components/concerns/katalyst/tables/has_html_attributes.rb
 - app/components/concerns/katalyst/tables/has_table_content.rb
 - app/components/concerns/katalyst/tables/orderable.rb
 - app/components/concerns/katalyst/tables/sortable.rb
@@ -84,7 +83,6 @@ files:
 - lib/katalyst/tables/engine.rb
 - lib/katalyst/tables/frontend.rb
 - lib/katalyst/tables/frontend/helper.rb
-- lib/katalyst/tables/version.rb
 homepage: https://github.com/katalyst/katalyst-tables
 licenses:
 - MIT

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

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-require "html_attributes_utils"
-
-module Katalyst
-  module Tables
-    # Adds HTML attributes to a component.
-    # Accepts HTML attributes from the constructor or via `html_attributes=`.
-    # These are merged with the default attributes defined in the component.
-    # Adds support for custom html attributes for other tags, e.g.:
-    #   define_html_attribute_methods :table_attributes, default: {}
-    #   tag.table(**table_attributes)
-    module HasHtmlAttributes
-      extend ActiveSupport::Concern
-
-      using HTMLAttributesUtils
-
-      MERGEABLE_ATTRIBUTES = [
-        *HTMLAttributesUtils::DEFAULT_MERGEABLE_ATTRIBUTES,
-        %i[data controller],
-        %i[data action],
-      ].freeze
-
-      FLATTENABLE_ATTRIBUTES = [
-        %i[data controller],
-        %i[data action],
-      ].freeze
-
-      refine NilClass do
-        def flatten_html(*)
-          self
-        end
-      end
-
-      refine Hash do
-        def merge_html(attributes)
-          result = deep_merge_html_attributes(attributes, mergeable_attributes: MERGEABLE_ATTRIBUTES)
-          FLATTENABLE_ATTRIBUTES.each_with_object(result) do |path, flattened|
-            flattened.flatten_html(*path)
-          end
-        end
-
-        def flatten_html(key, *path)
-          if path.empty?
-            self[key] = self[key].join(" ") if self[key].is_a?(Array)
-          else
-            self[key].flatten_html(*path)
-          end
-        end
-      end
-
-      class_methods do
-        using HasHtmlAttributes
-
-        def define_html_attribute_methods(name, default: {})
-          define_method("default_#{name}") { default }
-          private("default_#{name}")
-
-          define_method(name) do
-            send("default_#{name}").merge_html(instance_variable_get("@#{name}") || {})
-          end
-
-          define_method("#{name}=") do |options|
-            instance_variable_set("@#{name}", options.slice(:id, :aria, :class, :data).merge(options.fetch(:html, {})))
-          end
-        end
-      end
-
-      included do
-        define_html_attribute_methods :html_attributes, default: {}
-
-        # Backwards compatibility with tables 1.0
-        alias_method :options, :html_attributes=
-      end
-
-      def initialize(**options)
-        super(**options.except(:id, :aria, :class, :data, :html))
-
-        self.html_attributes = options
-      end
-    end
-  end
-end

data/lib/katalyst/tables/version.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Katalyst
-  module Tables
-    VERSION = "2.2.9"
-  end
-end