protos 0.2.3 → 0.4.0

data/lib/protos/popover.rb

@@ -80,17 +80,13 @@ module Protos
            reader: false,
            type: TriggerTypes | Types::Array.of(TriggerTypes)
 
-    def template(&block)
-      div(**attrs, &block)
+    def view_template(&)
+      div(**attrs, &)
     end
 
-    def content(...)
-      Content.new(...)
-    end
+    def content(...) = render Content.new(...)
 
-    def trigger(...)
-      Trigger.new(...)
-    end
+    def trigger(...) = render Trigger.new(...)
 
     private
 

data/lib/protos/stats/actions.rb

@@ -5,8 +5,8 @@ module Protos
     class Actions < Component
       # DOCS: A container for the actions (e.g. buttons) for a group of stats
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats/description.rb

@@ -5,8 +5,8 @@ module Protos
     class Description < Component
       # DOCS: A description for a group of stats
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats/figure.rb

@@ -5,8 +5,8 @@ module Protos
     class Figure < Component
       # DOCS: A figure for a single stat
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats/stat.rb

@@ -5,8 +5,8 @@ module Protos
     class Stat < Component
       # DOCS: A single stat container
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats/title.rb

@@ -5,8 +5,8 @@ module Protos
     class Title < Component
       # DOCS: A title for a group of stats
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats/value.rb

@@ -5,8 +5,8 @@ module Protos
     class Value < Component
       # DOCS: A value for a single stat
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats.rb

@@ -5,33 +5,21 @@ module Protos
     # DOCS: Stats component that contains a collection of stats
     # https://daisyui.com/components/stat/
 
-    def template(&block)
-      div(**attrs, &block)
+    def view_template(&)
+      div(**attrs, &)
     end
 
-    def actions(...)
-      Actions.new(...)
-    end
+    def actions(...) = render Actions.new(...)
 
-    def description(...)
-      Description.new(...)
-    end
+    def description(...) = render Description.new(...)
 
-    def figure(...)
-      Figure.new(...)
-    end
+    def figure(...) = render Figure.new(...)
 
-    def stat(...)
-      Stat.new(...)
-    end
+    def stat(...) = render Stat.new(...)
 
-    def title(...)
-      Title.new(...)
-    end
+    def title(...) = render Title.new(...)
 
-    def value(...)
-      Value.new(...)
-    end
+    def value(...) = render Value.new(...)
 
     private
 

data/lib/protos/swap/off.rb

@@ -5,8 +5,8 @@ module Protos
     class Off < Component
       # DOCS: The off state for a swap component. This is the default state.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/swap/on.rb

@@ -5,8 +5,8 @@ module Protos
     class On < Component
       # DOCS: The on state for a swap component. This is the active state.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/swap.rb

@@ -6,27 +6,22 @@ module Protos
     # display different content.
     # https://daisyui.com/components/swap/
 
-    def template
+    def view_template
       label(**attrs) do
-        input(type: :checkbox, class: css[:input])
+        input(type: :checkbox, class: css[:input], autocomplete: :off)
         yield if block_given?
       end
     end
 
-    def on(...)
-      On.new(...)
-    end
+    def on(...) = render On.new(...)
 
-    def off(...)
-      Off.new(...)
-    end
+    def off(...) = render Off.new(...)
 
     private
 
     def theme
       {
-        container: tokens("swap"),
-        input: tokens("hidden")
+        container: tokens("swap")
       }
     end
   end

data/lib/protos/table/body.rb

@@ -5,8 +5,8 @@ module Protos
     class Body < Component
       # DOCS: The body of a table
 
-      def template(&block)
-        tbody(**attrs, &block)
+      def view_template(&)
+        tbody(**attrs, &)
       end
     end
   end

data/lib/protos/table/caption.rb

@@ -5,15 +5,15 @@ module Protos
     class Caption < Component
       # DOCS: The caption of a table
 
-      def template(&block)
-        caption(**attrs, &block)
+      def view_template(&)
+        caption(**attrs, &)
       end
 
       private
 
       def theme
         {
-          container: tokens("caption-bottom", "p-sm")
+          container: tokens("caption-bottom")
         }
       end
     end

