pagy 5.7.5 → 8.6.2

data/lib/pagy/extras/materialize.rb

@@ -1,82 +1,98 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/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: '', **vars)
-      p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra: 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" aria-label="pager"><ul class="pagination">)
-      html << pagy_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 then %(<li class="waves-effect">#{link.call item}</li>)                           # page link
-                when String  then %(<li class="active">#{link.call item}</li>)                                 # active page
-                when :gap    then %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>)    # page gap
-                else raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                when Integer
+                  %(<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
+                  %(<li class="gap disabled"><a role="link" aria-disabled="true">#{pagy_t 'pagy.gap'}</a></li>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << pagy_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: '', **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: link_extra)
+      id      = %( id="#{id}") if id
+      a = pagy_anchor(pagy)
 
-      tags = { 'before' => %(<ul class="pagination">#{pagy_materialize_prev_html pagy, link}),
-               'link'   => %(<li class="waves-effect">#{mark = link.call(PAGE_PLACEHOLDER, LABEL_PLACEHOLDER)}</li>),
-               'active' => %(<li class="active">#{mark}</li>),
-               'gap'    => %(<li class="gap disabled"><a href="#">#{pagy_t 'pagy.nav.gap'}</a></li>),
-               'after'  => %(#{pagy_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" aria-label="pager" #{
-        pagy_json_attr(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: '')
-      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
-      style   = ' style="vertical-align: middle"'
-      input   = %(<input 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;">)
+    # 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")
-      %(#{html} aria-label="pager" style="padding-right: 0" #{
-          pagy_json_attr pagy, :combo, pagy_marked_link(link)}>#{
-          pagy_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>#{
-          pagy_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 pagy_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>', 'aria-label="previous"'}</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 href="#"><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 pagy_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>', 'aria-label="next"'}</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 href="#"><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/meilisearch.rb

@@ -1,43 +1,49 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/meilisearch
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
-  DEFAULT[:meilisearch_search_method] ||= :pagy_search
+  DEFAULT[:meilisearch_search]      ||= :ms_search
+  DEFAULT[:meilisearch_pagy_search] ||= :pagy_search
 
   # Paginate Meilisearch results
   module MeilisearchExtra
-    module Meilisearch # :nodoc:
+    module ModelExtension # :nodoc:
       # Return an array used to delay the call of #search
       # after the pagination variables are merged to the options
-      def pagy_meilisearch(term = nil, **vars)
-        [self, term, vars]
+      def pagy_meilisearch(query, params = {})
+        [self, query, params]
       end
-      alias_method DEFAULT[:meilisearch_search_method], :pagy_meilisearch
+      alias_method DEFAULT[:meilisearch_pagy_search], :pagy_meilisearch
     end
+    Pagy::Meilisearch = ModelExtension
 
-    # Additions for the Pagy class
-    module Pagy
+    # Extension for the Pagy class
+    module PagyExtension
       # Create a Pagy object from a Meilisearch results
       def new_from_meilisearch(results, vars = {})
-        vars[:items] = results.raw_answer['limit']
-        vars[:page]  = [results.raw_answer['offset'] / vars[:items], 1].max
-        vars[:count] = results.raw_answer['nbHits']
+        vars[:items] = results.raw_answer['hitsPerPage']
+        vars[:page]  = results.raw_answer['page']
+        vars[:count] = results.raw_answer['totalHits']
+
         new(vars)
       end
     end
+    Pagy.extend PagyExtension
 
     # Add specialized backend methods to paginate Meilisearch results
-    module Backend
+    module BackendAddOn
       private
 
       # Return Pagy object and results
       def pagy_meilisearch(pagy_search_args, vars = {})
-        model, term, options = pagy_search_args
-        vars                 = pagy_meilisearch_get_vars(nil, vars)
-        options[:limit]      = vars[:items]
-        options[:offset]     = (vars[:page] - 1) * vars[:items]
-        results              = model.search(term, **options)
-        vars[:count]         = results.raw_answer['nbHits']
-        pagy                 = ::Pagy.new(vars)
+        model, term, options    = pagy_search_args
+        vars                    = pagy_meilisearch_get_vars(nil, vars)
+        options[:hits_per_page] = vars[:items]
+        options[:page]          = vars[:page]
+        results                 = model.send(:ms_search, term, options)
+        vars[:count]            = results.raw_answer['totalHits']
+
+        pagy                    = ::Pagy.new(vars)
         # with :last_page overflow we need to re-run the method in order to get the hits
         return pagy_meilisearch(pagy_search_args, vars.merge(page: pagy.page)) \
                if defined?(::Pagy::OverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
@@ -50,12 +56,10 @@ class Pagy # :nodoc:
       def pagy_meilisearch_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[:page]  ||= pagy_get_page(vars)
         vars
       end
     end
+    Backend.prepend BackendAddOn
   end
-  Meilisearch = MeilisearchExtra::Meilisearch
-  extend MeilisearchExtra::Pagy
-  Backend.prepend MeilisearchExtra::Backend
 end

data/lib/pagy/extras/metadata.rb

@@ -1,7 +1,7 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/metadata
+# 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
@@ -15,17 +15,21 @@ class Pagy # :nodoc:
 
     # Return the metadata hash
     def pagy_metadata(pagy, absolute: nil)
-      scaffold_url = pagy_url_for(pagy, PAGE_PLACEHOLDER, absolute: absolute)
+      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
-                          when :first_url    then scaffold_url.sub(PAGE_PLACEHOLDER, 1.to_s)
-                          when :prev_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.prev.to_s)
-                          when :page_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.page.to_s)
-                          when :next_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.next.to_s)
-                          when :last_url     then scaffold_url.sub(PAGE_PLACEHOLDER, pagy.last.to_s)
+                          when :first_url    then scaffold_url.sub(PAGE_TOKEN, 1.to_s)
+                          when :prev_url     then scaffold_url.sub(PAGE_TOKEN, pagy.prev.to_s)
+                          when :page_url     then scaffold_url.sub(PAGE_TOKEN, pagy.page.to_s)
+                          when :next_url     then scaffold_url.sub(PAGE_TOKEN, pagy.next.to_s)
+                          when :last_url     then scaffold_url.sub(PAGE_TOKEN, pagy.last.to_s)
                           else pagy.send(key)
                           end
         rescue NoMethodError

data/lib/pagy/extras/overflow.rb

@@ -1,4 +1,4 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/overflow
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/overflow
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
@@ -7,7 +7,7 @@ class Pagy # :nodoc:
   # Handles OverflowError exceptions for different classes with different options
   module OverflowExtra
     # Support for Pagy class
-    module Pagy
+    module PagyOverride
       # Is the requested page overflowing?
       def overflow?
         @overflow
@@ -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
@@ -41,7 +42,7 @@ class Pagy # :nodoc:
 
       # Special series for empty page
       module Series
-        def series(*)
+        def series(*, **)
           @page = @last                                # series for last page
           super.tap do |s|                             # call original series
             s[s.index(@page.to_s)] = @page             # string to integer (i.e. no current page)
@@ -50,9 +51,11 @@ class Pagy # :nodoc:
         end
       end
     end
+    Pagy.prepend PagyOverride
+    Pagy::Calendar::Unit.prepend PagyOverride if defined?(Calendar::Unit)
 
     # Support for Pagy::Countless class
-    module Countless
+    module CountlessOverride
       # Add rescue clause for different behaviors
       def finalize(items)
         @overflow = false
@@ -64,15 +67,15 @@ 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])
         end
       end
     end
+    # :nocov:
+    Pagy::Countless.prepend CountlessOverride if defined?(Countless)
+    # :nocov:
   end
-  prepend OverflowExtra::Pagy
-  Calendar.prepend OverflowExtra::Pagy if defined?(Calendar)
-  Countless.prepend OverflowExtra::Countless if defined?(Countless)
 end

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

data/lib/pagy/extras/searchkick.rb

@@ -1,12 +1,13 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/searchkick
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/searchkick
 # frozen_string_literal: true
 
 class Pagy # :nodoc:
-  DEFAULT[:searchkick_search_method] ||= :pagy_search
+  DEFAULT[:searchkick_search]      ||= :search
+  DEFAULT[:searchkick_pagy_search] ||= :pagy_search
 
   # Paginate Searchkick::Results objects
   module SearchkickExtra
-    module Searchkick # :nodoc:
+    module ModelExtension # :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.
@@ -15,11 +16,12 @@ class Pagy # :nodoc:
           args.define_singleton_method(:method_missing) { |*a| args += a }
         end
       end
-      alias_method Pagy::DEFAULT[:searchkick_search_method], :pagy_searchkick
+      alias_method Pagy::DEFAULT[:searchkick_pagy_search], :pagy_searchkick
     end
+    Pagy::Searchkick = ModelExtension
 
     # Additions for the Pagy class
-    module Pagy
+    module PagyExtension
       # Create a Pagy object from a Searchkick::Results object
       def new_from_searchkick(results, vars = {})
         vars[:items] = results.options[:per_page]
@@ -28,9 +30,10 @@ class Pagy # :nodoc:
         new(vars)
       end
     end
+    Pagy.extend PagyExtension
 
     # Add specialized backend methods to paginate Searchkick::Results
-    module Backend
+    module BackendAddOn
       private
 
       # Return Pagy object and results
@@ -39,7 +42,7 @@ class Pagy # :nodoc:
         vars               = pagy_searchkick_get_vars(nil, vars)
         options[:per_page] = vars[:items]
         options[:page]     = vars[:page]
-        results            = model.search(term, **options, &block)
+        results            = model.send(DEFAULT[:searchkick_search], term, **options, &block)
         vars[:count]       = results.total_count
 
         pagy = ::Pagy.new(vars)
@@ -55,12 +58,10 @@ class Pagy # :nodoc:
       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[:page]  ||= pagy_get_page(vars)
         vars
       end
     end
+    Backend.prepend BackendAddOn
   end
-  Searchkick = SearchkickExtra::Searchkick
-  extend SearchkickExtra::Pagy
-  Backend.prepend SearchkickExtra::Backend
 end

data/lib/pagy/extras/semantic.rb

@@ -1,80 +1,92 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/extras/semantic
 # frozen_string_literal: true
 
-require 'pagy/extras/frontend_helpers'
+warn '[PAGY WARNING] The semantic 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 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: '', **vars)
-      p_id = %( id="#{pagy_id}") if pagy_id
-      link = pagy_link_proc(pagy, link_extra: %(class="item" #{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} class="pagy-semantic-nav ui pagination menu">)
-      html << pagy_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 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}"
+                when Integer
+                  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
+                  %(<div class="disabled item">#{pagy_t 'pagy.gap'}</div>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
                 end
       end
-      html << pagy_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: '', **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: %(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'  => pagy_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" #{
-        pagy_json_attr(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: '')
-      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">)
+    # 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
+
+      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#{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#{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 pagy_semantic_prev_html(pagy, link)
+    def semantic_prev_html(pagy, a)
       if (p_prev = pagy.prev)
-        link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'
+        a.(p_prev, pagy_t('pagy.prev'), classes: 'item', aria_label: pagy_t('pagy.aria_label.prev'))
       else
-        +%(<div class="item disabled"><i class="left small chevron icon"></i></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 pagy_semantic_next_html(pagy, link)
+    def semantic_next_html(pagy, a)
       if (p_next = pagy.next)
-        link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'
+        a.(p_next, pagy_t('pagy.next'), classes: 'item', aria_label: pagy_t('pagy.aria_label.next'))
       else
-        +%(<div class="item disabled"><i class="right small chevron icon"></i></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