nitro_kit 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48fd5bb40a38df4f675dae9e43f25512fc18331ec77fc1af4a4defbd6b2c6e69
-  data.tar.gz: 1f0cbd3330d866afbe39169042fb7985c39760a8625ff788e01ac9a508537ceb
+  metadata.gz: 43de49498356e50a1fbcac794f988fdcb36c4032bea949316aee19483c1b9208
+  data.tar.gz: 3b4d2a3cdaae5730e46a5880e0ed7d05e0d824bda868d4200d76785c14087ca0
 SHA512:
-  metadata.gz: 3a5f656c6ee81fb4a8ab95e1fbc79f8d8231dca1f51aa25c9c175ecd7dd71cfa57fd1202da71e51be864c6678668616852c7de7e3fed15518fc785b1dacc896c
-  data.tar.gz: f1afe2248dc6c83777782f9800006ff88220cb4bedcf9deacfd826efb8ad2a97281b8c845c1024549f71aa26ca93463593ed81c24984109b939dd322caaa3628
+  metadata.gz: 62f3abbfcc402e5a97b2223f91f95601655ec3a5f6824514ad27e2160d093fb62f458b6caccee302bd948717a29e8d89c248cc0e7f760ec03e870f06bb1dab00
+  data.tar.gz: f00b678398e9430ca799ca92f5331a1e62a1fb459237929aed658d24a6ec98836adde8617cbc01add48ac7d5bf66834ca5094fb2307378447e265203d2e306a3

data/app/components/nitro_kit/accordion.rb

@@ -16,42 +16,48 @@ module NitroKit
       end
     end
 
-    builder_method def item(**attrs)
-      div(**attrs) do
-        yield
+    def item(**attrs)
+      builder do
+        div(**attrs) do
+          yield
+        end
       end
     end
 
-    builder_method def trigger(text = nil, **attrs)
-      button(
-        **mattr(
-          attrs,
-          type: "button",
-          class: trigger_class,
-          data: {
-            action: "nk--accordion#toggle",
-            nk__accordion_target: "trigger"
-          },
-          aria: {expanded: "false"}
-        )
-      ) do
-        block_given? ? yield : plain(text)
-        chevron_icon
+    def trigger(text = nil, **attrs)
+      builder do
+        button(
+          **mattr(
+            attrs,
+            type: "button",
+            class: trigger_class,
+            data: {
+              action: "nk--accordion#toggle",
+              nk__accordion_target: "trigger"
+            },
+            aria: {expanded: "false"}
+          )
+        ) do
+          block_given? ? yield : plain(text)
+          chevron_icon
+        end
       end
     end
 
-    builder_method def content(**attrs)
-      div(
-        **mattr(
-          attrs,
-          class: content_class,
-          data: {
-            nk__accordion_target: "content"
-          },
-          aria: {hidden: "true"}
-        )
-      ) do
-        div(class: "pb-4") { yield }
+    def content(**attrs)
+      builder do
+        div(
+          **mattr(
+            attrs,
+            class: content_class,
+            data: {
+              nk__accordion_target: "content"
+            },
+            aria: {hidden: "true"}
+          )
+        ) do
+          div(class: "pb-4") { yield }
+        end
       end
     end
 

data/app/components/nitro_kit/alert.rb

@@ -22,15 +22,19 @@ module NitroKit
       end
     end
 
-    builder_method def title(text = nil, **attrs, &block)
-      h5(**mattr(attrs, class: title_class)) do
-        text_or_block(text, &block)
+    def title(text = nil, **attrs, &block)
+      builder do
+        h5(**mattr(attrs, class: title_class)) do
+          text_or_block(text, &block)
+        end
       end
     end
 
-    builder_method def description(text = nil, **attrs, &block)
-      div(**mattr(attrs, class: description_class)) do
-        text_or_block(text, &block)
+    def description(text = nil, **attrs, &block)
+      builder do
+        div(**mattr(attrs, class: description_class)) do
+          text_or_block(text, &block)
+        end
       end
     end
 

data/app/components/nitro_kit/avatar_stack.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module NitroKit
+  class AvatarStack < Component
+    def initialize(size: :md, **attrs)
+      @size = size
+
+      super(attrs)
+    end
+
+    attr_reader :size
+
+    def view_template
+      div(**mattr(attrs, class: "flex items-center -space-x-3 [&>div]:ring-2 [&>div]:ring-background")) do
+        yield
+      end
+    end
+
+    builder_method def avatar(*args, **attrs, &block)
+      render(Avatar.new(*args, size:, **attrs, &block))
+    end
+  end
+end

data/app/components/nitro_kit/button.rb

