avo 2.30.1.pre1.pr1683 → 2.30.1.pre3.pr1683

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c650833493f18162beff6fcb0244af4a5a2a6d91041a9be0b0103cb027f85b
-  data.tar.gz: af1f9219ac03dc7bfe05812010d025e26d5f26fec0b59feb56519045ae6385d3
+  metadata.gz: 7c187f50748a67fd5efd131b79d1f9a3aac50e9fde37691e26e7a6af264001fe
+  data.tar.gz: a1d21de053b77d80ed0ba618a043b94be172cf1ff47690f8a2a52d8fbed67e3e
 SHA512:
-  metadata.gz: 2a5b5b6e180b2d66d218b5e3d3f9f32622cacbb44104ac4a2d0e5ab6e0725d8e469ea0c5c830d04c0a489f9265bd6f2483ad92a2ec3c343d86a379bce63a8914
-  data.tar.gz: fd0a75e4c866d6a8562045ac0626378528a0751260788a9c9c3cf80183a4a698a0ac188396bba5c19e370b40a9831b1ce9d1d56e17bebc4638b0e8dbe7bffaec
+  metadata.gz: b68517f8dd8ea1865e07c68f8e890302ccfea22c752bd70fde7c1b16e9673d53acfcbc58c7bdeb8edf098177a404ba151b3fc3e2c6bdfaf304a5b0f92a391100
+  data.tar.gz: d6e7c905a8b25d2cbc6e81edc68382db0613ca680985e8d3a478ac233e3eb67b993ed7575a6ab2393ffa41f66ab37b5ea80f351eb68a7395a84e08716db8ef15

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.30.1.pre1.pr1683)
+    avo (2.30.1.pre3.pr1683)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

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

@@ -2,7 +2,7 @@
   class: classes,
   style: style,
   data: data do %>
-  <div class="h-full <% if stacked? %> md:pt-4 <% else %> md:pt-0 md:h-14 <% end %> pt-4 flex self-start items-center <%= @field.get_html(:classes, view: view, element: :label) %> w-48 <% if compact? %> md:w-48 xl:w-64 <% else %> md:w-64 <% end %> px-6 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 flex-shrink-0 <%= @field.get_html(:classes, view: view, element: :label) %> w-48 <% if compact? %> md:w-48 xl:w-64 <% else %> md:w-64 <% end %> px-6 uppercase font-semibold text-gray-500 text-sm" data-slot="label">
     <% if form.present? %>
       <%= form.label field.id, label %>
     <% else %>
@@ -11,7 +11,7 @@
     <% if on_edit? && field.is_required? %> <span class="text-red-600 ml-1">*</span> <% end %>
   </div>
   <div class="flex-1 flex flex-row md:min-h-inherit py-2 <% if stacked? %> pb-4 <% else %><% end %> px-6 <%= @field.get_html(:classes, view: view, element: :content) %>" data-slot="value">
-    <div class="self-center <% if full_width? || compact? || stacked? %> w-full <% else %> md:w-8/12 <% end %>">
+    <div class="self-center w-full <% if full_width? || compact? || stacked? %> <% else %> md:w-8/12 <% end %>">
       <% if on_show? %>
         <% if field.value.blank? and dash_if_blank %>
           —

data/app/components/avo/fields/common/files/list_viewer_component.html.erb

@@ -1,6 +1,6 @@
-<div class="-mt-9">
+<%= content_tag :div, class: wrapper_classes do %>
   <%= turbo_frame_tag @field.id do %>
-    <% unless @field.hide_view_type_changer %>
+    <% unless @field.hide_view_type_switcher %>
       <div class="justify-self-end flex justify-end items-center space-x-3">
         <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: @field.view_type, turbo_frame: @field.id } %>
       </div>
@@ -11,4 +11,4 @@
       <% end %>
     </div>
   <% end %>
-</div>
+<% end %>

data/app/components/avo/fields/common/files/list_viewer_component.rb

@@ -3,13 +3,15 @@
 class Avo::Fields::Common::Files::ListViewerComponent < ViewComponent::Base
   include Turbo::FramesHelper
 
