plutonium 0.51.0 → 0.53.0

data/lib/plutonium/helpers/display_helper.rb

@@ -1,11 +1,6 @@
 module Plutonium
   module Helpers
     module DisplayHelper
-      # def tooltip(text)
-      #   text = sanitize text
-      #   "title=\"#{text}\" data-controller=\"tooltip\" data-bs-title=\"#{text}\"".html_safe
-      # end
-
       def resource_name(resource_class, count = 1)
         resource_class.model_name.human.pluralize(count)
       end
@@ -32,59 +27,10 @@ module Plutonium
         end
       end
 
-      def display_field(value:, helper: nil, **options)
-        return "-" unless value.present?
-
-        stack_multiple = options.key?(:stack_multiple) ? options.delete(:stack_multiple) : helper != :display_name_of
-
-        # clean options list
-        options.select! { |k, _v| !k.starts_with? "pu_" }
-
-        if value.respond_to?(:each) && stack_multiple
-          tag.ul class: "list-unstyled m-0" do
-            value.each do |val|
-              rendered = display_field_value(value: val, helper:, **options)
-              concat tag.li(rendered)
-            end
-          end
-        else
-          rendered = display_field_value(value:, helper:, **options)
-          tag.span rendered
-        end
-      end
-
       def display_datetime_value(value)
         timeago value
       end
 
-      def display_field_value(value:, helper: nil, title: nil, **)
-        title = (title != false) ? title || display_name_of(value) : nil
-        rendered = helper.present? ? send(helper, value, **) : value
-        tag.span rendered, title:
-      end
-
-      def display_association_value(association)
-        display_name = display_name_of(association)
-        if registered_resources.include?(association.class)
-          link_to display_name, resource_url_for(association, parent: nil),
-            class: "font-medium text-primary-600 dark:text-primary-500"
-        else
-          display_name
-        end
-      end
-
-      def display_numeric_value(value)
-        number_with_delimiter value
-      end
-
-      def display_boolean_value(value)
-        tag.input type: :checkbox, class: "form-check-input", checked: value, disabled: true
-      end
-
-      def display_url_value(value)
-        link_to nil, value, class: "font-medium text-primary-600 dark:text-primary-500", target: :blank
-      end
-
       def display_name_of(obj, separator: ", ")
         return unless obj.present?
 
@@ -103,14 +49,6 @@ module Plutonium
         # Oh well. Just convert it to a string.
         obj.to_s
       end
-
-      def display_clamped_quill(value)
-        clamp_content quill(value)
-      end
-
-      def display_attachment_value(value, **, &)
-        attachment_preview(value, **, &)
-      end
     end
   end
 end

data/lib/plutonium/helpers/turbo_helper.rb

@@ -16,8 +16,23 @@ module Plutonium
       # modal frame specifically.
       def in_secondary_modal? = current_turbo_frame == Plutonium::REMOTE_MODAL_SECONDARY_FRAME
 
-      def remote_modal_frame_tag(&)
-        turbo_frame_tag(Plutonium::REMOTE_MODAL_FRAME, &)
+      # Returns a turbo-frame-scoped element id. Two identically-named forms
+      # can be on the page simultaneously (e.g. a primary modal opens a
+      # secondary modal, each rendering an `id="resource-form"`). When the
+      # server later replies with `turbo_stream.replace("resource-form", ...)`,
+      # Turbo would pick the FIRST element matching the id — which is rarely
+      # the one the user actually submitted. Append a frame suffix so each
+      # frame's form has a unique id and the controller can target precisely.
+      #
+      # @param base [String, Symbol] the base id
+      # @return [String] the scoped id (no suffix outside any modal frame)
+      def turbo_scoped_dom_id(base)
+        base = base.to_s
+        case current_turbo_frame
+        when Plutonium::REMOTE_MODAL_FRAME then "#{base}-primary"
+        when Plutonium::REMOTE_MODAL_SECONDARY_FRAME then "#{base}-secondary"
+        else base
+        end
       end
     end
   end

data/lib/plutonium/helpers.rb

@@ -3,10 +3,8 @@ module Plutonium
     def self.included(base)
       base.class_eval do
         include Plutonium::Helpers::ApplicationHelper
