bindable-fix (#75)

* 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 * Update Dom library to fix a few small bugs
phpgt · Jul 31, 2019 · 16ae8a7 · 16ae8a7
1 parent c42bd61
commit 16ae8a7
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 50 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Bindable.php b/src/Bindable.php
@@ -319,6 +319,20 @@ protected function setPropertyValue(
 		case "innerText":
 			$element->innerText = $value;
 			break;
+
+		case "value":
+			$tagName = strtoupper($element->tagName);
+			switch($tagName) {
+			case "SELECT":
+			case "INPUT":
+			case "TEXTAREA":
+				$element->value = $value;
+				break;
+			default:
+				$element->setAttribute($bindProperty, $value);
+			}
+			break;
+
 		default:
 			$element->setAttribute($bindProperty, $value);
 		}

diff --git a/src/HTMLDocument.php b/src/HTMLDocument.php
@@ -17,8 +17,13 @@
  * @property-read Element $firstElementChild;
  * @property-read Element $lastElementChild;
  * @property-read Element $body;
- * @method Node getElementById(string $id)
- * @method Element createElement(string $name, string $value = null)
+ *
+ * @method Attr createAttribute(string $name)
+ * @method Comment createComment(string $data)
+ * @method DocumentFragment createDocumentFragment()
+ * @method Element createElement(string $name)
+ * @method Element createTextNode(string $content)
+ * @method ?Element getElementById(string $id)
  *
  */
 class HTMLDocument extends BaseHTMLDocument {
@@ -197,7 +202,7 @@ public function storeBoundAttribute(BaseAttr $attr) {
 	}
 
 	public function validateBinds():void {
-		$allBindableElements = $this->getAllBindableElements();
+		$allBindableElements = $this->getAllDomTemplateElements();
 
 		foreach($allBindableElements as $element) {
 			foreach($element->attributes as $attr) {
@@ -214,24 +219,23 @@ public function validateBinds():void {
 		}
 	}
 
-	public function removeBinds():void {
-		$allBindableElements = $this->getAllBindableElements();
+	public function removeTemplateAttributes():void {
+		$allBindableElements = $this->getAllDomTemplateElements();
 
 		foreach($allBindableElements as $element) {
 			foreach($element->attributes as $attr) {
 				/** @var \Gt\Dom\Attr $attr */
-				if(strpos($attr->name, "data-bind") !== 0) {
-					continue;
+				if(strpos($attr->name, "data-bind") === 0
+				|| strpos($attr->name, "data-template") === 0) {
+					$attr->remove();
 				}
-
-				$attr->remove();
 			}
 		}
 	}
 
-	protected function getAllBindableElements():BaseHTMLCollection {
+	protected function getAllDomTemplateElements():BaseHTMLCollection {
 		return $this->documentElement->xPath(
-			"descendant-or-self::*[@*[starts-with(name(), 'data-bind')]]"
+			"descendant-or-self::*[@*[starts-with(name(), 'data-bind')]]|descendant-or-self::*[@*[starts-with(name(), 'data-template')]]"
 		);
 	}
 }
diff --git a/test/unit/BindableTest.php b/test/unit/BindableTest.php
@@ -173,7 +173,7 @@ public function testBindDataRemoved() {
 			"age" => $age,
 		]);
 
-		$document->removeBinds();
+		$document->removeTemplateAttributes();
 
 		$boundDataTestElement = $document->querySelector(".bound-data-test");
 		$spanChildren = $boundDataTestElement->querySelectorAll("span");

diff --git a/test/unit/HTMLDocumentTest.php b/test/unit/HTMLDocumentTest.php
@@ -13,5 +13,9 @@ public function testOverriddenClasses() {
 		self::assertInstanceOf(DocumentFragment::class, $fragment);
 	}
 
-
+	public function testGetElementById() {
+		$document = new HTMLDocument("<!doctype html><h1 id='test'>Test</h1>");
+		$element = $document->getElementById("test");
+		self::assertInstanceOf(Element::class, $element);
+	}
 }