pagy 7.0.11 → 8.0.2

data/lib/pagy/extras/materialize.rb

@@ -1,25 +1,24 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/materialize
 # frozen_string_literal: true
 
-require 'pagy/extras/frontend_helpers'
+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 +27,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
 
-      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>)
+      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
+
+      %(<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

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.prev'))
+      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

data/lib/pagy/extras/semantic.rb

@@ -1,25 +1,23 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/semantic
 # frozen_string_literal: true
 
-require 'pagy/extras/frontend_helpers'
+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 SemanticExtra
     # Pagination for semantic: it returns the html with the series of links to the pages
-    def pagy_semantic_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_semantic_nav(pagy, id: nil, aria_label: nil, **vars)
+      id = %( id="#{id}") if id
+      a  = pagy_anchor(pagy)
 
-      html = +%(<div#{p_id} role="navigation" class="pagy-semantic-nav ui pagination menu" #{
-                  nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}>)
-      html << semantic_prev_html(pagy, link)
+      html = %(<div#{id} role="navigation" class="pagy-semantic nav ui pagination menu" #{
+                 nav_aria_label(pagy, aria_label:)}>#{semantic_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
-                  link.call(item, pagy.label_for(item), %(class="item"))
+                  a.(item, pagy.label_for(item), classes: 'item')
                 when String
                   %(<a role="link" class="item active" aria-current="page" aria-disabled="true">#{pagy.label_for(item)}</a>)
                 when :gap
@@ -28,66 +26,65 @@ class Pagy # :nodoc:
                   raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << semantic_next_html(pagy, link)
-      html << %(</div>)
+      html << %(#{semantic_next_html(pagy, a)}</div>)
     end
 
-    # Javascript pagination for semantic: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_semantic_nav_js(pagy, pagy_id: nil, link_extra: '',
-                             nav_aria_label: nil, nav_i18n_key: nil, **vars)
+    # Javascript pagination for semantic: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_semantic_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:)
-      tags = { 'before' => semantic_prev_html(pagy, link),
-               'link'   => link.call(PAGE_TOKEN, LABEL_TOKEN, %(class="item")),
-               'active' => %(<a role="link" class="item active" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a>),
-               'gap'    => %(<div class="disabled item">#{pagy_t('pagy.gap')}</div>),
-               'after'  => semantic_next_html(pagy, link) }
+      id      = %( id="#{id}") if id
+      a       = pagy_anchor(pagy)
+      tokens  = { 'before'  => semantic_prev_html(pagy, a),
+                  'a'       => a.(PAGE_TOKEN, LABEL_TOKEN, classes: 'item'),
+                  'current' => %(<a role="link" class="item active" aria-current="page" aria-disabled="true">#{LABEL_TOKEN}</a>),
+                  'gap'     => %(<div class="disabled item">#{pagy_t('pagy.gap')}</div>),
+                  'after'   => semantic_next_html(pagy, a) }
 
-      %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-semantic-nav-js ui pagination menu" 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-semantic nav-js ui pagination menu" role="navigation" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :nav, tokens, sequels, pagy.label_sequels(sequels))
+        }></div>)
     end
 
-    # Combo pagination for semantic: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_semantic_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: %(class="item" #{link_extra}))
-      p_page  = pagy.page
-      p_pages = pagy.pages
-      input   = %(<input name="page" type="number" min="1" max="#{p_pages}" value="#{
-                    p_page}" style="padding: 0; text-align: center; width: #{
-                    p_pages.to_s.length + 1}rem; margin: 0 0.3rem" aria-current="page">)
+    # Combo pagination for semantic: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_semantic_combo_nav_js(pagy, id: nil, aria_label: nil)
+      id    = %( id="#{id}") if id
+      a     = pagy_anchor(pagy)
+      pages = pagy.pages
 
-      %(<div#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" #{
-          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
-          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))}>#{
-          semantic_prev_html pagy, link
-        }<div class="pagy-combo-input item">#{
-          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-        }</div> #{
-          semantic_next_html pagy, link
+      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; margin: 0 0.3rem">) <<
+                   JSTools::A_TAG
+
+      %(<div#{id} class="pagy-semantic combo-nav-js ui compact menu" role="navigation" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
+        }>#{
+          semantic_prev_html(pagy, a)
+        }<div class="item"><label>#{
+          pagy_t('pagy.combo_nav_js', page_input:, pages:)
+        }</label></div> #{
+          semantic_next_html(pagy, a)
         }</div>)
     end
 
     private
 