-        include Plutonium::Helpers::AttachmentHelper
         include Plutonium::Helpers::ContentHelper
         include Plutonium::Helpers::DisplayHelper
-        include Plutonium::Helpers::TableHelper
         include Plutonium::Helpers::TurboHelper
         include Plutonium::Helpers::TurboStreamActionsHelper
         include Plutonium::Helpers::AssetsHelper

data/lib/plutonium/resource/controllers/crud_actions.rb

@@ -53,7 +53,7 @@ module Plutonium
 
           respond_to do |format|
             if params[:pre_submit]
-              format.turbo_stream { render turbo_stream: turbo_stream.replace("resource-form", view_context.render(build_form(action: :new))) }
+              format.turbo_stream { render turbo_stream: turbo_stream.replace(helpers.turbo_scoped_dom_id("resource-form"), view_context.render(build_form(action: :new))) }
               format.html { render :new, status: :unprocessable_content }
             elsif resource_record!.save
               format.turbo_stream do
@@ -71,7 +71,7 @@ module Plutonium
                   location: redirect_url_after_submit
               end
             else
-              format.turbo_stream { render turbo_stream: turbo_stream.replace("resource-form", view_context.render(build_form(action: :new))), status: :unprocessable_content }
+              format.turbo_stream { render turbo_stream: turbo_stream.replace(helpers.turbo_scoped_dom_id("resource-form"), view_context.render(build_form(action: :new))), status: :unprocessable_content }
               format.html { render :new, status: :unprocessable_content }
               format.any do
                 @errors = resource_record!.errors
@@ -100,7 +100,7 @@ module Plutonium
 
           respond_to do |format|
             if params[:pre_submit]
-              format.turbo_stream { render turbo_stream: turbo_stream.replace("resource-form", view_context.render(build_form(action: :edit))) }
+              format.turbo_stream { render turbo_stream: turbo_stream.replace(helpers.turbo_scoped_dom_id("resource-form"), view_context.render(build_form(action: :edit))) }
               format.html { render :edit, status: :unprocessable_content }
             elsif resource_record!.save
               format.turbo_stream do
@@ -116,7 +116,7 @@ module Plutonium
                 render :show, status: :ok, location: redirect_url_after_submit
               end
             else
-              format.turbo_stream { render turbo_stream: turbo_stream.replace("resource-form", view_context.render(build_form(action: :edit))), status: :unprocessable_content }
+              format.turbo_stream { render turbo_stream: turbo_stream.replace(helpers.turbo_scoped_dom_id("resource-form"), view_context.render(build_form(action: :edit))), status: :unprocessable_content }
               format.html { render :edit, status: :unprocessable_content }
               format.any do
                 @errors = resource_record!.errors

data/lib/plutonium/resource/controllers/interactive_actions.rb

@@ -38,7 +38,7 @@ module Plutonium
 
           if params[:pre_submit]
             respond_to do |format|
-              format.turbo_stream { render turbo_stream: turbo_stream.replace("interaction-form", view_context.render(@interaction.build_form)) }
+              format.turbo_stream { render turbo_stream: turbo_stream.replace(helpers.turbo_scoped_dom_id("interaction-form"), view_context.render(@interaction.build_form)) }
               format.html { render :interactive_record_action, formats: [:html], status: :unprocessable_content }
             end
             return
@@ -87,7 +87,7 @@ module Plutonium
 
           if params[:pre_submit]
             respond_to do |format|
-              format.turbo_stream { render turbo_stream: turbo_stream.replace("interaction-form", view_context.render(@interaction.build_form)) }
+              format.turbo_stream { render turbo_stream: turbo_stream.replace(helpers.turbo_scoped_dom_id("interaction-form"), view_context.render(@interaction.build_form)) }
               format.html { render :interactive_resource_action, status: :unprocessable_content }
             end
             return
@@ -134,7 +134,7 @@ module Plutonium
 
           if params[:pre_submit]
             respond_to do |format|
