Allow IDs to be set on DataHandlers

packaged · Nov 5, 2019 · f2ede82 · f2ede82
1 parent be2679e
commit f2ede82
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/src/DataHandlers/AbstractDataHandler.php b/src/DataHandlers/AbstractDataHandler.php
@@ -10,6 +10,7 @@
 
 abstract class AbstractDataHandler implements DataHandler
 {
+  protected $_id;
   protected $_name;
   protected $_value;
   protected $_label;
@@ -239,6 +240,25 @@ public function setDecorator(DataHandlerDecorator $decorator)
 
   abstract protected function _defaultDecorator(): DataHandlerDecorator;
 
+  /**
+   * @return mixed
+   */
+  public function getId()
+  {
+    return $this->_id;
+  }
+
+  /**
+   * @param mixed $id
+   *
+   * @return AbstractDataHandler
+   */
+  public function setId($id)
+  {
+    $this->_id = $id;
+    return $this;
+  }
+
   /**
    * @return mixed
    */

diff --git a/src/Decorators/AbstractDataHandlerDecorator.php b/src/Decorators/AbstractDataHandlerDecorator.php
@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\Form\Decorators;
 
+use Packaged\Form\DataHandlers\AbstractDataHandler;
 use Packaged\Form\DataHandlers\Interfaces\DataHandler;
 use Packaged\Form\Decorators\Interfaces\DataHandlerDecorator;
 use Packaged\Glimpse\Core\HtmlTag;
@@ -22,7 +23,7 @@ abstract class AbstractDataHandlerDecorator extends AbstractDecorator implements
 {
   protected $_tag = 'div';
   /**
-   * @var DataHandler
+   * @var DataHandler|AbstractDataHandler
    */
   protected $_handler;
 
@@ -96,13 +97,24 @@ protected function _getContentForRender()
   protected function _configureInputElement(HtmlElement $input)
   {
     $id = $input->getId();
+    if(empty($id) && $this->_handler instanceof AbstractDataHandler)
+    {
+      $id = $this->_handler->getId();
+    }
+
     $name = $this->_handler->getName();
+
     if(empty($id) && $this->_label && $name)
     {
       // create an id
       $id = strtolower(str_replace(' ', '-', Strings::splitOnCamelCase($name)) . '-' . Strings::randomString(3));
+    }
+
+    if(!empty($id))
+    {
       $input->setId($id);
     }
+
     $input->setAttribute('name', $name, true);
   }
 

diff --git a/tests/Decorators/FormCustomDecoratorTest.php b/tests/Decorators/FormCustomDecoratorTest.php
@@ -15,5 +15,6 @@ public function testCustomDecorator()
     $output = $form->produceSafeHTML()->getContent();
     $this->assertContains('name="email"', $output);
     $this->assertContains('method="post"><div class="hidden"><input type="hidden"', $output);
+    $this->assertContains('id="name-input"', $output);
   }
 }
diff --git a/tests/Supporting/CustomDecoratorForm.php b/tests/Supporting/CustomDecoratorForm.php
@@ -13,6 +13,7 @@ protected function _initDataHandlers()
   {
     parent::_initDataHandlers();
     $this->name = new TextDataHandler();
+    $this->name->setId("name-input");
     $this->email = new TextDataHandler();
   }
 }