pagy 7.0.11 → 8.6.3

data/lib/pagy/extras/gearbox.rb

@@ -12,42 +12,43 @@ class Pagy # :nodoc:
     def setup_items_var
       return super if !@vars[:gearbox_extra] || @vars[:items_extra]
 
-      gearbox_items = @vars[:gearbox_items]
-      raise VariableError.new(self, :gearbox_items, 'to be an Array of positives', gearbox_items) \
-            unless gearbox_items.is_a?(Array) && gearbox_items.all? { |num| num.positive? rescue false } # rubocop:disable Style/RescueModifier
+      gears = @vars[:gearbox_items]
+      raise VariableError.new(self, :gearbox_items, 'to be an Array of positives', gears) \
+            unless gears.is_a?(Array) && gears.all? { |num| num.positive? rescue false } # rubocop:disable Style/RescueModifier
 
-      @items = gearbox_items[@page - 1] || gearbox_items.last
+      @items = gears[@page - 1] || gears.last
     end
 
-    # Setup @pages and @last based on the :gearbox_items variable (not used by Pagy::Countless)
-    def setup_pages_var
+    # Setup @offset based on the :gearbox_items variable
+    def setup_offset_var
       return super if !@vars[:gearbox_extra] || @vars[:items_extra]
 
-      gearbox_items = @vars[:gearbox_items]
-      # This algorithm is thousands of times faster than the one in the geared_pagination gem
-      @pages = @last = (if @count > (sum = gearbox_items.sum)
-                          [((@count - sum).to_f / gearbox_items.last).ceil, 1].max + gearbox_items.count
-                        else
-                          pages     = 0
-                          remainder = @count
-                          while remainder.positive?
-                            pages     += 1
-                            remainder -= gearbox_items[pages - 1]
-                          end
-                          [pages, 1].max
-                        end)
+      gears   = @vars[:gearbox_items]
+      @offset = if @page <= gears.count
+                  gears[0, @page - 1].sum
+                else
+                  gears.sum + (gears.last * (@page - gears.count - 1))
+                end + @outset
     end
 
-    # Setup @offset based on the :gearbox_items variable
-    def setup_offset_var
+    # Setup Pagy @last based on the :gearbox_items variable and @count
+    def setup_last_var
       return super if !@vars[:gearbox_extra] || @vars[:items_extra]
 
-      gearbox_items = @vars[:gearbox_items]
-      @offset       = if @page <= gearbox_items.count
-                        gearbox_items[0, @page - 1].sum
-                      else
-                        gearbox_items.sum + (gearbox_items.last * (@page - gearbox_items.count - 1))
-                      end + @outset
+      gears = @vars[:gearbox_items]
+      # This algorithm is thousands of times faster than the one in the geared_pagination gem
+      @last = (if count > (sum = gears.sum)
+                 [((count - sum).to_f / gears.last).ceil, 1].max + gears.count
+               else
+                 pages     = 0
+                 remainder = count
+                 while remainder.positive?
+                   pages     += 1
+                   remainder -= gears[pages - 1]
+                 end
+                 [pages, 1].max
+               end)
+      @last = vars[:max_pages] if vars[:max_pages] && @last > vars[:max_pages]
     end
   end
   prepend GearboxExtra

data/lib/pagy/extras/headers.rb

@@ -1,7 +1,7 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/headers
 # frozen_string_literal: true
 