-              format.turbo_stream { render turbo_stream: turbo_stream.replace("interaction-form", view_context.render(@interaction.build_form)) }
+              format.turbo_stream { render turbo_stream: turbo_stream.replace(helpers.turbo_scoped_dom_id("interaction-form"), view_context.render(@interaction.build_form)) }
               format.html { render :interactive_bulk_action, formats: [:html], status: :unprocessable_content }
             end
             return

data/lib/plutonium/resource/definition.rb

@@ -1,48 +1,6 @@
 module Plutonium
   module Resource
     class Definition < Plutonium::Definition::Base
-      class_attribute :modal_mode, default: :slideover, instance_accessor: false
-
-      VALID_MODAL_MODES = [:centered, :slideover, false].freeze
-
-      # Sets how :new / :edit actions render.
-      # - :slideover (default) — slide-in panel from the right
-      # - :centered — centered dialog
-      # - false — no modal; new/edit are full standalone pages
-      def self.modal(mode)
-        unless VALID_MODAL_MODES.include?(mode)
-          raise ArgumentError, "modal must be one of #{VALID_MODAL_MODES.inspect}, got #{mode.inspect}"
-        end
-        self.modal_mode = mode
-        configure_crud_modal_targets!
-      end
-
-      # Re-derives the default :new / :edit actions so their turbo_frame
-      # matches the current `modal_mode`. Called when `.modal` is set
-      # and once at Resource::Definition load (so the default
-      # :slideover state propagates to the action records). Subclasses
-      # inherit those records via DefineableProps#inherited (deep_dup);
-      # calling `.modal` on a subclass re-runs this method locally.
-      def self.configure_crud_modal_targets!
-        target = (modal_mode == false) ? nil : Plutonium::REMOTE_MODAL_FRAME
-        [:new, :edit].each do |name|
-          action = defined_actions[name]
-          next unless action
-          next if action.turbo_frame == target
-          defined_actions[name] = action.with(turbo_frame: target)
-        end
-      end
-
-      def modal
-        self.class.modal_mode
-      end
-
-      # Apply the default modal target ("remote_modal") to :new / :edit
-      # so resources that never call `.modal` still get the slideover
-      # behavior. Subclasses inherit the configured actions via
-      # DefineableProps' deep_dup; calling `.modal` on a subclass
-      # re-runs the configuration locally.
-      configure_crud_modal_targets!
     end
   end
 end

data/lib/plutonium/ui/action_button.rb

@@ -50,7 +50,7 @@ module Plutonium
         link_to(
           url_with_return_to,
           class: button_classes,
-          data: {turbo_frame: @action.turbo_frame}.merge(@extra_data)
+          data: {turbo_frame: @action.turbo_frame(current_definition)}.merge(@extra_data)
         ) do
           render_button_content
         end
@@ -67,7 +67,7 @@ module Plutonium
             data: {
               turbo: @action.turbo,
               turbo_confirm: @action.confirmation.presence,
-              turbo_frame: @action.turbo_frame
+              turbo_frame: @action.turbo_frame(current_definition)
             }
           }
         ) do
@@ -84,7 +84,8 @@ module Plutonium
         }
 
         # Add turbo frame if specified
-        link_attrs[:data] = {turbo_frame: @action.turbo_frame} if @action.turbo_frame
+        frame = @action.turbo_frame(current_definition)
+        link_attrs[:data] = {turbo_frame: frame} if frame
 
         # Add confirmation and method for non-GET requests
         if @action.confirmation || @action.route_options.method != :get

data/lib/plutonium/ui/avatar.rb

@@ -0,0 +1,182 @@
+# frozen_string_literal: true
+
+require "digest"
+require "cgi"
+
+module Plutonium
+  module UI
+    # Renders a profile/avatar image for a subject.
+    #
+    #   Avatar(user)                     # Navii fallback seeded from the record
+    #   Avatar(user, src: :photo)        # user.photo if present, else Navii fallback
+    #   Avatar(user, src: user.photo)    # pass the attachment/uploader/URL directly
+    #   Avatar("acme-team")              # a String subject is a deterministic seed
+    #   Avatar("https://.../p.png")      # a URL-shaped subject is shown as the image
+    #   Avatar(src: "https://.../p.png") # a bare image, no subject/fallback
+    #
+    # The positional +subject+ is the identity the fallback is derived from: a
+    # record or a String, hashed to an opaque, PII-free seed. As a convenience, a
+    # URL-shaped String subject is treated as +src+ (the image) instead.
+    # +src+ is the image to show and may be:
+    # - a Symbol naming a method on the subject (e.g. +:avatar+ -> +subject.avatar+).
+    #   This is a contract: the subject must respond to it (raises NoMethodError
+    #   otherwise), so only use a Symbol +src+ with a record subject.
+    # - an ActiveStorage attachment, active_shrine/Shrine uploader, or URL String
+    #
+    # Resolution order: the resolved +src+, then a Navii avatar seeded from the
+    # subject, then a generic user icon when there is nothing to show.
+    class Avatar < Plutonium::UI::Component::Base
+      # Pixel dimensions per semantic size, plus the matching Tailwind width/height
+      # utilities (needed because the preflight resets `img { height: auto }`, so
+      # width/height attributes alone don't pin the rendered size).
+      SIZES = {xs: 24, sm: 32, md: 40, lg: 48, xl: 64}.freeze
+      SIZE_CLASSES = {xs: "w-6 h-6", sm: "w-8 h-8", md: "w-10 h-10", lg: "w-12 h-12", xl: "w-16 h-16"}.freeze
+
+      # Resolve an image value to a URL string. Supports:
+      # - ActiveStorage attachments -> helpers.url_for (they aren't routable via #url)
+      # - active_shrine / other ActiveStorage-style wrappers -> value.url
+      # - Bare Shrine::UploadedFile, CarrierWave, etc. (respond to :url) -> value.url
+      # - Plain URL strings ("https://..." or "/uploads/...")
+      #
+      # Exposed as a module method so collaborators (e.g. Grid::Card) can reuse
+      # the resolution without instantiating the component.
+      def self.resolve_image_src(value, helpers = nil)
+        return nil if value.nil?
+
+        # ActiveStorage is the only supported source that must go through Rails
+        # routing rather than its own #url. It has to be matched *before* the
+        # generic attached?/url checks, because ActiveStorage-compatible wrappers
+        # (e.g. active_shrine) respond to BOTH attached? and url, and those should
+        # resolve via their own #url instead.
+        if active_storage_attachment?(value)
+          return value.attached? ? helpers&.url_for(value) : nil
+        end
+
+        if value.respond_to?(:attached?)  # active_shrine & other AS-style wrappers
+          value.attached? ? value.url : nil
+        elsif value.respond_to?(:url)     # bare Shrine::UploadedFile, CarrierWave, ...
+          value.url
+        elsif value.is_a?(String) && value.start_with?("http", "/")
+          value
+        end
+      rescue ArgumentError, URI::InvalidURIError
+        nil
+      end
+
+      def self.active_storage_attachment?(value)
+        defined?(ActiveStorage::Attached) && value.is_a?(ActiveStorage::Attached)
+      end
+      private_class_method :active_storage_attachment?
+
+      def initialize(subject = nil, src: nil, size: :md, alt: nil, **attributes)
+        # A URL-shaped positional subject is really an image, not an identity:
+        # route it to src so Avatar("https://…/p.png") shows the image rather
+        # than hashing the URL into a seed.
+        if src.nil? && subject.is_a?(String) && subject.start_with?("http", "/")
+          src = subject
+          subject = nil
+        end
+
+        @subject = subject
+        @src = src
+        @size = size
+        @alt = alt
+        @attributes = attributes
+      end
+
+      def view_template
+        url = resolved_src || navii_url
+
+        if url
+          img(
+            src: url, alt: alt_text.to_s, width: pixel_size, height: pixel_size, loading: "lazy",
+            **sized_attributes("rounded-full object-cover bg-[var(--pu-surface-alt)] shrink-0")
+          )
+        else
+          div(**sized_attributes("rounded-full bg-[var(--pu-surface-alt)] text-[var(--pu-text-muted)] flex items-center justify-center shrink-0")) do
+            render Phlex::TablerIcons::User.new(class: "w-2/3 h-2/3")
+          end
+        end
+      end
+
+      private
+
+      # Merge the component's base classes, the size class, and the caller's class;
+      # add an inline dimension style for raw-pixel (Integer) sizes.
+      def sized_attributes(base)
+        attrs = @attributes.dup
+        attrs[:class] = tokens(base, size_class, attrs.delete(:class))
+        attrs[:style] = [size_style, attrs[:style]].compact.join("; ") if size_style
+        attrs
+      end
+
+      def pixel_size
+        @size.is_a?(Symbol) ? SIZES.fetch(@size) : @size
+      end
+
+      def size_class
+        @size.is_a?(Symbol) ? SIZE_CLASSES.fetch(@size) : nil
+      end
+
+      def size_style
+        "width: #{@size}px; height: #{@size}px" unless @size.is_a?(Symbol)
+      end
+
+      def resolved_src
+        value = image_src_value
+        return nil if value.nil?
+
+        # Only reach for the Rails helper proxy when we have an attachment-style
+        # source (ActiveStorage needs helpers.url_for; the resolver ignores it
+        # for active_shrine and other #url-bearing sources).
+        resolver_helpers = value.respond_to?(:attached?) ? helpers : nil
+        self.class.resolve_image_src(value, resolver_helpers)
+      end
+
+      # A Symbol src names a method on the subject (e.g. :avatar -> subject.avatar);
+      # anything else is the attachment/uploader/URL itself.
+      def image_src_value
+        @src.is_a?(Symbol) ? @subject&.public_send(@src) : @src
+      end
+
+      def navii_url
+        seed = navii_seed
+        return nil unless seed
+
+        host = Plutonium.configuration.navii_host_url
+        "#{host}/avatar/#{CGI.escape(seed)}?size=#{pixel_size}"
+      end
+
+      # The value sent to Navii is ALWAYS a hash of the subject's identity, so no
+      # plaintext (model names, ids, emails, or caller-provided seed strings) ever
+      # reaches the external service. Determinism is preserved: same identity ->
+      # same hash -> same avatar.
+      def navii_seed
+        identity = subject_identity
+        return nil unless identity
+
+        Digest::SHA256.hexdigest(identity)[0, 16]
+      end
+
+      # Stable identity string for the subject: a String subject verbatim, or
+      # "Class:id" for a record. Hashed by #navii_seed before it leaves the app.
+      def subject_identity
+        case @subject
+        when nil then nil
+        when String then @subject
+        else "#{@subject.class.name}:#{@subject.id}" if @subject.respond_to?(:id) && @subject.id.present?
+        end
+      end
+
+      def alt_text
+        return @alt if @alt
+
+        case @subject
+        when nil then nil
+        when String then @subject
+        else helpers&.display_name_of(@subject)
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/ui/component/kit.rb

