feat(input): add getInputValOptions to allow input classes to define …

…their own set of options.
charcoalphp · Mar 5, 2024 · 8d3ce52 · 8d3ce52
1 parent a4a36c2
commit 8d3ce52
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/packages/admin/src/Charcoal/Admin/Property/AbstractPropertyInput.php b/packages/admin/src/Charcoal/Admin/Property/AbstractPropertyInput.php
@@ -376,6 +376,17 @@ public function escapeVal($val, array $options = [])
         return $callback($val, ...$args);
     }
 
+    /**
+     * Overridable.
+     * Makes it easier to pass InputVal options from children input types.
+     *
+     * @return array
+     **/
+    public function getInputValOptions(): array
+    {
+        return [];
+    }
+
     /**
      * @uses   AbstractProperty::inputVal() Must handle string sanitization of value.
      * @throws UnexpectedValueException If the value is invalid.
@@ -384,9 +395,12 @@ public function escapeVal($val, array $options = [])
     public function inputVal()
     {
         $prop = $this->p();
-        $val  = $prop->inputVal($this->propertyVal(), [
+        $val  = $prop->inputVal($this->propertyVal(), array_replace(
+            [
             'lang' => $this->lang(),
-        ]);
+            ],
+            $this->getInputValOptions()
+        ));
 
         if ($val === null) {
             return '';

diff --git a/packages/admin/src/Charcoal/Admin/Property/Input/JsonEditorInput.php b/packages/admin/src/Charcoal/Admin/Property/Input/JsonEditorInput.php
@@ -104,19 +104,12 @@ public function defaultEditorOptions()
     }
 
     /**
-     * Retrieve the property's value as a json encoded string.
-     *
-     * @return string
+     * @return array
      */
-    public function jsonVal()
+    public function getInputValOptions() : array
     {
-        $json = $this->propertyVal();
-        if (!is_string($json)) {
-            $json = json_encode($json);
-        }
-        if (!$json || $json == 'null') {
-            $json = '';
-        }
-        return $json;
+        return [
+            'pretty' => false,
+        ];
     }
 }
diff --git a/packages/admin/src/Charcoal/Admin/Property/Input/TextareaInput.php b/packages/admin/src/Charcoal/Admin/Property/Input/TextareaInput.php
@@ -4,6 +4,7 @@
 
 use InvalidArgumentException;
 use Charcoal\Admin\Property\AbstractPropertyInput;
+use UnexpectedValueException;
 
 /**
  * Multi-Line Text Input Property
@@ -118,6 +119,16 @@ public function setMaxLength($maxLength)
         return $this;
     }
 
+    /**
+    * @return array
+    */
+    public function getInputValOptions() : array
+    {
+        return [
+            'pretty' => true,
+        ];
+    }
+
     /**
      * @return integer
      */