-require 'pagy/url_helpers'
+require_relative '../url_helpers'
 
 class Pagy # :nodoc:
   DEFAULT[:headers] = { page:  'current-page',

data/lib/pagy/extras/i18n.rb

@@ -19,7 +19,7 @@ class Pagy # :nodoc:
       end
     end
   end
-  Calendar.prepend I18nExtra::CalendarOverride if defined?(Calendar)
+  Calendar::Unit.prepend I18nExtra::CalendarOverride if defined?(Calendar::Unit)
 
   # Add the pagy locales to the I18n.load_path
   ::I18n.load_path += Dir[Pagy.root.join('locales', '*.yml')]

data/lib/pagy/extras/items.rb

@@ -1,7 +1,7 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/items
 # frozen_string_literal: true
 
-require 'pagy/extras/frontend_helpers'
+require_relative 'js_tools'
 
 class Pagy # :nodoc:
   DEFAULT[:items_param] = :items
@@ -33,27 +33,30 @@ class Pagy # :nodoc:
 
     # Additions for the Frontend module
     module FrontendAddOn
-      ITEMS_PLACEHOLDER = '__pagy_items__'
+      ITEMS_TOKEN = '__pagy_items__'
 
       # Return the items selector HTML. For example "Show [20] items per page"
-      def pagy_items_selector_js(pagy, pagy_id: nil, item_name: nil, item_i18n_key: nil)
+      def pagy_items_selector_js(pagy, id: nil, item_name: nil)
         return '' unless pagy.vars[:items_extra]
 
-        p_id           = %( id="#{pagy_id}") if pagy_id
-        p_vars         = pagy.vars
-        p_items        = p_vars[:items]
-        p_vars[:items] = ITEMS_PLACEHOLDER
-        url_token      = pagy_url_for(pagy, PAGE_TOKEN)
-        p_vars[:items] = p_items # restore the items
-
-        html  = +%(<span#{p_id} class="pagy pagy-items-selector-js" #{pagy_data(pagy, :selector, pagy.from, url_token)}>)
-        input = %(<input name="items" type="number" min="1" max="#{p_vars[:max_items]}" value="#{
-                    p_items}" style="padding: 0; text-align: center; width: #{p_items.to_s.length + 1}rem;">)
-        html << pagy_t('pagy.items_selector_js',
-                       item_name: item_name || pagy_t(item_i18n_key || p_vars[:item_i18n_key], count: p_items),
-                       items_input: input,
-                       count: p_items)
-        html << %(</span>)
+        id           = %( id="#{id}") if id
+        vars         = pagy.vars
+        items        = vars[:items]
+        vars[:items] = ITEMS_TOKEN
+        url_token    = pagy_url_for(pagy, PAGE_TOKEN)
+        vars[:items] = items # restore the items
+
+        items_input = %(<input name="items" type="number" min="1" max="#{vars[:max_items]}" value="#{
+                          items}" style="padding: 0; text-align: center; width: #{items.to_s.length + 1}rem;">#{JSTools::A_TAG})
+
+        %(<span#{id} class="pagy items-selector-js" #{
+            pagy_data(pagy, :selector, pagy.from, url_token)
+          }><label>#{
+            pagy_t('pagy.items_selector_js',
+                   item_name: item_name || pagy_t('pagy.item_name', count: items),
+                   items_input:,
+                   count: items)
+          }</label></span>)
       end
     end
     Frontend.prepend ItemsExtra::FrontendAddOn

data/lib/pagy/extras/{frontend_helpers.rb → js_tools.rb}

@@ -4,17 +4,20 @@ class Pagy # :nodoc:
   DEFAULT[:steps] = false # default false will use {0 => @vars[:size]}
 
   # Private module documented in the main classes
-  module FrontendHelpers
+  module JSTools
+    # Dummy tag for input helpers: needed because Turbo does not intercept window.location changes
+    A_TAG = '<a href="#" style="display: none;">#</a>'
+
     # Additions for the Pagy class
     module PagyAddOn
       # `Pagy` instance method used by the `pagy*_nav_js` helpers.
       # It returns the sequels of width/series generated from the :steps hash
       # Example:
-      # >> pagy = Pagy.new(count:1000, page: 20, steps: {0 => [1,2,2,1], 350 => [2,3,3,2], 550 => [3,4,4,3]})
+      # >> pagy = Pagy.new(count:1000, page: 20, steps: {0 => 5, 350 => 7, 550 => 9})
       # >> pagy.sequels
