katalyst-tables 2.2.10 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3e58b95b2dc1f01bdd97fd36a31b2f340d93928d939a7501b58e7fd96150571
-  data.tar.gz: a72ece66c7770865d2b5892b83d114a9fa90afc5d1f81751ea37be6c34406077
+  metadata.gz: ea4e17cca2f486696e4cc5b8bff2bc6b06aeb33e131f0774f881b324964eae90
+  data.tar.gz: 5bc402aef25bee8f49418225d603f36246565622749f1fa6d06d922f341f6348
 SHA512:
-  metadata.gz: e353837d14ec65ca9391a5190615c8696d39a0b46a4099f5c4563b28963b0cd338eaf70d48187a485fbf2a747ed64d11d296da8805f3c4008ae4e02bbeacc768
-  data.tar.gz: 0d3837526230b4f95f9a1c235d6377c112b5d2edb820b0b56ca9f621c72a0019b735d206f9d39002340b1ce93c7efd3674013dbb1c96073d306c785562b4ad7c
+  metadata.gz: d87f264fb30eab8e5a9f43b1a85464f5b0fc32f499e11bc64acc745a804dda081ed58e3eb368b1a50b4e01eeb28b6ace4e9b550a86fb0addb2cf4fb0a61aa38d
+  data.tar.gz: 3afaa276a44921bdb7a5b62d60701d77c71da24741a651b0fe3b89c36a2fc059b037fe1c5859680f6be43c0bb324fe4e9924067b2d0c2b58cffcad1c1b7b585a

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::HasHtmlAttributes
 
       # 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/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.10
+  version: 2.2.12
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-12-05 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.10"
-  end
-end