avo 3.19.2 → 3.19.3

data/lib/avo/engine.rb

@@ -70,7 +70,7 @@ module Avo
 
           scope at do
             Avo.plugin_manager.engines.each do |engine|
-              mount engine[:klass], **engine[:options]
+              mount engine[:klass], **engine[:options].dup
             end
           end
         end

data/lib/avo/fields/base_field.rb

@@ -70,18 +70,19 @@ module Avo
         @summarizable = args[:summarizable] || false
         @nullable = args[:nullable] || false
         @null_values = args[:null_values] || [nil, ""]
-        @format_using = args[:format_using] || nil
-        @update_using = args[:update_using] || nil
+        @format_using = args[:format_using]
+        @update_using = args[:update_using]
+        @decorate = args[:decorate]
         @placeholder = args[:placeholder]
-        @autocomplete = args[:autocomplete] || nil
-        @help = args[:help] || nil
-        @default = args[:default] || nil
+        @autocomplete = args[:autocomplete]
+        @help = args[:help]
+        @default = args[:default]
         @visible = args[:visible]
         @as_avatar = args[:as_avatar] || false
-        @html = args[:html] || nil
-        @view = Avo::ViewInquirer.new(args[:view]) || nil
-        @value = args[:value] || nil
-        @stacked = args[:stacked] || nil
+        @html = args[:html]
+        @view = Avo::ViewInquirer.new(args[:view])
+        @value = args[:value]
+        @stacked = args[:stacked]
         @for_presentation_only = args[:for_presentation_only] || false
         @resource = args[:resource]
         @action = args[:action]
@@ -154,45 +155,42 @@ module Avo
       def value(property = nil)
         return @value if @value.present?
 
-        property ||= @for_attribute || id
+        property ||= @for_attribute || @id
 
         # Get record value
-        final_value = record.send(property) if is_model?(record) && record.respond_to?(property)
+        final_value = @record.send(property) if is_model?(@record) && @record.respond_to?(property)
 
         # On new views and actions modals we need to prefill the fields with the default value if value is nil
-        if final_value.nil? && should_fill_with_default_value? && default.present?
+        if final_value.nil? && should_fill_with_default_value? && @default.present?
           final_value = computed_default_value
         end
 
         # Run computable callback block if present
-        if computable && block.present?
-          final_value = execute_block
+        if computable && @block.present?
+          final_value = execute_context(@block)
         end
 
         # Run the value through resolver if present
-        if format_using.present?
-          final_value = Avo::ExecutionContext.new(
-            target: format_using,
-            value: final_value,
-            record: record,
-            resource: resource,
-            view: view,
-            field: self,
-            include: self.class.included_modules
-          ).handle
+        if @format_using.present?
+          final_value = execute_context(@format_using, value: final_value)
+        end
+
+        if @decorate.present? && @view.display?
+          final_value = execute_context(@decorate, value: final_value)
         end
 
         final_value
       end
 
-      def execute_block
+      def execute_context(target, **extra_args)
         Avo::ExecutionContext.new(
-          target: block,
-          record: record,
-          resource: resource,
-          view: view,
+          target:,
+          record: @record,
+          resource: @resource,
+          view: @view,
           field: self,
-          include: self.class.included_modules
+          include: self.class.included_modules,
+          **extra_args
         ).handle
       end
 

data/lib/avo/fields/heading_field.rb

@@ -24,7 +24,7 @@ module Avo
       end
 
       def value
-        block.present? ? execute_block : @label
+        @block.present? ? execute_context(@block) : @label
       end
     end
   end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.19.2" unless const_defined?(:VERSION)
+  VERSION = "3.19.3" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.19.2
+  version: 3.19.3
 platform: ruby
 authors:
 - Adrian Marin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-04-07 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord