avo 2.16.1.pre.1.nativefields → 2.17.1.pre.1.zeitwerk.eager.load.dir

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9faaa635bf77fa6bd6267dedf2a72bea08eb21c84714da5614be28df50da9028
-  data.tar.gz: 34418d8586a608efdcaf5b44c4cd98450578c0719e731d3534ac243681d3b994
+  metadata.gz: 8ce480a1789187841a9bcca025afdb3cfab7f153ba672409d23e7f8cefdfbfa3
+  data.tar.gz: 5737e02acb4959d6a5313dc9534ebb7a6903efeba06b1b923a9902ceaf64c2ee
 SHA512:
-  metadata.gz: 638a6f1809a1e379206d0358b8f8cb5767f53b3a8b5db8d61aa175744dd641c5332349d6108eb8565eae26b8629b9744da3549559243a4ced410a1b01cd41296
-  data.tar.gz: 3565f031cabab8fc386cab48276bfeb54592a45d5fdea58c5541935f4ebfed684223fdaf80baf26f5fb321641cb20644660abb70ca15400386dbaf9d9b5ee895
+  metadata.gz: 2c6dd37752b3279c05f68bd1c78751303b517339ecd06c93d35b33d1384527556e046a5680bff507f48a37f8d7a737e9687692d88623e39631d33cbe1266765f
+  data.tar.gz: b29f21327fb24141d7acb656f031decf4320e19944eb7e47d47d5d9fd6bf72148af7a46cc2ec7e0042717940b64d748ad176b0eab2e8f13145020338751c51dc

data/Gemfile

@@ -71,7 +71,7 @@ group :development do
   gem "bump", require: false
   gem "gem-release", require: false
 
-  gem 'annotate'
+  gem "annotate"
 
   # gem 'rack-mini-profiler'
   # gem 'memory_profiler'
@@ -80,14 +80,17 @@ group :development do
 
   # gem 'pry-rails'
 
-  gem 'htmlbeautifier'
+  gem "htmlbeautifier"
 
   gem "hotwire-livereload", "~> 1.1"
+
+  gem "brakeman"
 end
 
 group :development, :test do
   gem "awesome_print"
   gem "faker", require: false
+  gem "i18n-tasks", "~> 1.0.12"
 end
 
 group :test do
@@ -111,7 +114,7 @@ end
 gem "rubocop"
 gem "rubocop-shopify", require: false
 
-gem "zeitwerk", "~> 2.3"
+# gem "zeitwerk", "~> 2.3"
 
 gem "httparty"
 
@@ -150,3 +153,4 @@ gem 'acts-as-taggable-on', '~> 9.0'
 gem "bundler-integrity", "~> 1.0"
 
 gem 'erb-formatter'
+gem "zeitwerk", github: "fxn/zeitwerk"

data/Gemfile.lock

@@ -1,7 +1,13 @@
+GIT
+  remote: https://github.com/fxn/zeitwerk.git
+  revision: 50515063d309bf50cb1fdcffa7558ca26d124b3f
+  specs:
+    zeitwerk (2.6.1)
+
 PATH
   remote: .
   specs:
-    avo (2.16.1.pre.1.nativefields)
+    avo (2.17.1.pre.1.zeitwerk.eager.load.dir)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -17,8 +23,7 @@ PATH
       pundit
       rails (>= 6.0)
       turbo-rails
-      view_component (= 2.60)
-      zeitwerk
+      view_component
 
 GEM
   remote: https://rubygems.org/
@@ -119,9 +124,17 @@ GEM
     aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.18)
+    better_html (2.0.1)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      parser (>= 2.4)
+      smart_properties
     bindex (0.8.1)
     bootsnap (1.13.0)
       msgpack (~> 1.2)
+    brakeman (5.3.1)
     breadcrumbs_on_rails (4.1.0)
       railties (>= 5.0)
     builder (3.2.4)
@@ -188,6 +201,7 @@ GEM
     groupdate (6.1.0)
       activesupport (>= 5.2)
     hashdiff (1.0.1)
+    highline (2.0.3)
     hightop (0.3.0)
       activesupport (>= 5.2)
     hotwire-livereload (1.2.2)
