keystone_ui 0.9.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc51f5315bb4315b50a98d76085bce19f48de6c9f95ded851c745fc83f46ddf2
-  data.tar.gz: 0a2436931ac90ccb62af03429e1be4b1b3d19fc1b0a8cf9dac2385fc12c94ea0
+  metadata.gz: 779c5876ab225f8e81effa23a748805e832b8521081de86b1a64759f81876190
+  data.tar.gz: 62adc4c320cef40f09b1c0ca677e45a03cf9af3e46e7ac87e7854d9cea4b917b
 SHA512:
-  metadata.gz: b1a1fb202743e5a2fcd9312db49c202f3c0e60b5314b976a05b5584ccf80bba50dc64c169c31a6b9e6417b49913d2d6e99def606ecb7f63cd883d450e42e74e6
-  data.tar.gz: 1717453d259ec802e2b66e4f59db9c1d911cfa428a406da81f5546e83d78ead564214ebd41547133ca9e77f15e70b560b456b9d5dc6b85a3f99b4aa8af7ac511
+  metadata.gz: 7e2111385ae219156f7ddebc22ffbc064fe804a36ba7699b1828e368fc75b19e133fdedd3c95cab3f270262d7d7f86744972c66b6e7433bf19505a9a1365e6fe
+  data.tar.gz: ab7ea01f423446831a0e88a0b51185741d6099dbb49a655d37f955aa3bc0201b82c2d878e12ed1fb2cfb37948e035c399d288f5e49b4c16e102a7b4ee8943648

data/app/assets/javascripts/keystone_ui/theme_toggle_controller.js

@@ -10,11 +10,10 @@ export default class extends Controller {
 
     if (mode === "system") {
       delete page.documentElement.dataset.theme
-      page.cookie = `${COOKIE}=; path=/; max-age=0; samesite=lax`
     } else {
       page.documentElement.dataset.theme = mode
-      page.cookie = `${COOKIE}=${mode}; path=/; max-age=${ONE_YEAR}; samesite=lax`
     }
+    page.cookie = `${COOKIE}=${mode}; path=/; max-age=${ONE_YEAR}; samesite=lax`
   }
 
   #showPressed(mode) {

data/app/assets/tailwind/keystone_ui_engine/{engine.css → grid_safelist.css}

@@ -1,6 +1,3 @@
-/* Keystone UI components — tells Tailwind to scan for classes in component files */
-@source "../../components/**/*.{erb,rb}";
-
 /* Safelist: grid-cols classes built from static constants in GridComponent.
    Belt-and-suspenders — ensures these classes survive JIT purging even if
    the scanner misses the Ruby hash literals. */

data/app/components/keystone/ui/theme_toggle_component.rb

@@ -16,7 +16,7 @@ module Keystone
       end
 
       def pressed?(mode)
-        mode == (KeystoneUi::ThemeChoice::MODES.include?(@current) ? @current : "system")
+        mode == KeystoneUi::ThemeChoice.new(@current).mode
       end
     end
   end

data/app/helpers/keystone_ui_helper.rb

@@ -42,11 +42,11 @@ module KeystoneUiHelper
   end
 
   def ui_theme_toggle
-    render Keystone::Ui::ThemeToggleComponent.new(current: cookies[KeystoneUi::ThemeChoice::COOKIE])
+    render Keystone::Ui::ThemeToggleComponent.new(current: keystone_theme_choice.mode)
   end
 
   def keystone_theme_attributes
-    KeystoneUi::ThemeChoice.new(cookies[KeystoneUi::ThemeChoice::COOKIE]).html_attributes_markup.html_safe
+    keystone_theme_choice.html_attributes_markup.html_safe
   end
 
   def ui_copy_button(**args)
@@ -204,4 +204,10 @@ module KeystoneUiHelper
   def ui_disclosure(**args, &block)
     render Keystone::Ui::DisclosureComponent.new(**args), &block
   end
+
+  private
+
+  def keystone_theme_choice
+    KeystoneUi::ThemeChoice.new(cookies[KeystoneUi::ThemeChoice::COOKIE], supplied: KeystoneUi.configuration.supplied_theme_mode(self))
+  end
 end

