DefaultFormRenderer: supports option 'nextTo'

Author: dg

src/Forms/Rendering/DefaultFormRenderer.php

@@ -217,6 +217,12 @@ public function renderErrors(Nette\Forms\IControl $control = null, bool $own = t
 		$errors = $control
 			? $control->getErrors()
 			: ($own ? $this->form->getOwnErrors() : $this->form->getErrors());
+		return $this->doRenderErrors($errors, (bool) $control);
+	}
+
+
+	private function doRenderErrors(array $errors, bool $control): string
+	{
 		if (!$errors) {
 			return '';
 		}
@@ -450,6 +456,8 @@ public function renderControl(Nette\Forms\IControl $control): Html
 			$description = $this->getValue('control requiredsuffix') . $description;
 		}
 
+		$els = $errors = [];
+		renderControl:
 		$control->setOption('rendered', true);
 		$el = $control->getControl();
 		if ($el instanceof Html) {
@@ -458,7 +466,15 @@ public function renderControl(Nette\Forms\IControl $control): Html
 			}
 			$el->class($this->getValue('control .error'), $control->hasErrors());
 		}
-		return $body->setHtml($el . $description . $this->renderErrors($control));
+		$els[] = $el;
+		$errors = array_merge($errors, $control->getErrors());
+
+		if ($nextTo = $control->getOption('nextTo')) {
+			$control = $control->getForm()->getComponent($nextTo);
+			goto renderControl;
+		}
+
+		return $body->setHtml(implode('', $els) . $description . $this->doRenderErrors($errors, true));
 	}
 
 

tests/Forms/Forms.renderer.1.expect

@@ -93,26 +93,14 @@
 <tr class="required">
 	<th><label for="frm-password" class="required">Choose password:</label></th>
 
-	<td><input type="password" name="password" id="frm-password" required data-nette-rules='[{"op":":filled","msg":"Choose your password"},{"op":":minLength","msg":"The password is too short: it must be at least 3 characters","arg":3}]' class="text"></td>
-</tr>
-
-<tr>
-	<th><label for="frm-password2">Reenter password:</label></th>
-
-	<td><input type="password" name="password2" id="frm-password2" data-nette-rules='[{"op":":valid","rules":[{"op":":filled","msg":"Reenter your password"},{"op":":equal","msg":"Passwords do not match","arg":{"control":"password"}}],"control":"password"}]' class="text">
+	<td><input type="password" name="password" id="frm-password" required data-nette-rules='[{"op":":filled","msg":"Choose your password"},{"op":":minLength","msg":"The password is too short: it must be at least 3 characters","arg":3}]' class="text"><input type="password" name="password2" id="frm-password2" data-nette-rules='[{"op":":valid","rules":[{"op":":filled","msg":"Reenter your password"},{"op":":equal","msg":"Passwords do not match","arg":{"control":"password"}}],"control":"password"}]' class="text"><input type="file" name="avatar" id="frm-avatar" data-nette-rules='[{"op":":fileSize","msg":"The size of the uploaded file can be up to %d% bytes.","arg":%d%},{"op":":filled","rules":[{"op":":image","msg":"Uploaded file is not image"}],"control":"avatar"}]' class="text">
 
 	<span class="error">
 		Reenter your password
 	</span>
 </td>
 </tr>
 
-<tr>
-	<th><label for="frm-avatar">Picture:</label></th>
-
-	<td><input type="file" name="avatar" id="frm-avatar" data-nette-rules='[{"op":":fileSize","msg":"The size of the uploaded file can be up to %d% bytes.","arg":%d%},{"op":":filled","rules":[{"op":":image","msg":"Uploaded file is not image"}],"control":"avatar"}]' class="text"></td>
-</tr>
-
 <tr>
 	<th><label for="frm-note">Comment:</label></th>
 

tests/Forms/Forms.renderer.1.phpt

@@ -86,10 +86,12 @@ $form->addSelect('countrySetItems', 'Country:')
 $form->addGroup('Your account');
 
 $form->addPassword('password', 'Choose password:')
+	->setOption('nextTo', 'password2')
 	->addRule(Form::FILLED, 'Choose your password')
 	->addRule(Form::MIN_LENGTH, 'The password is too short: it must be at least %d characters', 3);
 
 $form->addPassword('password2', 'Reenter password:')
+	->setOption('nextTo', 'avatar')
 	->addConditionOn($form['password'], Form::VALID)
 		->addRule(Form::FILLED, 'Reenter your password')
 		->addRule(Form::EQUAL, 'Passwords do not match', $form['password']);