data/lib/protos/table/cell.rb

@@ -11,8 +11,8 @@ module Protos
                :left
              }
 
-      def template(&block)
-        td(**attrs, &block)
+      def view_template(&)
+        td(**attrs, &)
       end
 
       private

data/lib/protos/table/footer.rb

@@ -5,8 +5,8 @@ module Protos
     class Footer < Component
       # DOCS: The footer of a table
 
-      def template(&block)
-        tfoot(**attrs, &block)
+      def view_template(&)
+        tfoot(**attrs, &)
       end
     end
   end

data/lib/protos/table/head.rb

@@ -11,8 +11,8 @@ module Protos
                :left
              }
 
-      def template(&block)
-        th(**attrs, &block)
+      def view_template(&)
+        th(**attrs, &)
       end
 
       private

data/lib/protos/table/header.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: The header of a table that contains many Protos::Table::Head
       # components
 
-      def template(&block)
-        thead(**attrs, &block)
+      def view_template(&)
+        thead(**attrs, &)
       end
     end
   end

data/lib/protos/table/row.rb

@@ -5,8 +5,8 @@ module Protos
     class Row < Component
       # DOCS: The row of a table
 
-      def template(&block)
-        tr(**attrs, &block)
+      def view_template(&)
+        tr(**attrs, &)
       end
     end
   end

data/lib/protos/table.rb

@@ -18,39 +18,25 @@ module Protos
              :lg
            )
 
-    def template(&block)
+    def view_template(&block)
       div(**attrs) do
         table(class: css[:table], &block)
       end
     end
 
-    def body(...)
-      Body.new(...)
-    end
+    def body(...) = render Body.new(...)
 
-    def caption(...)
-      Caption.new(...)
-    end
+    def caption(...) = render Caption.new(...)
 
-    def cell(...)
-      Cell.new(...)
-    end
+    def cell(...) = render Cell.new(...)
 
-    def footer(...)
-      Footer.new(...)
-    end
+    def footer(...) = render Footer.new(...)
 
-    def head(...)
-      Head.new(...)
-    end
+    def head(...) = render Head.new(...)
 
-    def header(...)
-      Header.new(...)
-    end
+    def header(...) = render Header.new(...)
 
-    def row(...)
-      Row.new(...)
-    end
+    def row(...) = render Row.new(...)
 
     private
 

data/lib/protos/tabs/tab.rb

@@ -5,20 +5,21 @@ module Protos
     class Tab < Component
       # DOCS: A single tab in a tabs component
 
-      param :id
+      option :id
       option :label
       option :active, default: -> { false }
       option :disabled, default: -> { false }
 
-      def template(&block)
+      def view_template(&)
         input(
           type: :radio,
           class: css[:input],
           name: id,
           role: :tab,
-          aria_label: label
+          aria_label: label,
+          autocomplete: :off
         )
-        div(**attrs, &block)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/tabs.rb

@@ -24,13 +24,11 @@ module Protos
              :lg
            )
 
-    def template(&block)
-      div(**attrs, &block)
+    def view_template(&)
+      div(**attrs, &)
     end
 
-    def tab(...)
-      Tab.new(...)
-    end
+    def tab(...) = render Tab.new(...)
 
     private
 

data/lib/protos/theme.rb

@@ -13,13 +13,24 @@ module Protos
       end
     end
 
-    def initialize(theme = {}, **kwargs)
-      @theme = theme.merge(kwargs)
+    def initialize(theme = {}, tailwind_merge: true, **kwargs)
+      @tailwind_merge = tailwind_merge
+
+      @theme = Hash.new do |hash, key|
+        hash[key] = TokenList.new
+      end
+
+      theme.merge!(kwargs).each do |key, value|
+        @theme[key].add(value)
+      end
     end
 
     def [](key)
-      value = @theme[key]
-      return value unless value.is_a?(String)
+      return nil unless key?(key)
+
+      value = @theme[key].to_s
+      return nil if value.empty?
+      return value unless @tailwind_merge
 
       self.class.merger.merge(value)
     end
