nitro_kit 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43de49498356e50a1fbcac794f988fdcb36c4032bea949316aee19483c1b9208
-  data.tar.gz: 3b4d2a3cdaae5730e46a5880e0ed7d05e0d824bda868d4200d76785c14087ca0
+  metadata.gz: 06ec36dc808b0223864423889cf64d62465c925e111a49d334110aadfa0859a3
+  data.tar.gz: 9a1f9f81419b52fcfb8c5a956e134f424419a4c5b922ecc68d820f3bfb135a9d
 SHA512:
-  metadata.gz: 62f3abbfcc402e5a97b2223f91f95601655ec3a5f6824514ad27e2160d093fb62f458b6caccee302bd948717a29e8d89c248cc0e7f760ec03e870f06bb1dab00
-  data.tar.gz: f00b678398e9430ca799ca92f5331a1e62a1fb459237929aed658d24a6ec98836adde8617cbc01add48ac7d5bf66834ca5094fb2307378447e265203d2e306a3
+  metadata.gz: dd3df11e3987edb2be111e580442b9ccac3d3e1f414bdb7933469f1ab7d1c29cf0e3b17648eb01793301ea64b8880a776d545428b34e76aabf779c9161e7c889
+  data.tar.gz: b5ef21b4509537b8e373278ea1fa52e08d154e5a46869c942ad39f2fe69888ba2cb215a85e00e1e34f196a94afbace25e2a6b1ed744ef18116724462b2a22676

data/app/assets/tailwind/application.css

@@ -0,0 +1,49 @@
+@import "tailwindcss";
+
+@theme {
+  --color-foreground: var(--color-zinc-900);
+  --color-background: var(--color-white);
+
+  --color-border: var(--color-zinc-200);
+  --color-ring: var(--color-blue-600);
+  --color-muted: var(--color-zinc-100);
+  --color-muted-content: var(--color-zinc-500);
+  --color-primary: var(--color-zinc-800);
+  --color-primary-content: var(--zinc-800);
+  --color-primary-foreground: var(--color-zinc-100);
+  --color-destructive: var(--color-red-500);
+  --color-destructive-content: var(--color-red-800);
+  --color-destructive-foreground: var(--color-white);
+}
+
+@layer base {
+  [data-theme="dark"] {
+    --color-foreground: var(--color-zinc-100);
+    --color-background: var(--color-zinc-950);
+
+    --color-border: var(--color-zinc-700);
+    --color-ring: var(--color-blue-700);
+    --color-muted: var(--color-zinc-800);
+    --color-muted-content: var(--color-zinc-400);
+    --color-primary: var(--color-zinc-50);
+    --color-primary-content: var(--color-zinc-50);
+    --color-primary-foreground: var(--color-zinc-900);
+    --color-destructive: var(--color-red-900);
+    --color-destructive-content: var(--color-red-600);
+    --color-destructive-foreground: var(--color-white);
+  }
+}
+
+@variant dark (&:where([data-theme="dark"], [data-theme="dark"] *));
+
+@layer base {
+  * {
+    @apply border-border ring-ring min-w-0;
+  }
+
+  body {
+    /* Nitro Kit looks great in Inter as well */
+    /* https://rsms.me/inter */
+    @apply bg-background text-foreground font-sans;
+  }
+}

data/app/components/nitro_kit/accordion.rb

@@ -6,7 +6,7 @@ module NitroKit
       super(
         attrs,
         class: item_class,
-        data: {controller: "nk--accordion"}
+        data: { controller: "nk--accordion" }
       )
     end
 
@@ -35,7 +35,7 @@ module NitroKit
               action: "nk--accordion#toggle",
               nk__accordion_target: "trigger"
             },
-            aria: {expanded: "false"}
+            aria: { expanded: "false" }
           )
         ) do
           block_given? ? yield : plain(text)
@@ -53,7 +53,7 @@ module NitroKit
             data: {
               nk__accordion_target: "content"
             },
