avo 3.33.4 → 3.34.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a3af0fee54e4fe42d7118d5bb3934779335a08941fba6fbd5fae371b986877e4
4
- data.tar.gz: 118d0c3d2a580db3747acb50a6f6c0cfa12e1f472b931244209e26fd145a9fda
3
+ metadata.gz: 34a268e2f25e2b5928d8d3d6a44bc017bdc2a560755f63a0411e66562d282243
4
+ data.tar.gz: e88cf4061d63a6880a84bb16bc2d3b81a7d639a183852d34b1bf3db06a541379
5
5
  SHA512:
6
- metadata.gz: 15aef3f8b28560ca66086985a2eb882f6c8817b24485f79d6a9f70ae7d43b0241a2fefb4c09740ddab5b43243fd71f68504ed4dd2d875bc6411dc19f41bafbc9
7
- data.tar.gz: 15db5801633be9f55f39a274506b72622e84f65df97bbeb9da5ae1287f5a65d43ec9108b5a12cc0d81cf69239a19fc1353f6a8f3760df7cda33fe245bb5f1f6e
6
+ metadata.gz: 37e6dd9636989fbb775bb1728da6c8f6f4430603099e8f7b02784b4fc6eae36f65e3b9f242a151ecf77cf5c26e64e9b9998a73caf0e38b6c1cd17721656c7e4e
7
+ data.tar.gz: '06495746164755cf9ce3bfa29fb1f74e2e091ff8a0423d511c9ee8c1244d6d16a4f578a3d7f07bad239b3398791e37a6132178bb69f79c33649a71f71986eaee'
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- avo (3.33.4)
4
+ avo (3.34.0)
5
5
  actionview (>= 6.1)
6
6
  active_link_to
7
7
  activerecord (>= 6.1)
@@ -10,7 +10,7 @@ PATH
10
10
  avo-icons (>= 0.1.2)
11
11
  docile
12
12
  meta-tags
13
- pagy (>= 7.0.0, < 43)
13
+ pagy (>= 7.0.0)
14
14
  prop_initializer (>= 0.3.0)
15
15
  turbo-rails (>= 2.0.0)
16
16
  turbo_power (>= 0.6.0)
@@ -738,6 +738,7 @@ PLATFORMS
738
738
  aarch64-linux
739
739
  arm64-darwin-23
740
740
  arm64-darwin-24
741
+ arm64-darwin-25
741
742
  x86_64-linux
742
743
 
743
744
  DEPENDENCIES
@@ -65,14 +65,15 @@
65
65
  }
66
66
 
