pagy 7.0.11 → 8.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (81) hide show
  1. checksums.yaml +4 -4
  2. data/apps/calendar.ru +2196 -0
  3. data/apps/demo.ru +452 -0
  4. data/apps/rails.ru +205 -0
  5. data/apps/repro.ru +168 -0
  6. data/bin/pagy +83 -0
  7. data/{lib/config → config}/pagy.rb +6 -17
  8. data/javascripts/pagy-dev.js +114 -0
  9. data/{lib/javascripts → javascripts}/pagy-module.js +12 -10
  10. data/javascripts/pagy.js +1 -0
  11. data/lib/optimist.rb +1022 -0
  12. data/lib/pagy/calendar.rb +1 -1
  13. data/lib/pagy/console.rb +2 -2
  14. data/lib/pagy/countless.rb +1 -1
  15. data/lib/pagy/extras/bootstrap.rb +52 -63
  16. data/lib/pagy/extras/bulma.rb +49 -64
  17. data/lib/pagy/extras/calendar.rb +2 -2
  18. data/lib/pagy/extras/countless.rb +1 -1
  19. data/lib/pagy/extras/foundation.rb +49 -61
  20. data/lib/pagy/extras/headers.rb +1 -1
  21. data/lib/pagy/extras/items.rb +21 -18
  22. data/lib/pagy/extras/{frontend_helpers.rb → js_tools.rb} +4 -1
  23. data/lib/pagy/extras/jsonapi.rb +1 -1
  24. data/lib/pagy/extras/materialize.rb +53 -51
  25. data/lib/pagy/extras/metadata.rb +1 -1
  26. data/lib/pagy/extras/pagy.rb +82 -0
  27. data/lib/pagy/extras/semantic.rb +47 -50
  28. data/lib/pagy/extras/trim.rb +12 -12
  29. data/lib/pagy/extras/uikit.rb +48 -49
  30. data/lib/pagy/frontend.rb +33 -50
  31. data/lib/pagy/url_helpers.rb +1 -2
  32. data/lib/pagy.rb +15 -14
  33. data/{lib/locales → locales}/ar.yml +2 -2
  34. data/{lib/locales → locales}/be.yml +4 -4
  35. data/{lib/locales → locales}/bg.yml +4 -4
  36. data/{lib/locales → locales}/bs.yml +4 -4
  37. data/{lib/locales → locales}/ca.yml +4 -4
  38. data/locales/ckb.yml +18 -0
  39. data/{lib/locales → locales}/cs.yml +4 -4
  40. data/{lib/locales → locales}/da.yml +4 -4
  41. data/{lib/locales → locales}/de.yml +4 -4
  42. data/{lib/locales → locales}/en.yml +4 -4
  43. data/{lib/locales → locales}/es.yml +2 -2
  44. data/{lib/locales → locales}/fr.yml +4 -4
  45. data/{lib/locales → locales}/hr.yml +4 -4
  46. data/{lib/locales → locales}/id.yml +4 -4
  47. data/{lib/locales → locales}/it.yml +4 -4
  48. data/{lib/locales → locales}/ja.yml +4 -4
  49. data/{lib/locales → locales}/km.yml +4 -4
  50. data/{lib/locales → locales}/ko.yml +4 -4
  51. data/{lib/locales → locales}/nb.yml +4 -4
  52. data/{lib/locales → locales}/nl.yml +4 -4
  53. data/{lib/locales → locales}/nn.yml +4 -4
  54. data/{lib/locales → locales}/pl.yml +4 -4
  55. data/{lib/locales → locales}/pt-BR.yml +2 -2
  56. data/{lib/locales → locales}/pt.yml +2 -2
  57. data/locales/ru.yml +25 -0
  58. data/{lib/locales → locales}/sr.yml +4 -4
  59. data/{lib/locales → locales}/sv-SE.yml +4 -4
  60. data/{lib/locales → locales}/sv.yml +4 -4
  61. data/{lib/locales → locales}/sw.yml +4 -4
  62. data/{lib/locales → locales}/ta.yml +4 -4
  63. data/{lib/locales → locales}/tr.yml +4 -4
  64. data/{lib/locales → locales}/uk.yml +4 -4
  65. data/{lib/locales → locales}/vi.yml +4 -4
  66. data/{lib/locales → locales}/zh-CN.yml +4 -4
  67. data/{lib/locales → locales}/zh-HK.yml +4 -4
  68. data/{lib/locales → locales}/zh-TW.yml +4 -4
  69. data/pkg/pagy-8.0.1.gem +0 -0
  70. data/{lib/stylesheets → stylesheets}/pagy.css +19 -34
  71. data/{lib/stylesheets → stylesheets}/pagy.scss +17 -19
  72. data/stylesheets/pagy.tailwind.css +21 -0
  73. metadata +65 -51
  74. data/lib/javascripts/pagy-dev.js +0 -112
  75. data/lib/javascripts/pagy.js +0 -1
  76. data/lib/locales/ckb.yml +0 -18
  77. data/lib/locales/ru.yml +0 -27
  78. data/lib/pagy/extras/navs.rb +0 -51
  79. data/lib/pagy/extras/support.rb +0 -40
  80. data/lib/stylesheets/pagy.tailwind.scss +0 -24
  81. /data/{lib/javascripts → javascripts}/pagy-module.d.ts +0 -0
