plutonium 0.15.21 → 0.15.23

data/lib/plutonium/ui/display/base.rb

@@ -8,11 +8,11 @@ module Plutonium
 
         class Builder < Builder
           def association_tag(**, &)
-            create_component(Plutonium::UI::Display::Component::Association, :association, **, &)
+            create_component(Plutonium::UI::Display::Component::AssociationField, :association, **, &)
           end
 
           def markdown_tag(**, &)
-            create_component(Plutonium::UI::Display::Component::Markdown, :markdown, **, &)
+            create_component(Plutonium::UI::Display::Component::MarkdownField, :markdown, **, &)
           end
         end
 

data/lib/plutonium/ui/display/component/{association.rb → association_field.rb}

@@ -4,7 +4,7 @@ module Plutonium
   module UI
     module Display
       module Component
-        class Association < Phlexi::Display::Components::Association
+        class AssociationField < Phlexi::Display::Components::Association
           include Plutonium::UI::Component::Methods
 
           def render_value(value)

data/lib/plutonium/ui/display/component/{markdown.rb → markdown_field.rb}

@@ -6,7 +6,7 @@ module Plutonium
   module UI
     module Display
       module Component
-        class Markdown < Phlexi::Display::Components::Base
+        class MarkdownField < Phlexi::Display::Components::Base
           include Phlexi::Display::Components::Concerns::DisplaysValue
 
           RENDERER = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true)
@@ -16,6 +16,16 @@ module Plutonium
               unsafe_raw RENDERER.render(value)
             end
           end
+
+          private
+
+          def normalize_value(value)
+            if value.respond_to?(:to_plain_text)
+              value.to_plain_text
+            else
+              value.to_s
+            end
+          end
         end
       end
     end

data/lib/plutonium/ui/form/base.rb

@@ -10,7 +10,7 @@ module Plutonium
           include Plutonium::UI::Form::Options::InferredTypes
 
           def easymde_tag(**, &)
-            create_component(Plutonium::UI::Form::Components::Easymde, :easymde, **, &)
+            create_component(Plutonium::UI::Form::Components::EasymdeInput, :easymde, **, &)
           end
           alias_method :markdown_tag, :easymde_tag
 
@@ -19,6 +19,10 @@ module Plutonium
             basic_select_tag(**, data_controller: "slim-select", class!: "", &)
           end
           alias_method :select_tag, :slim_select_tag
+
+          def flatpickr_tag(**, &)
+            create_component(Plutonium::UI::Form::Components::FlatpickrInput, :flatpickr, **, &)
+          end
         end
 
         private

data/lib/plutonium/ui/form/components/{easymde.rb → easymde_input.rb}

@@ -4,11 +4,21 @@ module Plutonium
   module UI
     module Form
       module Components
-        class Easymde < Phlexi::Form::Components::Base
+        class EasymdeInput < Phlexi::Form::Components::Base
           include Phlexi::Form::Components::Concerns::HandlesInput
 
           def view_template
-            textarea(**attributes, data_controller: "easymde") { field.dom.value }
+            textarea(**attributes, data_controller: "easymde") { normalize_value(field.value) }
+          end
+
+          private
+
+          def normalize_value(value)
+            if value.respond_to?(:to_plain_text)
+              value.to_plain_text
+            else
+              value.to_s
+            end
           end
         end
       end

data/lib/plutonium/ui/form/components/flatpickr_input.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Plutonium
+  module UI
+    module Form
+      module Components
+        class FlatpickrInput < Phlexi::Form::Components::Input
+          private
+
+          def build_input_attributes
+            super
+            attributes[:data_controller] = tokens(attributes[:data_controller], :flatpickr)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/ui/form/options/inferred_types.rb

@@ -8,10 +8,14 @@ module Plutonium
           private
 
           def infer_field_component
+            return :markdown if inferred_field_type == :rich_text
+
             component = super
             case component
             when :select
               :slim_select
+            when :date, :time, :datetime
+              :flatpickr
             else
               component
             end

data/lib/plutonium/ui/form/theme.rb

@@ -37,7 +37,12 @@ module Plutonium
             # error themes
             error: "mt-2 text-sm text-red-600 dark:text-red-500",
             # button themes
-            button: "px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500"
+            button: "px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500",
+            # flatpickr
+            flatpickr: :input,
+            valid_flatpickr: :valid_input,
+            invalid_flatpickr: :invalid_input,
+            neutral_flatpickr: :neutral_input
           })
         end
       end

data/lib/plutonium/ui/layout/base.rb