-      # #=> { "0"   => [1, :gap, 18, 19, "20", 21, 22, :gap, 50],
-      #       "350" => [1, 2, :gap, 17, 18, 19, "20", 21, 22, 23, :gap, 49, 50],
-      #       "550" => [1, 2, 3, :gap, 16, 17, 18, 19, "20", 21, 22, 23, 24, :gap, 48, 49, 50] }
+      # #=> { "0"   => [18, 19, "20", 21, 22],
+      #       "350" => [1, :gap, 19, "20", 21, :gap, 50],
+      #       "550" => [1 :gap, 18, 19, "20", 21, 22, :gap, 50] }
       # Notice: if :steps is false it will use the single {0 => @vars[:size]} size
       def sequels(steps: @vars[:steps] || { 0 => @vars[:size] }, **_)
         raise VariableError.new(self, :steps, 'to define the 0 width', steps) unless steps.key?(0)
@@ -39,7 +42,7 @@ class Pagy # :nodoc:
         end
       end
     end
-    Calendar.prepend CalendarOverride if defined?(Calendar)
+    Calendar::Unit.prepend CalendarOverride if defined?(Calendar::Unit)
 
     # Additions for the Frontend
     module FrontendAddOn

data/lib/pagy/extras/jsonapi.rb

@@ -1,7 +1,7 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/jsonapi
 # frozen_string_literal: true
 
-require 'pagy/url_helpers'
+require_relative '../url_helpers'
 
 class Pagy # :nodoc:
   DEFAULT[:jsonapi] = true
@@ -42,7 +42,7 @@ class Pagy # :nodoc:
         return super if pagy_skip_jsonapi?(vars)
         return 1 if params[:page].nil?
 
-        params[:page][vars[:page_param] || DEFAULT[:page_param]].to_i
+        [params[:page][vars[:page_param] || DEFAULT[:page_param]].to_i, 1].max
       end
     end
     Backend.prepend BackendOverride

data/lib/pagy/extras/materialize.rb

@@ -1,25 +1,26 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/materialize
 # frozen_string_literal: true
 
-require 'pagy/extras/frontend_helpers'
+warn '[PAGY WARNING] The materialize extra has been discontinued and it will be removed in v9 ' \
+     '(https://github.com/ddnexus/pagy/discussions/672#discussioncomment-9212328)'
+
+require_relative 'js_tools'
 
 class Pagy # :nodoc:
   # Frontend modules are specially optimized for performance.
   # The resulting code may not look very elegant, but produces the best benchmarks
   module MaterializeExtra
     # Pagination for materialize: it returns the html with the series of links to the pages
-    def pagy_materialize_nav(pagy, pagy_id: nil, link_extra: '',
-                             nav_aria_label: nil, nav_i18n_key: nil, **vars)
-      p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra:)
+    def pagy_materialize_nav(pagy, id: nil, aria_label: nil, **vars)
+      id = %( id="#{id}") if id
+      a  = pagy_anchor(pagy)
 
-      html = +%(<div#{p_id} class="pagy-materialize-nav pagination" role="navigation" #{
-                  nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}><ul class="pagination">)
-      html << materialize_prev_html(pagy, link)
+      html = +%(<div#{id} class="pagy-materialize nav pagination" role="navigation" #{
+                  nav_aria_label(pagy, aria_label:)}><ul class="pagination">#{
+                  materialize_prev_html(pagy, a)})
       pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
                 when Integer