-            aria: {hidden: "true"}
+            aria: { hidden: "true" }
           )
         ) do
           div(class: "pb-4") { yield }

data/app/components/nitro_kit/alert.rb

@@ -10,7 +10,7 @@ module NitroKit
       super(
         attrs,
         role: "alert",
-        class: [base_class, variant_class]
+        class: [ base_class, variant_class ]
       )
     end
 

data/app/components/nitro_kit/avatar.rb

@@ -10,7 +10,7 @@ module NitroKit
 
       super(
         attrs,
-        class: [container_class, size_classes]
+        class: [ container_class, size_classes ]
       )
     end
 
@@ -22,7 +22,7 @@ module NitroKit
       end
     end
 
-    builder_method def image
+    def image
       image_tag(src, class: image_class)
     end
 

data/app/components/nitro_kit/avatar_stack.rb

@@ -16,7 +16,7 @@ module NitroKit
       end
     end
 
-    builder_method def avatar(*args, **attrs, &block)
+    def avatar(*args, **attrs, &block)
       render(Avatar.new(*args, size:, **attrs, &block))
     end
   end

data/app/components/nitro_kit/card.rb

@@ -49,7 +49,7 @@ module NitroKit
 
     def full_width(**attrs)
       builder do
-        div(**mattr(attrs, data: {slot: "full"}, class: "-mx-(--gap)")) do
+        div(**mattr(attrs, data: { slot: "full" }, class: "-mx-(--gap)")) do
           yield
         end
       end

data/app/components/nitro_kit/checkbox.rb

@@ -48,7 +48,7 @@ module NitroKit
         stroke_linecap: "round",
         stroke_linejoin: "round",
         stroke_width: 3,
-        data: {check: ""}
+        data: { check: "" }
       ) do |svg|
         svg.path(d: "M 3 8 L 6 12 L 13 5")
       end
@@ -62,7 +62,7 @@ module NitroKit
         stroke: "currentColor",
         stroke_linecap: "round",
         stroke_width: 3,
-        data: {indeterminate: ""}
+        data: { indeterminate: "" }
       ) do |svg|
         svg.line(x1: "3", y1: "8", x2: "13", y2: "8")
       end

data/app/components/nitro_kit/combobox.rb

@@ -9,7 +9,7 @@ module NitroKit
       placement: "bottom",
       tab_inserts_suggestions: true,
       first_option_selection_mode: "selected",
-      scroll_into_view_options: {block: "nearest", inline: "nearest"},
+      scroll_into_view_options: { block: "nearest", inline: "nearest" },
 
       **attrs
     )
@@ -56,8 +56,8 @@ module NitroKit
 
     def view_template
       div(
+        class: "isolate",
         data: {
-          class: "isolate",
           slot: "control",
           controller: "nk--combobox",
           nk__combobox_placement_value: placement,
@@ -77,19 +77,19 @@ module NitroKit
           type: "hidden",
           value: attrs[:value],
           name: attrs[:name],
-          data: {nk__combobox_target: "hiddenField"}
+          data: { nk__combobox_target: "hiddenField" }
         )
 
         ul(
           role: "listbox",
           id: id(:listbox),
           class: list_class,
-          data: {nk__combobox_target: "list", state: "closed"}
+          data: { nk__combobox_target: "list", state: "closed" }
         ) do
           options.each do |(key, value)|
             li(
               role: "option",
-              data: {value:},
+              data: { value: },
               class: merge_class(option_class)
             ) { key }
           end

data/app/components/nitro_kit/component.rb

@@ -13,7 +13,7 @@ module NitroKit
     end
 
     def builder(&block)
-      @_nk_from_template ? capture(&block) : yield
+      @_nk_from_template && !self.is_a?(NitroKit::Component) ? capture(&block) : yield
     end
 
     private
@@ -62,7 +62,7 @@ module NitroKit
             # Concat Stimulus actions
             case key
             when :action, :controller
-              [new_val, old_val].compact.join(" ")
+              [ new_val, old_val ].compact.join(" ")
             else
               new_val
             end

data/app/components/nitro_kit/datepicker.rb

@@ -3,7 +3,7 @@
 module NitroKit
   class Datepicker < Component
     def view_template
-      render(Input.new(type: "text", **attrs, data: {controller: "nk--datepicker"}))
+      render(Input.new(type: "text", **attrs, data: { controller: "nk--datepicker" }))
     end
   end
 end

data/app/components/nitro_kit/dialog.rb

@@ -7,7 +7,7 @@ module NitroKit
 
       super(
         attrs,
-        data: {controller: "nk--dialog", action: "click->nk--dialog#clickOutside"}
+        data: { controller: "nk--dialog", action: "click->nk--dialog#clickOutside" }
       )
     end
 
@@ -50,7 +50,7 @@ module NitroKit
           **mattr(
             attrs,
             class: dialog_class,
-            data: {nk__dialog_target: "dialog"},
+            data: { nk__dialog_target: "dialog" },
             aria: {
               labelledby: id(:title),
               describedby: id(:description)
@@ -71,7 +71,7 @@ module NitroKit
               variant: :ghost,
               size: :sm,
               class: "absolute top-2 right-2",
-              data: {action: "nk--dialog#close"}
+              data: { action: "nk--dialog#close" }
             )
           )
         ) do