@@ -50,6 +50,8 @@ module Plutonium
           self.class.method_defined?(build_method) || super
         end
 
+        def BuildAvatar(...) = Plutonium::UI::Avatar.new(...)
+
         def BuildBreadcrumbs(...) = Plutonium::UI::Breadcrumbs.new(...)
 
         def BuildSkeletonTable(...) = Plutonium::UI::SkeletonTable.new(...)

data/lib/plutonium/ui/component/methods.rb

@@ -48,6 +48,7 @@ module Plutonium
           :in_frame?,
           :in_modal?,
           :in_secondary_modal?,
+          :turbo_scoped_dom_id,
           :current_interactive_action,
           :current_engine,
           :policy_for,

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

@@ -149,8 +149,38 @@ module Plutonium
         def initialize_attributes
           super
 
-          attributes[:id] ||= :resource_form
-          attributes["data-controller"] = "form"
+          # Only fall back to :resource_form when the caller didn't already
+          # name the form. Phlexi moves an explicit `attributes[:id]` onto
+          # `@dom_id` before this runs, so a blind `||=` here would clobber
+          # things like the filter slideover's `id: "filter-form"` —
+          # producing two `<form id="resource-form">` on the page and
+          # silently breaking the modal pre_submit re-render (Turbo's
+          # `getElementById` finds the filter form first).
+          attributes[:id] ||= "resource-form" if @dom_id.nil?
+          attributes["data-controller"] = form_data_controller
+        end
+
+        # `dirty-form-guard` is attached unconditionally — it self-disables
+        # outside a <dialog>. Branching on `in_modal?` here would fail:
+        # Phlex forbids view-context access before rendering begins.
+        def form_data_controller
+          "form dirty-form-guard"
+        end
+
+        # Scope the form id to the current turbo frame at render time (we
+        # can't do this in `initialize_attributes` — Phlex hasn't started
+        # rendering yet, so `view_context` and the request headers aren't
+        # accessible). Primary and secondary modals can each host a form
+        # without colliding on document-level turbo-stream `replace target=`
+        # lookups. See Helpers::TurboHelper#turbo_scoped_dom_id.
+        #
+        # Also force-replace the id (Phlexi's `mix` would otherwise prepend
+        # `@namespace.dom_id`, producing space-separated ids like
+        # "q filter-form" which break document.getElementById lookups).
+        def form_attributes
+          attrs = super
+          attrs[:id] = turbo_scoped_dom_id(attributes[:id]) if attributes[:id]
+          attrs
         end
       end
     end

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

@@ -24,15 +24,20 @@ module Plutonium
           def render_add_button
             return if @add_action == false
 
+            # Two stacking levels are supported (primary + secondary modal).
+            # Hide the "+" entirely once we're already inside the secondary —
+            # there's no tertiary frame to escalate to.
+            return if in_secondary_modal?
+
             url, turbo_frame = add_url_and_frame
             return unless url
 
-            # When the parent form is already inside a modal, route the
-            # "+" to the secondary frame so the stacked dialog opens on
-            # top of the original form rather than replacing it. The
-            # crud controller mirrors this on success — closing the
-            # secondary modal and reloading the primary so the
-            # association select picks up the new record.
+            # When the parent form is already inside the primary modal,
+            # route the "+" to the secondary frame so the stacked dialog
+            # opens on top of the original form rather than replacing it.
+            # The crud controller mirrors this on success — closing the
+            # secondary modal and reloading the primary so the association
+            # select picks up the new record.
             if turbo_frame == Plutonium::REMOTE_MODAL_FRAME && in_modal?
               turbo_frame = Plutonium::REMOTE_MODAL_SECONDARY_FRAME
             end
@@ -65,12 +70,13 @@ module Plutonium
             end
 
             return unless registered_resources.include?(klass)
-            action = resource_definition(klass).defined_actions[:new]
+            target_definition = resource_definition(klass)
+            action = target_definition.defined_actions[:new]
             return unless action
             return unless @skip_authorization || action.permitted_by?(policy_for(record: klass))
 
             url = route_options_to_url(action.route_options, klass)
-            [with_return_to(url), action.turbo_frame]
+            [with_return_to(url), action.turbo_frame(target_definition)]
           end
 
           def with_return_to(url)

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

@@ -47,7 +47,7 @@ module Plutonium
 
         def initialize_attributes
           super
-          attributes[:id] = :interaction_form
+          attributes[:id] = "interaction-form"
           attributes.fetch(:data_turbo) { attributes[:data_turbo] = object.turbo.to_s }
         end
 

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

@@ -31,12 +31,70 @@ module Plutonium
           render_actions
         end
 
+        # Mirrors Phlexi::Form::Base#view_template (phlexi-form ~> 0.14)
+        # — keep these in sync if upgrading. We override so the guard
+        # dialog renders inside the <form> tag (where the JS controller
+        # looks for it via `dirty-form-guard-target`) even when a
+        # subclass overrides `form_template`. Without this, the
+        # controller silently falls back to `window.confirm`.
+        def view_template(&block)
+          captured_body = capture { form_template(&block) }
+          captured_guard = capture { render_dirty_form_guard_dialog if in_modal? }
+          form_tag do
+            form_errors
+            raw(safe(captured_body))
+            raw(safe(captured_guard))
+          end
+        end
+
         def form_class
           in_modal? ? "flex-1 flex flex-col min-h-0" : super
         end
 
         private
 