data/apps/repro.ru ADDED
@@ -0,0 +1,168 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Starting point app to try pagy or reproduce issues
4
+
5
+ # DEV USAGE
6
+ # pagy clone repro
7
+ # pagy ./repro.ru
8
+
9
+ # URL
10
+ # http://0.0.0.0:8000
11
+
12
+ # HELP
13
+ # pagy -h
14
+
15
+ # DOC
16
+ # https://ddnexus.github.io/pagy/playground/#1-repro-app
17
+
18
+ VERSION = '8.0.2'
19
+
20
+ require 'bundler/inline'
21
+ gemfile(true) do
22
+ source 'https://rubygems.org'
23
+ gem 'oj'
24
+ gem 'puma'
25
+ gem 'sinatra'
26
+ gem 'sinatra-contrib'
27
+ end
28
+
29
+ # Edit this section adding/removing the extras and Pagy::DEFAULT as needed
30
+ # pagy initializer
31
+ require 'pagy/extras/pagy'
32
+ require 'pagy/extras/items'
33
+ require 'pagy/extras/overflow'
34
+ Pagy::DEFAULT[:overflow] = :empty_page
35
+ Pagy::DEFAULT[:size] = [1, 4, 4, 1]
36
+ Pagy::DEFAULT.freeze
37
+
38
+ require 'sinatra/base'
39
+ # Sinatra application
40
+ class PagyRepro < Sinatra::Base
41
+ PAGY_JS = "pagy#{'-dev' if ENV['DEBUG']}.js".freeze
42
+
43
+ configure do
44
+ enable :inline_templates
45
+ end
46
+ include Pagy::Backend
47
+ # Serve pagy.js or pagy-dev.js
48
+ get("/#{PAGY_JS}") do
49
+ content_type 'application/javascript'
50
+ send_file Pagy.root.join('javascripts', PAGY_JS)
51
+ end
52
+ # Edit this action as needed
53
+ get '/' do
54
+ collection = MockCollection.new
55
+ @pagy, @records = pagy(collection)
56
+ erb :main # template available in the __END__ section as @@ main
57
+ end
58
+ # Edit this section adding your own helpers as needed
59
+ helpers do
60
+ include Pagy::Frontend
61
+ end
62
+ end
63
+
64
+ # Simple array-based collection that acts as a standard DB collection.
65
+ # Use it as a simple way to get a collection that acts as a AR scope, but without any DB
66
+ # or create an ActiveRecord class or anything else that you need instead
67
+ class MockCollection < Array
68
+ def initialize(arr = Array(1..1000))
69
+ super
70
+ @collection = clone
71
+ end
72
+
73
+ def offset(value)
74
+ @collection = self[value..]
75
+ self
76
+ end
77
+
78
+ def limit(value)
79
+ @collection[0, value]
80
+ end
81
+
82
+ def count(*)
83
+ size
84
+ end
85
+ end
86
+
87
+ run PagyRepro
88
+
89
+ __END__
90
+
91
+ @@ layout
92
+ <!DOCTYPE html>
93
+ <html lang="en">
94
+ <html>
95
+ <head>
96
+ <script src="<%= %(/#{PAGY_JS}) %>"></script>
97
+ <script type="application/javascript">
98
+ window.addEventListener("load", Pagy.init);
99
+ </script>
100
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
101
+ <style type="text/css">
102
+ @media screen { html, body {
103
+ font-size: 1rem;
104
+ line-heigth: 1.2s;
105
+ padding: 0;
106
+ margin: 0;
107
+ } }
108
+ body {
109
+ background: white !important;
110
+ margin: 0 !important;
111
+ font-family: sans-serif !important;
112
+ }
113
+ .content {
114
+ padding: 1rem 1.5rem 2rem !important;
115
+ }
116
+
117
+ /* Quick demo for overriding the element style attribute of certain pagy helpers
118
+ .pagy input[style] {
119
+ width: 5rem !important;
120
+ }
121
+ */
122
+
123
+ /*
124
+ If you want to customize the style,
125
+ please replace the line below with the actual file content
126
+ */
127
+ <%= Pagy.root.join('stylesheets', 'pagy.css').read %>
128
+ </style>
129
+ </head>
130
+
131
+ <body>
132
+ <%= yield %>
133
+ </body>
134
+ </html>
135
+
136
+ @@ main
137
+ <div class="content">
138
+ <h3>Pagy Repro App</h3>
139
+ <p> Self-contained, standalone Sinatra app usable to easily reproduce any pagy issue.</p>
140
+ <p>Please, report the following versions in any new issue.</p>
141
+ <h4>Versions</h4>
142
+ <ul>
143
+ <li>Ruby: <%= RUBY_VERSION %></li>
144
+ <li>Rack: <%= Rack::RELEASE %></li>
145
+ <li>Sinatra: <%= Sinatra::VERSION %></li>
146
+ <li>Pagy: <%= Pagy::VERSION %></li>
147
+ </ul>
148
+
149
+ <h4>Collection</h4>
150
+ <p>@records: <%= @records.join(',') %></p>
151
+
152
+ <hr>
153
+
154
+ <h4>pagy_nav</h4>
155
+ <%= pagy_nav(@pagy) %>
156
+
157
+ <h4>pagy_nav_js</h4>
158
+ <%= pagy_nav_js(@pagy) %>
159
+
160
+ <h4>pagy_combo_nav_js</h4>
161
+ <%= pagy_combo_nav_js(@pagy) %>
162
+
163
+ <h4>pagy_items_selector_js</h4>
164
+ <%= pagy_items_selector_js(@pagy) %>
165
+
166
+ <h4>pagy_info</h4>
167
+ <%= pagy_info(@pagy) %>
168
+ </div>
data/bin/pagy ADDED
@@ -0,0 +1,83 @@
1
+ #!/usr/bin/env ruby
2
+ # frozen_string_literal: true
3
+
4
+ VERSION = '8.0.2'
5
+ APPS = %w[repro rails demo calendar].freeze
6
+
7
+ require_relative '../lib/optimist'
8
+ opts = Optimist.options do
9
+ text <<~HEAD
10
+ Pagy #{VERSION} (https://ddnexus.github.io/pagy/playground)
11
+ Playground to showcase, clone and develop pagy APPs
12
+ APPs
13
+ repro Reproduce generic/simple issues
14
+ rails Reproduce rails related issues
15
+ demo Showcase all the helpers and styles
16
+ calendar Showcase the calendar; reproduce related issues
17
+ USAGE
18
+ pagy APP [options] Showcase APP from the installed gem
19
+ pagy clone APP Clone APP to the current dir
20
+ pagy APPFILE [options] Develop APPFILE from local path
21
+ EXAMPLES
22
+ pagy demo Showcase demo at http://0.0.0.0:8000
23
+ pagy clone repro Clone repro to ./repro.ru
24
+ pagy ~/my-repro.ru Develop ~/my-repro.ru at http://0.0.0.0:8000
25
+ HEAD
26
+ text 'Rackup options'
27
+ opt :env, 'Environment', default: 'development'
28
+ opt :host, 'Host', default: '0.0.0.0', short: :o
29
+ opt :port, 'Port', default: 8000
30
+ text 'Rerun options'
31
+ opt :rerun, 'Enable rerun for development', default: true
32
+ opt :clear, 'Clear screen before each rerun'
33
+ text 'Other options'
34
+ opt :quiet, 'Quiet mode for development'
35
+ version VERSION
36
+ end
37
+ Optimist.educate if ARGV.empty?
38
+
39
+ require 'bundler/inline'
40
+ gemfile true do
41
+ source 'https://rubygems.org'
42
+ gem 'rackup'
43
+ gem 'rerun'
44
+ end
45
+
46
+ path = ->(app) { File.expand_path("../apps/#{app}.ru", __dir__) }
47
+ arg = ARGV.shift
48
+ if arg.eql?('clone')
49
+ arg = ARGV.shift
50
+ Optimist.die("Expected APP to be in [#{APPS.join(', ')}]; got #{arg.inspect}") unless APPS.include?(arg)
51
+ file = path.(arg)
52
+ name = File.basename(file)
53
+ if File.exist?(name)
54
+ print "Do you want to overwrite the #{name.inspect} file? (y/n)> "
55
+ answer = gets.chomp
56
+ Optimist.die("#{name.inspect} file already present") unless answer.start_with?(/y/i)
57
+ end
58
+ require 'fileutils'
59
+ FileUtils.cp(file, '.', verbose: true)
60
+ else
61
+ if APPS.include?(arg) # showcase env
62
+ opts[:env] = 'showcase'
63
+ opts[:rerun] = false
64
+ opts[:quiet] = true
65
+ # Avoid the creation of './tmp/local_secret.txt' for showcase env
66
+ ENV['SECRET_KEY_BASE'] = 'absolute secret!' if arg.eql?('rails')
67
+ file = path.(arg)
68
+ else # development env
69
+ file = arg
70
+ end
71
+ Optimist.die("#{file.inspect} app not found") unless File.exist?(file)
72
+ # Run command
73
+ rackup = "rackup -I #{File.expand_path('../lib', __dir__)} -r pagy -o #{opts[:host]} -p #{opts[:port]} -E #{opts[:env]} #{file}"
74
+ rackup << ' -q' if opts[:quiet]
75
+ if opts[:rerun]
76
+ name = File.basename(file)
77
+ rerun = "rerun --name #{name} -d #{File.dirname(file)} -p #{name}"
78
+ rerun << ' -q' if opts[:quiet]
79
+ rerun << ' -c' if opts[:clear]
80
+ rerun << " -- #{rackup}"
81
+ end
82
+ exec(rerun || rackup)
83
+ end
data/{lib/config → config}/pagy.rb RENAMED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Pagy initializer file (7.0.11)
3
+ # Pagy initializer file (8.0.2)
4
4
  # Customize only what you really need and notice that the core Pagy works also without any of the following lines.
