Fixed defaults.

phrenotype · Jul 11, 2022 · 89f8837 · 89f8837
1 parent 00fdca4
commit 89f8837
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Chase/Safari/Element.php b/Chase/Safari/Element.php
@@ -61,6 +61,7 @@ public function stringify(): string
 
     public function html()
     {
+        $this->decideValue();
         if (!$this->__html__) {
             return "<{$this->__name__} " . $this->stringify() . "/>";
         } else {

diff --git a/Chase/Safari/Field.php b/Chase/Safari/Field.php
@@ -65,10 +65,13 @@ public function input(callable $mutator): Field
      */
     public function textarea(callable $mutator): Field
     {
-        $element = new Element('input', static::$request);
+        $element = new Element('textarea', static::$request);
         $mutator($element);
-        $element->setHtml(function () use ($element) {
-            return "<textarea " . $element->stringify() . "/></textarea>";
+
+        $valueInRequest = static::$request[$element->name ?? ''] ?? null;
+
+        $element->setHtml(function () use ($element, $valueInRequest) {
+            return "<textarea " . $element->stringify() . "/>$valueInRequest</textarea>";
         });
         $this->elements[] = $element;
         return $this;
@@ -158,10 +161,10 @@ public function radio(callable $mutator): Field
         $name = $element->name;
 
         if (!empty(static::$request) && $name) {
-            $valueInRequest = static::$request[$name];
+            $valueInRequest = static::$request[$name] ?? null;
             if (is_array($valueInRequest) && in_array($element->value, $valueInRequest)) {
                 $element->checked = 'checked';
-            } else if (in_array($element->value, $valueInRequest)) {
+            } else if (in_array($element->value, static::$request)) {
                 $element->checked = 'checked';
             }
         }
@@ -187,10 +190,10 @@ public function checkbox(callable $mutator): Field
         $name = $element->name;
 
         if (!empty(static::$request) && $name) {
-            $valueInRequest = static::$request[$name];
+            $valueInRequest = static::$request[$name] ?? null;
             if (is_array($valueInRequest) && in_array($element->value, $valueInRequest)) {
                 $element->checked = 'checked';
-            } else if (in_array($element->value, $valueInRequest)) {
+            } else if (in_array($element->value, static::$request)) {
                 $element->checked = 'checked';
             }
         }