protos 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6771e623cc76042636663c199b9dd48e3b9d8ed5011d180f7e9e1fa50728fc65
-  data.tar.gz: 3dcd91f89719b72fbd9f23725add23ef09d0588196f8647ed7597baeed48b5de
+  metadata.gz: 939a00cb6d422dc749d734683f4eceedf4c1857f21ab770dae704a99e06cdf8a
+  data.tar.gz: 60525463c5531256d9cac2139791b112c477b746a8ed2a643d29856fe548517a
 SHA512:
-  metadata.gz: 843780d369c551ee4e407037a6fa842343d36f9582d73823573af5bb06ee243424d85416737d9c6e80f433ab0147be41caf7af93b1c5db64765f479886157340
-  data.tar.gz: 37fb34135c07d53fc0d9e7af1c814f91130ed0a6891fb00db2059090fe7ec8787cebc004b41186a9cf09c936a151c9c2ef503333a25169cee91b1a3ca67f5864
+  metadata.gz: '094affdf956f0ff06aba676408ee34d20e6af8ed5ac92afa04576bbc52b83499e491bfd74c3b27c281d20f32fcada8dbad27ec2fbedcb79cb519e9e0a318d2e7'
+  data.tar.gz: 953db1b5c57a9202a3f87e0a3ac8e32ed226f48c85588b7d1041559fd8a0749952c76619cc85eb075717b697623bb1dc045cf0dcc9c23370c1622e67c460d993

data/lib/protos/accordion/item.rb

@@ -10,7 +10,9 @@ module Protos
       def template(&block)
         li(**attrs) do
           render collapse_component do
-            input(type: :radio, name: id, id:)
+            # form: "" prevents the radio button from being submitted if its
+            # within a form
+            input(type: :radio, name: id, form: "")
             yield if block
           end
         end

data/lib/protos/accordion.rb

@@ -7,7 +7,8 @@ module Protos
     # to be open at the same time, use the collapse component.
     # https://daisyui.com/components/accordion/
 
-    option :id, default: -> { SecureRandom.uuid }
+    option :id,
+           default: -> { "collapse-#{SecureRandom.hex(4)}" }
 
     def template(&block)
       ul(**attrs, &block)
@@ -17,8 +18,8 @@ module Protos
       Item.new(id:, **kwargs)
     end
 
-    def title(...)
-      Collapse::Title.new(...)
+    def title(*args, **kwargs, &block)
+      Collapse::Title.new(*args, id:, **kwargs, &block)
     end
 
     def content(...)

data/lib/protos/collapse/title.rb

@@ -5,9 +5,17 @@ module Protos
     class Title < Component
       # DOCS: The title of a collapse. This is the content that is always
       # visible and is used to toggle the collapse.
+      option :id,
+             type: Types::Coercible::String,
+             reader: false,
+             default: -> { "" }
 
       def template(&block)
-        div(**attrs, &block)
+        if @id.size.positive?
+          label(for: @id, **attrs, &block)
+        else
+          div(**attrs, &block)
+        end
       end
 
       private

data/lib/protos/collapse.rb

@@ -6,12 +6,20 @@ module Protos
     # is visible at all times, and the content is only visible when expanded.
     # https://daisyui.com/components/collapse/
 
-    def template(&block)
-      div(**attrs, &block)
+    option :checkbox, default: -> { false }, type: Types::Bool, reader: false
+    option :id,
+           default: -> { "collapse-#{SecureRandom.hex(4)}" },
+           type: Types::String
+
+    def template
+      div(**attrs) do
+        input(type: "checkbox", id:) if @checkbox
+        yield if block_given?
+      end
     end
 
-    def title(...)
-      Title.new(...)
+    def title(*args, **kwargs, &block)
+      Title.new(*args, id:, **kwargs, &block)
     end
 
     def content(...)

data/lib/protos/theme.rb

@@ -7,12 +7,21 @@ module Protos
     # This is the object that is returned by `css` and used to set slots for
     # a component style.
 
+    class << self
+      def merger
+        @merger ||= TailwindMerge::Merger.new
+      end
+    end
+
     def initialize(theme = {}, **kwargs)
       @theme = theme.merge(kwargs)
     end
 
     def [](key)
-      @theme[key]
+      value = @theme[key]
+      return value unless value.is_a?(String)
+
+      self.class.merger.merge(value)
     end
 
     def key?(key)

data/lib/protos/token_list.rb

@@ -24,7 +24,7 @@ module Protos
     end
 
     def to_s
-      merge(@tokens.to_a.join(" "))
+      @tokens.join(" ")
     end
 
     def -(other)
@@ -52,21 +52,5 @@ module Protos
         end
       end
     end
-
-    private
-
-    def merge(tokens)
-      TailwindMerge::Merger.new(
-        config: {
-          theme: {
-            # Not currently working in the gem.
-            # "spacing" => %w[xs sm md lg xl],
-            # "padding" => %w[xs sm md lg xl],
-            # "margin" => %w[xs sm md lg xl]
-          }
-        }
-      )
-        .merge(tokens)
-    end
   end
 end

data/lib/protos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Protos
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protos
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Nolan J Tait
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-core