@@ -29,66 +40,44 @@ module Protos
     end
 
     def add(key, value)
-      TokenList.new
-        .add(@theme.fetch(key, ""))
-        .add(value)
-        .to_s
-        .tap do |tokens|
-          @theme[key] = tokens
-        end
+      @theme[key].add(value)
     end
 
     def remove(key, value)
-      TokenList.new
-        .add(@theme.fetch(key, ""))
-        .remove(value)
-        .to_s
-        .tap do |tokens|
-          @theme[key] = tokens
-        end
+      @theme[key].remove(value)
+      @theme.delete(key) if @theme[key].empty?
     end
 
     def set(key, value)
-      if value.is_a?(Hash)
-        @theme[key] = value
-      else
-        TokenList
-          .parse(value)
-          .to_s
-          .tap do |tokens|
-            @theme[key] = tokens
-          end
-      end
+      @theme[key].clear.add(value)
     end
 
     def merge(hash)
-      hash ||= {}
-
-      tap do
-        hash.each_key do |key|
-          if key?(key)
-            add(key, hash[key])
-          elsif negation?(key)
-            no_bang = key.to_s[1..].to_sym
-            remove(no_bang, hash[key])
-          elsif override?(key)
-            no_bang = key.to_s.chomp("!").to_sym
-            set(no_bang, hash[key])
-          else
-            set(key, hash[key])
-          end
+      return self unless hash
+
+      hash.each do |key, value|
+        if key?(key)
+          add(key, value)
+        elsif negation?(key)
+          remove(key[1..].to_sym, value)
+        elsif override?(key)
+          set(key[..-2].to_sym, value)
+        else
+          set(key, value)
         end
       end
+
+      self
     end
 
     private
 
     def negation?(key)
-      key.to_s.start_with?("!")
+      key.start_with?("!")
     end
 
     def override?(key)
-      key.to_s.end_with?("!")
+      key.end_with?("!")
     end
   end
 end

data/lib/protos/timeline/center.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: The center of a timeline. This would usually be an icon or
       # something small that shows a point on the timeline.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/timeline/item.rb

@@ -7,8 +7,8 @@ module Protos
       # right and depending on its position in the list, an hr at the beginning
       # or end.
 
-      def template(&block)
-        li(**attrs, &block)
+      def view_template(&)
+        li(**attrs, &)
       end
     end
   end

data/lib/protos/timeline/left.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: Content on the left (on daisyui "start") side of a timeline.
       # We chose not to use start/end because of the keywork conflict with ruby.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/timeline/right.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: Content on the right (on daisyui "end") side of a timeline.
       # We chose not to use start/end because of the keywork conflict with ruby.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/timeline.rb

@@ -7,25 +7,17 @@ module Protos
 
     option :vertical, type: Types::Bool, default: -> { false }
 
-    def template(&block)
-      ul(**attrs, &block)
+    def view_template(&)
+      ul(**attrs, &)
     end
 
-    def item(...)
-      Item.new(...)
-    end
+    def item(...) = render Item.new(...)
 
-    def left(...)
-      Left.new(...)
-    end
+    def left(...) = render Left.new(...)
 
-    def center(...)
-      Center.new(...)
-    end
+    def center(...) = render Center.new(...)
 
-    def right(...)
-      Right.new(...)
-    end
+    def right(...) = render Right.new(...)
 
     private
 

data/lib/protos/toast/close_button.rb

@@ -5,11 +5,12 @@ module Protos
     class CloseButton < Component
       # DOCS: A close button for a toast
 
-      def template(&block)
+      def view_template(&block)
         form(method: :dialog, class: css[:form]) do
           button(
             autofocus: true,
             formmethod: :dialog,
+            formnovalidate: true,
             **attrs,
             &block
           )

data/lib/protos/toast.rb

@@ -23,13 +23,11 @@ module Protos
            default: -> { :bottom_end },
            reader: false
 
-    def template(&block)
-      dialog(**attrs, &block)
+    def view_template(&)
+      dialog(**attrs, &)
     end
 
-    def close_button(...)
-      CloseButton.new(...)
-    end
+    def close_button(...) = render CloseButton.new(...)
 
     private