5
5
  # Should you just cherry pick part of this file, please maintain the require-order of the extras
6
6
 
@@ -22,8 +22,6 @@
22
22
  # Pagy::DEFAULT[:page_param] = :page # default
23
23
  # Pagy::DEFAULT[:fragment] = '#fragment' # example
24
24
  # Pagy::DEFAULT[:link_extra] = 'data-remote="true"' # example
25
- # Pagy::DEFAULT[:item_i18n_key = 'pagy.item_name' # default
26
- # Pagy::DEFAULT[:nav_i18n_key] = 'pagy.aria_label.nav' # default
27
25
  # Pagy::DEFAULT[:cycle] = true # example
28
26
  # Pagy::DEFAULT[:request_path] = '/foo' # example
29
27
  # Pagy::DEFAULT[:count_args] = [] # example for non AR ORMs
@@ -133,7 +131,6 @@
133
131
  # Bulma extra: Add nav, nav_js and combo_nav_js helpers and templates for Bulma pagination
134
132
  # See https://ddnexus.github.io/pagy/docs/extras/bulma
135
133
  # require 'pagy/extras/bulma'
136
- # DEFAULT[:bulma_nav_classes] = 'is-centered' # default
137
134
 
138
135
  # Foundation extra: Add nav, nav_js and combo_nav_js helpers and templates for Foundation pagination