data/app/components/nitro_kit/dropdown.rb

@@ -30,8 +30,8 @@ module NitroKit
       builder do
         trigger_attrs = mattr(
           attrs,
-          aria: {haspopup: "true", expanded: "false"},
-          data: {nk__dropdown_target: "trigger", action: "click->nk--dropdown#toggle"}
+          aria: { haspopup: "true", expanded: "false" },
+          data: { nk__dropdown_target: "trigger", action: "click->nk--dropdown#toggle" }
         )
 
         case as
@@ -53,9 +53,9 @@ module NitroKit
           **mattr(
             attrs,
             role: "menu",
-            aria: {hidden: "true"},
+            aria: { hidden: "true" },
             class: content_class,
-            data: {nk__dropdown_target: "content"},
+            data: { nk__dropdown_target: "content" },
             popover: true
           )
         ) do
@@ -78,7 +78,7 @@ module NitroKit
           attrs,
           role: "menuitem",
           tabindex: "-1",
-          class: [item_class, item_variant_class(variant)]
+          class: [ item_class, item_variant_class(variant) ]
         )
 
         if href
@@ -117,7 +117,11 @@ module NitroKit
 
     def destructive_item_to(text_or_block, href = nil, **attrs, &block)
       builder do
-        href = args.shift if block_given?
+        if block_given?
+          href = text_or_block
+          text_or_block = nil
+        end
+
         destructive_item(text_or_block, href: href, **attrs, &block)
       end
     end

data/app/components/nitro_kit/field.rb

@@ -11,6 +11,8 @@ module NitroKit
       errors: nil,
       wrapper: {},
       options: nil,
+      include_blank: nil,
+      prompt: nil,
       **attrs
     )
       @form = form
@@ -22,6 +24,8 @@ module NitroKit
 
       # select, radio group
       @options = options
+      @include_blank = include_blank
+      @prompt = prompt
 
       @field_attrs = attrs
       @field_label = label.nil? ? field_name.to_s.humanize : label
@@ -32,7 +36,7 @@ module NitroKit
 
       super(
         wrapper,
-        data: {as: @as.to_s},
+        data: { as: @as.to_s },
         class: base_class
       )
     end
@@ -66,7 +70,7 @@ module NitroKit
 
         return unless text
 
-        render(Label.new(**mattr(attrs, for: id, data: {slot: "label"}))) do
+        render(Label.new(**mattr(attrs, for: id, data: { slot: "label" }))) do
           text
         end
       end
@@ -78,7 +82,7 @@ module NitroKit
 
         return unless text || block_given?
 
-        div(**mattr(attrs, data: {slot: "description"}, class: description_class)) do
+        div(**mattr(attrs, data: { slot: "description" }, class: description_class)) do
           text_or_block(text, &block)
         end
       end
