avo 3.7.0 → 3.7.2

data/app/assets/stylesheets/css/pagination.css

@@ -1,63 +1,103 @@
-.pagy-nav,
-.pagy-nav-js,
-.pagy-combo-nav-js {
-  @apply relative z-0 flex;
-}
-
-.pagy-nav.pagination,
-.pagy-nav-js.pagination,
-.pagy-combo-nav-js.pagination {
-  @apply space-x-2;
-}
+.pagy-gem-version-7 {
+  .pagy-nav,
+  .pagy-nav-js,
+  .pagy-combo-nav-js {
+    @apply relative z-0 flex;
+  }
 
-.pagy-nav .page a{
-  @apply block;
-}
+  .pagy-nav.pagination,
+  .pagy-nav-js.pagination,
+  .pagy-combo-nav-js.pagination {
+    @apply space-x-2;
+  }
 
-.pagy-nav .page a,
-.pagy-nav .page.active a,
-.pagy-nav .page.prev.disabled a,
-.pagy-nav .page.next.disabled a,
-.pagy-nav-js .page a,
-.pagy-combo-nav-js .page a,
-.pagy-combo-nav-js .pagy-combo-input a {
-  @apply rounded px-3 py-1 text-sm text-gray-500 font-semibold bg-white shadow-md border border-gray-300;
-
-  &:hover{
-    @apply bg-gray-150;
+  .pagy-nav .page a{
+    @apply block;
   }
 
-  &:active{
-    @apply bg-gray-200;
+  .pagy-nav .page a,
+  .pagy-nav .page.active a,
+  .pagy-nav .page.prev.disabled a,
+  .pagy-nav .page.next.disabled a,
+  .pagy-nav-js .page a,
+  .pagy-combo-nav-js .page a,
+  .pagy-combo-nav-js .pagy-combo-input a {
+    @apply rounded px-3 py-1 text-sm text-gray-500 font-semibold bg-white shadow-md border border-gray-300;
+
+    &:hover{
+      @apply bg-gray-150;
+    }
+
+    &:active{
+      @apply bg-gray-200;
+    }
   }
-}
 
-.pagy-nav .page.prev.disabled a,
-.pagy-nav-js .page.prev.disabled a,
-.pagy-combo-nav-js .page.prev.disabled a,
-.pagy-nav .page.next.disabled a,
-.pagy-nav-js .page.next.disabled a,
-.pagy-combo-nav-js .page.next.disabled a {
-  @apply text-gray-300 cursor-default;
+  .pagy-nav .page.prev.disabled a,
+  .pagy-nav-js .page.prev.disabled a,
+  .pagy-combo-nav-js .page.prev.disabled a,
+  .pagy-nav .page.next.disabled a,
+  .pagy-nav-js .page.next.disabled a,
+  .pagy-combo-nav-js .page.next.disabled a {
+    @apply text-gray-300 cursor-default;
+
+    &:hover {
+      @apply text-gray-300 bg-white;
+    }
 
-  &:hover {
-    @apply text-gray-300 bg-white;
+    &:active {
+      @apply text-gray-300 bg-white;
+    }
   }
 
-  &:active {
-    @apply text-gray-300 bg-white;
+  .pagy-nav .page.active a,
+  .pagy-nav-js .page.active a {
+    @apply text-white cursor-default bg-gray-500 border-gray-500;
+
+    &:hover {
+      @apply text-white bg-gray-500;
+    }
+
+    &:active {
+      @apply bg-gray-500 text-white;
+    }
   }
 }
 
-.pagy-nav .page.active a,
-.pagy-nav-js .page.active a {
-  @apply text-white cursor-default bg-gray-500 border-gray-500;
+.pagy-gem-version-8-or-more {
+  .pagy.nav {
+    @apply relative z-0 flex space-x-2;
 
-  &:hover {
-    @apply text-white bg-gray-500;
-  }
+    a.gap {
+      @apply text-gray-500;
+    }
+
+    & a:not(.gap) {
+      @apply block rounded px-3 py-1 text-sm text-gray-500 font-semibold bg-white shadow-md border border-gray-300;
+
+      &:hover{
+        @apply bg-gray-150;
+      }
+
+      &:active{
+        @apply bg-gray-200;
+      }
+
+      &.current {
+        @apply text-white cursor-default bg-gray-500 border-gray-500;
+
+        &:hover {
+          @apply text-white bg-gray-500;
+        }
+
+        &:active {
+          @apply bg-gray-500 text-white;
+        }
+      }
 
-  &:active {
-    @apply bg-gray-500 text-white;
+      &[aria-disabled="true"]:not(.current) {
+        @apply bg-gray-100 text-gray-300 cursor-default;
+      }
+    }
   }
 }

data/app/components/avo/field_wrapper_component.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Avo::FieldWrapperComponent < ViewComponent::Base
+  include Avo::Concerns::HasResourceStimulusControllers
+
   attr_reader :dash_if_blank
   attr_reader :compact
   attr_reader :field
@@ -112,12 +114,4 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
   def full_width?
     @full_width
   end
-
-  private
-
-  def add_stimulus_attributes_for(entity, attributes)
-    entity.get_stimulus_controllers.split(" ").each do |controller|
-      attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
-    end
-  end
 end

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

@@ -1,9 +1,9 @@
-<div class="flex items-start py-1 leading-tight bg-gray-100 text-gray-500 text-xs">
+<%= content_tag :div, class: @classes, data: @data do %>
   <div class="py-2 px-6 h-full w-full">
-    <% if as_html %>
-      <%= sanitize value %>
+    <% if @field.as_html %>
+      <%= sanitize @field.value %>
     <% else %>
-      <div class="font-semibold uppercase"><%= value %></div>
+      <div class="font-semibold uppercase"><%= @field.value %></div>
     <% end %>
   </div>
-</div>
+<% end %>

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 class Avo::Fields::Common::HeadingComponent < ViewComponent::Base
-  attr_reader :value
-  attr_reader :as_html
+  include Avo::Concerns::HasResourceStimulusControllers
 
-  def initialize(value:, as_html:)
-    @value = value
-    @as_html = as_html
+  def initialize(field:)
+    @field = field
+    @view = field.resource.view
+    @classes = "flex items-start py-1 leading-tight bg-gray-100 text-gray-500 text-xs #{@field.get_html(:classes, view: @view, element: :wrapper)}"
+
+    @data = stimulus_data_attributes
+    add_stimulus_attributes_for(field.resource, @data)
   end
 end

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

@@ -1,3 +1,3 @@
 <div <% if @index == 0 %> class="overflow-hidden rounded-t" <% end %> data-field-id="<%= @field.id %>">
-  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.value, as_html: @field.as_html %>
+  <%= render Avo::Fields::Common::HeadingComponent.new field: @field %>
 </div>

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

@@ -1,3 +1,3 @@
 <div <% if @index == 0 %> class="overflow-hidden rounded-t" <% end %> data-field-id="<%= @field.id %>">
-  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.value, as_html: @field.as_html %>
+  <%= render Avo::Fields::Common::HeadingComponent.new field: @field %>
 </div>

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

@@ -22,7 +22,7 @@
     </div>
   </div>
   <div class="flex">
-    <div class="flex-2 sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left">
+    <div class="flex-2 sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left pagy-gem-version-<%= pagy_major_version %>">
       <% if @resource.pagination_type.default? %>
         <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
       <% end %>

data/app/components/avo/paginator_component.rb

@@ -42,4 +42,13 @@ class Avo::PaginatorComponent < ViewComponent::Base
       options.sort.uniq
     end
   end
+
+  def pagy_major_version
+    return nil unless defined?(Pagy::VERSION)
+    version = Pagy::VERSION&.split(".")&.first&.to_i
+
+    return "8-or-more" if version >= 8
+
+    version
+  end
 end

data/lib/avo/concerns/has_resource_stimulus_controllers.rb

@@ -8,11 +8,11 @@ module Avo
       end
 
       def get_stimulus_controllers
-        return "" if view.nil?
+        return "" if @view.nil?
 
         controllers = []
 
-        case view.to_sym
+        case @view.to_sym
         when :show
           controllers << "resource-show"
         when :new, :edit
@@ -32,11 +32,17 @@ module Avo
         }
 
         get_stimulus_controllers.split(" ").each do |controller|
-          attributes["#{controller}-view-value"] = view
+          attributes["#{controller}-view-value"] = @view
         end
 
         attributes
       end
+
+      def add_stimulus_attributes_for(entity, attributes)
+        entity.get_stimulus_controllers.split(" ").each do |controller|
+          attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
+        end
+      end
     end
   end
 end

data/lib/avo/concerns/pagination.rb

@@ -38,7 +38,8 @@ module Avo
         send PAGINATION_METHOD[pagination_type.to_sym],
           query,
           items: index_params[:per_page],
-          link_extra: "data-turbo-frame=\"#{params[:turbo_frame]}\"",
+          link_extra: "data-turbo-frame=\"#{params[:turbo_frame]}\"", # Add extra arguments in pagy 7.
+          anchor_string: "data-turbo-frame=\"#{params[:turbo_frame]}\"", # Add extra arguments in pagy 8.
           params: extra_pagy_params,
           size: pagination_hash[:size]
       end

data/lib/avo/version.rb

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

data/lib/avo.rb

@@ -1,4 +1,5 @@
 require "zeitwerk"
+require "ostruct"
 require_relative "avo/version"
 require_relative "avo/engine" if defined?(Rails)