Merge pull request #2510 from ViewComponent/2484-fixed

See 2484

Author: joelhawksley

docs/CHANGELOG.md

@@ -10,6 +10,10 @@ nav_order: 6
 
 ## main
 
+* Capture partial block in the component's context, allowing access to the component instance inside the block.
+
+    *23tux*
+
 * Add `after_compile` class method hook to enable extensions to run logic after component compilation.
 
     *Jose Solás*

lib/view_component/base.rb

@@ -260,14 +260,17 @@ def render(options = {}, args = {}, &block)
         @view_context.render(options, args, &block)
       elsif block
         __vc_original_view_context.render(options, args) do
+          # capture the block output in the view context of the component
+          output = capture(&block)
+
           # Partials are rendered to their own buffer and do not append to the
           # original @output_buffer we retain a reference to in #render_in. This
           # is a problem since the block passed to us here in the #render method
           # is evaluated within the context of ViewComponent::Base, and thus
           # appends to the original @output_buffer. To avoid this, we evaluate the
           # block in the view context instead, which will append to the output buffer
           # created for the partial.
-          __vc_original_view_context.instance_exec(&block)
+          __vc_original_view_context.capture { output }
         end
       else
         __vc_original_view_context.render(options, args)

test/sandbox/app/components/partial_with_yield_and_method_call_component.html.erb

@@ -0,0 +1,3 @@
+<%= render "shared/yielding_partial" do %>
+  <%= world %>
+<% end %>

test/sandbox/app/components/partial_with_yield_and_method_call_component.rb

@@ -0,0 +1,5 @@
+class PartialWithYieldAndMethodCallComponent < ViewComponent::Base
+  def world
+    "world"
+  end
+end

test/sandbox/test/rendering_test.rb

@@ -1339,4 +1339,9 @@ def test_render_partial_with_yield
     render_inline(PartialWithYieldComponent.new)
     assert_text "hello world", exact: true, normalize_ws: true
   end
+
+  def test_render_partial_with_yield_and_method_call
+    render_inline(PartialWithYieldAndMethodCallComponent.new)
+    assert_text "hello world", exact: true, normalize_ws: true
+  end
 end