SelectBox: correctly selects prompt [Closes #343]

Author: bartko-s

src/Forms/Controls/SelectBox.php

@@ -107,7 +107,8 @@ public function getControl(): Nette\Utils\Html
 			$items = [$promptKey => $this->translate($this->prompt)] + $items;
 			if ($this->isRequired()) {
 				$attrs['hidden:'][$promptKey] = $attrs['disabled:'][$promptKey] = true;
-				$selected ??= $promptKey; // disabled & selected for Safari, hidden for other browsers
+				// disabled & selected for Safari, hidden for other browsers
+				$selected = array_key_exists($this->value, $this->getItems()) ? $this->value : $promptKey;
 			}
 		}
 

tests/Forms/Controls.SelectBox.render.phpt

@@ -91,6 +91,36 @@ test('required select with prompt', function () {
 });
 
 
+test('select with prompt and invalid selected value', function () {
+	$form = new Form;
+	$input = $form->addSelect('list', 'Label', [
+		'a' => 'First',
+		0 => 'Second',
+	])->setPrompt('prompt')->checkDefaultValue(false);
+
+	Assert::same('<select name="list" id="frm-list"><option value="">prompt</option><option value="a">First</option><option value="0">Second</option></select>', (string) $input->getControl());
+
+	$input->setValue('does not exists');
+
+	Assert::same('<select name="list" id="frm-list"><option value="">prompt</option><option value="a">First</option><option value="0">Second</option></select>', (string) $input->getControl());
+});
+
+
+test('required select with prompt and invalid selected value', function () {
+	$form = new Form;
+	$input = $form->addSelect('list', 'Label', [
+		'a' => 'First',
+		0 => 'Second',
+	])->setPrompt('prompt')->setRequired()->checkDefaultValue(false);
+
+	Assert::same('<select name="list" id="frm-list" required data-nette-rules=\'[{"op":":filled","msg":"This field is required."}]\'><option value="" disabled hidden selected>prompt</option><option value="a">First</option><option value="0">Second</option></select>', (string) $input->getControl());
+
+	$input->setValue('does not exists');
+
+	Assert::same('<select name="list" id="frm-list" required data-nette-rules=\'[{"op":":filled","msg":"This field is required."}]\'><option value="" disabled hidden selected>prompt</option><option value="a">First</option><option value="0">Second</option></select>', (string) $input->getControl());
+});
+
+
 test('empty value and prompt', function () {
 	$form = new Form;
 	$input = $form->addSelect('list', 'Label', [