Fix for #105 (#121)

* Fix return type for getElementById, closes #65 * Update PHPDoc to include inherited changes * Rename function for removing template attributes * Set value for certain input fields differently * Bind list to document fragment for efficiency for #77 * Remove unbindable check * Allow returning any iterable, not just array - fixes #88 * Test that multiple kvps can be bound within the same parameter * Remove unused functions * Extract templates after expanding components. Closes #105
PhpGt · Dec 11, 2019 · fcccb78 · fcccb78
1 parent 5447e2f
commit fcccb78
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 22 deletions.
diff --git a/src/HTMLDocument.php b/src/HTMLDocument.php
@@ -112,24 +112,6 @@ public function getUnnamedTemplate(
 		return $clone;
 	}
 
-	public function pushTemplateParentStack(
-		string $name,
-		Element $element
-	):void {
-		if(!isset($this->templateParentStack[$name])) {
-			$this->templateParentStack[$name] = [];
-		}
-
-		$this->templateParentStack[$name] []= $element;
-	}
-
-	public function insertTemplateParentStack():void {
-		ksort($this->templateParentStack);
-		foreach($this->templateParentStack as $name => $elementList) {
-
-		}
-	}
-
 	public function getParentOfUnnamedTemplate(
 		Element $element,
 		bool $requireMatchingPath = false

diff --git a/src/TemplateParent.php b/src/TemplateParent.php
@@ -196,7 +196,6 @@ protected function loadComponent(string $name, string $path):DocumentFragment {
 		}
 
 		$fragment->appendHTML($html);
-		$fragment->extractTemplates();
 		return $fragment;
 	}
 

diff --git a/test/unit/Helper/Helper.php b/test/unit/Helper/Helper.php
@@ -194,6 +194,22 @@ class Helper {
 <li>This is an item in the list</li>
 HTML;
 
+	const COMPONENT_WITH_TEMPLATE = <<<HTML
+<ul>
+	<li data-template data-bind:text>Test</li>
+</ul>
+HTML;
+
+	const HTML_SIMPLE_LIST_COMPONENT = <<<HTML
+<!doctype html>
+<meta charset="utf-8" />
+<title>Simple componentised list test</title>
+<main>
+	<simple-list></simple-list>
+</main>
+HTML;
+
+
 	const HTML_BIND_UNKNOWN_PROPERTY = <<<HTML
 <!doctype html>
 <meta charset="utf-8" />

diff --git a/test/unit/TemplateParentTest.php b/test/unit/TemplateParentTest.php
@@ -182,8 +182,8 @@ public function testComponentWithinTemplate() {
 			Helper::HTML_TEMPLATE_WITH_NESTED_COMPONENT,
 			$templateDir
 		);
-		$document->extractTemplates();
 		$document->expandComponents();
+		$document->extractTemplates();
 
 		self::assertCount(
 			0,
@@ -243,8 +243,7 @@ public function testNestedComponentsExpandWhenTemplateInserted() {
 			$templateDir
 		);
 		$document->expandComponents();
-
-		$document->getTemplate("title-definition-item")->insertTemplate();
+		$document->extractTemplates();
 
 		$section = $document->querySelector("section");
 		$ol = $section->lastElementChild;
@@ -420,4 +419,31 @@ public function testExistingClassesAreAddedToComponents() {
 			$component->classList->contains("source-class")
 		);
 	}
+
+	/** @link https://github.com/PhpGt/DomTemplate/issues/105 */
+	public function testTemplateWithinComponentIsAddedCorrectly() {
+		$componentDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
+		file_put_contents(
+			"$componentDir/simple-list.html",
+			Helper::COMPONENT_WITH_TEMPLATE
+		);
+
+		$document = new HTMLDocument(
+			Helper::HTML_SIMPLE_LIST_COMPONENT,
+			$componentDir
+		);
+		$document->expandComponents();
+		$document->extractTemplates();
+
+		$componentElement = $document->querySelector(".c-simple-list");
+		self::assertCount(0, $componentElement->children);
+
+		$componentElement->bindList([
+			"one",
+			"two",
+			"three",
+		]);
+
+		self::assertCount(3, $componentElement->children);
+	}
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		$fragment->appendHTML($html);
-    		$fragment->extractTemplates();
     		return $fragment;
     	}
@@ Expand Down @@