@@ -90,7 +94,7 @@ module NitroKit
 
         return unless error_messages&.any?
 
-        ul(**mattr(attrs, data: {slot: "error"}, class: error_class)) do |msg|
+        ul(**mattr(attrs, data: { slot: "error" }, class: error_class)) do |msg|
           error_messages.each do |msg|
             li { msg }
           end
@@ -166,7 +170,7 @@ module NitroKit
         name:,
         id:,
         value: value_before_typecast,
-        data: {slot: "control"}
+        data: { slot: "control" }
       )
     end
 
@@ -185,10 +189,17 @@ module NitroKit
 
     alias :html_select :select
 
-    def select(options: nil, **attrs)
+    def select(options: nil, include_blank: nil, prompt: nil, **attrs)
+      collection = options || @options || []
+      blank_option = include_blank || @include_blank
+      prompt_text = prompt || @prompt
+
       render(
         Select.new(
-          options || @options || [],
+          collection,
+          value: value,
+          include_empty: blank_option,
+          prompt: prompt_text,
           **control_attrs(
             **field_attrs,
             **attrs

data/app/components/nitro_kit/field_group.rb

@@ -3,7 +3,7 @@
 module NitroKit
   class FieldGroup < Component
     def initialize(**attrs)
-      super(attrs, class: base_class, data: {slot: "control"})
+      super(attrs, class: base_class, data: { slot: "control" })
     end
 
     def view_template(&block)

data/app/components/nitro_kit/fieldset.rb

@@ -32,7 +32,7 @@ module NitroKit
 
     def description(text = nil, **attrs, &block)
       builder do
-        div(**mattr(attrs, class: description_class, data: {slot: "text"})) do
+        div(**mattr(attrs, class: description_class, data: { slot: "text" })) do
           text_or_block(text, &block)
         end
       end

data/app/components/nitro_kit/form_builder.rb

@@ -86,5 +86,18 @@ module NitroKit
 
       @template.render(NitroKit::Button.new(value, **attrs), &block)
     end
+
+    def select(method, choices = nil, options = {}, html_options = {}, &block)
+      field_options = {
+        as: :select,
+        options: choices,
+        include_blank: options[:include_blank],
+        prompt: options[:prompt]
+      }.compact
+
+      field_attributes = options.except(:include_blank, :prompt, :selected)
+
+      field(method, **field_options, **field_attributes, **html_options, &block)
+    end
   end
 end

data/app/components/nitro_kit/label.rb

@@ -8,7 +8,7 @@ module NitroKit
       super(
         attrs,
         class: "text-sm font-medium select-none",
-        data: {slot: "label"}
+        data: { slot: "label" }
       )
     end
 

data/app/components/nitro_kit/pagination.rb

@@ -6,7 +6,7 @@ module NitroKit
       super(
         attrs,
         class: merge_class(nav_class, attrs[:class]),
-        aria: {label: "Pagination"}
+        aria: { label: "Pagination" }
       )
     end
 
@@ -18,7 +18,7 @@ module NitroKit
 
     def prev(text = nil, **attrs, &block)
       builder do
-        page_link(**mattr(attrs, aria: {label: "Previous page"})) do
+        page_link(**mattr(attrs, aria: { label: "Previous page" })) do
           if text || block_given?
             text_or_block(text, &block)
           else
@@ -31,7 +31,7 @@ module NitroKit
 
     def next(text = nil, **attrs, &block)
       builder do
-        page_link(**mattr(attrs, aria: {label: "Next page"})) do
+        page_link(**mattr(attrs, aria: { label: "Next page" })) do
           if text || block_given?
             text_or_block(text, &block)
           else
@@ -51,7 +51,7 @@ module NitroKit
               current: current ? "page" : nil
             },
             disabled: current,
-            class: [page_class, current && "bg-zinc-200/50 dark:bg-zinc-800/50"]
+            class: [ page_class, current && "bg-zinc-200/50 dark:bg-zinc-800/50" ]
           )
         ) do
           text_or_block(text, &block)