data/lib/keystone_ui/configuration.rb

@@ -2,11 +2,18 @@
 
 module KeystoneUi
   class Configuration
-    attr_accessor :accent, :surface
+    attr_accessor :accent, :surface, :theme_mode_supplier
+    attr_reader :tailwind_imports, :tailwind_sources
 
     def initialize
       @accent = :blue
       @surface = :zinc
+      @tailwind_imports = []
+      @tailwind_sources = []
+    end
+
+    def supplied_theme_mode(view)
+      theme_mode_supplier&.call(view)
     end
   end
 

data/lib/keystone_ui/engine.rb

@@ -29,7 +29,7 @@ module KeystoneUi
       keystone_import = '@import "./keystone_source.css";'
       next unless css_path.read.include?(keystone_import)
 
-      tailwind_dir.join("keystone_source.css").write(KeystoneUi::SourceCss.new(root).to_s)
+      tailwind_dir.join("keystone_source.css").write(KeystoneUi::SourceCss.new(root, imports: KeystoneUi.configuration.tailwind_imports, sources: KeystoneUi.configuration.tailwind_sources).to_s)
     end
   end
 end

data/lib/keystone_ui/source_css.rb

@@ -5,8 +5,10 @@ require "keystone_ui/styles"
 
 module KeystoneUi
   class SourceCss
-    def initialize(root)
+    def initialize(root, imports: [], sources: [])
       @root = Pathname.new(root)
+      @imports = imports
+      @sources = sources
     end
 
     def to_s
@@ -15,16 +17,15 @@ module KeystoneUi
 
     private
 
-    def styles_entry
-      KeystoneUi::Styles::Engine.root.join("app/assets/tailwind/keystone_ui_styles/engine.css")
-    end
-
     def lines
       [
-        %(@import "#{styles_entry}";),
+        %(@import "#{KeystoneUi::Styles.tailwind_file}";),
         %(@source "#{@root}/app/components/**/*.{erb,rb}";),
         %(@import "#{@root}/app/assets/tailwind/keystone_ui_engine/nav.css";),
-        %(@import "#{@root}/app/assets/tailwind/keystone_ui_engine/color_picker.css";)
+        %(@import "#{@root}/app/assets/tailwind/keystone_ui_engine/color_picker.css";),
+        %(@import "#{@root}/app/assets/tailwind/keystone_ui_engine/grid_safelist.css";),
+        *@imports.map { |import| %(@import "#{import}";) },
+        *@sources.map { |source| %(@source "#{source}";) }
       ]
     end
   end

data/lib/keystone_ui/theme_choice.rb

@@ -3,14 +3,19 @@
 module KeystoneUi
   class ThemeChoice
     COOKIE = "keystone_theme"
-    MODES = %w[light dark].freeze
+    MODES = %w[light dark system].freeze
 
-    def initialize(mode)
+    def initialize(mode, supplied: nil)
       @mode = mode
+      @supplied = supplied
     end
 
     def html_attributes
-      MODES.include?(@mode) ? { "data-theme" => @mode } : {}
+      mode == "system" ? {} : { "data-theme" => mode }
+    end
+
+    def mode
+      [ @mode, @supplied ].find { |candidate| MODES.include?(candidate) } || "light"
     end
 
     def html_attributes_markup

data/lib/keystone_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KeystoneUi
-  VERSION = "0.9.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keystone_ui
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Tyler Schneider
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ files:
 - app/assets/javascripts/keystone_ui/tab_switcher_controller.js
 - app/assets/javascripts/keystone_ui/theme_toggle_controller.js
 - app/assets/tailwind/keystone_ui_engine/color_picker.css
-- app/assets/tailwind/keystone_ui_engine/engine.css
+- app/assets/tailwind/keystone_ui_engine/grid_safelist.css
 - app/assets/tailwind/keystone_ui_engine/nav.css
 - app/components/keystone/ui/accordion_component.html.erb
 - app/components/keystone/ui/accordion_component.rb