DefaultFormRenderer: options 'class' & 'id' are used for 'control' part when 'pair' part is empty

Author: dg

src/Forms/Rendering/DefaultFormRenderer.php

@@ -431,6 +431,10 @@ public function renderControl(Nette\Forms\IControl $control): Html
 		if ($this->counter % 2) {
 			$body->class($this->getValue('control .odd'), true);
 		}
+		if (!$this->getWrapper('pair container')->getName()) {
+			$body->class($control->getOption('class'), true);
+			$body->id = $control->getOption('id');
+		}
 
 		$description = $control->getOption('description');
 		if ($description instanceof IHtmlString) {

tests/Forms/Forms.renderer.1.expect

@@ -5,7 +5,7 @@
 <p>We value your privacy and we ensure that the information you give to us will not be shared to other entities.</p>
 
 <table>
-<tr class="required">
+<tr class="required myclass" id="myid">
 	<th><label for="frm-name" class="required">Your name:</label></th>
 
 	<td><input type="text" name="name" id="frm-name" required data-nette-rules='[{"op":":filled","msg":"Enter your name"}]' value="John Doe" class="text"></td>

tests/Forms/Forms.renderer.1.phpt

@@ -43,7 +43,9 @@ $form->addGroup('Personal data')
 	->setOption('id', 'test-group-id-set-via-option');
 
 $form->addText('name', 'Your name:')
-	->addRule(Form::FILLED, 'Enter your name');
+	->addRule(Form::FILLED, 'Enter your name')
+	->setOption('class', 'myclass')
+	->setOption('id', 'myid');
 
 $form->addInteger('age', 'Your age:')
 	->addRule(Form::FILLED, 'Enter your age')

tests/Forms/Forms.renderer.2.expect

@@ -7,7 +7,7 @@
 
 	<dt><label for="frm-name" class="required">Your name:</label></dt>
 
-	<dd><input type="text" name="name" id="frm-name" required data-nette-rules='[{"op":":filled","msg":"Enter your name"}]' value="John Doe" class="text"> •</dd>
+	<dd class="myclass" id="myid"><input type="text" name="name" id="frm-name" required data-nette-rules='[{"op":":filled","msg":"Enter your name"}]' value="John Doe" class="text"> •</dd>
 
 
 

tests/Forms/Forms.renderer.2.phpt

@@ -55,7 +55,9 @@ $renderer->wrappers['control']['requiredsuffix'] = " \u{2022}";
 
 $form->addGroup('Personal data');
 $form->addText('name', 'Your name')
-	->addRule(Form::FILLED, 'Enter your name');
+	->addRule(Form::FILLED, 'Enter your name')
+	->setOption('class', 'myclass')
+	->setOption('id', 'myid');
 
 $form->addText('age', 'Your age')
 	->addRule(Form::FILLED, 'Enter your age')