plutonium 0.21.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd7d59a1efadc76fab68fd64a2a08bed616fd14c35439c6c486141f73b8856d8
-  data.tar.gz: 69b5be0a1f342a7388f715da0fa240410ed437fece5603f8f4d1b6c892d3ca03
+  metadata.gz: 9b7671d043400785ca24363d24a18b8b4562dfeaf6bf4f9d8cb03ac92dfa17cc
+  data.tar.gz: '092938ea8c152f8505a597db56e20e3ec423fefc3a549eba7437800eccce823e'
 SHA512:
-  metadata.gz: f593bae03cbbb4c14ab1932615fef6d99744c575aaa418836cbb53af0bbee188e8064b64d8191af39ef959a4258220d97a8751cba3d6815f5801cf4ec15f377c
-  data.tar.gz: 1822266c88940a5fded00df5c8a7482614b511580c3d6859d46f3e0e82f225567172eacf321034676b181fbc66f3c4d41b22197ab53a936db2453880425950dc
+  metadata.gz: b409e381c34bf2cede9f71a35652a0357cd78cce109c08b0d2f6f3fa1b5848e63d6da849802b8e84f7d104b0f07d7fc97d9c2d7f4669f8abc8e5b5ae120a1a16
+  data.tar.gz: 0d137d2b3d62b96eff4ad5f550325045b67c6395de74d1f87c5c48eb32ba0514facca68203ad3fedcca3445f1300931e55081de4204386434db40c80dd42d17b

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

@@ -12,7 +12,7 @@ module Plutonium
       #   class MyView
       #     include Plutonium::UI::Component::Kit
       #
-      #     def template
+      #     def view_template
       #       PageHeader(title: "Dashboard")
       #       TabList(items: tabs)
       #       Panel(class: "mt-4") do

data/lib/plutonium/ui/display/components/markdown.rb

@@ -23,7 +23,7 @@ module Plutonium
 
           def render_value(value)
             article(**attributes) {
-              unsafe_raw(render_markdown(value))
+              raw(safe(render_markdown(value)))
             }
           end
 

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

@@ -61,36 +61,39 @@ module Plutonium
           input_definition = definition.defined_inputs[name] || {}
           input_options = input_definition[:options] || {}
 
-          condition = input_options[:condition] || field_options[:condition]
-          return if condition && !instance_exec(&condition)
-
           tag = input_options[:as] || field_options[:as]
-          tag_attributes =
-            input_options.except(:wrapper, :as, :pre_submit, :condition)
+          tag_attributes = input_options.except(:wrapper, :as, :pre_submit, :condition)
           if input_options[:pre_submit]
-            tag_attributes[
-              "data-action"
-            ] = "change->form#preSubmit"
+            tag_attributes["data-action"] = "change->form#preSubmit"
           end
-          tag_block =
-            input_definition[:block] ||
-            ->(f) do
-              tag ||= f.inferred_field_component
-              f.send(:"#{tag}_tag", **tag_attributes)
-            end
-
-          wrapper_options = input_options[:wrapper] || {}
-          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])
+          tag_block = input_definition[:block] || ->(f) do
+            tag ||= f.inferred_field_component
+            f.send(:"#{tag}_tag", **tag_attributes)
           end
 
           field_options = field_options.except(:as, :condition)
-          render form.field(name, **field_options).wrapped(
-            **wrapper_options
-          ) do |f|
-            render instance_exec(f, &tag_block)
+
+          condition = input_options[:condition] || field_options[:condition]
+          conditionally_hidden = condition && !instance_exec(&condition)
+          if conditionally_hidden
+            # Do not render the field, but still create field
+            # Phlexi form will record it without rendering it, allowing us to extract its value
+            form.field(name, **field_options) do |f|
+              instance_exec(f, &tag_block)
+            end
+          else
+            wrapper_options = input_options[:wrapper] || {}
+            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])
+            end
+
+            render form.field(name, **field_options).wrapped(
+              **wrapper_options
+            ) do |f|
+              render instance_exec(f, &tag_block)
+            end
           end
         end
 

data/lib/plutonium/ui/panel.rb

@@ -1,8 +1,6 @@
 module Plutonium
   module UI
     class Panel < Plutonium::UI::Component::Base
-      include Phlex::DeferredRender
-
       def initialize
         @items = []
       end
@@ -19,6 +17,15 @@ module Plutonium
         @content = content
       end
 
+      def before_template
+        vanish do
+          @items.each do |item|
+            render item
+          end
+        end
+        super
+      end
+
       def view_template
         wrapped do
           render_toolbar if render_toolbar?

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

@@ -34,11 +34,6 @@ module Plutonium
           end
 
           def per_page_selector
-            original_attributes = Phlex::HTML::EVENT_ATTRIBUTES
-            temp_attributes = Phlex::HTML::EVENT_ATTRIBUTES.dup
-            temp_attributes.delete("onchange")
-            Phlex::HTML.const_set(:EVENT_ATTRIBUTES, temp_attributes)
-
             div(
               class: "flex items-center space-x-2 mt-2 md:mt-0",
               data_controller: "select-navigator"
@@ -55,9 +50,6 @@ module Plutonium
                 end
               end
             end
-          ensure
-            # TODO: remove this once Phlex adds support for SafeValues
-            Phlex::HTML.const_set(:EVENT_ATTRIBUTES, original_attributes)
           end
 
           def select_classes

data/lib/plutonium/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-27 00:00:00.000000000 Z
+date: 2025-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: phlex-rails
   requirement: !ruby/object:Gem::Requirement
@@ -196,58 +196,58 @@ dependencies:
   name: phlexi-form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: phlexi-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: phlexi-display
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: phlexi-menu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: tailwind_merge
   requirement: !ruby/object:Gem::Requirement