-                  %(<li class="waves-effect">#{link.call(item)}</li>)
+                  %(<li class="waves-effect">#{a.(item)}</li>)
                 when String
                   %(<li class="active"><a role="link" aria-current="page" aria-disabled="true">#{pagy.label_for(item)}</a></li>)
                 when :gap
@@ -28,67 +29,70 @@ class Pagy # :nodoc:
                   raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << materialize_next_html(pagy, link)
-      html << %(</ul></div>)
+      html << %(#{materialize_next_html(pagy, a)}</ul></div>)
     end
 
-    # Javascript pagination for materialize: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_materialize_nav_js(pagy, pagy_id: nil, link_extra: '',
-                                nav_aria_label: nil, nav_i18n_key: nil, **vars)
+    # Javascript pagination for materialize: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_materialize_nav_js(pagy, id: nil, aria_label: nil, **vars)
       sequels = pagy.sequels(**vars)
-      p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra:)
+      id      = %( id="#{id}") if id
+      a = pagy_anchor(pagy)
 
-      tags = { 'before' => %(<ul class="pagination">#{materialize_prev_html pagy, link}),
-               'link'   => %(<li class="waves-effect">#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</li>),
-               'active' => %(<li class="active"><a role="link" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a></li>),
-               'gap'    => %(<li class="gap disabled"><a role="link" aria-disabled="true">#{pagy_t 'pagy.gap'}</a></li>),
-               'after'  => %(#{materialize_next_html pagy, link}</ul>) }
+      tokens = { 'before' => %(<ul class="pagination">#{materialize_prev_html pagy, a}),
+                 'a'      => %(<li class="waves-effect">#{a.(PAGE_TOKEN, LABEL_TOKEN)}</li>),
+                 'current' => %(<li class="active"><a role="link" aria-current="page" aria-disabled="true">#{
+                                  LABEL_TOKEN}</a></li>),
+                 'gap'    => %(<li class="gap disabled"><a role="link" aria-disabled="true">#{pagy_t 'pagy.gap'}</a></li>),
+                 'after'  => %(#{materialize_next_html pagy, a}</ul>) }
 
-      %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-materialize-nav-js" role="navigation" #{
-          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
-          pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></div>)
+      %(<div#{id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-materialize nav-js" role="navigation" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :nav, tokens, sequels, pagy.label_sequels(sequels))
+        }></div>)
     end
 
-    # Javascript combo pagination for materialize: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_materialize_combo_nav_js(pagy, pagy_id: nil, link_extra: '',
-                                      nav_aria_label: nil, nav_i18n_key: nil)
-      p_id    = %( id="#{pagy_id}") if pagy_id
-      link    = pagy_link_proc(pagy, link_extra:)
-      p_page  = pagy.page
-      p_pages = pagy.pages
-      style   = ' style="vertical-align: middle"'
-      input   = %(<input  name="page" type="number" class="browser-default" min="1" max="#{p_pages}" value="#{
-                    p_page}" style="text-align: center; width: #{p_pages.to_s.length + 1}rem;" aria-current="page">)
+    # Javascript combo pagination for materialize: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_materialize_combo_nav_js(pagy, id: nil, aria_label: nil)
+      id    = %( id="#{id}") if id
+      a     = pagy_anchor(pagy)
+      pages = pagy.pages
+
+      page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
+                   %(style="text-align: center; width: #{pages.to_s.length + 1}rem; height: 1.5rem; font-size: 1.2rem; ) <<
+                   %(border: none; border-radius: 2px; color: white; background-color: #ee6e73;" class="browser-default"> ) <<
+                   JSTools::A_TAG
 
-      html = %(<ul#{p_id} class="pagy-materialize-combo-nav-js pagination chip" role="navigation" #{
-                 nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)})
-      %(#{html} style="padding-right: 0" #{
-          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))}>#{
-          materialize_prev_html pagy, link, style}<li class="pagy-combo-input">#{
-          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages}</li>#{
-          materialize_next_html pagy, link, style}</ul>)
+      %(<ul#{id} class="pagy-materialize combo-nav-js pagination" role="navigation" style="padding-right: 0;" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
+        }>#{
+          materialize_prev_html(pagy, a)
+        }<li style="vertical-align: -webkit-baseline-middle;"><label style="font-size: 1.2rem;">#{
+          pagy_t('pagy.combo_nav_js', page_input:, pages:)
+        }</label></li>#{
+          materialize_next_html(pagy, a)
+        }</ul>)
     end
 
     private
 