@@ -126,6 +126,12 @@ module Plutonium
         end
 
         def render_external_styles
+          link(
+            rel: "stylesheet",
+            href: "https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.css",
+            integrity: "sha384-RkASv+6KfBMW9eknReJIJ6b3UnjKOKC5bOUaNgIY778NFbQ8MtWq9Lr/khUgqtTt",
+            crossorigin: "anonymous"
+          )
         end
 
         def render_scripts
@@ -146,6 +152,11 @@ module Plutonium
             integrity: "sha384-WKsmo+vSs0gqrT+es6wFEojVFn4P0kNaHpHTIkn84iHY8T4rF2V2McZeSbLPLlHy",
             crossorigin: "anonymous"
           )
+          script(
+            src: "https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.js",
+            integrity: "sha384-5JqMv4L/Xa0hfvtF06qboNdhvuYXUku9ZrhZh3bSk8VXF0A/RuSLHpLsSV9Zqhl6",
+            crossorigin: "anonymous"
+          )
         end
 
         def render_body_scripts

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.15.21"
+  VERSION = "0.15.23"
   NEXT_MAJOR_VERSION = VERSION.split(".").tap { |v|
     v[1] = v[1].to_i + 1
     v[2] = 0

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@radioactive-labs/plutonium",
-      "version": "0.1.11",
+      "version": "0.1.12",
       "license": "MIT",
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "Core assets for the Plutonium gem",
   "type": "module",
   "main": "src/js/core.js",

data/src/js/controllers/flatpickr_controller.js

@@ -0,0 +1,28 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="flatpickr"
+export default class extends Controller {
+  connect() {
+    console.log(`flatpickr connected: ${this.element}`)
+    self.picker = new flatpickr(this.element, this.#buildOptions())
+  }
+
+  disconnect() {
+    self.picker.destroy()
+    self.picker = null
+  }
+
+  #buildOptions() {
+    let options = { altInput: true }
+    if (this.element.attributes.type.value == "datetime-local") {
+      options.enableTime = true
+    }
+    else if (this.element.attributes.type.value == "time") {
+      options.enableTime = true
+      options.noCalendar = true
+      // options.time_24hr = true
+      // options.altFormat = "H:i"
+    }
+    return options
+  }
+}

data/src/js/controllers/register_controllers.js

@@ -23,6 +23,7 @@ import FrameNavigatorController from "./frame_navigator_controller.js"
 import ColorModeController from "./color_mode_controller.js"
 import EasyMDEController from "./easymde_controller.js"
 import SlimSelectController from "./slim_select_controller.js"
+import FlatpickrController from "./flatpickr_controller.js"
 
 export default function (application) {
   // Register controllers here
@@ -50,4 +51,5 @@ export default function (application) {
   application.register("color-mode", ColorModeController)
   application.register("easymde", EasyMDEController)
   application.register("slim-select", SlimSelectController)
+  application.register("flatpickr", FlatpickrController)
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.15.21
+  version: 0.15.23
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2024-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -1400,15 +1400,16 @@ files:
 - lib/plutonium/ui/component/kit.rb
 - lib/plutonium/ui/component/methods.rb
 - lib/plutonium/ui/display/base.rb
-- lib/plutonium/ui/display/component/association.rb
-- lib/plutonium/ui/display/component/markdown.rb
+- lib/plutonium/ui/display/component/association_field.rb
+- lib/plutonium/ui/display/component/markdown_field.rb
 - lib/plutonium/ui/display/resource.rb
 - lib/plutonium/ui/display/theme.rb
 - lib/plutonium/ui/dyna_frame/content.rb
 - lib/plutonium/ui/dyna_frame/host.rb
 - lib/plutonium/ui/empty_card.rb
 - lib/plutonium/ui/form/base.rb
-- lib/plutonium/ui/form/components/easymde.rb
+- lib/plutonium/ui/form/components/easymde_input.rb
+- lib/plutonium/ui/form/components/flatpickr_input.rb
 - lib/plutonium/ui/form/concerns/renders_nested_resource_fields.rb
 - lib/plutonium/ui/form/interaction.rb
 - lib/plutonium/ui/form/options/inferred_types.rb
@@ -1461,6 +1462,7 @@ files:
 - src/css/slim_select.css
 - src/js/controllers/color_mode_controller.js
 - src/js/controllers/easymde_controller.js
+- src/js/controllers/flatpickr_controller.js
 - src/js/controllers/form_controller.js
 - src/js/controllers/frame_navigator_controller.js
 - src/js/controllers/has_many_panel_controller.js