phlexy_ui 0.1.18 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28571932626bbfb52238b529c6dfe67ba038b32c2c735377667fa0005974295
-  data.tar.gz: 820d96f4249069a762071132fcbe977bd78b00b54aa9e86b4f44622459c73628
+  metadata.gz: e92e0e137db4f235a6271b85a4916c64d725a6201af324e31aae6774e52cfdc9
+  data.tar.gz: 4005ccdeece88c2ac24bbefff65fc36a3e9d14473028e04c9cadd6a55aa343e2
 SHA512:
-  metadata.gz: 70be19b85cf1ce3d9eb6f0837f207399830901e3dd3d8556e7881eb612c4cf6c99b022609743d51d6fa58ab08a18e919806d211490a05aa5f5a52591f474db41
-  data.tar.gz: d1e10d0c19ca19d07159e60a98cd3a34669cf368166231ba9ed87b3dd3b8109bba0c2f8637df5a7fdd5f02353a606738f6d873c9957327a21f346d5b28398c05
+  metadata.gz: 4cf059089b3566b9647f41b6fde7c227f34ae08d3b1d852afe9781c058ef9f2f684219871f450f9bf27592f0c2909cd9b274e7355d4332d65937b3f863966e8f
+  data.tar.gz: c69976c4a84ce88633bbcd8943f706af196fb5f45407bb5194dccd4830fd28de0e46bedba19b794171df89f11707e3765b20aa27ecc8652fbfdd07be5ad5ef60

data/lib/phlexy_ui/attribute_set.rb

@@ -1,28 +1,63 @@
+# frozen_string_literal: true
+
 module PhlexyUI
+  # @private
+  #
+  # Converts component modifiers and options into HTML attributes.
+  # This is an internal class used by Base components.
+  #
+  # Internal Usage:
+  #   # Component defines an attributes map
+  #   ATTRIBUTES_MAP = { open: { checked: true }, closed: true }
+  #
+  #   # Attributes can come from modifiers or options:
+  #   #   tab(:open)           #=> { checked: true }
+  #   #   tab(open: true)      #=> { checked: true }
+  #   #   tab(open: false)     #=> {}
+  #   #   tab(:closed)         #=> { closed: true }
+  #   #   tab(closed: true)    #=> { closed: true }
+  #   #   tab(closed: false)   #=> {}
   class AttributeSet
-    def initialize(base_modifiers, attributes_map)
+    def initialize(base_modifiers, options, attributes_map)
       @base_modifiers = base_modifiers
+      @options = options
       @attributes_map = attributes_map
     end
 
     def to_h
-      attributes_modifiers.each_with_object({}) do |modifier, final_attributes_hash|
-        value = attributes_map[modifier]
-
-        if value.is_a?(Hash)
-          final_attributes_hash.merge!(value)
-        elsif value
-          final_attributes_hash[modifier] = value
-        end
+      result = {}
+
+      # Process modifiers first
+      base_modifiers.each do |modifier|
+        next unless attributes_map.key?(modifier)
+        next if options.key?(modifier)
+
+        process_attribute(modifier, true, result)
       end
+
+      # Then process options (overriding modifiers)
+      options.each do |key, value|
+        next unless attributes_map.key?(key)
+        next unless value
+
+        process_attribute(key, value, result)
+      end
+
+      result
     end
 
     private
 
-    attr_reader :base_modifiers, :attributes_map
+    attr_reader :base_modifiers, :options, :attributes_map
 
-    def attributes_modifiers
-      base_modifiers.select { |modifier| attributes_map.key?(modifier) }
+    def process_attribute(key, value, result)
+      mapped_value = attributes_map[key]
+
+      if mapped_value.is_a?(Hash)
+        result.merge!(mapped_value)
+      else
+        result[key] = mapped_value
+      end
     end
   end
 end

data/lib/phlexy_ui/base.rb

@@ -48,8 +48,8 @@ module PhlexyUI
       end
     end
 
-    def generate_attributes(base_modifiers, attributes_map)
-      AttributeSet.new(base_modifiers, attributes_map).to_h
+    def generate_attributes(base_modifiers, options, attributes_map)
+      AttributeSet.new(base_modifiers, options, attributes_map).to_h
     end
 
     def render_as(*, as:, **, &)

data/lib/phlexy_ui/checkbox.rb

@@ -3,7 +3,7 @@
 module PhlexyUI
   class Checkbox < Base
     def view_template(&)
-      attributes = generate_attributes(base_modifiers, ATTRIBUTES_MAP)
+      attributes = generate_attributes(base_modifiers, options, ATTRIBUTES_MAP)
 
       generate_classes!(
         component_html_class: :checkbox,
@@ -11,7 +11,13 @@ module PhlexyUI
         base_modifiers:,
         options:
       ).then do |classes|
-        input(type: :checkbox, class: classes, **options, **attributes, &)
+        input(
+          type: :checkbox,
+          class: classes,
+          **options.except(*ATTRIBUTES_MAP.keys),
+          **attributes,
+          &
+        )
       end
     end
 

data/lib/phlexy_ui/collapsible_sub_menu.rb

@@ -11,7 +11,7 @@ module PhlexyUI
     end
 
     def view_template(&)
-      attributes = generate_attributes(base_modifiers, ATTRIBUTES_MAP)
+      attributes = generate_attributes(base_modifiers, options, ATTRIBUTES_MAP)
 
       generate_classes!(
         base_modifiers:,

data/lib/phlexy_ui/tab_with_content.rb

@@ -15,6 +15,7 @@ module PhlexyUI
 
       attributes = generate_attributes(
         base_modifiers,
+        options,
         ATTRIBUTES_MAP
       )
 
@@ -31,7 +32,7 @@ module PhlexyUI
           role: :tab,
           aria_label: title,
           **attributes,
-          **options
+          **options.except(*ATTRIBUTES_MAP.keys)
         )
       end
 

data/lib/phlexy_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PhlexyUI
-  VERSION = "0.1.18"
+  VERSION = "0.1.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexy_ui
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.20
 platform: ruby
 authors:
 - David Alejandro Aguilar Ramos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-26 00:00:00.000000000 Z
+date: 2024-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex