plutonium 0.37.0 → 0.39.0

data/lib/plutonium/ui/action_button.rb

@@ -17,6 +17,13 @@ module Plutonium
         secondary: {default: "pu-btn-secondary", soft: "pu-btn-soft-secondary"}
       }.freeze
 
+      # Color to CSS class mapping for dropdown item variants
+      DROPDOWN_COLOR_CLASSES = {
+        danger: "text-danger-600 dark:text-danger-400 hover:bg-danger-50 dark:hover:bg-danger-900/30"
+      }.freeze
+
+      DROPDOWN_DEFAULT_COLOR = "text-[var(--pu-text)] hover:bg-[var(--pu-surface-alt)]"
+
       def initialize(action, url:, variant: :default)
         @action = action
         @url = url
@@ -24,24 +31,23 @@ module Plutonium
       end
 
       def view_template
-        if @action.route_options.method == :get
-          render_link
+        case @variant
+        when :dropdown, :row_dropdown
+          render_dropdown_item
         else
-          render_button
+          if @action.route_options.method == :get
+            render_link
+          else
+            render_button
+          end
         end
       end
 
       private
 
       def render_link
-        uri = URI.parse(@url)
-        params = Rack::Utils.parse_nested_query(uri.query)
-        params["return_to"] = @action.return_to.nil? ? request.original_url : @action.return_to
-        uri.query = params.to_query
-        uri.to_s
-
         link_to(
-          uri.to_s,
+          url_with_return_to,
           class: button_classes,
           data: {turbo_frame: @action.turbo_frame}
         ) do
