fluxbit_view_components 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60a235092c19fce1b3548ee037d23e4698e106230bcffc2c64e38eea922c3fe2
-  data.tar.gz: 61ffaeca393020f18b18a6b1956bf568c5bcc99379f4b53c778da4512fe48b82
+  metadata.gz: 98187d5ac8174cfe0b38638e43b70e8076ec32068cab920e5829105e0e903f6a
+  data.tar.gz: 1e7c9b50861f506bb56407ecdd008988a96c9b8d3f79f75e43fbae7f2642c989
 SHA512:
-  metadata.gz: '046998a7d114dc3e3734079b51a509665ae36c1ec585891d832c514f8bfca125d1ea991dce89f49b9758872c97a0c4ce9ca5738d6e49457401f2e2a37626e6e2'
-  data.tar.gz: 78d051dc5b7b9dd7ef26bcdaf5f26d6c3a1e8c6352dc1fe70dd19f3bfb46e933378e9fff5e79411aae94e85218526c3318ab66b0b88382a1e3f3026d548115e3
+  metadata.gz: 426024fbf92e4dd34587a9f14057a541e5f00cb501578026c940ffcc98739398cded786b733c36aa0d1d4de2292ce56b7700e9b93d630c4b15a9e58f9098a1e6
+  data.tar.gz: 688a8bec19c6def98088f4e59dc8bd96f46c7fc7818612e799bb77f2f44ebced4dc2055d77b7afcad78b6bbd1b5e0d9c16859fcf4ba62866ff472a15955f4c63

data/app/components/fluxbit/form/toggle_component.html.erb

@@ -6,11 +6,7 @@
       @other_label || (other_label if other_label?)
     end %>
 
-    <% if @form.present? && @attribute.present? %>
-      <%= @form.check_box(@attribute, **@props) %>
-    <% else %>
-      <%= check_box_tag(@name, **@props) %>
-    <% end %>
+    <%= checkbox_without_wrapper %>
 
     <span class="<%= toggle_class %>"></span>
     <%= if @invert_label

data/app/components/fluxbit/form/toggle_component.rb

@@ -50,6 +50,7 @@ class Fluxbit::Form::ToggleComponent < Fluxbit::Form::FieldComponent
     @invert_label = options(@props.delete(:invert_label), collection: [ true, false ], default: @@invert_label)
 
     add to: @props, first_element: true, class: styles[:input]
+    @props[:class] = remove_class(@props.delete(:remove_class) || "", @props[:class])
   end
 
   def valid_color(color)
@@ -78,4 +79,25 @@ class Fluxbit::Form::ToggleComponent < Fluxbit::Form::FieldComponent
       styles[:toggle][:active][(@props[:disabled] ? :off : :on)]
     ].compact.join(" ")
   end
+
+  # Renders the checkbox without Rails' field_with_errors wrapper
+  # We handle errors through help_text instead
+  def checkbox_without_wrapper
+    return check_box_tag(@name, **@props) unless @form.present? && @attribute.present?
+
+    # Temporarily remove errors to prevent field_with_errors wrapper
+    if @object&.errors&.any? && @object.errors.include?(@attribute)
+      # Store the errors for this attribute
+      attribute_errors = @object.errors.where(@attribute).to_a
+      # Delete them temporarily
+      @object.errors.delete(@attribute)
+      # Render checkbox without wrapper
+      checkbox_html = @form.check_box(@attribute, **@props)
+      # Restore the errors
+      attribute_errors.each { |error| @object.errors.add(@attribute, error.type, **error.options) }
+      checkbox_html
+    else
+      @form.check_box(@attribute, **@props)
+    end
+  end
 end

data/app/components/fluxbit/pagination_component.rb

@@ -15,19 +15,23 @@ class Fluxbit::PaginationComponent < Fluxbit::Component
     @next = @props.delete(:next)
     @page = @props.delete(:page) || 1
     @previous = @props.delete(:previous)
-    @size = @props.delete(:size) || :default
+    @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
-      @previous = @pagy.previous
-      @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
@@ -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.1"
+    VERSION = "0.4.3"
   end
 end

metadata

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