-    def semantic_prev_html(pagy, link)
+    def semantic_prev_html(pagy, a)
       if (p_prev = pagy.prev)
-        link.call(p_prev, pagy_t('pagy.prev'), %(#{prev_aria_label_attr} class="item"))
+        a.(p_prev, pagy_t('pagy.prev'), classes: 'item', aria_label: pagy_t('pagy.aria_label.prev'))
       else
-        +%(<div class="item disabled" role="link" aria-disabled="true" #{
-             prev_aria_label_attr}>#{pagy_t('pagy.prev')}</div>)
+        %(<div class="item disabled" role="a" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.prev')}">#{pagy_t('pagy.prev')}</div>)
       end
     end
 
-    def semantic_next_html(pagy, link)
+    def semantic_next_html(pagy, a)
       if (p_next = pagy.next)
-        link.call(p_next, pagy_t('pagy.next'), %(#{next_aria_label_attr} class="item"))
+        a.(p_next, pagy_t('pagy.next'), classes: 'item', aria_label: pagy_t('pagy.aria_label.next'))
       else
-        +%(<div class="item disabled" role="link" aria-disabled="true" #{
-             next_aria_label_attr}>#{pagy_t('pagy.next')}</div>)
+        %(<div class="item disabled" role="link" aria-disabled="true" aria=label="#{
+            pagy_t('pagy.aria_label.prev')}">#{pagy_t('pagy.next')}</div>)
       end
     end
   end

data/lib/pagy/extras/trim.rb

@@ -6,23 +6,23 @@ class Pagy # :nodoc:
 
   # Remove the page=1 param from the first page link
   module TrimExtra
-    # Override the original pagy_link_proc.
-    # Call the pagy_trim method if the trim_extra is enabled.
-    def pagy_link_proc(pagy, link_extra: '')
-      link_proc = super(pagy, link_extra:)
-      return link_proc unless pagy.vars[:trim_extra]
+    # Override the original pagy_a_proc.
+    # Call the pagy_trim method for page 1 if the trim_extra is enabled
+    def pagy_anchor(pagy)
+      a_proc = super(pagy)
+      return a_proc unless pagy.vars[:trim_extra]
 
-      lambda do |page, text = pagy.label_for(page), extra = ''|
-        link = +link_proc.call(page, text, extra)
-        return link unless page.to_s == '1'
+      lambda do |page, text = pagy.label_for(page), **opts|
+        a = +a_proc.(page, text, **opts)
+        return a unless page.to_s == '1'
 
-        pagy_trim(pagy, link)
+        pagy_trim(pagy, a) # in method for isolated testing
       end
     end
 
-    # Remove the the :page_param param from the first page link
-    def pagy_trim(pagy, link)
-      link.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
+    # Remove the the :page_param param from the first page anchor
+    def pagy_trim(pagy, a)
+      a.sub!(/[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/, '')
     end
   end
   Frontend.prepend TrimExtra

data/lib/pagy/extras/uikit.rb

@@ -1,25 +1,24 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/uikit
 # frozen_string_literal: true
 
-require 'pagy/extras/frontend_helpers'
+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 UikitExtra
     # Pagination for uikit: it returns the html with the series of links to the pages
-    def pagy_uikit_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_uikit_nav(pagy, id: nil, aria_label: nil, **vars)
+      id = %( id="#{id}") if id
+      a  = pagy_anchor(pagy)
 
-      html = +%(<ul#{p_id} class="pagy-uikit-nav uk-pagination uk-flex-center" role="navigation"  #{
-
-      nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)}>#{uikit_prev_html(pagy, link)})
+      html = %(<ul#{id} class="pagy-uikit nav uk-pagination uk-flex-center" role="navigation" #{
+                nav_aria_label(pagy, aria_label:)}>#{
+                uikit_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>#{link.call(item)}</li>)
+                  %(<li>#{a.(item)}</li>)
                 when String
                   %(<li class="uk-active"><span role="link" aria-current="page" aria-disabled="true">#{
                       pagy.label_for(item)}</span></li>)
@@ -29,67 +28,67 @@ class Pagy # :nodoc:
                   raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << uikit_next_html(pagy, link)
-      html << %(</ul>)
+      html << %(#{uikit_next_html(pagy, a)}</ul>)
     end
 
-    # Javascript pagination for uikit: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_uikit_nav_js(pagy, pagy_id: nil, link_extra: '',
-                          nav_aria_label: nil, nav_i18n_key: nil, **vars)
+    # Javascript pagination for uikit: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_uikit_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:)
-      tags = { 'before' => uikit_prev_html(pagy, link),
-               'link'   => %(<li>#{link.call(PAGE_TOKEN, LABEL_TOKEN)}</li>),
-               'active' => %(<li class="uk-active"><span role="link" aria-current="page" aria-disabled="true">#{
-                               LABEL_TOKEN}</span></li>),
-               'gap'    => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.gap'}</span></li>),
-               'after'  => uikit_next_html(pagy, link) }
+      id      = %( id="#{id}") if id
+      a       = pagy_anchor(pagy)
+      tokens  = { 'before'  => uikit_prev_html(pagy, a),
+                  'a'       => %(<li>#{a.(PAGE_TOKEN, LABEL_TOKEN)}</li>),
+                  'current' => %(<li class="uk-active"><span role="link" aria-current="page" aria-disabled="true">#{
+                                   LABEL_TOKEN}</span></li>),
+                  'gap'     => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.gap'}</span></li>),
+                  'after'   => uikit_next_html(pagy, a) }
 
-      %(<ul#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-uikit-nav-js uk-pagination uk-flex-center" role="navigation" #{
-          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
-          pagy_data(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></ul>)
+      %(<ul#{id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-uikit nav-js uk-pagination uk-flex-center" role="navigation" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :nav, tokens, sequels, pagy.label_sequels(sequels))
+        }></ul>)
     end
 
-    # Javascript combo pagination for uikit: it returns a nav and a JSON tag used by the pagy.js file
-    def pagy_uikit_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
-      input   = %(<input name="page" type="number" 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 uikit: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_uikit_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;">#{JSTools::A_TAG})
 
-      %(<ul#{p_id} class="pagy-uikit-combo-nav-js uk-button-group uk-pagination uk-flex-center" role="navigation" #{
-          nav_aria_label_attr(pagy, nav_aria_label, nav_i18n_key)} #{
+      %(<ul#{id} class="pagy-uikit combo-nav-js uk-button-group uk-pagination uk-flex-center" role="navigation" #{
+          nav_aria_label(pagy, aria_label:)} #{
           pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
         }>#{
-          uikit_prev_html pagy, link
-        }<li>#{
-          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
-        }</li>#{
-          uikit_next_html pagy, link
+          uikit_prev_html(pagy, a)
+        }<li><label>#{
+          pagy_t('pagy.combo_nav_js', page_input:, pages:)
+        }</label></li>#{
+          uikit_next_html(pagy, a)
         }</ul>)
     end
 
     private
 
-    def uikit_prev_html(pagy, link)
-      previous_span = %(<span uk-pagination-previous></span>)
+    def uikit_prev_html(pagy, a)
+      span = %(<span uk-pagination-previous></span>)
       if (p_prev = pagy.prev)
-        %(<li>#{link.call(p_prev, previous_span, prev_aria_label_attr)}</li>)
+        %(<li>#{a.(p_prev, span, aria_label: pagy_t('pagy.aria_label.prev'))}</li>)
       else
-        %(<li class="uk-disabled"><span role="link" aria-disabled="true" #{prev_aria_label_attr}>#{previous_span}</a></li>)
+        %(<li class="uk-disabled"><a role="link" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.prev')}">#{span}</a></li>)
       end
     end
 
-    def uikit_next_html(pagy, link)
-      next_span = %(<span uk-pagination-next></span>)
+    def uikit_next_html(pagy, a)
+      span = %(<span uk-pagination-next></span>)
       if (p_next = pagy.next)
-        %(<li>#{link.call(p_next, next_span, next_aria_label_attr)}</li>)
+        %(<li>#{a.(p_next, span, aria_label: pagy_t('pagy.aria_label.prev'))}</li>)
       else
-        %(<li class="uk-disabled"><span role="link" aria-disabled="true" #{prev_aria_label_attr}>#{next_span}</span></li>)
+        %(<li class="uk-disabled"><a role="link" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.next')}">#{span}</a></li>)
       end
     end
   end