add format and varaiant to cache_digest

Author: reeganviljoen

lib/view_component/base.rb

@@ -118,7 +118,7 @@ def render_in(view_context, &block)
       if render?
         rendered_template = render_template_for(@__vc_variant, __vc_request&.format&.to_sym).to_s
         if respond_to?(:__vc_render_cacheable)
-          __vc_render_cacheable(rendered_template, @__vc_variant, __vc_request&.format&.to_sym)
+          __vc_render_cacheable(rendered_template)
         else
           __vc_render_template(rendered_template)
         end
@@ -309,6 +309,13 @@ def __vc_request
       @__vc_request ||= controller.request if controller.respond_to?(:request)
     end
 
+    # Fo use in caching
+    #
+    # @private
+    def __vc_format
+      __vc_request&.format&.to_sym
+    end
+
     # The content passed to the component instance as a block.
     #
     # @return [String]

lib/view_component/cacheable.rb

@@ -4,7 +4,7 @@ module ViewComponent::Cacheable
   extend ActiveSupport::Concern
 
   included do
-    class_attribute :__vc_cache_dependencies, default: []
+    class_attribute :__vc_cache_dependencies, default: [:format, :__vc_format]
 
     # For caching, such as #cache_if
     #
@@ -18,9 +18,8 @@ def view_cache_dependencies
     # Render component from cache if possible
     #
     # @private
-    def __vc_render_cacheable(rendered_template, variant = nil, format = nil)
-      if view_cache_dependencies.present?
-        view_cache_dependencies = view_cache_dependencies + [variant, format]
+    def __vc_render_cacheable(rendered_template)
+      if view_cache_dependencies != [:format, :__vc_format]
         Rails.cache.fetch(view_cache_dependencies) do
           __vc_render_template(rendered_template)
         end