wip

nette · Nov 1, 2023 · 22f995a · 22f995a
1 parent e85d315
commit 22f995a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Bridges/ApplicationLatte/Nodes/ControlNode.php b/src/Bridges/ApplicationLatte/Nodes/ControlNode.php
@@ -98,7 +98,7 @@ public function print(PrintContext $context): string
 
 		$fetchCode .= $this->inSnippetArea
 			? 'if ($ʟ_tmp instanceof Nette\Application\UI\Renderable) $ʟ_tmp->snippetMode = $this->global->uiControl->snippetMode;'
-			: 'if ($ʟ_tmp instanceof Nette\Application\UI\Renderable) $ʟ_tmp->redrawControl(null, $ʟ_tmp->snippetMode = false);';
+			: 'if ($ʟ_tmp instanceof Nette\Application\UI\Renderable) $ʟ_tmp->redrawControl(null, false);';
 
 		if ($this->escape) {
 			return $context->format(

diff --git a/src/Bridges/ApplicationLatte/SnippetRuntime.php b/src/Bridges/ApplicationLatte/SnippetRuntime.php
@@ -64,7 +64,8 @@ public function enter(string $name, string $type): void
 			$this->nestingLevel++;
 		}
 
-		$this->stack[] = [$name, $obStarted];
+		$this->stack[] = [$name, $obStarted, $this->control->snippetMode];
+		$this->control->snippetMode = false;
 		if ($name !== '') {
 			$this->control->redrawControl($name, false);
 		}
@@ -78,7 +79,7 @@ public function leave(): void
 			return;
 		}
 
-		[$name, $obStarted] = array_pop($this->stack);
+		[$name, $obStarted, $this->control->snippetMode] = array_pop($this->stack);
 		if ($this->nestingLevel > 0 && --$this->nestingLevel === 0) {
 			$content = ob_get_clean();
 			$this->payload ??= $this->control->getPresenter()->getPayload();
@@ -114,9 +115,9 @@ public function renderSnippets(array $blocks, array $params): bool
 
 			$function = reset($block->functions);
 			$function($params);
+			$this->control->redrawControl($name, false);
 		}
 
-		$this->control->redrawControl(null, false);
 		$this->renderChildren();
 		return true;
 	}