+  attr_reader :field
+
   def initialize(field:, resource:)
     @field = field
     @resource = resource
   end
 
   def classes
-    base_classes = "py-4 rounded-xl"
+    base_classes = "py-4 rounded-xl max-w-full"
 
     view_type_classes = if @field.view_type == :list
       "flex flex-col space-y-2"
@@ -20,6 +22,10 @@ class Avo::Fields::Common::Files::ListViewerComponent < ViewComponent::Base
     "#{base_classes} #{view_type_classes}"
   end
 
+  def wrapper_classes
+    (field.stacked && !field.hide_view_type_switcher) ? "-mt-9" : ""
+  end
+
   def available_view_types
     [:list, :grid]
   end

data/app/components/avo/fields/common/files/view_type/list_component.html.erb

@@ -1,15 +1,15 @@
 <div class="relative min-h-full max-w-full flex-1 flex">
   <% if file.present? %>
-    <div class="flex gap-2 items-center max-w-full w-full">
-      <div class="flex-1 flex flex-row col-span-7 items-center text-gray-700 truncate">
+    <div class="grid grid-cols-6 gap-2 items-center max-w-full w-full">
+      <div class="col-span-4 flex-1 flex flex-row items-center text-gray-700 overflow-x-auto mac-styled-scrollbar ">
         <div class="rounded-full bg-slate-100 border border-gray-500 p-1.5 flex items-center justify-center">
           <%= helpers.svg icon_for_file, class: "h-5 text-gray-600" %>
         </div>
-        <p class="overflow-x-scroll items-center h-full p-2 whitespace-nowrap">
+        <p class="items-center h-full p-2 flex-shrink-0">
           <%= file.filename %>
         </p>
       </div>
-      <div class="col-span-4 text-gray-700 flex-shrink-0 text-sm">
+      <div class="text-gray-700 flex-shrink-0 text-sm">
         <%= helpers.number_to_human_size(file.byte_size) %>
       </div>
       <div class="flex space-x-2 justify-end col-span-1 flex-shrink-0">

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

@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, stacked: true do %>
+<%= field_wrapper **field_wrapper_args, full_width: true do %>
   <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 
   <% if can_upload_file? %>

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

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

data/lib/avo/fields/files_field.rb

@@ -6,7 +6,7 @@ module Avo
       attr_accessor :direct_upload
       attr_accessor :accept
       attr_reader :display_filename
-      attr_reader :hide_view_type_changer
+      attr_reader :hide_view_type_switcher
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -17,7 +17,7 @@ module Avo
         @accept = args[:accept].present? ? args[:accept] : nil
         @display_filename = args[:display_filename].nil? ? true : args[:display_filename]
         @view_type = args[:view_type] || :grid
-        @hide_view_type_changer = args[:hide_view_type_changer]
+        @hide_view_type_switcher = args[:hide_view_type_switcher]
       end
 
       def view_component_name

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.30.1.pre1.pr1683" unless const_defined?(:VERSION)
+  VERSION = "2.30.1.pre3.pr1683" unless const_defined?(:VERSION)
 end

data/public/avo-assets/avo.base.css

@@ -6386,10 +6386,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   grid-column:1 / -1
 }
 
-.col-span-7{
-  grid-column:span 7 / span 7
-}
-
 .col-span-4{
   grid-column:span 4 / span 4
 }
@@ -6930,6 +6926,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   grid-template-columns:repeat(1, minmax(0, 1fr))
 }
 
+.grid-cols-6{
+  grid-template-columns:repeat(6, minmax(0, 1fr))
+}
+
 .flex-row{
   flex-direction:row
 }
@@ -7113,10 +7113,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   overflow-x:auto
 }
 
-.overflow-x-scroll{
-  overflow-x:scroll
-}
-
 .truncate{
   overflow:hidden;
   text-overflow:ellipsis;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.30.1.pre1.pr1683
+  version: 2.30.1.pre3.pr1683
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-15 00:00:00.000000000 Z
+date: 2023-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord