pagy 3.10.0 → 5.7.3

data/lib/pagy/extras/searchkick.rb

@@ -1,48 +1,66 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/searchkick
-# encoding: utf-8
 # frozen_string_literal: true
 
-require 'pagy/extras/pagy_search'
+class Pagy # :nodoc:
+  DEFAULT[:searchkick_search_method] ||= :pagy_search
 
-class Pagy
+  # Paginate Searchkick::Results objects
+  module SearchkickExtra
+    module Searchkick # :nodoc:
+      # Return an array used to delay the call of #search
+      # after the pagination variables are merged to the options.
+      # It also pushes to the same array an optional method call.
+      def pagy_searchkick(term = '*', **options, &block)
+        [self, term, options, block].tap do |args|
+          args.define_singleton_method(:method_missing) { |*a| args += a }
+        end
+      end
+      alias_method Pagy::DEFAULT[:searchkick_search_method], :pagy_searchkick
+    end
 
-  # used by the items extra
-  SEARCHKICK = true
+    # Additions for the Pagy class
+    module Pagy
+      # Create a Pagy object from a Searchkick::Results object
+      def new_from_searchkick(results, vars = {})
+        vars[:items] = results.options[:per_page]
+        vars[:page]  = results.options[:page]
+        vars[:count] = results.total_count
+        new(vars)
+      end
+    end
 
-  # create a Pagy object from a Searchkick::Results object
-  def self.new_from_searchkick(results, vars={})
-    vars[:items] = results.options[:per_page]
-    vars[:page]  = results.options[:page]
-    vars[:count] = results.total_count
-    new(vars)
-  end
+    # Add specialized backend methods to paginate Searchkick::Results
+    module Backend
+      private
 