67
67
  .pagy-gem-version-8-or-more {
68
- .pagy.nav {
68
+ /* Pagy 43 renders .series-nav, marks the gap with role="separator" and the current page with aria-current. */
69
+ .pagy.nav, .pagy.series-nav {
69
70
  @apply relative z-0 flex space-x-2 max-sm:flex-wrap max-sm:gap-2 max-sm:justify-center;
70
71
 
71
- a.gap {
72
+ a.gap, a[role="separator"] {
72
73
  @apply text-gray-500;
73
74
  }
74
75
 
75
- & a:not(.gap) {
76
+ & a:not(.gap):not([role="separator"]) {
76
77
  @apply block rounded px-3 py-1 text-sm text-gray-500 font-semibold bg-white shadow-md border border-gray-300;
77
78
 
78
79
  &:hover{
@@ -83,7 +84,7 @@
83
84
  @apply bg-gray-200;
84
85
  }
85
86
 
86
- &.current {
87
+ &.current, &[aria-current="page"] {
87
88
  @apply text-white cursor-default bg-gray-500 border-gray-500;
88
89
 
89
90
  &:hover {
@@ -95,7 +96,7 @@
95
96
  }
96
97
  }
97
98
 
98
- &[aria-disabled="true"]:not(.current) {
99
+ &[aria-disabled="true"]:not(.current):not([aria-current="page"]) {
99
100
  @apply bg-gray-100 text-gray-300 cursor-default;
100
101
  }
101
102
  }
@@ -49,12 +49,12 @@
49
49
  <% c.with_bare_content do %>
50
50
  <div class="flex-1 flex w-full mt-4">
51
51
  <div class="flex-2 w-full sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left pagy-gem-version-<%= helpers.pagy_major_version %> ">
52
- <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
52
+ <div class="text-sm text-slate-600 mr-4"><%== helpers.avo_pagy_info @pagy %></div>
53
53
  <% if @pagy.pages > 1 %>
54
54
  <%# xanchor_string is not valid key word argument and it breaks when require "pagy/extras/calendar" %>
55
55
  <%# https://github.com/ddnexus/pagy/blob/d70e443872a5b18da4e482454b3c8b4a1c86cb6b/gem/lib/pagy/extras/calendar.rb#L47 %>
56
56
  <%#== helpers.pagy_nav(@pagy, xanchor_string: "data-turbo-frame=\"#{@turbo_frame}\"") %>
57
- <%== helpers.pagy_nav(@pagy) %>
57
+ <%== helpers.avo_pagy_nav(@pagy) %>
58
58
  <% end %>
59
59
  </div>
60
60
  </div>
@@ -4,11 +4,11 @@ module Avo
4
4
  module MediaLibrary
5
5
  class ListComponent < Avo::BaseComponent
6
6
  include Avo::ApplicationHelper
7
- include Pagy::Backend
7
+ include Avo::PagyCompat.backend
8
8
 
9
9
  def initialize(attaching: false, turbo_frame: nil)
10
10
  @attaching = attaching
11
- @pagy, @blobs = pagy(query, limit:)
11
+ @pagy, @blobs = Avo::PagyCompat.pagy_43? ? pagy(:offset, query, limit:) : pagy(query, limit:)
12
12
  turbo_frame ||= params[:turbo_frame]
13
13
  @turbo_frame = turbo_frame.present? ? CGI.escapeHTML(turbo_frame.to_s) : :_top
14
14
  end
@@ -26,12 +26,12 @@
26
26
  <div class="flex">
27
27
  <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-<%= helpers.pagy_major_version %>">
28
28
  <% if @resource.pagination_type.default? %>
29
- <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
29
+ <div class="text-sm text-slate-600 mr-4"><%== helpers.avo_pagy_info @pagy %></div>
30
30
  <% end %>
31
31
 
32
32
  <% if @pagy.pages > 1 %>
33
33
  <%# @todo: add first & last page. make the first and last buttons rounded %>
34
- <%== helpers.pagy_nav @pagy, anchor_string: "data-turbo-frame=\"#{@turbo_frame}\"" %>
34
+ <%== helpers.avo_pagy_nav @pagy, anchor_string: "data-turbo-frame=\"#{@turbo_frame}\"" %>
35
35
  <% end %>
36
36
  </div>
37
37
  </div>
@@ -1,6 +1,6 @@
1
1
  module Avo
2
2
  class MediaLibraryController < ApplicationController
3
- include Pagy::Backend
3
+ include Avo::PagyCompat.backend
4
4
 
5
5
  before_action :authorize_access!
6
6
 
@@ -1,6 +1,6 @@
1
1
  module Avo
2
2
  module ApplicationHelper
3
- include ::Pagy::Frontend
3
+ include ::Pagy::Frontend unless Avo::PagyCompat.pagy_43?
4
4
  include Avo::ResourcesHelper
5
5
 
6
6
  def render_license_warning(title: "", message: "", icon: "exclamation")
@@ -134,6 +134,18 @@ module Avo
134
134
  defined?(Authentication) && Authentication.private_instance_methods.include?(:require_authentication) && Authentication.private_instance_methods.include?(:authenticated?)
135
135
  end
136
136
 
137
+ def avo_pagy_info(pagy)
138
+ return pagy_info(pagy) unless Avo::PagyCompat.pagy_43?
139
+
140
+ Avo::PagyCompat.with_locale(@pagy_locale) { pagy.info_tag }
141
+ end
142
+
143
+ def avo_pagy_nav(pagy, anchor_string: nil)
144
+ return pagy_nav(pagy, anchor_string:) unless Avo::PagyCompat.pagy_43?
145
+
146
+ Avo::PagyCompat.with_locale(@pagy_locale) { pagy.series_nav(anchor_string:) }
147
+ end
148
+
137
149
  def pagy_major_version
138
150
  return nil unless defined?(Pagy::VERSION)
139
151
  version = Pagy::VERSION&.split(".")&.first&.to_i
data/avo.gemspec CHANGED
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
37
37
  spec.add_dependency "activerecord", ">= 6.1"
38
38
  spec.add_dependency "activesupport", ">= 6.1"
39
39
  spec.add_dependency "actionview", ">= 6.1"
40
- spec.add_dependency "pagy", ">= 7.0.0", "< 43"
40
+ spec.add_dependency "pagy", ">= 7.0.0"
41
41
  spec.add_dependency "zeitwerk", ">= 2.6.12"
42
42
  spec.add_dependency "active_link_to"
43
43
  spec.add_dependency "view_component", ">= 3.7.0"
@@ -1,3 +1,6 @@
1
+ # Pagy 43 has no extras to require, and it loads its own dictionaries (nn and ro included) on first use.
2
+ return if Avo::PagyCompat.pagy_43?
3
+
1
4
  require "pagy/extras/trim"
2
5
  require "pagy/extras/countless"
3
6
  require "pagy/extras/array"
@@ -4,7 +4,7 @@ module Avo
4
4
  extend ActiveSupport::Concern
5
5
 
6
6
  included do
7
- include Pagy::Backend
7
+ include Avo::PagyCompat.backend
8
8
 
9
9
  class_attribute :pagination, default: {}
10
10
 
@@ -38,10 +38,10 @@ module Avo
38
38
 
39
39
  data_turbo_frame = "data-turbo-frame=\"#{CGI.escapeHTML(params[:turbo_frame]) if params[:turbo_frame]}\""
40
40
 
41
- # Perform pagination and fallback to first page on Pagy::OverflowError
41
+ # Perform pagination and fallback to first page when the page is out of range
42
42
  begin
43
43
  perform_pagination(index_params:, query:, data_turbo_frame:, extra_pagy_params:, **args)
44
- rescue Pagy::OverflowError
44
+ rescue Avo::PagyCompat.page_out_of_range_error
45
45
  index_params[:page] = 1
46
46
  perform_pagination(index_params:, query:, data_turbo_frame:, extra_pagy_params:, **args)
47
47
  end
@@ -50,6 +50,10 @@ module Avo
50
50
  private
51
51
 
52
52
  def perform_pagination(index_params:, query:, data_turbo_frame:, extra_pagy_params:, **args)
53
+ if Avo::PagyCompat.pagy_43?
54
+ return perform_pagy_43_pagination(index_params:, query:, data_turbo_frame:, extra_pagy_params:, **args)
55
+ end
56
+
53
57
  send PAGINATION_METHOD[pagination_type.to_sym],
54
58
  query,
55
59
  **args,
@@ -62,6 +66,19 @@ module Avo
62
66
  size: pagination_hash[:size]
63
67
  end
64
68
 
69
+ # Pagy 43 paginates arrays with :offset, and has no trim extra: it always links page 1 with page=1.
70
+ def perform_pagy_43_pagination(index_params:, query:, data_turbo_frame:, extra_pagy_params:, **args)
71
+ pagy pagination_type.countless? ? :countless : :offset,
72
+ query,
73
+ **args.except(:trim_extra),
74
+ page: index_params[:page],
75
+ limit: index_params[:per_page],
76
+ anchor_string: data_turbo_frame,
77
+ querify: ->(query_params) { query_params.merge!(extra_pagy_params.stringify_keys) },
78
+ slots: Avo::PagyCompat.slots(pagination_hash[:size]),
79
+ raise_range_error: true
80
+ end
81
+
65
82
  def pagination_hash
66
83
  @pagination ||= PAGINATION_DEFAULTS.merge(Avo.configuration.pagination).merge Avo::ExecutionContext.new(
67
84
  target: pagination,
@@ -0,0 +1,37 @@
1
+ module Avo
2
+ # Pagy 43 replaced Pagy::Backend, Pagy::Frontend and the extras with Pagy::Method and helpers on the
3
+ # Pagy instance. Avo 3 keeps supporting Pagy 7 to 9, so each place that differs asks this module.
4
+ module PagyCompat
5
+ def self.pagy_43?
6
+ ::Gem::Version.new(::Pagy::VERSION) >= ::Gem::Version.new("43.0")
7
+ end
8
+
9
+ def self.backend
10
+ pagy_43? ? ::Pagy::Method : ::Pagy::Backend
11
+ end
12
+
13
+ # Raised for a page outside the range, for example after the last record of the last page was deleted.
14
+ def self.page_out_of_range_error
15
+ pagy_43? ? ::Pagy::RangeError : ::Pagy::OverflowError
16
+ end
17
+
18
+ # Pagy 43 calls the `size` option `slots` and accepts only an Integer. Pagy 7 also accepted an Array
19
+ # like `[1, 2, 2, 1]`: pages at the start, before the current page, after it, and at the end. It shows
20
+ # those pages, the current page and two gaps, so the same nav needs three slots more than its sum.
21
+ def self.slots(size)
22
+ return size unless size.is_a?(Array)
23
+
24
+ size.sum.zero? ? 0 : size.sum + 3
25
+ end
26
+
27
+ # Pagy 43 keeps its locale in a thread variable. Set it only while Avo renders, so that the next
28
+ # request on the same thread, and the host app, do not get Avo's locale.
29
+ def self.with_locale(locale)
30
+ previous_locale = ::Pagy::I18n.locale
31
+ ::Pagy::I18n.locale = locale
32
+ yield
33
+ ensure
34
+ ::Pagy::I18n.locale = previous_locale
35
+ end
36
+ end
37
+ end
data/lib/avo/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Avo
2
- VERSION = "3.33.4" unless const_defined?(:VERSION)
2
+ VERSION = "3.34.0" unless const_defined?(:VERSION)
3
3
  end
@@ -5668,158 +5668,160 @@ svg.tea #steamR {
5668
5668
  color:rgb(255 255 255 / var(--tw-text-opacity, 1))
5669
5669
  }
5670
5670
 
5671
- .pagy-gem-version-8-or-more .pagy.nav{
5671
+ /* Pagy 43 renders .series-nav, marks the gap with role="separator" and the current page with aria-current. */
5672
+
5673
+ .pagy-gem-version-8-or-more .pagy.nav, .pagy-gem-version-8-or-more .pagy.series-nav{
5672
5674
  position:relative
5673
5675
  }
5674
5676
 
5675
- .pagy-gem-version-8-or-more .pagy.nav{
5677
+ .pagy-gem-version-8-or-more .pagy.nav, .pagy-gem-version-8-or-more .pagy.series-nav{
5676
5678
  z-index:0
5677
5679
  }
5678
5680
 
5679
- .pagy-gem-version-8-or-more .pagy.nav{
5681
+ .pagy-gem-version-8-or-more .pagy.nav, .pagy-gem-version-8-or-more .pagy.series-nav{
5680
5682
  display:flex
5681
5683
  }
5682
5684
 
5683
- .pagy-gem-version-8-or-more .pagy.nav > :not([hidden]) ~ :not([hidden]){
5685
+ .pagy-gem-version-8-or-more .pagy.nav > :not([hidden]) ~ :not([hidden]), .pagy-gem-version-8-or-more .pagy.series-nav > :not([hidden]) ~ :not([hidden]){
5684
5686
  --tw-space-x-reverse:0;
5685
5687
  margin-right:calc(0.5rem * var(--tw-space-x-reverse));
5686
5688
  margin-left:calc(0.5rem * calc(1 - var(--tw-space-x-reverse)))
5687
5689
  }
5688
5690
 
5689
5691
  @media not all and (min-width: 640px){
5690
- .pagy-gem-version-8-or-more .pagy.nav{
5692
+ .pagy-gem-version-8-or-more .pagy.nav, .pagy-gem-version-8-or-more .pagy.series-nav{
5691
5693
  flex-wrap:wrap
5692
5694
  }
5693
5695
  }
5694
5696
 
5695
5697
  @media not all and (min-width: 640px){
5696
- .pagy-gem-version-8-or-more .pagy.nav{
5698
+ .pagy-gem-version-8-or-more .pagy.nav, .pagy-gem-version-8-or-more .pagy.series-nav{
5697
5699
  justify-content:center
5698
5700
  }
5699
5701
  }
5700
5702
 
5701
5703
  @media not all and (min-width: 640px){
5702
- .pagy-gem-version-8-or-more .pagy.nav{
5704
+ .pagy-gem-version-8-or-more .pagy.nav, .pagy-gem-version-8-or-more .pagy.series-nav{
5703
5705
  gap:0.5rem
5704
5706
  }
5705
5707
  }
5706
5708
 
5707
- .pagy-gem-version-8-or-more .pagy.nav a.gap{
5709
+ .pagy-gem-version-8-or-more .pagy.nav a.gap, .pagy-gem-version-8-or-more .pagy.nav a[role="separator"], .pagy-gem-version-8-or-more .pagy.series-nav a.gap, .pagy-gem-version-8-or-more .pagy.series-nav a[role="separator"]{
5708
5710
  --tw-text-opacity:1;
5709
5711
  color:rgb(117 125 138 / var(--tw-text-opacity, 1))
5710
5712
  }
5711
5713
 
5712
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5714
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5713
5715
  display:block
5714
5716
  }
5715
5717
 
5716
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5718
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5717
5719
  border-radius:0.25rem
5718
5720
  }
5719
5721
 
5720
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5722
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5721
5723
  border-width:1px
5722
5724
  }
5723
5725
 
5724
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5726
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5725
5727
  --tw-border-opacity:1;
5726
5728
  border-color:rgb(172 177 185 / var(--tw-border-opacity, 1))
5727
5729
  }
5728
5730
 
5729
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5731
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5730
5732
  --tw-bg-opacity:1;
5731
5733
  background-color:rgb(255 255 255 / var(--tw-bg-opacity, 1))
5732
5734
  }
5733
5735
 
5734
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5736
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5735
5737
  padding-left:0.75rem;
5736
5738
  padding-right:0.75rem
5737
5739
  }
5738
5740
 
5739
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5741
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5740
5742
  padding-top:0.25rem;
5741
5743
  padding-bottom:0.25rem
5742
5744
  }
5743
5745
 
5744
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5746
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5745
5747
  font-size:0.875rem;
5746
5748
  line-height:1.25rem
5747
5749
  }
5748
5750
 
5749
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5751
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5750
5752
  font-weight:600
5751
5753
  }
5752
5754
 
5753
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5755
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5754
5756
  --tw-text-opacity:1;
5755
5757
  color:rgb(117 125 138 / var(--tw-text-opacity, 1))
5756
5758
  }
5757
5759
 
5758
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap){
5760
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]){
5759
5761
  --tw-shadow:0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
5760
5762
  --tw-shadow-colored:0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
5761
5763
  box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
5762
5764
  }
5763
5765
 
5764
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):hover{
5766
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]):hover,.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]):hover{
5765
5767
  --tw-bg-opacity:1;
5766
5768
  background-color:rgb(214 216 220 / var(--tw-bg-opacity, 1))
5767
5769
  }