-    def materialize_prev_html(pagy, link, style = '')
+    def materialize_prev_html(pagy, a)
       if (p_prev = pagy.prev)
-        %(<li class="waves-effect prev"#{style}>#{
-            link.call(p_prev, '<i class="material-icons">chevron_left</i>', prev_aria_label_attr)}</li>)
+        %(<li class="waves-effect prev">#{
+        a.(p_prev, '<i class="material-icons">chevron_left</i>', aria_label: pagy_t('pagy.aria_label.prev'))}</li>)
       else
-        %(<li class="prev disabled"#{style}><a role="link" aria-disabled="true" #{
-            prev_aria_label_attr}><i class="material-icons">chevron_left</i></a></li>)
+        %(<li class="prev disabled"><a role="link" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.prev')}"><i class="material-icons">chevron_left</i></a></li>)
       end
     end
 
-    def materialize_next_html(pagy, link, style = '')
+    def materialize_next_html(pagy, a)
       if (p_next = pagy.next)
-        %(<li class="waves-effect next"#{style}>#{
-            link.call(p_next, '<i class="material-icons">chevron_right</i>', next_aria_label_attr)}</li>)
+        %(<li class="waves-effect next">#{
+            a.(p_next, '<i class="material-icons">chevron_right</i>', aria_label: pagy_t('pagy.aria_label.next'))}</li>)
       else