139
136
  # See https://ddnexus.github.io/pagy/docs/extras/foundation
@@ -143,11 +140,10 @@
143
140
  # See https://ddnexus.github.io/pagy/docs/extras/materialize
144
141
  # require 'pagy/extras/materialize'
145
142
 
146
- # Navs extra: Add nav_js and combo_nav_js javascript helpers
147
- # Notice: the other frontend extras add their own framework-styled versions,
148
- # so require this extra only if you need the unstyled version
149
- # See https://ddnexus.github.io/pagy/docs/extras/navs
150
- # require 'pagy/extras/navs'
143
+ # Pagy extra: Add the pagy styled versions of the javascript-powered navs
144
+ # and a few other components to the Pagy::Frontend module.
145
+ # See https://ddnexus.github.io/pagy/docs/extras/pagy
146
+ # require 'pagy/extras/pagy'
151
147
 
152
148
  # Semantic extra: Add nav, nav_js and combo_nav_js helpers for Semantic UI pagination
153
149
  # See https://ddnexus.github.io/pagy/docs/extras/semantic
@@ -158,7 +154,7 @@
158
154
  # require 'pagy/extras/uikit'
159
155
 
160
156
  # Multi size var used by the *_nav_js helpers
161
- # See https://ddnexus.github.io/pagy/docs/extras/navs#steps
157
+ # See https://ddnexus.github.io/pagy/docs/extras/pagy#steps
162
158
  # Pagy::DEFAULT[:steps] = { 0 => [2,3,3,2], 540 => [3,5,5,3], 720 => [5,7,7,5] } # example
