fluxbit_view_components 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88d83b2e55472c883a4c14bb7df900c55c1ee9f69d128c4864b9edd4966cda26
-  data.tar.gz: 431db78fc6116407ee9244ef970110dcf24f5dd57ea540845543e7459ffbad5c
+  metadata.gz: 762b3796b8dfaa6244369146383b4994f3d5e0c3ba81226606f2a8e2e89b5cb8
+  data.tar.gz: 98299ec772265f75887e33f74a9d4249dcc18e1548e97ca684ba4bec7a75278a
 SHA512:
-  metadata.gz: 994ef29e0f99d930f9983558ce48b78eb67804bb43fb586c840acac7fc47049667f07cf93e6830f96d33b2d9a3d834a7bcee92923ce566aacdce45cac40d2c0b
-  data.tar.gz: f4bb70523e48dde4b7d4b97032ca09c793f81ef7bbda326b03e5bb387b21f379191f1de77b98d0e0d1fd8ffcfd4db09fd0743a52d6a1a5d67e3abcd6a3e3ed90
+  metadata.gz: d736f9bc7abfa18e62843b64960de28fe7aec3ece62c90343683548ab821168ce3fa7c3c374592cf71dbc951a0cbf726c9501f1adf550725046b47f123199bb5
+  data.tar.gz: 30c713c9c039c11e5aa0b3e0b10e13874ca92939c6ed765ac636322c9662a31da92d274af1de33923551bca92a182133996fdf7996eb3de4e369012d56acc30f

data/app/components/fluxbit/pagination_component.rb

@@ -14,20 +14,24 @@ class Fluxbit::PaginationComponent < Fluxbit::Component
     @last = @props.delete(:last) || 1
     @next = @props.delete(:next)
     @page = @props.delete(:page) || 1
-    @prev = @props.delete(:prev)
-    @size = @props.delete(:size) || :default
+    @previous = @props.delete(:previous)
+    @size = @props.delete(:size) || 3
     @ends = @props.delete(:ends) || true
     @request_path = @props.delete(:request_path) || nil
 
     if @pagy
-      @count = @pagy.count
-      @last = @pagy.last
-      @next = @pagy.next
-      @page = @pagy.page
-      @prev = @pagy.prev
-      @size = @pagy.vars[:size]
-      @ends = @pagy.vars[:ends]
-      @request_path = @pagy.vars[:request_path]
+      @count = @pagy.count if @pagy.respond_to?(:count)
+      @last = @pagy.last if @pagy.respond_to?(:last)
+      @next = @pagy.next if @pagy.respond_to?(:next)
+      @page = @pagy.page if @pagy.respond_to?(:page)
+      @previous = @pagy.prev if @pagy.respond_to?(:prev)
+      @previous = @pagy.previous if @pagy.respond_to?(:previous)
+
+      if @pagy.respond_to?(:vars)
+        @size = @pagy.vars[:size]
+        @ends = @pagy.vars[:ends]
+        @request_path = @pagy.vars[:request_path]
+      end
     end
 
     unless @size.is_a?(Integer) && @size >= 0
@@ -119,7 +123,7 @@ class Fluxbit::PaginationComponent < Fluxbit::Component
 
   def prev_button
     props = { role: "link", class: @page_link_style, aria: { label: translate("aria_label.prev") } }
-    if prev_page = @prev
+    if prev_page = @previous
       props[:href] = url_for(prev_page)
     else
       props[:aria][:disabled] = true
@@ -186,13 +190,14 @@ class Fluxbit::PaginationComponent < Fluxbit::Component
   end
 
   def url_for(page)
-    vars = @pagy&.vars || {}
+    vars = @pagy.respond_to?(:vars) ? @pagy&.vars : {}
     # Use current request parameters as base
     params = (respond_to?(:request) ? request.GET : controller.request.GET).dup
     params.merge!(vars[:params].transform_keys(&:to_s)) if vars[:params].is_a?(Hash)
     # Set page and possibly limit
-    params[vars[:page_param].to_s] = page
-    params[vars[:limit_param].to_s] = vars[:limit] if vars[:limit_extra]
+    page_param = vars[:page_param]&.to_s.presence || 'page'
+    params[page_param] = page
+    params[vars[:limit_param].to_s] = vars[:limit] if vars[:limit_extra] && vars[:limit_param]
     # Apply params proc if given
     params = vars[:params].call(params) if vars[:params].is_a?(Proc)
 

data/lib/fluxbit/view_components/version.rb

@@ -1,5 +1,5 @@
 module Fluxbit
   module ViewComponents
-    VERSION = "0.4.0"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluxbit_view_components
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Arthur Molina