-  # Add specialized backend methods to paginate Searchkick::Results
-  module Backend ; private
-
-    # Return Pagy object and results
-    def pagy_searchkick(pagy_search_args, vars={})
-      model, search_args, block, *called = pagy_search_args
-      vars                       = pagy_searchkick_get_vars(nil, vars)
-      search_args[-1][:per_page] = vars[:items]
-      search_args[-1][:page]     = vars[:page]
-      results                    = model.search(*search_args, &block)
-      vars[:count]               = results.total_count
-      pagy = Pagy.new(vars)
-      # with :last_page overflow we need to re-run the method in order to get the hits
-      if defined?(OVERFLOW) && pagy.overflow? && pagy.vars[:overflow] == :last_page
-        return pagy_searchkick(pagy_search_args, vars.merge(page: pagy.page))
+      # Return Pagy object and results
+      def pagy_searchkick(pagy_search_args, vars = {})
+        model, term, options, block, *called = pagy_search_args
+        vars               = pagy_searchkick_get_vars(nil, vars)
+        options[:per_page] = vars[:items]
+        options[:page]     = vars[:page]
+        results            = model.search(term, **options, &block)
+        vars[:count]       = results.total_count
+
+        pagy = ::Pagy.new(vars)
+        # with :last_page overflow we need to re-run the method in order to get the hits
+        return pagy_searchkick(pagy_search_args, vars.merge(page: pagy.page)) \
+               if defined?(::Pagy::OverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
+
+        [pagy, called.empty? ? results : results.send(*called)]
       end
-      return pagy, called.empty? ? results : results.send(*called)
-    end
 
-    # Sub-method called only by #pagy_searchkick: here for easy customization of variables by overriding
-    # the _collection argument is not available when the method is called
-    def pagy_searchkick_get_vars(_collection, vars)
-      vars[:items] ||= VARS[:items]
-      vars[:page]  ||= (params[ vars[:page_param] || VARS[:page_param] ] || 1).to_i
-      vars
+      # Sub-method called only by #pagy_searchkick: here for easy customization of variables by overriding
+      # the _collection argument is not available when the method is called
+      def pagy_searchkick_get_vars(_collection, vars)
+        pagy_set_items_from_params(vars) if defined?(ItemsExtra)
+        vars[:items] ||= DEFAULT[:items]
+        vars[:page]  ||= (params[vars[:page_param] || DEFAULT[:page_param]] || 1).to_i
+        vars
+      end
     end
-
   end
+  Searchkick = SearchkickExtra::Searchkick
+  extend SearchkickExtra::Pagy
+  Backend.prepend SearchkickExtra::Backend
 end

data/lib/pagy/extras/semantic.rb

@@ -1,55 +1,82 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/semantic
-# encoding: utf-8
 # frozen_string_literal: true
 
-require 'pagy/extras/shared'
-
-class Pagy
-  module Frontend
+require 'pagy/extras/frontend_helpers'
 
+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)
-      link, p_prev, p_next = pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next
-
-      html = EMPTY + (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
-                             : %(<div class="item disabled"><i class="left small chevron icon"></i></div>))
-      pagy.series.each do |item|  # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        html << if    item.is_a?(Integer); %(#{link.call item})                      # page link
-                elsif item.is_a?(String) ; %(<a class="item active">#{item}</a>)     # current page
-                elsif item == :gap       ; %(<div class="disabled item">...</div>)   # page gap
+    def pagy_semantic_nav(pagy, pagy_id: nil, link_extra: '', **vars)
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: %(class="item" #{link_extra}))
+
+      html = +%(<div#{p_id} class="pagy-semantic-nav ui pagination menu">)
+      html << pagy_semantic_prev_html(pagy, link)
+      pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+        html << case item
+                when Integer then link.call item
+                when String  then %(<a class="item active">#{pagy.label_for(item)}</a>)
+                when :gap    then %(<div class="disabled item">#{pagy_t 'pagy.nav.gap'}</div>)
+                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << (p_next ? %(#{link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'})
-                      : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
-      %(<div class="pagy-semantic-nav ui pagination menu" aria-label="pager">#{html}</div>)
+      html << pagy_semantic_next_html(pagy, link)
+      html << %(</div>)
     end
 
-    # Javascript pagination for semantic: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_semantic_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next
-      tags = { 'before' => (p_prev ? %(#{link.call(p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"')})
-                                   : %(<div class="item disabled"><i class="left small chevron icon"></i></div>)),
-               'link'   => %(#{link.call(PAGE_PLACEHOLDER)}),
-               'active' => %(<a class="item active">#{pagy.page}</a>),
+    # 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: '', **vars)
+      sequels = pagy.sequels(**vars)
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: %(class="item" #{link_extra}))
+      tags = { 'before' => pagy_semantic_prev_html(pagy, link),
+               'link'   => link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER),
+               'active' => %(<a class="item active">#{LABEL_PLACEHOLDER}</a>),
                'gap'    => %(<div class="disabled item">#{pagy_t('pagy.nav.gap')}</div>),
-               'after'  => (p_next ? %(#{link.call(p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"')})
-                                   : %(<div class="item disabled"><i class="right small chevron icon"></i></div>)) }
-      %(<div id="#{id}" class="pagy-semantic-nav-js ui pagination menu" role="navigation" aria-label="pager"></div>#{pagy_json_tag(:nav, id, tags, pagy.sequels, defined?(TRIM) && pagy.vars[:page_param])})
+               'after'  => pagy_semantic_next_html(pagy, link) }
+
+      %(<div#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-semantic-nav-js ui pagination menu" role="navigation" #{
+        pagy_json_attr(pagy, :nav, tags, 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: '')
+      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 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">)
+
+      %(<div#{p_id} class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" #{
+          pagy_json_attr pagy, :combo, pagy_marked_link(link)}>#{
+          pagy_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> #{
+          pagy_semantic_next_html pagy, link
+        }</div>)
     end
 
-    # Combo pagination for semantic: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_semantic_combo_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy, 'class="item"'), pagy.prev, pagy.next, pagy.page, pagy.pages
-
-      html = EMPTY + %(<div id="#{id}" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" aria-label="pager">)
-      html << (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
-                      : %(<div class="item disabled"><i class="left small chevron icon"></i></div>))
-      input = %(<input 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">)
-      html << %(<div class="pagy-combo-input item">#{pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages)}</div> )
-      html << (p_next ? %(#{link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'})
-                      : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
-      html << %(</div>#{pagy_json_tag(:combo_nav, id, p_page, pagy_marked_link(link), defined?(TRIM) && pagy.vars[:page_param])})
+    private
+
+    def pagy_semantic_prev_html(pagy, link)
+      if (p_prev = pagy.prev)
+        link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'
+      else
+        +%(<div class="item disabled"><i class="left small chevron icon"></i></div>)
+      end
     end
 
+    def pagy_semantic_next_html(pagy, link)
+      if (p_next = pagy.next)
+        link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'
+      else
+        +%(<div class="item disabled"><i class="right small chevron icon"></i></div>)
+      end
+    end
   end
+  Frontend.prepend SemanticExtra
 end

data/lib/pagy/extras/standalone.rb

@@ -0,0 +1,64 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/standalone
+# frozen_string_literal: true
+
+require 'uri'
+
+class Pagy # :nodoc:
+  # Use pagy without any request object, nor Rack environment/gem, nor any defined params method,
+  # even in the irb/rails console without any app or config.
+  module StandaloneExtra
+    # Extracted from Rack::Utils and reformatted for rubocop
+    module QueryUtils
+      module_function
+
+      def escape(str)
+        URI.encode_www_form_component(str)
+      end
+
+      def build_nested_query(value, prefix = nil)
+        case value
+        when Array
+          value.map { |v| build_nested_query(v, "#{prefix}[]") }.join('&')
+        when Hash
+          value.map do |k, v|
+            build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
+          end.delete_if(&:empty?).join('&')
+        when nil
+          prefix
+        else
+          raise ArgumentError, 'value must be a Hash' if prefix.nil?
+
+          "#{prefix}=#{escape(value)}"
+        end
+      end
+    end
+
+    # Return the URL for the page. If there is no pagy.vars[:url]
+    # it works exactly as the regular #pagy_url_for, relying on the params method and Rack.
+    # If there is a defined pagy.vars[:url] variable it does not need the params method nor Rack.
+    def pagy_url_for(pagy, page, absolute: nil)
+      return super unless pagy.vars[:url]
+
+      vars                = pagy.vars
+      page_param          = vars[:page_param].to_s
+      items_param         = vars[:items_param].to_s
+      params              = pagy.params.is_a?(Hash) ? pagy.params.clone : {}  # safe when it gets reused
+      params[page_param]  = page
+      params[items_param] = vars[:items] if vars[:items_extra]
+      query_string        = "?#{QueryUtils.build_nested_query(pagy_deprecated_params(pagy, params))}"  # remove in 6.0
+      # params              = pagy.params.call(params) if pagy.params.is_a?(Proc)                      # add in 6.0
+      # query_string        = "?#{Rack::Utils.build_nested_query(params)}"                             # add in 6.0
+      "#{vars[:url]}#{query_string}#{vars[:fragment]}"
+    end
+  end
+  # In ruby 3+ `UrlHelpers.prepend StandaloneExtra` would be enough instead of using the next 2 lines
+  Frontend.prepend StandaloneExtra
+  Backend.prepend StandaloneExtra
+
+  # Define a dummy params method if it's not already defined in the including module
+  module Backend
+    def self.included(controller)
+      controller.define_method(:params) { {} } unless controller.method_defined?(:params)
+    end
+  end
+end

data/lib/pagy/extras/support.rb

@@ -1,37 +1,54 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/support
-# encoding: utf-8
 # frozen_string_literal: true
 
-class Pagy
-
-  module Frontend
-
+class Pagy # :nodoc:
+  # Extra support for features like: incremental, auto-incremental and infinite pagination
+  module SupportExtra
+    # Return the previous page URL string or nil
     def pagy_prev_url(pagy)
-      pagy_url_for(pagy.prev, pagy) if pagy.prev
+      pagy_url_for(pagy, pagy.prev) if pagy.prev
     end
 
+    # Return the next page URL string or nil
     def pagy_next_url(pagy)
-      pagy_url_for(pagy.next, pagy) if pagy.next
+      pagy_url_for(pagy, pagy.next) if pagy.next
     end
 
-    def pagy_prev_link(pagy, text = pagy_t('pagy.nav.prev'), link_extra = '')
-      pagy.prev ? %(<span class="page prev"><a href="#{pagy_url_for(pagy.prev, pagy)}" rel="prev" aria-label="previous" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
-                : %(<span class="page prev disabled">#{text}</span>)
+    # Return the HTML string for the previous page link
+    def pagy_prev_link(pagy, text: pagy_t('pagy.nav.prev'), link_extra: '')
+      if pagy.prev
+        %(<span class="page prev"><a href="#{
+            pagy_url_for(pagy, pagy.prev)
+          }" rel="prev" aria-label="previous" #{
+            pagy.vars[:link_extra]
+          } #{link_extra}>#{text}</a></span>)
+      else
+        %(<span class="page prev disabled">#{text}</span>)
+      end
     end
 
-    def pagy_next_link(pagy, text = pagy_t('pagy.nav.next'), link_extra = '')
-      pagy.next ? %(<span class="page next"><a href="#{pagy_url_for(pagy.next, pagy)}" rel="next" aria-label="next" #{pagy.vars[:link_extra]} #{link_extra}>#{text}</a></span>)
-                : %(<span class="page next disabled">#{text}</span>)
+    # Return the HTML string for the next page link
+    def pagy_next_link(pagy, text: pagy_t('pagy.nav.next'), link_extra: '')
+      if pagy.next
+        %(<span class="page next"><a href="#{
+            pagy_url_for(pagy, pagy.next)
+          }" rel="next" aria-label="next" #{
+            pagy.vars[:link_extra]
+          } #{link_extra}>#{text}</a></span>)
+      else
+        %(<span class="page next disabled">#{text}</span>)
+      end
     end
 
+    # Return the HTML link tag for the previous page or nil
     def pagy_prev_link_tag(pagy)
-      %(<link href="#{pagy_url_for(pagy.prev, pagy)}" rel="prev"/>) if pagy.prev
+      %(<link href="#{pagy_url_for(pagy, pagy.prev)}" rel="prev"/>) if pagy.prev
     end
 
+    # Return the HTML link tag for the next page or nil
     def pagy_next_link_tag(pagy)
-      %(<link href="#{pagy_url_for(pagy.next, pagy)}" rel="next"/>) if pagy.next
+      %(<link href="#{pagy_url_for(pagy, pagy.next)}" rel="next"/>) if pagy.next
     end
-
   end
-
+  Frontend.prepend SupportExtra
 end

data/lib/pagy/extras/trim.rb

@@ -1,23 +1,29 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/trim
-# encoding: utf-8
 # frozen_string_literal: true
 
-class Pagy
+class Pagy # :nodoc:
+  DEFAULT[:trim_extra] = true   # extra enabled by default
 
-  module Frontend
+  # 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: link_extra)
+      return link_proc unless pagy.vars[:trim_extra]
 
-    TRIM = true   # boolean used by *_js helpers
+      lambda do |page, text = pagy.label_for(page), extra = ''|
+        link = +link_proc.call(page, text, extra)
+        return link unless page == 1
 
-    alias_method :pagy_link_proc_without_trim, :pagy_link_proc
-    def pagy_link_proc_with_trim(pagy, link_extra='')
-      link_proc = pagy_link_proc_without_trim(pagy, link_extra)
-      re = /[?&]#{pagy.vars[:page_param]}=1\b(?!&)|\b#{pagy.vars[:page_param]}=1&/
-      lambda do |n, text=n, extra=''|
-        link = link_proc.call(n, text, extra)
-        n == 1 ? link.sub(re, '') : link
+        pagy_trim(pagy, link)
       end
     end
-    alias_method :pagy_link_proc, :pagy_link_proc_with_trim
 
+    # 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&/, '')
+    end
   end
+  Frontend.prepend TrimExtra
 end

data/lib/pagy/extras/uikit.rb

@@ -1,62 +1,84 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/extras/uikit
-# encoding: utf-8
 # frozen_string_literal: true
 
-require 'pagy/extras/shared'
-
-class Pagy
-  module Frontend
+require 'pagy/extras/frontend_helpers'
 
+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)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-
-      previous_span = "<span uk-pagination-previous>#{pagy_t('pagy.nav.prev')}</span>"
-      html = EMPTY + (p_prev ? %(<li>#{link.call p_prev, previous_span}</li>)
-                             : %(<li class="uk-disabled"><a href="#">#{previous_span}</a></li>))
-      pagy.series.each do |item|
-        html << if    item.is_a?(Integer); %(<li>#{link.call item}</li>)
-                elsif item.is_a?(String) ; %(<li class="uk-active"><span>#{item}</span></li>)
-                elsif item == :gap       ; %(<li class="uk-disabled"><span>#{pagy_t('pagy.nav.gap')}</span></li>)
+    def pagy_uikit_nav(pagy, pagy_id: nil, link_extra: '', **vars)
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: link_extra)
+
+      html = +%(<ul#{p_id} class="pagy-uikit-nav uk-pagination uk-flex-center">#{pagy_uikit_prev_html pagy, link})
+      pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+        html << case item
+                when Integer then %(<li>#{link.call item}</li>)
+                when String  then %(<li class="uk-active"><span>#{pagy.label_for(item)}</span></li>)
+                when :gap    then %(<li class="uk-disabled"><span>#{pagy_t 'pagy.nav.gap'}</span></li>)
+                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      next_span = "<span uk-pagination-next>#{pagy_t('pagy.nav.next')}</span>"
-      html << (p_next ? %(<li>#{link.call p_next, next_span}</li>)
-                      : %(<li class="uk-disabled"><a href="#">#{next_span}</a></li>))
-      %(<ul class="pagy-uikit-nav uk-pagination uk-flex-center">#{html}</ul>)
+      html << pagy_uikit_next_html(pagy, link)
+      html << %(</ul>)
     end
 
-    # Javascript pagination for uikit: it returns a nav and a JSON tag used by the Pagy.nav javascript
-    def pagy_uikit_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next = pagy_link_proc(pagy), pagy.prev, pagy.next
-      previous_span = "<span uk-pagination-previous>#{pagy_t('pagy.nav.prev')}</span>"
-      next_span     = "<span uk-pagination-next>#{pagy_t('pagy.nav.next')}</span>"
-      tags = { 'before' => p_prev ? %(<li>#{link.call p_prev, previous_span}</li>)
-                                  : %(<li class="uk-disabled"><a href="#">#{previous_span}</a></li>),
-               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER)}</li>),
-               'active' => %(<li class="uk-active"><span>#{PAGE_PLACEHOLDER}</span></li>),
-               'gap'    => %(<li class="uk-disabled"><span>#{pagy_t('pagy.nav.gap')}</span></li>),
-               'after'  => p_next ? %(<li>#{link.call p_next, next_span}</li>)
-                                  : %(<li class="uk-disabled"><a href="#">#{next_span}</a></li>) }
-      %(<ul id="#{id}" class="pagy-uikit-nav-js uk-pagination uk-flex-center"></ul>#{pagy_json_tag(:nav, id, tags, pagy.sequels, defined?(TRIM) && pagy.vars[:page_param])})
+    # 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: '', **vars)
+      sequels = pagy.sequels(**vars)
+      p_id = %( id="#{pagy_id}") if pagy_id
+      link = pagy_link_proc(pagy, link_extra: link_extra)
+      tags = { 'before' => pagy_uikit_prev_html(pagy, link),
+               'link'   => %(<li>#{link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
+               'active' => %(<li class="uk-active"><span>#{LABEL_PLACEHOLDER}</span></li>),
+               'gap'    => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.nav.gap'}</span></li>),
+               'after'  => pagy_uikit_next_html(pagy, link) }
+
+      %(<ul#{p_id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-uikit-nav-js uk-pagination uk-flex-center" #{
+        pagy_json_attr(pagy, :nav, tags, sequels, pagy.label_sequels(sequels))}></ul>)
     end
 
-    # Javascript combo pagination for uikit: it returns a nav and a JSON tag used by the Pagy.combo_nav javascript
-    def pagy_uikit_combo_nav_js(pagy, id=pagy_id)
-      link, p_prev, p_next, p_page, p_pages = pagy_link_proc(pagy), pagy.prev, pagy.next, pagy.page, pagy.pages
+    # 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: '')
+      p_id    = %( id="#{pagy_id}") if pagy_id
+      link    = pagy_link_proc(pagy, link_extra: link_extra)
+      p_page  = pagy.page
+      p_pages = pagy.pages
+      input   = %(<input type="number" min="1" max="#{p_pages}" value="#{
+                    p_page}" style="text-align: center; width: #{p_pages.to_s.length + 1}rem;">)
 
-      html = %(<div id="#{id}" class="pagy-uikit-combo-nav-js uk-button-group">)
-      html = html + (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="uk-button uk-button-default"')
-                            : %(<button class="uk-button uk-button-default" disabled>#{pagy_t('pagy.nav.prev')}</button>))
+      %(<ul#{p_id} class="pagy-uikit-combo-nav-js uk-button-group uk-pagination uk-flex-center" #{
+          pagy_json_attr pagy, :combo, pagy_marked_link(link)
+        }>#{
+          pagy_uikit_prev_html pagy, link
+        }<li>#{
+          pagy_t 'pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages
+        }</li>#{
+          pagy_uikit_next_html pagy, link
+        }</ul>)
+    end
 
-      html << %(<div class="uk-text-middle uk-margin-left uk-margin-right">)
-      input = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" class="uk-input" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
-      html << pagy_t('pagy.combo_nav_js', page_input: input, count: p_page, pages: p_pages) + '</div>'
+    private
 
-      html << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'class="uk-button uk-button-default"')
-                      : %(<button class="uk-button uk-button-default" disabled>#{pagy_t('pagy.nav.next')}</button>))
+    def pagy_uikit_prev_html(pagy, link)
+      previous_span = %(<span uk-pagination-previous>#{pagy_t 'pagy.nav.prev'}</span>)
+      if (p_prev = pagy.prev)
+        %(<li>#{link.call p_prev, previous_span}</li>)
+      else
+        %(<li class="uk-disabled"><a href="#">#{previous_span}</a></li>)
+      end
+    end
 
-      html << %(</div>#{pagy_json_tag(:combo_nav, id, p_page, pagy_marked_link(link), defined?(TRIM) && pagy.vars[:page_param])})
+    def pagy_uikit_next_html(pagy, link)
+      next_span = %(<span uk-pagination-next>#{pagy_t 'pagy.nav.next'}</span>)
+      if (p_next = pagy.next)
+        %(<li>#{link.call p_next, next_span}</li>)
+      else
+        %(<li class="uk-disabled"><a href="#">#{next_span}</a></li>)
+      end
     end
   end
+  Frontend.include UikitExtra
 end