5768
5770
 
5769
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):active{
5771
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]):active,.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]):active{
5770
5772
  --tw-bg-opacity:1;
5771
5773
  background-color:rgb(200 203 208 / var(--tw-bg-opacity, 1))
5772
5774
  }
5773
5775
 
5774
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap).current{
5776
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]).current, .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-current="page"], .pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]).current, .pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-current="page"]{
5775
5777
  cursor:default
5776
5778
  }
5777
5779
 
5778
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap).current{
5780
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]).current, .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-current="page"], .pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]).current, .pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-current="page"]{
5779
5781
  --tw-border-opacity:1;
5780
5782
  border-color:rgb(117 125 138 / var(--tw-border-opacity, 1))
5781
5783
  }
5782
5784
 
5783
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap).current{
5785
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]).current, .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-current="page"], .pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]).current, .pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-current="page"]{
5784
5786
  --tw-bg-opacity:1;
5785
5787
  background-color:rgb(117 125 138 / var(--tw-bg-opacity, 1))
5786
5788
  }
5787
5789
 
5788
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap).current{
5790
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]).current, .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-current="page"], .pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]).current, .pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-current="page"]{
5789
5791
  --tw-text-opacity:1;
5790
5792
  color:rgb(255 255 255 / var(--tw-text-opacity, 1))
5791
5793
  }