@@ -83,7 +83,7 @@ module NitroKit
         **mattr(
           attrs,
           role: "link",
-          aria: {disabled: disabled.to_s},
+          aria: { disabled: disabled.to_s },
           class: link_class
         )
       ) do

data/app/components/nitro_kit/select.rb

@@ -4,7 +4,7 @@ module NitroKit
   class Select < Component
     def initialize(options = nil, value: nil, include_empty: false, prompt: nil, index: nil, **attrs)
       @options = options
-      @value = value.to_s
+      @value = value&.to_s
       @include_empty = include_empty
       @prompt = prompt
       @index = index
@@ -15,13 +15,35 @@ module NitroKit
       )
     end
 
-    attr_reader :value, :options, :include_empty, :prompts, :index
+    attr_reader :value, :options, :include_empty, :prompt, :index
 
     def view_template
-      span(class: wrapper_class, data: {slot: "control"}) do
+      span(class: wrapper_class, data: { slot: "control" }) do
         select(**attrs, class: select_class) do
-          option if include_empty
-          options ? options.map { |o| option(*o) } : yield
+          if include_empty
+            blank_text = if include_empty.is_a?(String)
+              include_empty
+            elsif @prompt
+              @prompt
+            else
+              ""
+            end
+
+            html_option(value: "", selected: @value == "") { blank_text }
+          end
+
+          if options
+            options.each do |opt|
+              if opt.is_a?(Array) && opt.length >= 2
+                html_option(value: opt[1], selected: @value == opt[1].to_s) { opt[0] }
+              else
+                # Handle simple strings - use as both label and value
+                html_option(value: opt.to_s, selected: @value == opt.to_s) { opt.to_s }
+              end
+            end
+          else
+            yield if block_given?
+          end
         end
 
         chevron_icon
@@ -30,15 +52,15 @@ module NitroKit
 
     alias :html_option :option
 
-    def option(key_or_value = nil, value = nil, **attrs, &block)
+    def option(text = nil, value = nil, **attrs, &block)
       builder do
-        value ||= key_or_value
+        value ||= text
 
         html_option(value:, selected: @value == value.to_s, **attrs) do
           if block_given?
             yield
           else
-            key_or_value
+            text
           end
         end
       end

data/app/components/nitro_kit/switch.rb

@@ -22,10 +22,10 @@ module NitroKit
         **mattr(
           **attrs,
           type: "button",
-          class: [base_class, size_class],
-          data: {controller: "nk--switch", action: "nk--switch#toggle"},
+          class: [ base_class, size_class ],
+          data: { controller: "nk--switch", action: "nk--switch#toggle" },
           role: "switch",
-          aria: {checked: checked.to_s}
+          aria: { checked: checked.to_s }
         )
       ) do
         span(class: "sr-only") { description }
@@ -36,7 +36,7 @@ module NitroKit
     private
 
     def handle
-      span(aria: {hidden: true}, class: handle_class, data: {slot: "handle"})
+      span(aria: { hidden: true }, class: handle_class, data: { slot: "handle" })
     end
 
     def base_class

data/app/components/nitro_kit/table.rb

@@ -2,16 +2,21 @@
 
 module NitroKit
   class Table < Component
-    def initialize(**attrs)
-      super(
-        attrs,
-        class: "w-full caption-bottom text-sm divide-y"
-      )
+    def initialize(wrapper: {}, **attrs)
+      super(attrs)
+      @wrapper = wrapper
     end
 
+    attr_reader :wrapper
+
     def view_template
-      div(class: "w-full overflow-x-scroll") do
-        table(**attrs) do
+      div(**mattr(wrapper, class: "w-full overflow-x-scroll")) do
+        table(
+          **mattr(
+            attrs,
+            class: "w-full caption-bottom text-sm divide-y"
+          )
+        ) do
           yield
         end
       end
