RadioList: is rendered without attribute ID; added $generateId for back compatibility (BC BREAK!)

Author: dg

src/Forms/Controls/RadioList.php

@@ -22,6 +22,9 @@
  */
 class RadioList extends ChoiceControl
 {
+	/** @var bool */
+	public $generateId = FALSE;
+
 	/** @var Nette\Utils\Html  separator element template */
 	protected $separator;
 
@@ -98,19 +101,22 @@ public function getControl($key = NULL)
 		}
 
 		$input = parent::getControl();
+		$items = $this->getItems();
 		$ids = array();
-		foreach ($this->getItems() as $value => $label) {
-			$ids[$value] = $input->id . '-' . $value;
+		if ($this->generateId) {
+			foreach ($items as $value => $label) {
+				$ids[$value] = $input->id . '-' . $value;
+			}
 		}
 
 		return $this->container->setHtml(
 			Nette\Forms\Helpers::createInputList(
-				$this->translate($this->getItems()),
+				$this->translate($items),
 				array_merge($input->attrs, array(
 					'id:' => $ids,
 					'checked?' => $this->value,
 					'disabled:' => $this->disabled,
-					'data-nette-rules:' => array(key($ids) => $input->attrs['data-nette-rules']),
+					'data-nette-rules:' => array(key($items) => $input->attrs['data-nette-rules']),
 				)),
 				array('for:' => $ids) + $this->itemLabel->attrs,
 				$this->separator

tests/Forms/Controls.RadioList.render.phpt

@@ -36,7 +36,7 @@ test(function() {
 	Assert::same('<label for="frm-list-0">Second</label>', (string) $input->getLabelPart(0));
 
 	Assert::type('Nette\Utils\Html', $input->getControl());
-	Assert::same('<label for="frm-list-a"><input type="radio" name="list" id="frm-list-a" value="a">First</label><br><label for="frm-list-0"><input type="radio" name="list" id="frm-list-0" value="0">Second</label>', (string) $input->getControl());
+	Assert::same('<label><input type="radio" name="list" value="a">First</label><br><label><input type="radio" name="list" value="0">Second</label>', (string) $input->getControl());
 
 	Assert::type('Nette\Utils\Html', $input->getControlPart(0));
 	Assert::same('<input type="radio" name="list" id="frm-list-0" value="0">', (string) $input->getControlPart(0));
@@ -50,7 +50,7 @@ test(function() { // checked
 		0 => 'Second',
 	))->setValue(0);
 
-	Assert::same('<label for="frm-list-a"><input type="radio" name="list" id="frm-list-a" value="a">First</label><br><label for="frm-list-0"><input type="radio" name="list" id="frm-list-0" checked value="0">Second</label>', (string) $input->getControl());
+	Assert::same('<label><input type="radio" name="list" value="a">First</label><br><label><input type="radio" name="list" checked value="0">Second</label>', (string) $input->getControl());
 });
 
 
@@ -66,7 +66,7 @@ test(function() { // translator
 	Assert::same('<label>ANOTHER LABEL</label>', (string) $input->getLabel('Another label'));
 	Assert::same('<label for="frm-list-0">SECOND</label>', (string) $input->getLabelPart(0));
 
-	Assert::same('<label for="frm-list-a"><input type="radio" name="list" id="frm-list-a" value="a">FIRST</label><br><label for="frm-list-0"><input type="radio" name="list" id="frm-list-0" value="0">SECOND</label>', (string) $input->getControl());
+	Assert::same('<label><input type="radio" name="list" value="a">FIRST</label><br><label><input type="radio" name="list" value="0">SECOND</label>', (string) $input->getControl());
 	Assert::same('<input type="radio" name="list" id="frm-list-0" value="0">', (string) $input->getControlPart(0));
 });
 
@@ -81,7 +81,7 @@ test(function() { // Html
 	Assert::same('<label><b>Label</b></label>', (string) $input->getLabel());
 	Assert::same('<label><b>Another label</b></label>', (string) $input->getLabel(Html::el('b', 'Another label')));
 
-	Assert::same('<label for="frm-list-a"><input type="radio" name="list" id="frm-list-a" value="a"><b>First</b></label>', (string) $input->getControl());
+	Assert::same('<label><input type="radio" name="list" value="a"><b>First</b></label>', (string) $input->getControl());
 	Assert::same('<input type="radio" name="list" id="frm-list-a" value="a">', (string) $input->getControlPart('a'));
 });
 
@@ -93,7 +93,7 @@ test(function() { // validation rules
 		0 => 'Second',
 	))->setRequired('required');
 
-	Assert::same('<label for="frm-list-a"><input type="radio" name="list" required id="frm-list-a" data-nette-rules=\'[{"op":":filled","msg":"required"}]\' value="a">First</label><br><label for="frm-list-0"><input type="radio" name="list" required id="frm-list-0" value="0">Second</label>', (string) $input->getControl());
+	Assert::same('<label><input type="radio" name="list" required data-nette-rules=\'[{"op":":filled","msg":"required"}]\' value="a">First</label><br><label><input type="radio" name="list" required value="0">Second</label>', (string) $input->getControl());
 	Assert::same('<input type="radio" name="list" id="frm-list-0" required data-nette-rules=\'[{"op":":filled","msg":"required"}]\' value="0">', (string) $input->getControlPart(0));
 });
 
@@ -106,7 +106,7 @@ test(function() { // container
 		0 => 'Second',
 	));
 
-	Assert::same('<label for="frm-container-list-a"><input type="radio" name="container[list]" id="frm-container-list-a" value="a">First</label><br><label for="frm-container-list-0"><input type="radio" name="container[list]" id="frm-container-list-0" value="0">Second</label>', (string) $input->getControl());
+	Assert::same('<label><input type="radio" name="container[list]" value="a">First</label><br><label><input type="radio" name="container[list]" value="0">Second</label>', (string) $input->getControl());
 });
 
 
