Look for layout templates of all parent presenters

contributte · Jul 28, 2018 · fa2702e · fa2702e
1 parent a58c7d2
commit fa2702e
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/src/UI/Presenter/StructuredTemplates.php b/src/UI/Presenter/StructuredTemplates.php
@@ -15,16 +15,22 @@ trait StructuredTemplates
 	 */
 	public function formatLayoutTemplateFiles(): array
 	{
-		$presenterReflection = new ReflectionClass(get_called_class());
-		$presenterDir = dirname($presenterReflection->getFileName());
+		$called = get_called_class();
+		$classes = [$called] + class_parents($called);
+		$list = [];
 
-		$parentPresenterReflection = new ReflectionClass(self::class);
-		$parentPresenterDir = dirname($parentPresenterReflection->getFileName());
+		foreach ($classes as $class) {
+			// Skip Nette classes
+			if (Strings::startsWith($class, 'Nette\\')) continue;
 
-		return [
-			$presenterDir . '/templates/@layout.latte',
-			$parentPresenterDir . '/templates/@layout.latte',
-		];
+			$presenterReflection = new ReflectionClass($class);
+			$presenterDir = dirname($presenterReflection->getFileName());
+			$list[] = $presenterDir . '/templates/@layout.latte';
+		}
+
+		$list = array_unique($list);
+
+		return $list;
 	}
 
 	/**