@@ -43,7 +48,7 @@ module NitroKit
 
     def th(text = nil, align: :left, **attrs, &block)
       builder do
-        html_th(**mattr(attrs, class: [header_cell_classes, cell_classes, align_classes(align), "font-medium"])) do
+        html_th(**mattr(attrs, class: [ header_cell_classes, cell_classes, align_classes(align), "font-medium" ])) do
           text_or_block(text, &block)
         end
       end
@@ -51,7 +56,7 @@ module NitroKit
 
     def td(text = nil, align: nil, **attrs, &block)
       builder do
-        html_td(**mattr(attrs, class: [cell_classes, align_classes(align)])) do
+        html_td(**mattr(attrs, class: [ cell_classes, align_classes(align) ])) do
           text_or_block(text, &block)
         end
       end
@@ -64,7 +69,7 @@ module NitroKit
     end
 
     def cell_classes
-      "whitespace-nowrap py-2 min-h-10 px-2"
+      "py-2 min-h-10 px-2"
     end
 
     def align_classes(align = nil)

data/app/components/nitro_kit/tabs.rb

@@ -8,7 +8,7 @@ module NitroKit
 
       super(
         attrs,
-        data: {controller: "nk--tabs", nk__tabs_active_value: default},
+        data: { controller: "nk--tabs", nk__tabs_active_value: default },
         class: base_class
       )
     end

data/app/components/nitro_kit/toast.rb

@@ -37,9 +37,9 @@ module NitroKit
               variant_class
             ],
             role: "status",
-            aria: {live: "off", atomic: "true"},
+            aria: { live: "off", atomic: "true" },
             tabindex: "0",
-            data: {state: "closed"}
+            data: { state: "closed" }
           )
         )
       end
@@ -49,11 +49,11 @@ module NitroKit
       def view_template(&block)
         li(**attrs) do
           div(class: "grid gap-1") do
-            div(class: "text-sm font-semibold", data: {slot: "title"}) do
+            div(class: "text-sm font-semibold", data: { slot: "title" }) do
               title && plain(title)
             end
 
-            div(class: "text-sm opacity-90", data: {slot: "description"}) do
+            div(class: "text-sm opacity-90", data: { slot: "description" }) do
               text_or_block(description, &block)
             end
           end
@@ -87,34 +87,30 @@ module NitroKit
         attrs,
         role: "region",
         tabindex: "-1",
-        aria: {label: "Notifications"},
+        aria: { label: "Notifications" },
         class: "pointer-events-none"
       )
     end
 
     def view_template
       div(**attrs) do
-        ol(class: list_class, data: {nk__toast_target: "list"})
+        ol(class: list_class, data: { nk__toast_target: "list" })
       end
 
       flash_sink
 
-      template(data: {nk__toast_target: "template"}) do
+      template(data: { nk__toast_target: "template" }) do
         item
       end
     end
 
     def item(title: nil, description: nil, **attrs, &block)
-      builder do
-        render(Item.new(title:, description:, **attrs), &block)
-      end
+      render(Item.new(title:, description:, **attrs), &block)
     end
 
     def flash_sink
-      builder do
-        div(id: "nk--toast-sink", data: {nk__toast_target: "sink"}, hidden: true) do
-          render(FlashMessages.new(view_context.flash))
-        end
+      div(id: "nk--toast-sink", data: { nk__toast_target: "sink" }, hidden: true) do
+        render(FlashMessages.new(view_context.flash))
       end
     end
 

data/app/helpers/nitro_kit/checkbox_helper.rb

@@ -26,7 +26,7 @@ module NitroKit
       end
 
       options = args.extract_options!
