[TwigComponent][LiveComponent] Fix DataModelPropsSubscriber for embedded components

Author: sneakyvv

src/ComponentRenderer.php

@@ -93,17 +93,18 @@ public function embeddedContext(string $name, array $props, array $context, stri
 
         $this->componentStack->push($mounted);
 
-        try {
-            $embeddedContext = $this->preRender($mounted, $context)->getVariables();
-
-            if (!isset($embeddedContext['outerBlocks'])) {
-                $embeddedContext['outerBlocks'] = new BlockStack();
-            }
+        $embeddedContext = $this->preRender($mounted, $context)->getVariables();
 
-            return $embeddedContext;
-        } finally {
-            $this->componentStack->pop();
+        if (!isset($embeddedContext['outerBlocks'])) {
+            $embeddedContext['outerBlocks'] = new BlockStack();
         }
+
+        return $embeddedContext;
+    }
+
+    public function finishEmbeddedComponentRender(): void
+    {
+        $this->componentStack->pop();
     }
 
     private function preRender(MountedComponent $mounted, array $context = []): PreRenderEvent

src/ComponentStack.php

@@ -16,7 +16,7 @@
  *
  * @internal
  */
-class ComponentStack
+class ComponentStack implements \IteratorAggregate
 {
     /**
      * @var MountedComponent[]
@@ -60,4 +60,12 @@ public function hasParentComponent(): bool
     {
         return (bool) $this->getParentComponent();
     }
+
+    /**
+     * @return MountedComponent[]|\ArrayIterator
+     */
+    public function getIterator(): \Traversable
+    {
+        return new \ArrayIterator(array_reverse($this->components));
+    }
 }

src/Twig/ComponentExtension.php

@@ -80,6 +80,15 @@ public function embeddedContext(string $name, array $props, array $context, stri
         }
     }
 
+    public function finishEmbeddedComponentRender(): void
+    {
+        try {
+            $this->container->get(ComponentRenderer::class)->finishEmbeddedComponentRender();
+        } catch (\Throwable $e) {
+            $this->throwRuntimeError($name, $e);
+        }
+    }
+
     private function throwRuntimeError(string $name, \Throwable $e): void
     {
         if (!($e instanceof \Exception)) {

src/Twig/ComponentNode.php

@@ -85,6 +85,12 @@ public function compile(Compiler $compiler): void
         $compiler->raw('->display($embeddedContext, $embeddedBlocks);');
         $compiler->raw("\n");
 
+        $compiler->write('$this->extensions[')
+            ->string(ComponentExtension::class)
+            ->raw(']->finishEmbeddedComponentRender()')
+            ->raw(";\n")
+        ;
+
         $compiler
             ->outdent()
             ->write('}')