@@ -133,6 +133,12 @@ module NitroKit
           # If icon only, make square
           "[&_svg:first-child:last-child]:-mx-2"
         ]
+      when :xl
+        [
+          "px-8 h-14 text-2xl [&_svg]:size-5 gap-x-4",
+          # If icon only, make square
+          "[&_svg:first-child:last-child]:-mx-8"
+        ]
       else
         raise ArgumentError, "Unknown size `#{size}'"
       end

data/app/components/nitro_kit/card.rb

@@ -15,33 +15,43 @@ module NitroKit
       end
     end
 
-    builder_method def title(text = nil, **attrs, &block)
-      h2(**mattr(attrs, class: "text-lg font-bold -mb-2")) do
-        text_or_block(text, &block)
+    def title(text = nil, **attrs, &block)
+      builder do
+        h2(**mattr(attrs, class: "text-lg font-bold -mb-2")) do
+          text_or_block(text, &block)
+        end
       end
     end
 
-    builder_method def body(text = nil, **attrs, &block)
-      div(**mattr(attrs, class: "text-muted-content text-sm leading-relaxed")) do
-        text_or_block(text, &block)
+    def body(text = nil, **attrs, &block)
+      builder do
+        div(**mattr(attrs, class: "text-muted-content text-sm leading-relaxed")) do
+          text_or_block(text, &block)
+        end
       end
     end
 
-    builder_method def footer(text = nil, **attrs, &block)
-      div(**mattr(attrs, class: "flex gap-2 items-center")) do
-        text_or_block(text, &block)
+    def footer(text = nil, **attrs, &block)
+      builder do
+        div(**mattr(attrs, class: "flex gap-2 items-center")) do
+          text_or_block(text, &block)
+        end
       end
     end
 
-    builder_method def divider(**attrs)
-      full_width do
-        hr(**attrs)
+    def divider(**attrs)
+      builder do
+        full_width do
+          hr(**attrs)
+        end
       end
     end
 
-    builder_method def full_width(**attrs)
-      div(**mattr(attrs, data: {slot: "full"}, class: "-mx-(--gap)")) do
-        yield
+    def full_width(**attrs)
+      builder do
+        div(**mattr(attrs, data: {slot: "full"}, class: "-mx-(--gap)")) do
+          yield
+        end
       end
     end
 

data/app/components/nitro_kit/checkbox.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NitroKit
   class Checkbox < Component
     def initialize(label: nil, id: nil, wrapper: {}, **attrs)

data/app/components/nitro_kit/checkbox_group.rb

@@ -23,15 +23,19 @@ module NitroKit
       end
     end
 
-    builder_method def title(text = nil, **attrs, &block)
-      render(Label.new(**attrs)) do
-        text_or_block(text, &block)
+    def title(text = nil, **attrs, &block)
+      builder do
+        render(Label.new(**attrs)) do
+          text_or_block(text, &block)
+        end
       end
     end
 
-    builder_method def item(text = nil, **attrs, &block)
-      render(Checkbox.new(**attrs)) do
-        text_or_block(text, &block)
+    def item(text = nil, **attrs, &block)
+      builder do
+        render(Checkbox.new(**attrs)) do
+          text_or_block(text, &block)
+        end
       end
     end
   end

data/app/components/nitro_kit/component.rb

@@ -2,12 +2,20 @@
 
 module NitroKit
   class Component < Phlex::HTML
-    def initialize(*hashes, **defaults)
-      @attrs = merge_attrs(*hashes, **defaults)
+    def initialize(attrs = {}, **defaults)
+      @attrs = merge_attrs(attrs, **defaults)
     end
 
     attr_reader :attrs
 
+    def self.from_template(*args, **attrs, &block)
+      new(*args, **attrs, &block).tap { |instance| instance.instance_variable_set(:@_nk_from_template, true) }
+    end
+
+    def builder(&block)
+      @_nk_from_template ? capture(&block) : yield
+    end
+
     private
 
     # Class-level helper method for builder style components.
@@ -15,24 +23,11 @@ module NitroKit
     # in capture so we don't write to the output buffer immediately.
     # However when called from other components, we don't.
     def self.builder_method(method_name)