5792
5794
 
5793
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap).current:hover{
5795
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]).current:hover,.pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-current="page"]:hover,.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]).current:hover,.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-current="page"]:hover{
5794
5796
  --tw-bg-opacity:1;
5795
5797
  background-color:rgb(117 125 138 / var(--tw-bg-opacity, 1))
5796
5798
  }
5797
5799
 
5798
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap).current:hover{
5800
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]).current:hover,.pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-current="page"]:hover,.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]).current:hover,.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-current="page"]:hover{
5799
5801
  --tw-text-opacity:1;
5800
5802
  color:rgb(255 255 255 / var(--tw-text-opacity, 1))
5801
5803
  }
5802
5804
 
5803
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap).current:active{
5805
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]).current:active,.pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-current="page"]:active,.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]).current:active,.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-current="page"]:active{
5804
5806
  --tw-bg-opacity:1;
5805
5807
  background-color:rgb(117 125 138 / var(--tw-bg-opacity, 1))
5806
5808
  }
5807
5809
 
5808
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap).current:active{
5810
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"]).current:active,.pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-current="page"]:active,.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"]).current:active,.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-current="page"]:active{
5809
5811
  --tw-text-opacity:1;
5810
5812
  color:rgb(255 255 255 / var(--tw-text-opacity, 1))
5811
5813
  }
