avo 4.1.10 → 4.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f959e8ef3f97c60529547224a14021887a228f1d4d1acfff73b60f97293b3f
-  data.tar.gz: 03d04787aae5bc9ba4a880f69f007aed595f831b1d9488b030c7623f6da8474d
+  metadata.gz: b75d350bbabce26a04fbe5ff8967073b84ab93ffa6aa38033000c6cdf7023a08
+  data.tar.gz: 491411e9d13ea7ee2e6bdc604424019e03540456303d8007fc2afe6b54371e27
 SHA512:
-  metadata.gz: dc91308c6d18e7b6a45a0c5bcd70bc82f627840c6751f666ed25709ee6c3e93428c599d4eed27c507ae0b2e671a096eceac663a4a0564f2cee7a2157c96b8b18
-  data.tar.gz: 199e5be527728e623579b262f2c95d67adca773b439e4087733b19d957e9296c758468bedf4606dc23f951af5635c7cb89a3ba402c9fa9d2721f770b9fe5198c
+  metadata.gz: d7a94a371d5c4efdc7ad152e57ffb46dcee355a349cf3873dde1aea54d5b628e1e4a2cb3f3565423847955a2a61bd7a5dcdd180b3f7f9e1c58e75dc9b4e35d65
+  data.tar.gz: fb430818f2ed8b7ae860c05a1590ede18c292fc19a684405f52709673be20042da41d5764e78c28bf4f5abfc0209761ee7b12d5bc5d7f6681f4977ee199e1920

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (4.1.10)
+    avo (4.1.11)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/components/avo/field_wrapper_component.rb

@@ -122,12 +122,13 @@ class Avo::FieldWrapperComponent < Avo::BaseComponent
   end
 
   def stacked?
-    # Override on the declaration level
-    return @stacked unless @stacked.nil?
-
-    # Fetch it from the field
+    # The field declaration is the user's explicit intent, so it wins over the
+    # layout default a parent component passes in (sidebars, preview, etc.).
     return @field.stacked unless @field.stacked.nil?
 
+    # Fallback to what the rendering component asked for
+    return @stacked unless @stacked.nil?
+
     # Fallback to defaults
     Avo.configuration.field_wrapper_layout == :stacked
   end

data/lib/avo/fields/base_field.rb

@@ -117,7 +117,7 @@ module Avo
 
         @width = args[:width] || 100
 
-        if width_option.present? && width_option != 100
+        if @stacked.nil? && width_option.present? && width_option != 100
           @stacked = true
         end
 

data/lib/avo/skills/avo-fields/SKILL.md

@@ -143,7 +143,7 @@ Every field accepts these common options (full list + types at the field-options
 - **`copyable:`** — clipboard icon on Show/Index. Copies the **displayed** (formatted) value.
 - **`link_to_record:`** — make the Index cell a link to the record. Only on `:id`, `:text`, `:gravatar`, and `belongs_to`.
 - **`for_attribute:`** — back the field with a different attribute than its id (lets you show one column two ways).
-- **`width:`** / **`stacked:`** — column width (`25/33/50/66/75/100`; any value <100 auto-stacks) and label-above-value layout.
+- **`width:`** / **`stacked:`** — column width (`25/33/50/66/75/100`; any value <100 auto-stacks) and label-above-value layout. `stacked:` on the field wins everywhere, so `stacked: false` opts out of the auto-stacking and of sidebars/preview stacking too.
 - **`html:`** — attach `style`/`classes`/`data` to the field's wrapper/label/input per view (e.g. right-align a number: `html: {index: {wrapper: {classes: "text-right"}}}`). See the html page.
 
 ### Computed (block) fields

data/lib/avo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 4.1.10
+  version: 4.1.11
 platform: ruby
 authors:
 - Adrian Marin