UIMacros: initialization moved to UIRuntime::initialize()

Author: dg

src/Bridges/ApplicationLatte/UIMacros.php

@@ -45,12 +45,7 @@ public static function install(Latte\Compiler $compiler)
 	 */
 	public function finalize()
 	{
-		$prolog = '
-// snippets support
-if (empty($this->local->parentName) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
-	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
-}';
-		return [$prolog, ''];
+		return ['if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this)) return;', ''];
 	}
 
 

src/Bridges/ApplicationLatte/UIRuntime.php

@@ -9,6 +9,7 @@
 
 use Nette;
 use Nette\Application\UI;
+use Latte;
 
 
 /**
@@ -19,25 +20,42 @@ class UIRuntime
 {
 	use Nette\StaticClass;
 
-	public static function renderSnippets(UI\Control $control, \stdClass $local = NULL, array $params = [])
+
+	/**
+	 * @return bool
+	 */
+	public static function initialize(Latte\Template $template)
+	{
+		// snippet support
+		$params = $template->params;
+		if (empty($template->local->parentName) && !empty($params['_control']->snippetMode)) {
+			$tmp = $template;
+			while (in_array($tmp->getReferenceType(), ['extends', 'include', NULL], TRUE) && ($tmp = $tmp->getReferrer()));
+			if (!$tmp) {
+				self::renderSnippets($params['_control'], $template->blockQueue, $params);
+				return TRUE;
+			}
+		};
+	}
+
+
+	public static function renderSnippets(UI\Control $control, array $blockQueue = NULL, array $params = [])
 	{
 		$control->snippetMode = FALSE;
 		$payload = $control->getPresenter()->getPayload();
-		if (isset($local->blocks)) {
-			foreach ($local->blocks as $name => $function) {
-				if ($name[0] !== '_' || !$control->isControlInvalid((string) substr($name, 1))) {
-					continue;
-				}
-				ob_start(function () {});
-				$function = reset($function);
-				$snippets = $function($params + ['_snippetMode' => TRUE]);
-				$payload->snippets[$id = $control->getSnippetId((string) substr($name, 1))] = ob_get_clean();
-				if ($snippets !== NULL) { // pass FALSE from snippetArea
-					if ($snippets) {
-						$payload->snippets += $snippets;
-					}
-					unset($payload->snippets[$id]);
+		foreach ($blockQueue as $name => $function) {
+			if ($name[0] !== '_' || !$control->isControlInvalid((string) substr($name, 1))) {
+				continue;
+			}
+			ob_start(function () {});
+			$function = reset($function);
+			$snippets = $function($params + ['_snippetMode' => TRUE]);
+			$payload->snippets[$id = $control->getSnippetId((string) substr($name, 1))] = ob_get_clean();
+			if ($snippets !== NULL) { // pass FALSE from snippetArea
+				if ($snippets) {
+					$payload->snippets += $snippets;
 				}
+				unset($payload->snippets[$id]);
 			}
 		}
 		$control->snippetMode = TRUE;

tests/Bridges.Latte/expected/UIMacros.dynamicsnippets.alt.phtml

@@ -13,11 +13,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
-
-// snippets support
-if (empty($this->local->parentName) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
-	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
-}
+if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this)) return;
 
 // main template
 if ($this->tryRenderParent(get_defined_vars())) return ?>

tests/Bridges.Latte/expected/UIMacros.dynamicsnippets.phtml

@@ -12,11 +12,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
-
-// snippets support
-if (empty($this->local->parentName) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
-	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
-}
+if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this)) return;
 
 // main template
 if ($this->tryRenderParent(get_defined_vars())) return ?>

tests/Bridges.Latte/expected/UIMacros.snippet.alt.phtml

@@ -14,11 +14,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
-
-// snippets support
-if (empty($this->local->parentName) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
-	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
-}
+if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this)) return;
 
 // main template
 ?>	<div class="test"<?php echo ' id="' . $_control->getSnippetId('outer') . '"' ?>>

tests/Bridges.Latte/expected/UIMacros.snippet.phtml

@@ -16,11 +16,7 @@ class Template%a% extends Latte\Template
 	{
 %A%
 // prolog Nette\Bridges\ApplicationLatte\UIMacros
-
-// snippets support
-if (empty($this->local->parentName) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
-	return Nette\Bridges\ApplicationLatte\UIRuntime::renderSnippets($_control, $_b, get_defined_vars());
-}
+if (Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this)) return;
 
 // main template
 ?>
@@ -44,7 +40,7 @@ if (empty($this->local->parentName) && !empty($_control->snippetMode) && empty($
 	}
 
 
-	function block_%h%($_args)
+	function block_b14a7($_args)
 	{
 		extract($_args);
 $_control->redrawControl('', FALSE);