Rules::validate() $emptyOptional is always false in BLANK condition

Author: dg

src/Forms/Rules.php

@@ -224,9 +224,9 @@ public function getToggleStates(array $toggles = [], bool $success = true): arra
 	/**
 	 * Validates against ruleset.
 	 */
-	public function validate(bool $emptyOptional = false): bool
+	public function validate(bool $emptyOptional = null): bool
 	{
-		$emptyOptional = $emptyOptional || !$this->isRequired() && !$this->control->isFilled();
+		$emptyOptional = $emptyOptional ?? (!$this->isRequired() && !$this->control->isFilled());
 		foreach ($this as $rule) {
 			if (!$rule->branch && $emptyOptional && $rule->validator !== Form::FILLED) {
 				continue;

src/assets/netteForms.js

@@ -139,7 +139,7 @@
 		elem = elem.tagName ? elem : elem[0]; // RadioNodeList
 		rules = rules || JSON.parse(elem.getAttribute('data-nette-rules') || '[]');
 		value = value === undefined ? {value: Nette.getEffectiveValue(elem)} : value;
-		emptyOptional = emptyOptional || !Nette.validateRule(elem, ':filled', null, value);
+		emptyOptional = emptyOptional === undefined ? !Nette.validateRule(elem, ':filled', null, value) : emptyOptional;
 
 		for (var id = 0, len = rules.length; id < len; id++) {
 			var rule = rules[id],

tests/Forms/Controls.TextBase.loadData.phpt

@@ -189,3 +189,19 @@ test(function () { // filter in condition
 	$input->validate();
 	Assert::same('olleh', $input->getValue());
 });
+
+
+test(function () { // filter in BLANK condition
+	$_POST = ['text' => ''];
+
+	$form = new Form;
+	$input = $form->addText('text');
+	$input->addCondition($form::BLANK)
+		->addFilter(function () use ($input) {
+			return 'default';
+		});
+
+	Assert::same('', $input->getValue());
+	$input->validate();
+	Assert::same('default', $input->getValue());
+});