5812
5814
 
5813
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap)[aria-disabled="true"]:not(.current){
5815
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-disabled="true"]:not(.current):not([aria-current="page"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-disabled="true"]:not(.current):not([aria-current="page"]){
5814
5816
  cursor:default
5815
5817
  }
5816
5818
 
5817
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap)[aria-disabled="true"]:not(.current){
5819
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-disabled="true"]:not(.current):not([aria-current="page"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-disabled="true"]:not(.current):not([aria-current="page"]){
5818
5820
  --tw-bg-opacity:1;
5819
5821
  background-color:rgb(227 229 232 / var(--tw-bg-opacity, 1))
5820
5822
  }
5821
5823
 
5822
- .pagy-gem-version-8-or-more .pagy.nav a:not(.gap)[aria-disabled="true"]:not(.current){
5824
+ .pagy-gem-version-8-or-more .pagy.nav a:not(.gap):not([role="separator"])[aria-disabled="true"]:not(.current):not([aria-current="page"]),.pagy-gem-version-8-or-more .pagy.series-nav a:not(.gap):not([role="separator"])[aria-disabled="true"]:not(.current):not([aria-current="page"]){
5823
5825
  --tw-text-opacity:1;
5824
5826
  color:rgb(172 177 185 / var(--tw-text-opacity, 1))
5825
5827
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avo
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.33.4
4
+ version: 3.34.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adrian Marin
@@ -60,9 +60,6 @@ dependencies:
60
60
  - - ">="
61
61
  - !ruby/object:Gem::Version
62
62
  version: 7.0.0
63
- - - "<"
64
- - !ruby/object:Gem::Version
65
- version: '43'
66
63
  type: :runtime
67
64
  prerelease: false
68
65
  version_requirements: !ruby/object:Gem::Requirement
@@ -70,9 +67,6 @@ dependencies:
70
67
  - - ">="
71
68
  - !ruby/object:Gem::Version
72
69
  version: 7.0.0
73
- - - "<"
74
- - !ruby/object:Gem::Version
75
- version: '43'
76
70
  - !ruby/object:Gem::Dependency
77
71
  name: zeitwerk
78
72
  requirement: !ruby/object:Gem::Requirement
@@ -933,6 +927,7 @@ files:
933
927
  - lib/avo/loaders/scopes_loader.rb
934
928
  - lib/avo/mappings.rb
935
929
  - lib/avo/media_library/configuration.rb
930
+ - lib/avo/pagy_compat.rb
936
931
  - lib/avo/photo_object.rb
937
932
  - lib/avo/plugin.rb
938
933
  - lib/avo/plugin_manager.rb