@@ -53,7 +59,7 @@ module Plutonium
         button_to(
           @url,
           method: @action.route_options.method,
-          name: :return_to, value: (@action.return_to.nil? ? request.original_url : @action.return_to),
+          name: :return_to, value: return_to_url,
           class: "inline-block",
           form: {
             data: {
@@ -69,6 +75,28 @@ module Plutonium
         end
       end
 
+      def render_dropdown_item
+        link_attrs = {
+          href: url_with_return_to,
+          class: dropdown_item_classes
+        }
+
+        # Add turbo frame if specified
+        link_attrs[:data] = {turbo_frame: @action.turbo_frame} if @action.turbo_frame
+
+        # Add confirmation and method for non-GET requests
+        if @action.confirmation || @action.route_options.method != :get
+          link_attrs[:data] ||= {}
+          link_attrs[:data][:turbo_method] = @action.route_options.method if @action.route_options.method != :get
+          link_attrs[:data][:turbo_confirm] = @action.confirmation if @action.confirmation
+        end
+
+        a(**link_attrs) do
+          render @action.icon.new(class: "w-4 h-4") if @action.icon
+          span { @action.label }
+        end
+      end
+
       def render_button_content
         if @action.icon
           render @action.icon.new(class: icon_classes)
@@ -100,6 +128,39 @@ module Plutonium
         # Table variant uses soft (tinted) buttons, default uses solid buttons
         (@variant == :table) ? color_mapping[:soft] : color_mapping[:default]
       end
+
+      def dropdown_item_classes
+        base_classes = "flex items-center gap-2 text-sm transition-colors"
+        size_classes = (@variant == :row_dropdown) ? "px-3 py-1.5" : "px-4 py-2"
+
+        # Use same color determination as buttons: color || category
+        color_key = (@action.color || @action.category)&.to_sym
+        color_classes = DROPDOWN_COLOR_CLASSES[color_key] || DROPDOWN_DEFAULT_COLOR
+
+        "#{base_classes} #{size_classes} #{color_classes}"
+      end
+
+      def url_with_return_to
+        uri = URI.parse(@url)
+        params = Rack::Utils.parse_nested_query(uri.query)
+        params["return_to"] = return_to_url
+        uri.query = params.to_query
+        uri.to_s
+      end
+
+      def default_return_to
+        # When in a turbo frame with a parent, return to parent's show page
+        # instead of the frame's URL (which would be the nested index)
+        if current_turbo_frame && current_parent
+          resource_url_for(current_parent, parent: nil)
+        else
+          request.original_url
+        end
+      end
+
+      def return_to_url
+        @action.return_to.nil? ? default_return_to : @action.return_to
+      end
     end
   end
 end

data/lib/plutonium/ui/actions_dropdown.rb

@@ -56,35 +56,13 @@ module Plutonium
 
       def render_danger_actions
         div(class: "py-1") do
-          danger_actions.each { |action| render_action_item(action, danger: true) }
+          danger_actions.each { |action| render_action_item(action) }
         end
       end
 
-      def render_action_item(action, danger: false)
+      def render_action_item(action)
         url = route_options_to_url(action.route_options, @subject)
-
-        link_attrs = {
-          href: url,
-          class: tokens(
-            "flex items-center gap-2 px-4 py-2 text-sm transition-colors",
-            danger ? "text-danger-600 dark:text-danger-400 hover:bg-danger-50 dark:hover:bg-danger-900/30" : "text-[var(--pu-text)] hover:bg-[var(--pu-surface-alt)]"
-          )
-        }
-
-        # Add turbo frame if specified
-        link_attrs[:data] = {turbo_frame: action.turbo_frame} if action.turbo_frame
-
-        # Add confirmation if specified
-        if action.confirmation
-          link_attrs[:data] ||= {}
-          link_attrs[:data][:turbo_method] = :delete if action.route_options.method == :delete
-          link_attrs[:data][:turbo_confirm] = action.confirmation
-        end
-
-        a(**link_attrs) do
-          render action.icon.new(class: "w-4 h-4") if action.icon
-          span { action.label }
-        end
+        render ActionButton.new(action, url: url, variant: :dropdown)
       end
 
       def secondary_actions

data/lib/plutonium/ui/breadcrumbs.rb

@@ -15,7 +15,7 @@ module Plutonium
             # Dashboard
             li(class: "inline-flex items-center") do
               a(
-                href: helpers.root_path,
+                href: root_path,
                 class: "inline-flex items-center text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 transition-colors"
               ) do
                 svg(
@@ -101,7 +101,7 @@ module Plutonium
                       d: "m1 9 4-4-4-4"
                     )
                   end
-                  link_to resource_name_plural(resource_class),
+                  link_to nestable_resource_name_plural(resource_class),
                     resource_url_for(resource_class),
                     class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 md:ms-2 transition-colors"
                 end

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

@@ -11,15 +11,19 @@ module Plutonium
         private
 
         def params
-          helpers.controller.params
+          view_context.controller.params
         end
 
         def request
-          helpers.controller.request
+          view_context.controller.request
         end
 
         def pagy_instance
-          helpers.controller.instance_variable_get(:@pagy)
+          view_context.controller.instance_variable_get(:@pagy)
+        end
+
+        def controller
+          view_context.controller
         end
 
         delegate \
@@ -29,6 +33,7 @@ module Plutonium
           :resource_record?,
           :resource_name,
           :resource_name_plural,
+          :nestable_resource_name_plural,
           :display_name_of,
           :resource_url_for,
           :route_options_to_url,
@@ -46,6 +51,8 @@ module Plutonium
           :allowed_to?,
           :registered_resources,
           :root_path,
+          :make_page_title,
+          :resource_logo_tag,
           to: :view_context
       end
     end

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

@@ -48,11 +48,14 @@ module Plutonium
 
             title = object.class.human_attribute_name(name)
             src = case reflection.macro
-            when :belongs_to, :has_one
+            when :belongs_to
               associated = object.public_send name
               resource_url_for(associated, parent: nil) if associated
+            when :has_one
+              associated = object.public_send name
+              resource_url_for(associated, parent: object, association: name)
             when :has_many
-              resource_url_for(reflection.klass, parent: object)
+              resource_url_for(reflection.klass, parent: object, association: name)
             end
 
             next unless src

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

@@ -109,7 +109,7 @@ module Plutonium
         end
 
         def form_action
-          return @form_action unless object.present? && @form_action != false && helpers.present?
+          return @form_action unless object.present? && @form_action != false && view_context.present?
 
           @form_action ||= url_for(object, action: object.new_record? ? :create : :update)
         end

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

@@ -60,6 +60,12 @@ module Plutonium
           end
 
           def render_key_value_pairs
+            # Hidden sentinel input ensures the field is always present in params when the
+            # component is rendered. Without this, removing all pairs would submit nothing,
+            # making it impossible to distinguish "field not in form" from "field cleared".
+            # This allows normalize_input to return nil (preserve existing) vs {} (clear field).
+            input(type: :hidden, name: "#{field_name}[_submitted]", value: "1", autocomplete: "off", hidden: true)
+
             div(class: "key-value-pairs space-y-2", data_key_value_store_target: "container") do
               pairs.each_with_index do |(key, value), index|
                 render_key_value_pair(key, value, index)
@@ -196,19 +202,25 @@ module Plutonium
             attributes.fetch(:limit, DEFAULT_LIMIT)
           end
 
-          # Override from ExtractsInput concern to normalize form parameters
+          # Override from ExtractsInput concern to normalize form parameters.
+          # Returns nil if field wasn't submitted (preserves existing value),
+          # or a Hash (possibly empty) if the field was in the form.
           def normalize_input(input_value)
             case input_value
             when Hash
-              if input_value.keys.all? { |k| k.to_s.match?(/^\d+$/) }
+              # Remove the sentinel key before processing
+              params = input_value.except("_submitted", :_submitted)
+
+              if params.keys.all? { |k| k.to_s.match?(/^\d+$/) }
                 # Handle indexed form params: {"0" => {"key" => "foo", "value" => "bar"}}
-                process_indexed_params(input_value)
+                process_indexed_params(params)
               else
                 # Handle direct hash params
-                input_value.reject { |k, v| k.blank? || (v.blank? && v != false) }
+                params.reject { |k, v| k.blank? || (v.blank? && v != false) }
               end
             when nil
-              {}
+              # Field was not submitted at all - preserve existing value
+              nil
             end
           end
 

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

@@ -16,7 +16,7 @@ module Plutonium
 
         def form_action
           # Build the correct commit URL for the interactive action
-          action = helpers.current_interactive_action
+          action = current_interactive_action
           return nil unless action
 
           # Create route options for the commit action (convert GET to POST action)
@@ -28,8 +28,8 @@ module Plutonium
           )
 
           # Use existing infrastructure to build the URL
-          subject = action.record_action? ? helpers.resource_record! : helpers.resource_class
-          helpers.route_options_to_url(commit_route_options, subject)
+          subject = action.record_action? ? resource_record! : resource_class
+          route_options_to_url(commit_route_options, subject)
         end
 
         def commit_action_name(action_name)
@@ -52,10 +52,10 @@ module Plutonium
         end
 
         def render_bulk_action_ids
-          action = helpers.current_interactive_action
+          action = current_interactive_action
           return unless action&.bulk_action?
 
-          ids = Array(helpers.params[:ids])
+          ids = Array(params[:ids])
           ids.each do |id|
             input(type: :hidden, name: "ids[]", value: id)
           end

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

@@ -207,7 +207,7 @@ module Plutonium
         def count_active_filters
           count = 0
           query_object.filter_definitions.each do |filter_name, _|
-            filter_params = helpers.params.dig(:q, filter_name)
+            filter_params = params.dig(:q, filter_name)
             next unless filter_params.is_a?(Hash) || filter_params.is_a?(ActionController::Parameters)
 
             filter_params.each_value do |v|

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

@@ -58,7 +58,7 @@ module Plutonium
         end
 
         def form_action
-          return @form_action unless object.present? && @form_action != false && helpers.present?
+          return @form_action unless object.present? && @form_action != false && view_context.present?
 
           @form_action ||= resource_url_for(object, action: object.new_record? ? :create : :update)
         end

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

@@ -22,7 +22,7 @@ module Plutonium
 
         def lang = nil
 
-        def page_title = helpers.controller.instance_variable_get(:@page_title)
+        def page_title = view_context.controller.instance_variable_get(:@page_title)
 
         def html_attributes = {lang:, data_controller: "color-mode"}
 

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

@@ -5,8 +5,8 @@ module Plutonium
         private
 
         def page_title
-          helpers.make_page_title(
-            helpers.controller.instance_variable_get(:@page_title)
+          make_page_title(
+            controller.instance_variable_get(:@page_title)
           )
         end
       end

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

@@ -9,8 +9,8 @@ module Plutonium
         })
 
         def page_title
-          helpers.make_page_title(
-            helpers.controller.instance_variable_get(:@page_title)
+          make_page_title(
+            controller.instance_variable_get(:@page_title)
           )
         end
 

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

@@ -7,7 +7,7 @@ module Plutonium
         private
 
         def page_title
-          helpers.controller.instance_variable_get(:@page_title)
+          controller.instance_variable_get(:@page_title)
         end
 
         def main_attributes = mix(super, {
@@ -26,7 +26,7 @@ module Plutonium
 
         def render_logo
           link_to root_path, class: "flex items-center text-2xl font-semibold text-[var(--pu-text)] mb-2" do
-            helpers.resource_logo_tag classname: "w-24 h-24 mr-2 rounded-[var(--pu-radius-md)]"
+            resource_logo_tag classname: "w-24 h-24 mr-2 rounded-[var(--pu-radius-md)]"
           end
         end
 

data/lib/plutonium/ui/page/index.rb

@@ -7,7 +7,7 @@ module Plutonium
         private
 
         def page_title
-          super || current_definition.index_page_title || resource_name_plural(resource_class)
+          super || current_definition.index_page_title || nestable_resource_name_plural(resource_class)
         end
 
         def page_description

data/lib/plutonium/ui/page/interactive_action.rb

@@ -17,7 +17,7 @@ module Plutonium
         end
 
         def render_default_content
-          if helpers.current_turbo_frame == "remote_modal"
+          if current_turbo_frame == "remote_modal"
             dialog(
               closedby: "any",
               class: "rounded-[var(--pu-radius-lg)] w-full max-w-3xl

data/lib/plutonium/ui/table/components/row_actions_dropdown.rb

@@ -56,35 +56,13 @@ module Plutonium
 
           def render_danger_actions
             div(class: "py-1") do
-              danger_actions.each { |action| render_action_item(action, danger: true) }
+              danger_actions.each { |action| render_action_item(action) }
             end
           end
 
-          def render_action_item(action, danger: false)
+          def render_action_item(action)
             url = route_options_to_url(action.route_options, @record)
-
-            link_attrs = {
-              href: url,
-              class: tokens(
-                "flex items-center gap-2 px-3 py-1.5 text-sm transition-colors",
-                danger ? "text-danger-600 dark:text-danger-400 hover:bg-danger-50 dark:hover:bg-danger-900/30" : "text-[var(--pu-text)] hover:bg-[var(--pu-surface-alt)]"
-              )
-            }
-
-            # Add turbo frame if specified
-            link_attrs[:data] = {turbo_frame: action.turbo_frame} if action.turbo_frame
-
-            # Add confirmation if specified
-            if action.confirmation
-              link_attrs[:data] ||= {}
-              link_attrs[:data][:turbo_method] = action.route_options.method if action.route_options.method
-              link_attrs[:data][:turbo_confirm] = action.confirmation
-            end
-
-            a(**link_attrs) do
-              render action.icon.new(class: "w-4 h-4") if action.icon
-              span { action.label }
-            end
+            render Plutonium::UI::ActionButton.new(action, url: url, variant: :row_dropdown)
           end
 
           def secondary_actions

data/lib/plutonium/version.rb

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

data/lib/tasks/release.rake

@@ -102,7 +102,7 @@ namespace :release do
   desc "Build front-end assets"
   task :build_frontend do
     puts "Building front-end assets..."
-    system("npm run build") || abort("Front-end build failed")
+    system("yarn build") || abort("Front-end build failed")
     puts "✓ Built front-end assets"
   end
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.37.0",
+  "version": "0.39.0",
   "description": "Build production-ready Rails apps in minutes, not days. Convention-driven, fully customizable, AI-ready.",
   "type": "module",
   "main": "src/js/core.js",
@@ -33,6 +33,7 @@
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/postcss": "^4.0.9",
     "@tailwindcss/typography": "^0.5.16",
+    "chokidar-cli": "^3.0.0",
     "concurrently": "^8.2.2",
     "cssnano": "^7.0.2",
     "esbuild": "^0.20.1",
@@ -48,10 +49,10 @@
     "vitepress-plugin-mermaid": "^2.0.17"
   },
   "scripts": {
-    "dev": "concurrently \"npm run css:dev\" \"npm run js:dev\"",
-    "build": "npm run js:prod && npm run css:prod",
-    "prepare": "npm run build",
-    "css:dev": "postcss src/css/plutonium.entry.css -o src/build/plutonium.css --watch --dev",
+    "dev": "concurrently \"yarn css:dev\" \"yarn js:dev\"",
+    "build": "yarn js:prod && yarn css:prod",
+    "prepare": "yarn build",
+    "css:dev": "chokidar \"src/css/**/*.css\" \"src/js/**/*.js\" \"app/views/**/*.{rb,erb,js}\" \"lib/plutonium/**/*.rb\" -c \"postcss src/css/plutonium.entry.css -o src/build/plutonium.css --dev\" --initial",
     "js:dev": "node esbuild.config.js --dev",
     "css:prod": "postcss src/css/plutonium.entry.css -o app/assets/plutonium.css && postcss src/css/plutonium.entry.css -o src/dist/css/plutonium.css",
     "js:prod": "node esbuild.config.js",

data/plutonium.gemspec

@@ -44,10 +44,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "phlex-rails"
   spec.add_dependency "phlex-tabler_icons"
   spec.add_dependency "phlexi-field", ">= 0.2.0"
-  spec.add_dependency "phlexi-form", ">= 0.13.0"
+  spec.add_dependency "phlexi-form", ">= 0.14.1"
   spec.add_dependency "phlexi-table", ">= 0.2.0"
   spec.add_dependency "phlexi-display", ">= 0.2.0"
-  spec.add_dependency "phlexi-menu", ">= 0.4.0"
+  spec.add_dependency "phlexi-menu", ">= 0.4.1"
   spec.add_dependency "tailwind_merge"
   spec.add_dependency "phlex-slotable", ">= 1.0.0"
   spec.add_dependency "redcarpet"

data/src/js/controllers/key_value_store_controller.js

@@ -25,6 +25,7 @@ export default class extends Controller {
     this.updatePairIndices(newPair, index)
 
     this.containerTarget.appendChild(newPair)
+    this.updateIndices()
     this.updateAddButtonState()
 
     // Focus on the key input of the new pair
@@ -52,9 +53,11 @@ export default class extends Controller {
 
       if (keyInput) {
         keyInput.name = keyInput.name.replace(/\[\d+\]/, `[${index}]`)
+        keyInput.id = keyInput.id.replace(/_\d+_/, `_${index}_`)
       }
       if (valueInput) {
         valueInput.name = valueInput.name.replace(/\[\d+\]/, `[${index}]`)
+        valueInput.id = valueInput.id.replace(/_\d+_/, `_${index}_`)
       }
     })
   }
@@ -65,6 +68,9 @@ export default class extends Controller {
       if (input.name) {
         input.name = input.name.replace('__INDEX__', index)
       }
+      if (input.id) {
+        input.id = input.id.replace('___INDEX___', `_${index}_`)
+      }
     })
   }
 

data/src/js/controllers/resource_drop_down_controller.js

@@ -42,14 +42,14 @@ export default class extends Controller {
           {
             name: 'flip',
             options: {
-              fallbackPlacements: ['left-end', 'right-start', 'right-end', 'bottom-start', 'bottom-end', 'top-start', 'top-end'],
-              boundary: 'clippingParents',
+              fallbackPlacements: ['bottom-end', 'bottom-start', 'top', 'top-end', 'top-start'],
+              boundary: 'viewport',
             },
           },
           {
             name: 'preventOverflow',
             options: {
-              boundary: 'clippingParents',
+              boundary: 'viewport',
               altAxis: true,
               padding: 8,
             },