@@ -118,7 +118,7 @@ test(function() { // container prototype
 	$input->getSeparatorPrototype()->setName('hr');
 	$input->getContainerPrototype()->setName('div');
 
-	Assert::same('<div><label for="frm-list-a"><input type="radio" name="list" id="frm-list-a" value="a">b</label></div>', (string) $input->getControl());
+	Assert::same('<div><label><input type="radio" name="list" value="a">b</label></div>', (string) $input->getControl());
 });
 
 
@@ -129,7 +129,7 @@ test(function() { // disabled all
 		0 => 'Second',
 	))->setDisabled(TRUE);
 
-	Assert::same('<label for="frm-list-a"><input type="radio" name="list" disabled id="frm-list-a" value="a">First</label><br><label for="frm-list-0"><input type="radio" name="list" disabled id="frm-list-0" value="0">Second</label>', (string) $input->getControl());
+	Assert::same('<label><input type="radio" name="list" disabled value="a">First</label><br><label><input type="radio" name="list" disabled value="0">Second</label>', (string) $input->getControl());
 });
 
 
@@ -140,7 +140,7 @@ test(function() { // disabled one
 		0 => 'Second',
 	))->setDisabled(array('a'));
 
-	Assert::same('<label for="frm-list-a"><input type="radio" name="list" id="frm-list-a" disabled value="a">First</label><br><label for="frm-list-0"><input type="radio" name="list" id="frm-list-0" value="0">Second</label>', (string) $input->getControl());
+	Assert::same('<label><input type="radio" name="list" disabled value="a">First</label><br><label><input type="radio" name="list" value="0">Second</label>', (string) $input->getControl());
 	Assert::same('<input type="radio" name="list" id="frm-list-a" disabled value="a">', (string) $input->getControlPart('a'));
 });
 
@@ -152,5 +152,17 @@ test(function() { // item label prototype
 	));
 	$input->getItemLabelPrototype()->class("foo");
 
-	Assert::same('<label class="foo" for="frm-list-a"><input type="radio" name="list" id="frm-list-a" value="a">b</label>', (string) $input->getControl());
+	Assert::same('<label class="foo"><input type="radio" name="list" value="a">b</label>', (string) $input->getControl());
+});
+
+
+test(function() { // forced ID
+	$form = new Form;
+	$input = $form->addRadioList('list', 'Label', array(
+		'a' => 'First',
+		0 => 'Second',
+	));
+	$input->generateId = TRUE;
+
+	Assert::same('<label for="frm-list-a"><input type="radio" name="list" id="frm-list-a" value="a">First</label><br><label for="frm-list-0"><input type="radio" name="list" id="frm-list-0" value="0">Second</label>', (string) $input->getControl());
 });

tests/Forms/Forms.renderer.1.expect

@@ -25,7 +25,7 @@
 <tr>
 	<th><label>Your gender:</label></th>
 
-	<td><label for="frm-gender-m"><input type="radio" name="gender" id="frm-gender-m" value="m">male</label><br><label for="frm-gender-f"><input type="radio" name="gender" id="frm-gender-f" value="f">female</label></td>
+	<td><label><input type="radio" name="gender" value="m">male</label><br><label><input type="radio" name="gender" value="f">female</label></td>
 </tr>
 
 <tr>