@@ -199,6 +213,17 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    i18n-tasks (1.0.12)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      better_html (>= 1.0, < 3.0)
+      erubi
+      highline (>= 2.0.0)
+      i18n
+      parser (>= 2.2.3.0)
+      rails-i18n
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
@@ -248,6 +273,8 @@ GEM
     nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    nokogiri (1.13.8-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
@@ -288,6 +315,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
+    rails-i18n (7.0.5)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 8)
     railties (6.1.6.1)
       actionpack (= 6.1.6.1)
       activesupport (= 6.1.6.1)
@@ -349,7 +379,7 @@ GEM
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     rubyzip (2.3.2)
-    selenium-webdriver (4.4.0)
+    selenium-webdriver (4.5.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -364,6 +394,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sixarm_ruby_unaccent (1.2.0)
+    smart_properties (1.17.0)
     spring (4.0.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -377,6 +408,8 @@ GEM
     standard (1.16.0)
       rubocop (= 1.35.0)
       rubocop-performance (= 1.14.3)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     test-prof (1.0.10)
     thor (1.2.1)
     timeout (0.3.0)
@@ -387,8 +420,9 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
-    view_component (2.60.0)
+    view_component (2.74.1)
       activesupport (>= 5.0.0, < 8.0)
+      concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -397,7 +431,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.0.0)
+    webdrivers (5.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (~> 4.0)
@@ -411,7 +445,6 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -429,6 +462,7 @@ DEPENDENCIES
   awesome_print
   aws-sdk-s3
   bootsnap (>= 1.4.2)
+  brakeman
   breadcrumbs_on_rails
   bump
   bundler-integrity (~> 1.0)
@@ -450,6 +484,7 @@ DEPENDENCIES
   hotwire-livereload (~> 1.1)
   htmlbeautifier
   httparty
+  i18n-tasks (~> 1.0.12)
   image_processing (~> 1.12)
   iso
   jsbundling-rails
@@ -480,7 +515,7 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   webdrivers
   webmock
-  zeitwerk (~> 2.3)
+  zeitwerk!
 
 BUNDLED WITH
    2.3.5

data/README.md

@@ -48,7 +48,7 @@ Avo is a beautiful next-generation framework that empowers you, the developer, t
   - **Menu builder** - Group and surface information as you need to
   - **Branding** - Make it look
 
-## Some of the things we're going focusing on next
+## Some of the things we're going to focus on next
 
 Theming ⭐️   notifications ⭐️   Resource segmentation ⭐️   filterable fields ⭐️   inline editing ⭐️   multilingual records ⭐️   keyboard shortcuts ⭐️   track resource changes ⭐️   smart resource generation ⭐️   live resources ⭐️   columns view ⭐️   list view ⭐️   custom action items ⭐️   command bar ⭐️    use fields DSL in your custom views
 

data/app/assets/config/avo_manifest.js

@@ -1,2 +1,3 @@
 //= link_directory ../images/avo
+//= link_directory ../svgs
 //= link_tree ../builds

data/app/assets/svgs/placeholder.svg

@@ -0,0 +1 @@
+<svg fill="#9197A1" xmlns:x="http://ns.adobe.com/Extensibility/1.0/" xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:graph="http://ns.adobe.com/Graphs/1.0/" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 100 125" style="enable-background:new 0 0 100 100;" xml:space="preserve"><switch><foreignObject requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" x="0" y="0" width="1" height="1"/><g i:extraneous="self"><g><path d="M61.5,61.1c0-11.8-8.7-21.5-19.5-21.5c-10.7,0-19.5,9.6-19.5,21.5s8.7,21.5,19.5,21.5C52.8,82.6,61.5,73,61.5,61.1z      M27.7,61.1c0-9,6.4-16.4,14.4-16.4s14.4,7.3,14.4,16.4S50,77.5,42.1,77.5S27.7,70.2,27.7,61.1z"/><path d="M44.6,54.3c0-1.4-1.1-2.5-2.5-2.5c-4.8,0-8.7,4.2-8.7,9.4c0,1.4,1.1,2.5,2.5,2.5s2.5-1.1,2.5-2.5c0-2.4,1.6-4.3,3.6-4.3     C43.5,56.8,44.6,55.7,44.6,54.3z"/><path d="M90.3,52.6c-1.1-9.3-5.8-21.5-12-31C72.7,12.9,63.3,2.5,50.7,2.5h-8.7c-11.6,0-21.5,11-24.6,27.4     c-1.1,5.7-3.2,11.2-5.2,16.3c-1.9,4.7-2.9,9.8-2.9,15c0,20,14.7,36.4,32.8,36.4h20.3c6,0,12.5-3.4,17.8-9.4     C88.3,79,92,66.1,90.3,52.6z M14.4,61.1c0-4.6,0.9-9,2.5-13.1c2.2-5.3,4.3-11.1,5.5-17.2C25,17.2,33.1,7.6,42.1,7.6     s17,9.6,19.6,23.2c1.2,6.2,3.3,11.9,5.5,17.2h0c1.7,4.1,2.5,8.5,2.5,13.1c0,17.2-12.4,31.3-27.7,31.3S14.4,78.4,14.4,61.1z      M76.3,84.8c-4.2,4.8-9.5,7.6-14,7.6h-3.7c9.6-6.3,16.1-18,16.1-31.3c0-5.2-1-10.3-2.9-15c0,0,0,0,0,0     c-2.1-5.1-4.1-10.5-5.2-16.3C64.9,20.7,61.1,13.2,56,8.4c15.5,4.9,27.6,30.3,29.3,44.8C86.7,65.2,83.5,76.7,76.3,84.8z"/></g></g></switch></svg>

data/app/components/avo/actions_component.html.erb

@@ -1,4 +1,4 @@
-<div class="relative flex flex-col w-full sm:w-auto z-40 js-actions-dropdown"
+<div class="relative flex flex-col w-full sm:w-auto js-actions-dropdown"
   data-controller="toggle-panel actions-picker"
   data-actions-picker-enabled-class="text-black hover:bg-primary-500 hover:text-white"
   data-actions-picker-disabled-class="cursor-wait text-gray-500"
@@ -14,7 +14,7 @@
     <%= t 'avo.actions' %>
   <% end %>
   <div
-    class="absolute flex inset-auto xl:right-0 top-full bg-white w-full sm:w-auto sm:min-w-[300px] mt-2 z-20 shadow-modal rounded overflow-hidden hidden"
+    class="absolute flex inset-auto xl:right-0 top-full bg-white w-full sm:w-auto sm:min-w-[300px] mt-2 z-40 shadow-modal rounded overflow-hidden hidden"
     data-toggle-panel-target="panel"
   >
     <div class="w-full space divide-y">
@@ -28,7 +28,7 @@
           },
           title: action.action_name,
           class: "flex items-center px-4 py-3 w-full font-semibold text-sm hover:bg-primary-100 #{is_disabled?(action) ? 'text-gray-500' : 'text-black'}" do %>
-          <%= svg 'play', class: 'h-5 mr-1 inline' %> <%= action.action_name %>
+          <%= svg 'play', class: 'h-5 mr-1 inline pointer-events-none' %> <%= action.action_name %>
         <% end %>
       <% end %>
     </div>

data/app/components/avo/base_component.rb

@@ -17,13 +17,16 @@ class Avo::BaseComponent < ViewComponent::Base
   end
 
   # Fetch the resource and hydrate it with the model
-  def relation_resource
-    model = params[:via_resource_class] || params[:via_relation_class]
-    model_klass = model.safe_constantize
+  def association_resource
+    resource = ::Avo::App.get_resource(params[:via_resource_class])
+    model_class_name = params[:via_relation_class] || resource.model_class
+
+    model_klass = ::Avo::BaseResource.valid_model_class model_class_name
 
-    resource = ::Avo::App.get_resource_by_model_name model_klass
     model = model_klass.find params[:via_resource_id]
 
+    resource = ::Avo::App.get_resource_by_model_name model_klass if resource.blank?
+
     resource.dup.hydrate model: model
   end
 

data/app/components/avo/field_wrapper_component.html.erb

@@ -2,8 +2,8 @@
   class: classes,
   style: style,
   data: data do %>
-  <div class="h-full pt-4 md:pt-0 md:h-14 flex self-start items-center text-slate-800">
-    <div class="<% if displayed_in_modal %> md:w-48 <% else %> md:w-64 px-6 md:px-6 <% end %> w-48 flex uppercase font-semibold text-gray-500 text-sm" data-slot="label">
+  <div class="h-full <% if stacked? %> md:pt-4 <% else %> md:pt-0 md:h-14 <% end %> pt-4 flex self-start items-center text-slate-800">
+    <div class="w-48 <% if compact? %> md:w-48 xl:w-64 <% else %> md:w-64 <% end %> px-6 flex uppercase font-semibold text-gray-500 text-sm" data-slot="label">
       <% if form.present? %>
         <%= form.label field.id, label %>
       <% else %>
@@ -12,17 +12,15 @@
       <% if on_edit? && field.is_required? %> <span class="text-red-600 ml-1">*</span> <% end %>
     </div>
   </div>
-  <div class="flex-1 flex flex-row md:min-h-inherit py-2 <% unless displayed_in_modal %> px-6 <% end %>">
-    <% if on_show? %>
-      <div class="self-center <% if full_width %> w-full <% else %> w-full md:w-8/12 <% end %>" data-slot="value">
+  <div class="flex-1 flex flex-row md:min-h-inherit py-2 <% if stacked? %> pb-4 <% else %><% end %> px-6">
+    <div class="self-center <% if full_width? || compact? || stacked? %> w-full <% else %> md:w-8/12 <% end %>" data-slot="value">
+      <% if on_show? %>
         <% if field.value.blank? and dash_if_blank %>
           —
         <% else %>
           <%= content %>
         <% end %>
-      </div>
-    <% elsif on_edit? %>
-      <div class="self-center <% if displayed_in_modal or full_width or compact? %> w-full <% else %> w-full md:w-8/12 <% end %>" data-slot="value">
+      <% elsif on_edit? %>
         <%= content %>
         <% if record.present? and record.errors.include? field.id %>
           <div class="text-red-600 mt-2 text-sm"><%= record.errors.full_messages_for(field.id).to_sentence %></div>
@@ -30,8 +28,8 @@
         <% if help.present? %>
           <div class="text-gray-600 mt-2 text-sm"><%== help %></div>
         <% end %>
-      </div>
-    <% end %>
+      <% end %>
+    </div>
   </div>
   <% if params[:avo_debug].present? %>
     <!-- Raw value: -->

data/app/components/avo/field_wrapper_component.rb

@@ -1,53 +1,47 @@
 # frozen_string_literal: true
 
 class Avo::FieldWrapperComponent < ViewComponent::Base
-  # attr_reader :classes
   attr_reader :dash_if_blank
-  # attr_reader :data
-  attr_reader :displayed_in_modal
-  # attr_reader :help
+  attr_reader :compact
   attr_reader :field
   attr_reader :form
   attr_reader :full_width
-  # attr_reader :label
   attr_reader :resource
-  # attr_reader :record
-  # attr_reader :style
   attr_reader :view
 
   def initialize(
-    compact: false,
     dash_if_blank: true,
     data: {},
-    displayed_in_modal: false,
+    compact: false,
     help: nil, # do we really need it?
     field: nil,
     form: nil,
     full_width: false,
     label: nil, # do we really need it?
     resource: nil,
+    stacked: false,
     style: "",
     view: :show,
     **args
   )
     @args = args
     @classes = args[:class].present? ? args[:class] : ""
-    @compact = compact
     @dash_if_blank = dash_if_blank
     @data = data
-    @displayed_in_modal = displayed_in_modal
+    @compact = compact
     @help = help
     @field = field
     @form = form
     @full_width = full_width
     @label = label
     @resource = resource
+    @stacked = stacked
     @style = style
     @view = view
   end
 
   def classes(extra_classes = "")
-    "relative flex flex-col flex-grow pb-2 md:pb-0 leading-tight min-h-14 #{compact? ? "" : "md:flex-row md:items-center"} #{@classes || ""} #{extra_classes || ""} #{@field.get_html(:classes, view: view, element: :wrapper)}"
+    "relative flex flex-col flex-grow pb-2 md:pb-0 leading-tight min-h-14 #{stacked? ? "" : "md:flex-row md:items-center"} #{@classes || ""} #{extra_classes || ""} #{@field.get_html(:classes, view: view, element: :wrapper)}"
   end
 
   def style
@@ -96,7 +90,15 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
     attributes
   end
 
+  def stacked?
+    @stacked
+  end
+
   def compact?
     @compact
   end
+
+  def full_width?
+    @full_width
+  end
 end

data/app/components/avo/fields/badge_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, resource: @resource, flush: true do %>
+<%= index_field_wrapper **field_wrapper_args, flush: true do %>
   <%= render Avo::Fields::Common::BadgeViewerComponent.new value: @field.value, options: @field.options %>
 <% end %>

data/app/components/avo/fields/belongs_to_field/edit_component.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
-  def initialize(field: nil, resource: nil, index: 0, form: nil, displayed_in_modal: false)
-    super field: field, resource: resource, index: index, form: form, displayed_in_modal: displayed_in_modal
+  def initialize(field: nil, resource: nil, index: 0, form: nil, compact: false)
+    super field: field, resource: resource, index: index, form: form, compact: compact
 
     @polymorphic_record = nil
   end
@@ -12,7 +12,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
     # When visiting the record through it's association we keep the field disabled by default
     # We make an exception when the user deliberately instructs Avo to allow detaching in this scenario
-    return !@field.allow_via_detaching if @field.target_resource.present? && @field.target_resource.model_class.name == params[:via_resource_class]
+    return !@field.allow_via_detaching if @field.target_resource.present? && visit_through_association?
     return !@field.allow_via_detaching if @field.id.to_s == params[:via_relation].to_s
 
     false
@@ -52,4 +52,10 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   def field_html_action
     @field.get_html(:data, view: @resource.view, element: :input).fetch(:action, nil)
   end
+
+  private
+
+  def visit_through_association?
+    @field.target_resource.class.to_s == params[:via_resource_class].to_s
+  end
 end

data/app/components/avo/fields/belongs_to_field/index_component.html.erb

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field, resource: @resource do %>
+<%= index_field_wrapper **field_wrapper_args do %>
   <%= link_to @field.label, helpers.resource_view_path(model: @field.value, resource: @field.target_resource)
  %>
 <% end %>

data/app/components/avo/fields/belongs_to_field/show_component.html.erb

@@ -1,3 +1,3 @@
 <%= field_wrapper **field_wrapper_args do %>
-  <%= link_to @field.label, resource_view_path %>
+  <%= link_to @field.label, resource_view_path, data: {turbo_frame: @field.target} %>
 <% end %>

data/app/components/avo/fields/belongs_to_field/show_component.rb

@@ -5,7 +5,7 @@ class Avo::Fields::BelongsToField::ShowComponent < Avo::Fields::ShowComponent
     helpers.resource_view_path(
       model: @field.value,
       resource: @field.target_resource,
-      via_resource_class: @resource.model_class,
+      via_resource_class: @resource.class.to_s,
       via_resource_id: @resource.model.id
     )
   end

data/app/components/avo/fields/boolean_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, resource: @resource, dash_if_blank: false, center_content: true, flush: true do %>
+<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false, center_content: true, flush: true do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>

data/app/components/avo/fields/boolean_field/show_component.html.erb

@@ -1,3 +1,3 @@
-<%= field_wrapper  **field_wrapper_args, dash_if_blank: false do %>
+<%= field_wrapper **field_wrapper_args, dash_if_blank: false do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>

data/app/components/avo/fields/boolean_group_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, resource: @resource, dash_if_blank: false do %>
+<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false do %>
   <%= render Avo::Fields::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>

data/app/components/avo/fields/boolean_group_field/show_component.html.erb

@@ -1,3 +1,3 @@
-<%= field_wrapper  **field_wrapper_args, dash_if_blank: false do %>
+<%= field_wrapper **field_wrapper_args, dash_if_blank: false do %>
   <%= render Avo::Fields::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>

data/app/components/avo/fields/code_field/show_component.html.erb

@@ -1,4 +1,4 @@
-<%= field_wrapper  **field_wrapper_args, full_width: true do %>
+<%= field_wrapper **field_wrapper_args, full_width: true do %>
   <div data-controller="code-field" style="--height: <%= @field.height %>">
     <%= text_area_tag @field.id, @field.value,
       class: helpers.input_classes('w-full'),

data/app/components/avo/fields/common/heading_component.html.erb

@@ -1,10 +1,11 @@
 <div class="flex items-start py-1 leading-tight bg-gray-100 text-gray-500 text-xs">
   <div class="py-2 px-6 h-full w-full">
-    <% if @value.present? %>
-      <% if @as_html %>
-        <%== @value %>
+    <% if empty %>
+    <% elsif value.present? %>
+      <% if as_html %>
+        <%== value %>
       <% else %>
-        <div class="font-semibold uppercase"><%= @value %></div>
+        <div class="font-semibold uppercase"><%= value %></div>
       <% end %>
     <% else %>
       —

data/app/components/avo/fields/common/heading_component.rb

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
 class Avo::Fields::Common::HeadingComponent < ViewComponent::Base
-  def initialize(value:, as_html:)
+  attr_reader :value
+  attr_reader :as_html
+  attr_reader :empty
+
+  def initialize(value:, as_html:, empty:)
     @value = value
     @as_html = as_html
+    @empty = empty
   end
 end

data/app/components/avo/fields/country_field/index_component.html.erb

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field, resource: @resource do %>
+<%= index_field_wrapper **field_wrapper_args do %>
   <% if @field.display_code %>
     <%= @field.value %>
   <% else %>

data/app/components/avo/fields/date_field/index_component.html.erb

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field, resource: @resource do %>
+<%= index_field_wrapper **field_wrapper_args do %>
    <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,

data/app/components/avo/fields/date_time_field/index_component.html.erb

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field, resource: @resource do %>
+<%= index_field_wrapper **field_wrapper_args do %>
    <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,

data/app/components/avo/fields/edit_component.rb

@@ -4,20 +4,22 @@ class Avo::Fields::EditComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
   attr_reader :compact
-  attr_reader :displayed_in_modal
   attr_reader :field
   attr_reader :form
   attr_reader :index
+  attr_reader :multiple
   attr_reader :resource
+  attr_reader :stacked
   attr_reader :view
 
-  def initialize(field: nil, resource: nil, index: 0, form: nil, displayed_in_modal: false, compact: false, **kwargs)
+  def initialize(field: nil, resource: nil, index: 0, form: nil, compact: false, stacked: false, multiple: false, **kwargs)
     @compact = compact
-    @displayed_in_modal = displayed_in_modal
     @field = field
     @form = form
     @index = index
+    @multiple = multiple
     @resource = resource
+    @stacked = stacked
     @view = :edit
   end
 
@@ -32,11 +34,11 @@ class Avo::Fields::EditComponent < ViewComponent::Base
   def field_wrapper_args
     {
       compact: compact,
-      displayed_in_modal: displayed_in_modal,
       field: field,
       form: form,
       index: index,
       resource: resource,
+      stacked: stacked,
       view: view
     }
   end

data/app/components/avo/fields/external_image_field/index_component.html.erb

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field, resource: @resource, flush: true do %>
+<%= index_field_wrapper **field_wrapper_args, flush: true do %>
   <% if @field.value.present? %>
     <%= link_to_if @field.link_to_resource.present?,
                    image_tag(@field.value,

data/app/components/avo/fields/file_field/edit_component.html.erb

@@ -11,7 +11,8 @@
       data: @field.get_html(:data, view: view, element: :input),
       direct_upload: @field.direct_upload,
       disabled: @field.is_readonly?,
-      style: @field.get_html(:style, view: view, element: :input)
+      style: @field.get_html(:style, view: view, element: :input),
+      class: "w-full"
     %>
   <% end %>
 <% end %>

data/app/components/avo/fields/file_field/index_component.html.erb

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field, resource: @resource, flush: flush? do %>
+<%= index_field_wrapper **field_wrapper_args, flush: flush? do %>
   <% if @field.value.present? %>
     <% if @field.value.attached? && @field.value.representable? && @field.is_image %>
       <%= link_to_if @field.link_to_resource, image_tag(helpers.main_app.url_for(@field.value), class: 'h-10'), resource_view_path, class: 'block' %>

data/app/components/avo/fields/files_field/edit_component.html.erb

@@ -9,7 +9,8 @@
         direct_upload: @field.direct_upload,
         disabled: @field.is_readonly?,
         multiple: true,
-        style: @field.get_html(:style, view: view, element: :input)
+        style: @field.get_html(:style, view: view, element: :input),
+        class: "w-full"
       %>
     </div>
   <% end %>

data/app/components/avo/fields/files_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, resource: @resource do %>
+<%= index_field_wrapper **field_wrapper_args do %>
   <%= @field.value.attachments.length %> files
 <% end %>

data/app/components/avo/fields/files_field/show_component.html.erb

@@ -1,3 +1,3 @@
-<%= field_wrapper  **field_wrapper_args, full_width: true do %>
+<%= field_wrapper **field_wrapper_args, full_width: true do %>
   <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 <% end %>

data/app/components/avo/fields/gravatar_field/index_component.html.erb

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field, resource: @resource, flush: true do %>
+<%= index_field_wrapper **field_wrapper_args, flush: true do %>
   <%= render Avo::Fields::Common::GravatarViewerComponent.new(
     md5: @field.md5,
     default: @field.default,

data/app/components/avo/fields/has_one_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, resource: @resource do %>
+<%= index_field_wrapper **field_wrapper_args do %>
   <%= link_to @field.label, helpers.resource_path(model: @field.value, resource: @field.target_resource) %>
 <% end %>