+        # Nested inside the form so showModal() stacks it in the browser's
+        # top layer above the surrounding slideover/centered modal — no
+        # z-index juggling required.
+        def render_dirty_form_guard_dialog
+          dialog(
+            class:
+              "pu-dialog " \
+              "top-1/2 -translate-y-1/2 left-1/2 -translate-x-1/2 " \
+              "w-full max-w-md p-0 " \
+              "open:flex flex-col " \
+              "opacity-0 scale-95 data-[open]:opacity-100 data-[open]:scale-100 " \
+              "transition-[opacity,transform] duration-200 ease-out",
+            data: {"dirty-form-guard-target": "confirmDialog"},
+            # Modern Chrome refuses user-agent close requests (Esc, backdrop);
+            # older browsers fall back to the JS controller's interception.
+            closedby: "none",
+            "aria-labelledby": "pu-dirty-guard-title",
+            "aria-describedby": "pu-dirty-guard-desc"
+          ) do
+            div(class: "px-6 pt-5 pb-4 border-b border-[var(--pu-border)]") do
+              h2(id: "pu-dirty-guard-title", class: "text-lg font-semibold text-[var(--pu-text)]") do
+                "Discard changes?"
+              end
+              p(id: "pu-dirty-guard-desc", class: "mt-1 text-sm text-[var(--pu-text-muted)]") do
+                "You have unsaved changes. Closing this form now will lose them."
+              end
+            end
+            div(class: "flex items-center justify-end gap-2 px-6 py-4") do
+              button(
+                type: "button",
+                class: "pu-btn pu-btn-md pu-btn-outline",
+                data: {action: "dirty-form-guard#keepEditing"}
+              ) { "Keep editing" }
+              button(
+                type: "button",
+                class: "pu-btn pu-btn-md pu-btn-danger",
+                data: {action: "dirty-form-guard#discard"}
+              ) { "Discard changes" }
+            end
+          end
+        end
+
         def render_fields
           fields_wrapper {
             resource_fields.each { |name|

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

@@ -14,7 +14,7 @@ module Plutonium
             inner_wrapper: "w-full",
 
             # Form errors
-            form_errors_wrapper: "flex items-start gap-3 p-4 mb-6 text-base text-danger-800 rounded-[var(--pu-radius-lg)] bg-danger-50 border border-danger-200 dark:bg-danger-950/30 dark:border-danger-800 dark:text-danger-300",
+            form_errors_wrapper: "flex items-start gap-3 m-4 p-4 text-base text-danger-800 rounded-[var(--pu-radius-lg)] bg-danger-50 border border-danger-200 dark:bg-danger-950/30 dark:border-danger-800 dark:text-danger-300",
             form_errors_message: "font-semibold",
             form_errors_list: "mt-2 list-disc list-inside text-sm",
 
@@ -30,11 +30,15 @@ module Plutonium
             valid_input: "pu-input pu-input-valid",
             neutral_input: "",
 
-            # Checkbox
+            # Checkbox / Boolean
             checkbox: "pu-checkbox",
+            boolean: "pu-checkbox",
+            valid_boolean: "pu-checkbox",
+            invalid_boolean: "pu-checkbox pu-input-invalid",
 
             # Radio buttons
-            radio_button: "pu-checkbox",
+            radio_button: "pu-radio",
+            collection_radio_buttons: "flex flex-col gap-2",
 
             # Color
             color: "pu-color-input appearance-none bg-transparent border-none cursor-pointer w-12 h-12 rounded-lg",
@@ -46,7 +50,7 @@ module Plutonium
             file: "pu-input py-2 [&::file-selector-button]:mr-4 [&::file-selector-button]:px-4 [&::file-selector-button]:py-2 [&::file-selector-button]:bg-[var(--pu-surface-alt)] [&::file-selector-button]:border-0 [&::file-selector-button]:rounded-md [&::file-selector-button]:text-sm [&::file-selector-button]:font-semibold [&::file-selector-button]:text-[var(--pu-text-muted)] [&::file-selector-button]:hover:bg-[var(--pu-border)] [&::file-selector-button]:cursor-pointer [&::file-selector-button]:transition-colors",
 
             # Hint themes
-            hint: "pu-hint whitespace-pre",
+            hint: "pu-hint whitespace-pre-wrap",
 
             # Error themes
             error: "text-xs text-danger-600 mt-1",