keystone_ui 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e2ba0387ee8dd44d772be3546d44dada399d754099e486b607a73056c85606
-  data.tar.gz: ea5acc7537974e4bd59f7415e267b0038148fecd0890dc0b91a86f1af9a3801d
+  metadata.gz: 002fac505b8658ac84ead1730a24efc02aaf7b1ada50fca184408e95ef166a77
+  data.tar.gz: 06b2c641c7af8d6b06999a3e5d7c65fcf40bf84e85a2a9bb80bd772b89439df4
 SHA512:
-  metadata.gz: 1f7b432026de7ac8ededb44facb8488df5ded58f185b91b9981654c978d7a32ce567b43b5fe38359c036a1457092a633ca54e2b5a873654250aac36b99bd1a08
-  data.tar.gz: fb986e2fde289d1c0b969096a04a02be8664544fbe7046d93c358b8d054440da8eed66824e23a23644b02efb76e0d25c95647bf0b32d06582dd0a5b4a0fd5bb1
+  metadata.gz: c380a81162057aa27c4305e2530c493ba69ad42dd627a74bd01bc5eaabee67fa883558e4dad53a3d7a9f245bc5ad2fb0ebaf50ac6ef50c6ca8ab061b2c9eb49b
+  data.tar.gz: 22447d5c5e4c19057112ccbae4604ccb77b1a106915639221b8dacb3eb4b4ee9449fd2e69aecf74d5c8bc2f62a7c1c73c18ac0e9ae33cf4c4714c2d772161463

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/components/keystone/ui/checkbox_row_component.rb

@@ -4,9 +4,9 @@ module Keystone
   module Ui
     class CheckboxRowComponent < ViewComponent::Base
       ROW_CLASSES = "flex items-start gap-3 py-3 cursor-pointer"
-      INPUT_CLASSES = "mt-0.5 size-4 shrink-0 rounded border-surface-300 text-accent-600 focus:ring-accent-500"
-      LABEL_CLASSES = "block text-sm font-medium text-surface-900"
-      HINT_CLASSES = "block mt-0.5 text-sm text-surface-500"
+      INPUT_CLASSES = "mt-0.5 size-4 shrink-0 rounded border-surface-300 text-accent-600 checked:bg-accent-600 focus:ring-accent-500"
+      LABEL_CLASSES = "block text-sm font-medium text-surface-900 dark:text-surface-100"
+      HINT_CLASSES = "block mt-0.5 text-sm text-surface-500 dark:text-surface-400"
 
       attr_reader :name, :value, :label, :hint
 

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,12 +2,16 @@
 
 module KeystoneUi
   class Configuration
-    attr_accessor :accent, :surface
+    attr_accessor :accent, :surface, :theme_mode_supplier
 
     def initialize
       @accent = :blue
       @surface = :zinc
     end
+
+    def supplied_theme_mode(view)
+      theme_mode_supplier&.call(view)
+    end
   end
 
   def self.configuration

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.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keystone_ui
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Tyler Schneider