-        %(<li class="next disabled"#{style}><a role="link" aria-disabled="true" #{
-            next_aria_label_attr}><i class="material-icons">chevron_right</i></a></li>)
+        %(<li class="next disabled"#><a role="link" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.next')}><i class="material-icons">chevron_right</i></a></li>)
       end
     end
   end

data/lib/pagy/extras/metadata.rb

@@ -1,7 +1,7 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/metadata
 # frozen_string_literal: true
 
-require 'pagy/url_helpers'
+require_relative '../url_helpers'
 
 class Pagy # :nodoc:
   DEFAULT[:metadata] = %i[ scaffold_url first_url prev_url page_url next_url last_url
@@ -17,7 +17,11 @@ class Pagy # :nodoc:
     def pagy_metadata(pagy, absolute: nil)
       scaffold_url = pagy_url_for(pagy, PAGE_TOKEN, absolute:)
       {}.tap do |metadata|
-        keys = defined?(Calendar) && pagy.is_a?(Calendar) ? pagy.vars[:metadata] - %i[count items] : pagy.vars[:metadata]
+        keys = if defined?(Calendar::Unit) && pagy.is_a?(Calendar::Unit)
+                 pagy.vars[:metadata] - %i[count items]
+               else
+                 pagy.vars[:metadata]
+               end
         keys.each do |key|
           metadata[key] = case key
                           when :scaffold_url then scaffold_url

data/lib/pagy/extras/overflow.rb

@@ -27,8 +27,9 @@ class Pagy # :nodoc:
           initialize vars.merge!(page: @last)          # re-run with the last page
           @vars[:page] = requested_page                # restore the requested page
         when :empty_page
-          @offset = @items = @from = @to = 0           # vars relative to the actual page
-          if defined?(Calendar) && is_a?(Calendar)     # only for Calendar instances
+          @offset = @items = @in = @from = @to = 0     # vars relative to the actual page
+          if defined?(Calendar::Unit) \
+              && is_a?(Calendar::Unit)                 # only for Calendar::Units instances
             edge = @order == :asc ? @final : @initial  # get the edge of the overflow side (neat, but any time would do)
             @from = @to = edge                         # set both to the edge utc time (a >=&&< query will get no records)
           end
@@ -51,7 +52,7 @@ class Pagy # :nodoc:
       end
     end
     Pagy.prepend PagyOverride
-    Pagy::Calendar.prepend PagyOverride if defined?(Calendar)
+    Pagy::Calendar::Unit.prepend PagyOverride if defined?(Calendar::Unit)
 
     # Support for Pagy::Countless class
     module CountlessOverride
@@ -66,7 +67,7 @@ class Pagy # :nodoc:
           raise                                        # same as without the extra
         when :empty_page
           @offset = @items = @from = @to = 0           # vars relative to the actual page
-          @vars[:size] = []                            # no page in the series
+          @vars[:size] = 0                             # no page in the series
           self
         else
           raise VariableError.new(self, :overflow, 'to be in [:empty_page, :exception]', @vars[:overflow])

data/lib/pagy/extras/pagy.rb

@@ -0,0 +1,82 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/pagy
+# frozen_string_literal: true
+
+require_relative 'js_tools'
+
+class Pagy # :nodoc:
+  # Frontend modules are specially optimized for performance.
+  # The resulting code may not look very elegant, but produces the best benchmarks
+  module PagyExtra
+    # pagy_nav is defined in the Frontend itself
+    # Javascript pagination: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_nav_js(pagy, id: nil, aria_label: nil, **vars)
+      sequels = pagy.sequels(**vars)
+      id      = %( id="#{id}") if id
+      a       = pagy_anchor(pagy)
+      tokens  = { 'before'  => prev_a(pagy, a),
+                  'a'       => a.(PAGE_TOKEN, LABEL_TOKEN),
+                  'current' => %(<a class="current" role="link" aria-current="page" aria-disabled="true">#{
+                                   LABEL_TOKEN}</a>),
+                  'gap'     => %(<a class="gap" role="link" aria-disabled="true">#{pagy_t('pagy.gap')}</a>),
+                  'after'   => next_a(pagy, a) }
+
+      %(<nav#{id} class="#{'pagy-rjs ' if sequels.size > 1}pagy nav-js" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :nav, tokens, sequels, pagy.label_sequels(sequels))
+        }></nav>)
+    end
+
+    # Javascript combo pagination: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_combo_nav_js(pagy, id: nil, aria_label: nil)
+      id    = %( id="#{id}") if id
+      a     = pagy_anchor(pagy)
+      pages = pagy.pages
+
+      page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
+                   %(style="text-align: center; width: #{pages.to_s.length + 1}rem; padding: 0;">#{JSTools::A_TAG})
+
+      %(<nav#{id} class="pagy combo-nav-js" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))}>#{
+          prev_a(pagy, a)
+        }<label>#{
+          pagy_t('pagy.combo_nav_js', page_input:, pages:)
+        }</label>#{
+          next_a(pagy, a)
+        }</nav>)
+    end
+
+    # Return the previous page URL string or nil
+    def pagy_prev_url(pagy, absolute: false)
+      pagy_url_for(pagy, pagy.prev, absolute:) if pagy.prev
+    end
+
+    # Return the next page URL string or nil
+    def pagy_next_url(pagy, absolute: false)
+      pagy_url_for(pagy, pagy.next, absolute:) if pagy.next
+    end
+
+    # Return the enabled/disabled previous page anchor tag
+    def pagy_prev_a(pagy, text: pagy_t('pagy.prev'), aria_label: pagy_t('pagy.aria_label.prev'))
+      a = pagy_anchor(pagy)
+      prev_a(pagy, a, text:, aria_label:)
+    end
+
+    # Return the enabled/disabled next page anchor tag
+    def pagy_next_a(pagy, text: pagy_t('pagy.next'), aria_label: pagy_t('pagy.aria_label.next'))
+      a = pagy_anchor(pagy)
+      next_a(pagy, a, text:, aria_label:)
+    end
+
+    # Conditionally return the previous page link tag
+    def pagy_prev_link(pagy, absolute: false)
+      %(<link href="#{pagy_url_for(pagy, pagy.prev, absolute:)}"/>) if pagy.prev
+    end
+
+    # Conditionally return the next page link tag
+    def pagy_next_link(pagy, absolute: false)
+      %(<link href="#{pagy_url_for(pagy, pagy.next, absolute:)}"/>) if pagy.next
+    end
+  end
+  Frontend.prepend PagyExtra
+end