-      value, checked = args.empty? ? ["1", false] : [*args, false]
+      value, checked = args.empty? ? [ "1", false ] : [ *args, false ]
       attrs = {
         type: "checkbox",
         name: name,

data/app/helpers/nitro_kit/pagination_helper.rb

@@ -1,27 +1,31 @@
 # frozen_string_literal: true
 
+begin
+  require "pagy/toolbox/helpers/support/series"
+rescue LoadError
+  # Pagy isn't around
+end
+
 module NitroKit
   module PaginationHelper
-    include Pagy::UrlHelpers if defined?(Pagy)
-
     def nk_pagination(**attrs, &block)
       render(Pagination.from_template(**attrs), &block)
     end
 
     def nk_pagy_nav(pagy, id: nil, aria_label: nil, **attrs)
-      attrs[:aria] ||= {label: aria_label}
+      attrs[:aria] ||= { label: aria_label }
 
       nk_pagination(id:, **attrs) do |p|
-        if prev_page = pagy.prev
-          p.prev(href: pagy_url_for(pagy, prev_page))
+        if prev_page = pagy.previous
+          p.prev(href: pagy.page_url(prev_page))
         else
           p.prev(disabled: true)
         end
 
-        pagy.series.each do |item|
+        pagy.send(:series).each do |item|
           case item
           when Integer
-            p.page(item.to_s, href: pagy_url_for(pagy, item))
+            p.page(item.to_s, href: pagy.page_url(item))
           when String
             p.page(item, current: true)
           when :gap
@@ -32,7 +36,7 @@ module NitroKit
         end
 
         if next_page = pagy.next
-          p.next(href: pagy_url_for(pagy, next_page))
+          p.next(href: pagy.page_url(next_page))
         else
           p.next(disabled: true)
         end

data/app/helpers/nitro_kit/select_helper.rb

@@ -18,7 +18,7 @@ module NitroKit
 
       # TODO: support index
 
-      render(Select.from_template(options, value:, include_blank:, prompt:, **compat_options, **attrs), &block)
+      render(Select.from_template(options, value:, include_blank:, prompt:, name:, **compat_options, **attrs), &block)
     end
   end
 end

data/app/javascript/controllers/nk/toast_controller.js

@@ -7,8 +7,6 @@ export default class extends Controller {
   };
 
   connect() {
-    this.#flushSink();
-
     if (this.hasSinkTarget) {
       this.mutationObserver = new MutationObserver(([event]) => {
         if (event.addedNodes.length === 0) return;
@@ -16,6 +14,8 @@ export default class extends Controller {
       });
       this.mutationObserver.observe(this.sinkTarget, { childList: true });
     }
+
+    this.#flushSink();
   }
 
   disconnect() {
@@ -60,6 +60,8 @@ export default class extends Controller {
   }
 
   #flushSink() {
+    if (!this.hasSinkTarget) return;
+
     for (const li of this.sinkTarget.children) {
       this.show(li.cloneNode(true));
       li.remove();

data/lib/generators/nitro_kit/component_generator.rb

@@ -50,7 +50,7 @@ module NitroKit
     def components
       return @components if @components
 
-      if component_names == ["all"]
+      if component_names == [ "all" ]
         return @components = SCHEMA.all
       end
 
@@ -58,7 +58,7 @@ module NitroKit
       @components = component_names
         .flat_map do |name|
           component = SCHEMA.find(name)
-          [component] + component.dependencies
+          [ component ] + component.dependencies
         end
     end
 

data/lib/nitro_kit/schema_builder.rb

@@ -1,3 +1,5 @@
+require "set"
+
 module NitroKit
   module SchemaBuilder
     class Component
@@ -21,12 +23,18 @@ module NitroKit
       def resolve!
         raise "Component already resolved" if resolved?
 
-        @dependencies = @unresolved_dependencies
-          .each_with_object(Set.new) do |name, list|
-            list.add(name)
-            list.merge(@schema.find(name).unresolved_dependencies)
-          end
-          .map { |name| @schema.find(name) }
+        dependencies = Set.new
+        stack = @unresolved_dependencies.dup
+
+        until stack.empty?
+          name = stack.pop
+          next if dependencies.include?(name)
+
+          dependencies.add(name)
+          stack.concat(@schema.find(name).unresolved_dependencies)
+        end
+
+        @dependencies = dependencies.map { |name| @schema.find(name) }
 
         @resolved = true
       end
@@ -71,8 +79,8 @@ module NitroKit
         gems: []
       )
         # Default is one component, one helper with same name
-        components ||= [name]
-        helpers ||= [name]
+        components ||= [ name ]
+        helpers ||= [ name ]
 
         files = [
           components.map { |c| "app/components/nitro_kit/#{c}.rb" },

data/lib/nitro_kit/version.rb

@@ -1,3 +1,3 @@
 module NitroKit
-  VERSION = "0.7.0"
+  VERSION = "0.9.0"
 end

data/lib/nitro_kit.rb

@@ -10,37 +10,37 @@ module NitroKit
   extend SchemaBuilder
 
   SCHEMA = build_schema do |s|
-    s.add(:accordion, js: [:accordion])
+    s.add(:accordion, js: [ :accordion ])
     s.add(:alert)
     s.add(:avatar)
     s.add(:badge)
-    s.add(:button, [:icon], components: [:button, :button_group], helpers: [:button, :button_group])
+    s.add(:button, [ :icon ], components: [ :button, :button_group ], helpers: [ :button, :button_group ])
     s.add(:card)
-    s.add(:checkbox, [:label], components: [:checkbox, :checkbox_group])
+    s.add(:checkbox, [ :label ], components: [ :checkbox, :checkbox_group ])
     s.add(
       :combobox,
-      [:input],
-      js: [:combobox],
-      modules: ["@floating-ui/core", "@floating-ui/dom", "@github/combobox-nav"]
+      [ :input ],
+      js: [ :combobox ],
+      modules: [ "@floating-ui/core", "@floating-ui/dom", "@github/combobox-nav" ]
     )
     s.add(:datepicker)
-    s.add(:dialog, [:button, :icon], js: [:dialog])
-    s.add(:dropdown, [:button], js: [:dropdown], modules: ["@floating-ui/core", "@floating-ui/dom"])
-    s.add(:field, [:label, :checkbox, :combobox, :label, :radio_button, :select, :switch, :textarea])
+    s.add(:dialog, [ :button, :icon ], js: [ :dialog ])
+    s.add(:dropdown, [ :button ], js: [ :dropdown ], modules: [ "@floating-ui/core", "@floating-ui/dom" ])
+    s.add(:field, [ :label, :checkbox, :combobox, :label, :radio_button, :select, :switch, :textarea ])
     s.add(:field_group)
-    s.add(:fieldset, [:field_group])
-    s.add(:form_builder, [:field], helpers: [:form])
-    s.add(:icon, gems: ["lucide-rails"])
+    s.add(:fieldset, [ :field_group ])
+    s.add(:form_builder, [ :field ], helpers: [ :form ])
+    s.add(:icon, gems: [ "lucide-rails" ])
     s.add(:input)
     s.add(:label)
-    s.add(:pagination, [:icon, :button])
-    s.add(:radio_button, [:label], components: [:radio_button, :radio_button_group])
+    s.add(:pagination, [ :icon, :button ])
+    s.add(:radio_button, [ :label ], components: [ :radio_button, :radio_button_group ])
     s.add(:select)
-    s.add(:switch, js: [:switch])
+    s.add(:switch, js: [ :switch ])
     s.add(:table)
-    s.add(:tabs, js: [:tabs])
+    s.add(:tabs, js: [ :tabs ])
     s.add(:textarea)
-    s.add(:toast, js: [:toast])
-    s.add(:tooltip, js: [:tooltip], modules: ["@floating-ui/core", "@floating-ui/dom"])
+    s.add(:toast, js: [ :toast ])
+    s.add(:tooltip, js: [ :tooltip ], modules: [ "@floating-ui/core", "@floating-ui/dom" ])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nitro_kit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mikkel Malmberg
@@ -60,6 +60,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/assets/tailwind/application.css
 - app/components/nitro_kit/accordion.rb
 - app/components/nitro_kit/alert.rb
 - app/components/nitro_kit/avatar.rb
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: WIP, not usable yet
 test_files: []