-      mod = Module.new
-      mod.module_eval(
-        <<~RUBY,
-          # frozen_string_literal: true
-
-          def #{method_name}(...)
-            if caller_locations(1, 1).first.path.end_with?(".rb")
-              super
-            else
-              capture { super }
-            end
-          end
-        RUBY
-        __FILE__,
-        __LINE__ + 1
+      warn(
+        "[DEPRECATION] builder_method is deprecated. Please migrate to using the builder(&) pattern. See https://github.com/mikker/nitro_kit/issues/35 for details."
       )
 
-      prepend(mod)
+      nil
     end
 
     # Merge attributes with some special cases for matching keys
@@ -76,8 +71,10 @@ module NitroKit
     end
 
     def text_or_block(text = nil, &block)
-      if text
+      if text && text.is_a?(ActiveSupport::SafeBuffer)
         plain(text)
+      elsif text
+        text
       elsif block_given?
         yield
       else

data/app/components/nitro_kit/dialog.rb

@@ -19,76 +19,86 @@ module NitroKit
       end
     end
 
-    builder_method def trigger(text = nil, as: Button, **attrs, &block)
-      trigger_attrs = mattr(
-        attrs,
-        data: {
-          nk__dialog_target: "trigger",
-          action: "click->nk--dialog#open"
-        }
-      )
+    def trigger(text = nil, as: Button, **attrs, &block)
+      builder do
+        trigger_attrs = mattr(
+          attrs,
+          data: {
+            nk__dialog_target: "trigger",
+            action: "click->nk--dialog#open"
+          }
+        )
 
-      case as
-      when Symbol
-        send(as, **trigger_attrs) do
-          text_or_block(text, &block)
-        end
-      else
-        render(as.new(**trigger_attrs)) do
-          text_or_block(text, &block)
+        case as
+        when Symbol
+          send(as, **trigger_attrs) do
+            text_or_block(text, &block)
+          end
+        else
+          render(as.new(**trigger_attrs)) do
+            text_or_block(text, &block)
+          end
         end
       end
     end
 
     alias :html_dialog :dialog
 
-    builder_method def dialog(**attrs)
-      html_dialog(
-        **mattr(
-          attrs,
-          class: dialog_class,
-          data: {nk__dialog_target: "dialog"},
-          aria: {
-            labelledby: id(:title),
-            describedby: id(:description)
-          }
-        )
-      ) do
-        yield
+    def dialog(**attrs)
+      builder do
+        html_dialog(
+          **mattr(
+            attrs,
+            class: dialog_class,
+            data: {nk__dialog_target: "dialog"},
+            aria: {
+              labelledby: id(:title),
+              describedby: id(:description)
+            }
+          )
+        ) do
+          yield
+        end
       end
     end
 
-    builder_method def close_button(**attrs)
-      render(
-        Button.new(
-          **mattr(
-            attrs,
-            variant: :ghost,
-            size: :sm,
-            class: "absolute top-2 right-2",
-            data: {action: "nk--dialog#close"}
+    def close_button(**attrs)
+      builder do
+        render(
+          Button.new(
+            **mattr(
+              attrs,
+              variant: :ghost,
+              size: :sm,
+              class: "absolute top-2 right-2",
+              data: {action: "nk--dialog#close"}
+            )
           )
-        )
-      ) do
-        render(Icon.new(:x))
+        ) do
+          render(Icon.new(:x))
+        end
       end
     end
 
-    builder_method def title(text = nil, **attrs, &block)
-      h2(**mattr(attrs, id: id(:title), class: "text-lg font-semibold mb-2")) do
-        text_or_block(text, &block)
+    def title(text = nil, **attrs, &block)
+      builder do
+        h2(**mattr(attrs, id: id(:title), class: "text-lg font-semibold mb-2")) do
+          text_or_block(text, &block)
+        end
       end
     end
 
-    builder_method def description(text = nil, **attrs, &block)
-      div(
-        **mattr(
-          attrs,
-          id: id(:description),
-          class: "text-muted-content mb-6 text-sm leading-relaxed"
-        )
-      ) do
-        text_or_block(text, &block)
+    def description(text = nil, **attrs, &block)
+      builder do
+        div(
+          **mattr(
+            attrs,
+            id: id(:description),
+            class: "text-muted-content mb-6 text-sm leading-relaxed"
+          )
+        ) do
+          text_or_block(text, &block)
+        end
       end
     end
 

data/app/components/nitro_kit/dropdown.rb

@@ -26,97 +26,113 @@ module NitroKit
       end
     end
 
-    builder_method def trigger(text = nil, as: NitroKit::Button, **attrs, &block)
-      trigger_attrs = mattr(
-        attrs,
-        aria: {haspopup: "true", expanded: "false"},
-        data: {nk__dropdown_target: "trigger", action: "click->nk--dropdown#toggle"}
-      )
+    def trigger(text = nil, as: NitroKit::Button, **attrs, &block)
+      builder do
+        trigger_attrs = mattr(
+          attrs,
+          aria: {haspopup: "true", expanded: "false"},
+          data: {nk__dropdown_target: "trigger", action: "click->nk--dropdown#toggle"}
+        )
 
-      case as
-      when Symbol
-        send(as, **trigger_attrs) do
-          text_or_block(text, &block)
-        end
-      else
-        render(as.new(**trigger_attrs)) do
-          text_or_block(text, &block)
+        case as
+        when Symbol
+          send(as, **trigger_attrs) do
+            text_or_block(text, &block)
+          end
+        else
+          render(as.new(**trigger_attrs)) do
+            text_or_block(text, &block)
+          end
         end
       end
     end
 
-    builder_method def content(as: :div, **attrs)
-      div(
-        **mattr(
-          attrs,
-          role: "menu",
-          aria: {hidden: "true"},
-          class: content_class,
-          data: {nk__dropdown_target: "content"},
-          popover: true
-        )
-      ) do
-        yield
+    def content(as: :div, **attrs)
+      builder do
+        div(
+          **mattr(
+            attrs,
+            role: "menu",
+            aria: {hidden: "true"},
+            class: content_class,
+            data: {nk__dropdown_target: "content"},
+            popover: true
+          )
+        ) do
+          yield
+        end
       end
     end
 
-    builder_method def title(text = nil, **attrs, &block)
-      div(**mattr(attrs, class: title_class)) do
-        text_or_block(text, &block)
+    def title(text = nil, **attrs, &block)
+      builder do
+        div(**mattr(attrs, class: title_class)) do
+          text_or_block(text, &block)
+        end
       end
     end
 
-    builder_method def item(text = nil, href: nil, variant: :default, **attrs, &block)
-      common_attrs = mattr(
-        attrs,
-        role: "menuitem",
-        tabindex: "-1",
-        class: [item_class, item_variant_class(variant)]
-      )
+    def item(text = nil, href: nil, variant: :default, **attrs, &block)
+      builder do
+        common_attrs = mattr(
+          attrs,
+          role: "menuitem",
+          tabindex: "-1",
+          class: [item_class, item_variant_class(variant)]
+        )
 
-      if href
-        link_to(href, **common_attrs) do
-          text_or_block(text, &block)
-        end
-      else
-        div(**common_attrs) do
-          text_or_block(text, &block)
+        if href
+          link_to(href, **common_attrs) do
+            text_or_block(text, &block)
+          end
+        else
+          div(**common_attrs) do
+            text_or_block(text, &block)
+          end
         end
       end
     end
 
-    builder_method def item_to(
+    def item_to(
       text_or_href,
       href = nil,
       **attrs,
       &block
     )
-      if block_given?
-        href = text_or_href
-        text_or_href = nil
-      end
+      builder do
+        if block_given?
+          href = text_or_href
+          text_or_href = nil
+        end
 
-      item(text_or_href, href: href, **attrs, &block)
+        item(text_or_href, href: href, **attrs, &block)
+      end
     end
 
-    builder_method def destructive_item(*args, **attrs, &block)
-      item(*args, **attrs, variant: :destructive, &block)
+    def destructive_item(*args, **attrs, &block)
+      builder do
+        item(*args, **attrs, variant: :destructive, &block)
+      end
     end
 
-    builder_method def destructive_item_to(text_or_block, href = nil, **attrs, &block)
-      href = args.shift if block_given?
-      destructive_item(text_or_block, href: href, **attrs, &block)
+    def destructive_item_to(text_or_block, href = nil, **attrs, &block)
+      builder do
+        href = args.shift if block_given?
+        destructive_item(text_or_block, href: href, **attrs, &block)
+      end
     end
 
-    builder_method def separator
-      hr(class: separator_class)
+    def separator
+      builder do
+        hr(class: separator_class)
+      end
     end
 
     private
 
     def content_class
       [
-        "z-10 w-max-content absolute top-0 left-0",
+        "isolate w-max-content absolute top-0 left-0",
         "p-1 bg-background text-foreground rounded-md border shadow-sm",
         "w-fit max-w-sm flex-col text-left",
         "[&[aria-hidden=true]]:hidden flex"
@@ -135,7 +151,8 @@ module NitroKit
       [
         "px-3 py-1.5 rounded",
         "font-medium truncate",
-        "cursor-default"
+        "cursor-default",
+        "flex gap-2 items-center [&>span]:truncate"
       ]
     end
 
@@ -144,7 +161,7 @@ module NitroKit
       when :default
         "[&[href]]:hover:bg-muted"
       when :destructive
-        "text-destructive [&[href]]:hover:bg-destructive [&[href]]:hover:text-white"
+        "text-destructive-content [&[href]]:hover:bg-destructive [&[href]]:hover:text-white"
       else
         raise ArgumentError, "Unknown variant: #{variant.inspect}"
       end