nitro_kit 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f96e86485be82839eb17fea8522c31b8bac982f5b9e09a479d159e9f69b59f7
-  data.tar.gz: 41814a0fc817bd11dab95a132de45a83c300c52a39cf3d407e0174c0a6af9584
+  metadata.gz: 06ec36dc808b0223864423889cf64d62465c925e111a49d334110aadfa0859a3
+  data.tar.gz: 9a1f9f81419b52fcfb8c5a956e134f424419a4c5b922ecc68d820f3bfb135a9d
 SHA512:
-  metadata.gz: 73c6883c42f6cab78d4fe6550ea88dda8c0546ae33c6c9f9696b894bbba47d98a381de82385c754f41e56f1971177876c2ca2e1460ee53243ee4eba82f7ddd74
-  data.tar.gz: 81998e474d6125fcc2bd6fa094223c3e4470261519049535c0301922873325206c50ad49b6c4756be1914f0a88bb915a7221f1b99c75018120cb6f26dd34f321
+  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/combobox.rb

@@ -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,

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

data/app/components/nitro_kit/dropdown.rb

@@ -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/select.rb

@@ -15,7 +15,7 @@ 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

data/app/helpers/nitro_kit/pagination_helper.rb

@@ -1,9 +1,13 @@
 # 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
@@ -12,16 +16,16 @@ module NitroKit
       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/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

data/lib/nitro_kit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nitro_kit
 version: !ruby/object:Gem::Version
-  version: 0.8.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.7.1
+rubygems_version: 4.0.3
 specification_version: 4
 summary: WIP, not usable yet
 test_files: []