plutonium 0.59.0 → 0.60.0

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

@@ -98,11 +98,81 @@ module Plutonium
         end
 
         def render_fields
-          fields_wrapper {
-            resource_fields.each { |name|
-              render_resource_field name
+          sections = resolve_form_layout
+          if sections.nil?
+            fields_wrapper {
+              resource_fields.each { |name| render_resource_field name }
             }
-          }
+          else
+            sections.each { |rs| render_form_section(rs) }
+          end
+        end
+
+        # Resolve the whole form layout for THIS render, in one pass: drop
+        # condition-hidden sections and evaluate any proc-valued options, all in
+        # the form instance context (where `object`, `current_user`, `params` and
+        # helpers live — same context as input/section `condition:`). Returns nil
+        # when no form_layout is declared (caller falls back to a single grid).
+        def resolve_form_layout
+          sections = resource_definition.resolve_form_sections(resource_fields)
+          return nil if sections.nil?
+
+          sections.filter_map do |resolved|
+            section = resolved.section
+            condition = section.condition
+            next if condition && !instance_exec(&condition)
+
+            # `columns` stays a validated literal; everything else may be a proc.
+            options = section.options.to_h do |key, value|
+              [key, (key != :condition && value.is_a?(Proc)) ? instance_exec(&value) : value]
+            end
+            Plutonium::Definition::FormLayout::ResolvedSection.new(
+              section: Plutonium::Definition::FormLayout::Section.new(
+                key: section.key, fields: section.fields, options: options.freeze
+              ),
+              fields: resolved.fields
+            )
+          end
+        end
+
+        # Pure presentation — the section is already resolved (visible, options
+        # evaluated) by resolve_form_layout.
+        def render_form_section(resolved)
+          section = resolved.section
+          render Plutonium::UI::Form::Components::Section.new(
+            resolved, grid_class: section_grid_class(section.columns)
+          ) do
+            # Inside a multi-column section, let fields flow into the grid cells
+            # instead of forcing each to span the full row (see col-span default
+            # in render_simple_resource_field).
+            previous = @section_columns
+            @section_columns = section.columns
+            begin
+              resolved.fields.each { |name| render_resource_field name }
+            ensure
+              @section_columns = previous
+            end
+          end
+        end
+
+        # True while rendering fields inside a section that declared an explicit
+        # column count > 1. Such fields default to a single grid cell rather than
+        # `col-span-full`, so the section's grid actually lays out in columns.
+        def in_multi_column_section?
+          @section_columns.to_i > 1
+        end
+
+        # nil → the form's default responsive grid; an Integer overrides columns.
+        def section_grid_class(columns)
+          return themed(:fields_wrapper, nil) if columns.nil?
+
+          base = "grid gap-6 grid-flow-row-dense grid-cols-1"
+          case columns.to_i
+          when 1 then base
+          when 2 then "#{base} md:grid-cols-2"
+          when 3 then "#{base} md:grid-cols-2 lg:grid-cols-3"
+          else "#{base} md:grid-cols-2 2xl:grid-cols-#{columns.to_i}"
+          end
         end
 
         def render_actions
@@ -232,10 +302,18 @@ module Plutonium
             end
           else
             wrapper_options = input_options[:wrapper] || {}
+            # Only supply a default column span when the field hasn't declared its
+            # own (via `wrapper: {class: "col-span-..."}`). A field-level col-span
+            # ALWAYS wins — including inside a section with `columns:` — so authors
+            # can opt a single field back to full width in a multi-column section,
+            # or vice versa.
+            # TODO: remove the string check once theming supports class merges.
             if !wrapper_options[:class] || !wrapper_options[:class].include?("col-span")
-              # temp hack to allow col span overrides
-              # TODO: remove once we complete theming, which will support merges
-              wrapper_options[:class] = tokens("col-span-full", wrapper_options[:class])
+              # In a multi-column section the field flows into a single grid cell
+              # (no col-span), so the declared `columns:` actually takes effect.
+              # Everywhere else fields span the full row.
+              default_span = in_multi_column_section? ? nil : "col-span-full"
+              wrapper_options[:class] = tokens(default_span, wrapper_options[:class])
             end
 
             render form.field(name, **field_options).wrapped(

data/lib/plutonium/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.59.0",
+  "version": "0.60.0",
   "description": "Build production-ready Rails apps in minutes, not days. Convention-driven, fully customizable, AI-ready.",
   "type": "module",
   "main": "src/js/core.js",

data/src/css/slim_select.css

@@ -43,9 +43,11 @@
   border-radius: var(--pu-radius-md);
   color: var(--pu-text);
 }
+
 .ss-main:hover {
   border-color: var(--pu-border-strong);
 }
+
 .ss-main:focus,
 .ss-main[aria-expanded="true"] {
   border-color: var(--pu-input-focus-ring);
@@ -196,9 +198,11 @@
   font-size: inherit;
   line-height: inherit;
 }
+
 .ss-content .ss-search input::placeholder {
   color: var(--pu-input-placeholder);
 }
+
 .ss-content .ss-search input:focus {
   border-color: var(--pu-input-focus-ring);
   box-shadow: 0 0 0 3px theme(colors.primary.500 / 15%);
@@ -225,7 +229,7 @@
 
 /* List */
 .ss-content .ss-list {
-  @apply flex-auto h-auto overflow-x-hidden overflow-y-auto;
+  @apply flex-auto h-auto overflow-x-hidden overflow-y-auto mb-2;
 }
 
 .ss-content .ss-list .ss-error {
@@ -345,10 +349,12 @@
 .ss-main.ss-invalid {
   @apply border-danger-500 bg-danger-50/50 text-danger-900;
 }
+
 .ss-main.ss-invalid:focus,
 .ss-main.ss-invalid[aria-expanded="true"] {
   box-shadow: 0 0 0 3px theme(colors.danger.500 / 15%);
 }
+
 .dark .ss-main.ss-invalid {
   @apply bg-danger-950/20 border-danger-500/70 text-danger-200;
 }
@@ -360,10 +366,12 @@
 .ss-main.ss-valid {
   @apply border-success-500 bg-success-50/50 text-success-900;
 }
+
 .ss-main.ss-valid:focus,
 .ss-main.ss-valid[aria-expanded="true"] {
   box-shadow: 0 0 0 3px theme(colors.success.500 / 15%);
 }
+
 .dark .ss-main.ss-valid {
   @apply bg-success-950/20 border-success-500/70 text-success-200;
 }
@@ -385,7 +393,8 @@
   width: 100% !important;
   border-radius: 0 !important;
   margin: 0 !important;
-  pointer-events: none !important; /* Disabled by default */
+  pointer-events: none !important;
+  /* Disabled by default */
 }
 
 /* When active (dropdown is expanded), enable pointer events */

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.60.0
 platform: ruby
 authors:
 - Stefan Froelich
 bindir: exe
 cert_chain: []
-date: 2026-06-13 00:00:00.000000000 Z
+date: 2026-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -685,6 +685,8 @@ files:
 - docs/superpowers/plans/2026-06-02-structured-inputs.md.tasks.json
 - docs/superpowers/plans/2026-06-04-sqlite-tune-maintenance-generators.md
 - docs/superpowers/plans/2026-06-04-sqlite-tune-maintenance-generators.md.tasks.json
+- docs/superpowers/plans/2026-06-14-form-sectioning.md
+- docs/superpowers/plans/2026-06-14-form-sectioning.md.tasks.json
 - docs/superpowers/specs/2026-04-08-plutonium-skills-overhaul-design.md
 - docs/superpowers/specs/2026-04-14-plutonium-testing-design.md
 - docs/superpowers/specs/2026-05-07-ui-layout-overhaul-design.md
@@ -696,6 +698,7 @@ files:
 - docs/superpowers/specs/2026-06-01-structured-inputs-design.md
 - docs/superpowers/specs/2026-06-04-sqlite-tune-maintenance-generators-design.md
 - docs/superpowers/specs/2026-06-12-export-csv-default-action-design.md
+- docs/superpowers/specs/2026-06-14-form-sectioning-design.md
 - esbuild.config.js
 - exe/pug
 - gemfiles/rails_7.gemfile
@@ -904,6 +907,7 @@ files:
 - lib/generators/pu/rodauth/templates/app/controllers/plugin_controller.rb.tt
 - lib/generators/pu/rodauth/templates/app/controllers/rodauth_controller.rb.tt
 - lib/generators/pu/rodauth/templates/app/interactions/invite_admin_interaction.rb.tt
+- lib/generators/pu/rodauth/templates/app/interactions/resend_admin_interaction.rb.tt
 - lib/generators/pu/rodauth/templates/app/mailers/account_mailer.rb.tt
 - lib/generators/pu/rodauth/templates/app/mailers/rodauth_mailer.rb.tt
 - lib/generators/pu/rodauth/templates/app/models/account.rb.tt
@@ -995,6 +999,7 @@ files:
 - lib/plutonium/definition/base.rb
 - lib/plutonium/definition/config_attr.rb
 - lib/plutonium/definition/defineable_props.rb
+- lib/plutonium/definition/form_layout.rb
 - lib/plutonium/definition/index_views.rb
 - lib/plutonium/definition/inheritable_config_attr.rb
 - lib/plutonium/definition/metadata.rb
@@ -1131,6 +1136,7 @@ files:
 - lib/plutonium/ui/form/components/json.rb
 - lib/plutonium/ui/form/components/key_value_store.rb
 - lib/plutonium/ui/form/components/resource_select.rb
+- lib/plutonium/ui/form/components/section.rb
 - lib/plutonium/ui/form/components/secure_association.rb
 - lib/plutonium/ui/form/components/secure_polymorphic_association.rb
 - lib/plutonium/ui/form/components/sticky_footer.rb