163
159
 
164
160
 
@@ -184,10 +180,6 @@
184
180
  # require 'pagy/extras/overflow'
185
181
  # Pagy::DEFAULT[:overflow] = :empty_page # default (other options: :last_page and :exception)
186
182
 
187
- # Support extra: Extra support for features like: incremental, infinite, auto-scroll pagination
188
- # See https://ddnexus.github.io/pagy/docs/extras/support
189
- # require 'pagy/extras/support'
190
-
191
183
  # Trim extra: Remove the page=1 param from links
192
184
  # See https://ddnexus.github.io/pagy/docs/extras/trim
193
185
  # require 'pagy/extras/trim'
@@ -250,9 +242,6 @@
250
242
  # See https://ddnexus.github.io/pagy/docs/extras/i18n
251
243
  # require 'pagy/extras/i18n'
252
244
 
253
- # Default i18n key
254
- # Pagy::DEFAULT[:item_i18n_key] = 'pagy.item_name' # default
255
-
256
245
 
257
246
  # When you are done setting your own default freeze it, so it will not get changed accidentally
258
247
  Pagy::DEFAULT.freeze
data/javascripts/pagy-dev.js ADDED
@@ -0,0 +1,114 @@
1
+ "use strict";
2
+ window.Pagy = (() => {
3
+ // The observer instance for responsive navs
4
+ const rjsObserver = new ResizeObserver(entries => entries.forEach(e => e.target.querySelectorAll(".pagy-rjs").forEach(el => el.pagyRender())));
5
+ // Init the *_nav_js helpers
6
+ const initNav = (el, [tokens, sequels, labelSequels, trimParam]) => {
7
+ const container = el.parentElement ?? el;
8
+ const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);
9
+ let lastWidth = -1;
10
+ const fillIn = (a, page, label) => a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);
11
+ (el.pagyRender = function () {
12
+ const width = widths.find(w => w < container.clientWidth) || 0;
13
+ if (width === lastWidth) {
14
+ return;
15
+ } // no change: abort
16
+ let html = tokens.before; // already trimmed in html
17
+ const series = sequels[width.toString()];
18
+ const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());
19
+ for (const i in series) {
20
+ const item = series[i];
21
+ const label = labels[i];
22
+ let filled;
23
+ if (typeof item === "number") {
24
+ filled = fillIn(tokens.a, item.toString(), label);
25
+ }
26
+ else if (item === "gap") {
27
+ filled = tokens.gap;
28
+ }
29
+ else { // active page
30
+ filled = fillIn(tokens.current, item, label);
31
+ }
32
+ html += (typeof trimParam === "string" && item == 1) ? trim(filled, trimParam) : filled;
33
+ }
34
+ html += tokens.after; // eslint-disable-line align-assignments/align-assignments
35
+ el.innerHTML = "";
36
+ el.insertAdjacentHTML("afterbegin", html);
37
+ lastWidth = width;
38
+ })();
39
+ if (el.classList.contains("pagy-rjs")) {
40
+ rjsObserver.observe(container);
41
+ }
42
+ };
43
+ // Init the *_combo_nav_js helpers
44
+ const initCombo = (el, [url_token, trimParam]) => initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);
45
+ // Init the items_selector_js helper
46
+ const initSelector = (el, [from, url_token, trimParam]) => {
47
+ initInput(el, inputValue => {
48
+ const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();
49
+ const url = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);
50
+ return [page, url];
51
+ }, trimParam);
52
+ };
53
+ // Init the input element
54
+ const initInput = (el, getVars, trimParam) => {
55
+ const input = el.querySelector("input");
56
+ const link = el.querySelector("a");
57
+ const initial = input.value;
58
+ const action = function () {
59
+ if (input.value === initial) {
60
+ return;
61
+ } // not changed
62
+ const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);
63
+ if (val < min || val > max) { // reset invalid/out-of-range
64
+ input.value = initial;
65
+ input.select();
66
+ return;
67
+ }
68
+ let [page, url] = getVars(input.value); // eslint-disable-line prefer-const
69
+ if (typeof trimParam === "string" && page === "1") {
70
+ url = trim(url, trimParam);
71
+ }
72
+ link.href = url;
73
+ link.click();
74
+ };
75
+ ["change", "focus"].forEach(e => input.addEventListener(e, input.select)); // auto-select
76
+ input.addEventListener("focusout", action); // trigger action
77
+ input.addEventListener("keypress", e => { if (e.key === "Enter") {
78
+ action();
79
+ } }); // trigger action
80
+ };
81
+ // Trim the ${page-param}=1 params in links
82
+ const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
83
+ // Public interface
84
+ return {
85
+ version: "8.0.2",
86
+ // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
87
+ init(arg) {
88
+ const target = arg instanceof Element ? arg : document;
89
+ const elements = target.querySelectorAll("[data-pagy]");
90
+ for (const el of elements) {
91
+ try {
92
+ const uint8array = Uint8Array.from(atob(el.getAttribute("data-pagy")), c => c.charCodeAt(0));
93
+ const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array
94
+ if (keyword === "nav") {
95
+ initNav(el, args);
96
+ }
97
+ else if (keyword === "combo") {
98
+ initCombo(el, args);
99
+ }
100
+ else if (keyword === "selector") {
101
+ initSelector(el, args);
102
+ }
103
+ else {
104
+ console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'", el, keyword);
105
+ }
106
+ }
107
+ catch (err) {
108
+ console.warn("Skipped Pagy.init() for: %o\n%s", el, err);
109
+ }
110
+ }
111
+ }
112
+ };
113
+ })();
114
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pagy.js","sourceRoot":"","sources":["pagy.ts"],"names":[],"mappings":"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","sourcesContent":["type NavArgs = readonly [Tokens, Sequels, null | LabelSequels, string?]\ntype ComboArgs = readonly [string, string?]\ntype SelectorArgs = readonly [number, string, string?]\n\ninterface Tokens {\n    readonly before:string\n    readonly a:string\n    readonly current:string\n    readonly gap:string\n    readonly after:string\n}\n\ninterface Sequels {readonly [width:string]:(string | number)[]}\n\ninterface LabelSequels {readonly [width:string]:string[]}\n\ninterface NavElement extends Element {pagyRender():void}\n\nconst Pagy = (() => {\n    // The observer instance for responsive navs\n    const rjsObserver = new ResizeObserver(entries =>\n                                               entries.forEach(e => e.target.querySelectorAll<NavElement>(\".pagy-rjs\").forEach(\n                                                   el => el.pagyRender())));\n\n    // Init the *_nav_js helpers\n    const initNav = (el:NavElement, [tokens, sequels, labelSequels, trimParam]:NavArgs) => {\n        const container = el.parentElement ?? el;\n        const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);\n        let lastWidth = -1;\n        const fillIn = (a:string, page:string, label:string):string =>\n            a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);\n        (el.pagyRender = function () {\n            const width = widths.find(w => w < container.clientWidth) || 0;\n            if (width === lastWidth) { return } // no change: abort\n            let html = tokens.before;  // already trimmed in html\n            const series = sequels[width.toString()];\n            const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());\n            for (const i in series) {\n                const item = series[i];\n                const label = labels[i];\n                let filled;\n                if (typeof item === \"number\") {\n                    filled = fillIn(tokens.a, item.toString(), label);\n                } else if (item === \"gap\") {\n                    filled = tokens.gap;\n                } else { // active page\n                    filled = fillIn(tokens.current, item, label);\n                }\n                html += (typeof trimParam === \"string\" && item == 1) ? trim(filled, trimParam) : filled;\n            }\n            html += tokens.after;   // eslint-disable-line align-assignments/align-assignments\n            el.innerHTML = \"\";\n            el.insertAdjacentHTML(\"afterbegin\", html);\n            lastWidth = width;\n        })();\n        if (el.classList.contains(\"pagy-rjs\")) { rjsObserver.observe(container) }\n    };\n\n    // Init the *_combo_nav_js helpers\n    const initCombo = (el:Element, [url_token, trimParam]:ComboArgs) =>\n        initInput(el, inputValue => [inputValue, url_token.replace(/__pagy_page__/, inputValue)], trimParam);\n\n    // Init the items_selector_js helper\n    const initSelector = (el:Element, [from, url_token, trimParam]:SelectorArgs) => {\n        initInput(el, inputValue => {\n            const page = Math.max(Math.ceil(from / parseInt(inputValue)), 1).toString();\n            const url = url_token.replace(/__pagy_page__/, page).replace(/__pagy_items__/, inputValue);\n            return [page, url];\n        }, trimParam);\n    };\n\n    // Init the input element\n    const initInput = (el:Element, getVars:(v:string) => [string, string], trimParam?:string) => {\n        const input = el.querySelector(\"input\") as HTMLInputElement;\n        const link = el.querySelector(\"a\") as HTMLAnchorElement;\n        const initial = input.value;\n        const action = function () {\n            if (input.value === initial) { return }  // not changed\n            const [min, val, max] = [input.min, input.value, input.max].map(n => parseInt(n) || 0);\n            if (val < min || val > max) {  // reset invalid/out-of-range\n                input.value = initial;\n                input.select();\n                return;\n            }\n            let [page, url] = getVars(input.value);   // eslint-disable-line prefer-const\n            if (typeof trimParam === \"string\" && page === \"1\") { url = trim(url, trimParam) }\n            link.href = url;\n            link.click();\n        };\n        [\"change\", \"focus\"].forEach(e => input.addEventListener(e, input.select));        // auto-select\n        input.addEventListener(\"focusout\", action);                                       // trigger action\n        input.addEventListener(\"keypress\", e => { if (e.key === \"Enter\") { action() } }); // trigger action\n    };\n\n    // Trim the ${page-param}=1 params in links\n    const trim = (a:string, param:string) =>\n        a.replace(new RegExp(`[?&]${param}=1\\\\b(?!&)|\\\\b${param}=1&`), \"\");\n\n    // Public interface\n    return {\n        version: \"8.0.2\",\n\n        // Scan for elements with a \"data-pagy\" attribute and call their init functions with the decoded args\n        init(arg?:Element | never) {\n            const target = arg instanceof Element ? arg : document;\n            const elements = target.querySelectorAll(\"[data-pagy]\");\n            for (const el of elements) {\n                try {\n                    const uint8array = Uint8Array.from(atob(el.getAttribute(\"data-pagy\") as string), c => c.charCodeAt(0));\n                    const [keyword, ...args] = JSON.parse((new TextDecoder()).decode(uint8array)); // base64-utf8 -> JSON -> Array\n                    if (keyword === \"nav\") {\n                        initNav(el as NavElement, args as NavArgs);\n                    } else if (keyword === \"combo\") {\n                        initCombo(el, args as ComboArgs);\n                    } else if (keyword === \"selector\") {\n                        initSelector(el, args as SelectorArgs);\n                    } else {\n                        console.warn(\"Skipped Pagy.init() for: %o\\nUnknown keyword '%s'\", el, keyword);\n                    }\n                } catch (err) { console.warn(\"Skipped Pagy.init() for: %o\\n%s\", el, err) }\n            }\n        }\n    };\n})();\n"]}
data/{lib/javascripts → javascripts}/pagy-module.js RENAMED
@@ -2,17 +2,17 @@ const Pagy = (() => {
2
2
  // The observer instance for responsive navs
3
3
  const rjsObserver = new ResizeObserver(entries => entries.forEach(e => e.target.querySelectorAll(".pagy-rjs").forEach(el => el.pagyRender())));
4
4
  // Init the *_nav_js helpers
5
- const initNav = (el, [tags, sequels, labelSequels, trimParam]) => {
5
+ const initNav = (el, [tokens, sequels, labelSequels, trimParam]) => {
6
6
  const container = el.parentElement ?? el;
7
7
  const widths = Object.keys(sequels).map(w => parseInt(w)).sort((a, b) => b - a);
8
8
  let lastWidth = -1;
9
- const fillIn = (link, page, label) => link.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);
9
+ const fillIn = (a, page, label) => a.replace(/__pagy_page__/g, page).replace(/__pagy_label__/g, label);
10
10
  (el.pagyRender = function () {
11
11
  const width = widths.find(w => w < container.clientWidth) || 0;
12
12
  if (width === lastWidth) {
13
13
  return;
14
14
  } // no change: abort
15
- let html = tags.before; // already trimmed in html
15
+ let html = tokens.before; // already trimmed in html
16
16
  const series = sequels[width.toString()];
17
17
  const labels = labelSequels?.[width.toString()] ?? series.map(l => l.toString());
18
18
  for (const i in series) {
@@ -20,17 +20,17 @@ const Pagy = (() => {
20
20
  const label = labels[i];
21
21
  let filled;
22
22
  if (typeof item === "number") {
23
- filled = fillIn(tags.link, item.toString(), label);
23
+ filled = fillIn(tokens.a, item.toString(), label);
24
24
  }
25
25
  else if (item === "gap") {
26
- filled = tags.gap;
26
+ filled = tokens.gap;
27
27
  }
28
28
  else { // active page
29
- filled = fillIn(tags.active, item, label);
29
+ filled = fillIn(tokens.current, item, label);
30
30
  }
31
31
  html += (typeof trimParam === "string" && item == 1) ? trim(filled, trimParam) : filled;
32
32
  }
33
- html += tags.after; // eslint-disable-line align-assignments/align-assignments
33
+ html += tokens.after; // eslint-disable-line align-assignments/align-assignments
34
34
  el.innerHTML = "";
35
35
  el.insertAdjacentHTML("afterbegin", html);
36
36
  lastWidth = width;
@@ -52,6 +52,7 @@ const Pagy = (() => {
52
52
  // Init the input element
53
53
  const initInput = (el, getVars, trimParam) => {
54
54
  const input = el.querySelector("input");
55
+ const link = el.querySelector("a");
55
56
  const initial = input.value;
56
57
  const action = function () {
57
58
  if (input.value === initial) {
@@ -67,7 +68,8 @@ const Pagy = (() => {
67
68
  if (typeof trimParam === "string" && page === "1") {
68
69
  url = trim(url, trimParam);
69
70
  }
70
- window.location.href = url;
71
+ link.href = url;
72
+ link.click();
71
73
  };
72
74
  ["change", "focus"].forEach(e => input.addEventListener(e, input.select)); // auto-select
73
75
  input.addEventListener("focusout", action); // trigger action
@@ -76,10 +78,10 @@ const Pagy = (() => {
76
78
  } }); // trigger action
77
79
  };
78
80
  // Trim the ${page-param}=1 params in links
79
- const trim = (link, param) => link.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
81
+ const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
80
82
  // Public interface
81
83
  return {
82
- version: "7.0.11",
84
+ version: "8.0.2",
83
85
  // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
84
86
  init(arg) {
85
87
  const target = arg instanceof Element ? arg : document;
data/javascripts/pagy.js ADDED
@@ -0,0 +1 @@
1
+ !function(){let e=(()=>{let e=new ResizeObserver(e=>e.forEach(e=>e.target.querySelectorAll(".pagy-rjs").forEach(e=>e.pagyRender()))),t=(t,[r,a,n,l])=>{let i=t.parentElement??t,c=Object.keys(a).map(e=>parseInt(e)).sort((e,t)=>t-e),p=-1,s=(e,t,r)=>e.replace(/__pagy_page__/g,t).replace(/__pagy_label__/g,r);(t.pagyRender=function(){let e=c.find(e=>e<i.clientWidth)||0;if(e===p)return;let g=r.before,y=a[e.toString()],f=n?.[e.toString()]??y.map(e=>e.toString());for(let e in y){let t;let a=y[e],n=f[e];t="number"==typeof a?s(r.a,a.toString(),n):"gap"===a?r.gap:s(r.current,a,n),g+="string"==typeof l&&1==a?o(t,l):t}g+=r.after,t.innerHTML="",t.insertAdjacentHTML("afterbegin",g),p=e})(),t.classList.contains("pagy-rjs")&&e.observe(i)},r=(e,[t,r])=>n(e,e=>[e,t.replace(/__pagy_page__/,e)],r),a=(e,[t,r,a])=>{n(e,e=>{let a=Math.max(Math.ceil(t/parseInt(e)),1).toString(),n=r.replace(/__pagy_page__/,a).replace(/__pagy_items__/,e);return[a,n]},a)},n=(e,t,r)=>{let a=e.querySelector("input"),n=e.querySelector("a"),l=a.value,i=function(){if(a.value===l)return;let[e,i,c]=[a.min,a.value,a.max].map(e=>parseInt(e)||0);if(i<e||i>c){a.value=l,a.select();return}let[p,s]=t(a.value);"string"==typeof r&&"1"===p&&(s=o(s,r)),n.href=s,n.click()};["change","focus"].forEach(e=>a.addEventListener(e,a.select)),a.addEventListener("focusout",i),a.addEventListener("keypress",e=>{"Enter"===e.key&&i()})},o=(e,t)=>e.replace(RegExp(`[?&]${t}=1\\b(?!&)|\\b${t}=1&`),"");return{version:"8.0.2",init(e){for(let n of(e instanceof Element?e:document).querySelectorAll("[data-pagy]"))try{let e=Uint8Array.from(atob(n.getAttribute("data-pagy")),e=>e.charCodeAt(0)),[o,...l]=JSON.parse(new TextDecoder().decode(e));"nav"===o?t(n,l):"combo"===o?r(n,l):"selector"===o?a(n,l):console.warn("Skipped Pagy.init() for: %o\nUnknown keyword '%s'",n,o)}catch(e){console.warn("Skipped Pagy.init() for: %o\n%s",n,e)}}}})();window.Pagy=e}();