TextBase, TextInput, TextArea: refactoring, rendered value is built in getRenderedValue()

Author: dg

src/Forms/Controls/TextArea.php

@@ -33,12 +33,8 @@ public function __construct($label = NULL)
 	 */
 	public function getControl()
 	{
-		$value = $this->getValue();
-		if ($value === '') {
-			$value = $this->translate($this->emptyValue);
-		}
 		return parent::getControl()
-			->setText($value);
+			->setText($this->getRenderedValue());
 	}
 
 }

src/Forms/Controls/TextBase.php

@@ -111,6 +111,17 @@ public function getControl()
 	}
 
 
+	/**
+	 * @return string|NULL
+	 */
+	protected function getRenderedValue()
+	{
+		return $this->rawValue === ''
+			? ($this->emptyValue === '' ? NULL : $this->translate($this->emptyValue))
+			: $this->rawValue;
+	}
+
+
 	public function addRule($validator, $message = NULL, $arg = NULL)
 	{
 		if ($validator === Form::LENGTH || $validator === Form::MAX_LENGTH) {

src/Forms/Controls/TextInput.php

@@ -57,14 +57,10 @@ public function setType($type)
 	 */
 	public function getControl()
 	{
-		$input = parent::getControl();
-		if ($input->type !== 'password' && ($this->rawValue !== '' || $this->emptyValue !== '')) {
-			$input->value = $this->rawValue === ''
-				? $this->translate($this->emptyValue)
-				: $this->rawValue;
-		}
-		$input->type = $input->type ?: 'text';
-		return $input;
+		return parent::getControl()->addAttributes([
+			'value' => $this->control->type === 'password' ? $this->control->value : $this->getRenderedValue(),
+			'type' => $this->control->type ?: 'text',
+		]);
 	}
 
 

tests/Forms/Controls.TextArea.render.phpt

@@ -97,3 +97,12 @@ test(function () { // rendering options
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
 });
+
+
+test(function () { // setEmptyValue
+	$form = new Form;
+	$input = $form->addTextArea('text')
+		->setEmptyValue('empty ');
+
+	Assert::same('<textarea name="text" id="frm-text" data-nette-empty-value="empty">empty </textarea>', (string) $input->getControl());
+});