Rules::getToggleStates() synced with netteForms.js toggleControl

Author: dg

src/Forms/Rules.php

@@ -215,15 +215,22 @@ public function getToggles(bool $actual = false): array
 
 
 	/** @internal */
-	public function getToggleStates(array $toggles = [], bool $success = true): array
+	public function getToggleStates(array $toggles = [], bool $success = true, bool $emptyOptional = null): array
 	{
 		foreach ($this->toggles as $id => $hide) {
 			$toggles[$id] = ($success xor !$hide) || !empty($toggles[$id]);
 		}
 
-		foreach ($this->rules as $rule) {
+		$emptyOptional = $emptyOptional ?? (!$this->isRequired() && !$this->control->isFilled());
+		foreach ($this as $rule) {
 			if ($rule->branch) {
-				$toggles = $rule->branch->getToggleStates($toggles, $success && static::validateRule($rule));
+				$toggles = $rule->branch->getToggleStates(
+					$toggles,
+					$success && static::validateRule($rule),
+					$rule->validator === Form::BLANK ? false : $emptyOptional
+				);
+			} elseif (!$emptyOptional || $rule->validator === Form::FILLED) {
+				$success = $success && static::validateRule($rule);
 			}
 		}
 		return $toggles;

tests/Forms/Forms.toggle.phpt

@@ -548,3 +548,134 @@ test(function () {
 		'a' => true,
 	], $form->getToggles());
 });
+
+
+test(function () { // combined with rules
+	$form = new Form;
+	$form->addText('1');
+	$form->addText('2');
+	$form->addText('3')
+		->setRequired()
+		->addConditionOn($form['1'], Form::NOT_EQUAL, 'x')
+			->toggle('a')
+			->addConditionOn($form['2'], Form::NOT_EQUAL, 'x')
+				->toggle('b')
+			->endCondition()
+		->endCondition();
+
+	Assert::same([
+		'a' => false,
+		'b' => false,
+	], $form->getToggles());
+});
+
+
+test(function () {
+	$form = new Form;
+	$form->addText('1');
+	$form->addText('2');
+	$form->addText('3')
+		->setRequired()
+		->addRule(Form::NOT_EQUAL, null, 'x')
+		->addConditionOn($form['1'], Form::EQUAL, 'x')
+			->toggle('a')
+			->addConditionOn($form['2'], Form::EQUAL, 'x')
+				->toggle('b');
+
+	Assert::same([
+		'a' => false,
+		'b' => false,
+	], $form->getToggles());
+});
+
+
+test(function () {
+	$form = new Form;
+	$form->addText('1');
+	$form->addText('2');
+	$form->addText('3')
+		->setRequired()
+		->addRule(Form::EQUAL, null, 'x')
+		->addConditionOn($form['1'], Form::NOT_EQUAL, 'x')
+			->toggle('a')
+			->addConditionOn($form['2'], Form::NOT_EQUAL, 'x')
+				->toggle('b');
+
+	Assert::same([
+		'a' => false,
+		'b' => false,
+	], $form->getToggles());
+});
+
+
+test(function () {
+	$form = new Form;
+	$form->addText('1');
+	$form->addText('2');
+	$form->addText('3')
+		->addConditionOn($form['1'], Form::NOT_EQUAL, 'x')
+			->setRequired()
+			->addRule(Form::EQUAL, null, 'x')
+			->toggle('a')
+			->addConditionOn($form['2'], Form::NOT_EQUAL, 'x')
+				->toggle('b');
+
+	Assert::same([
+		'a' => true,
+		'b' => false,
+	], $form->getToggles());
+});
+
+
+test(function () {
+	$form = new Form;
+	$form->addText('1');
+	$form->addText('2');
+	$form->addText('3')
+		->addRule(Form::EQUAL, null, 'x')
+		->addConditionOn($form['1'], Form::NOT_EQUAL, 'x')
+			->toggle('a')
+			->addConditionOn($form['2'], Form::NOT_EQUAL, 'x')
+				->toggle('b');
+
+	Assert::same([
+		'a' => true,
+		'b' => true,
+	], $form->getToggles());
+});
+
+
+test(function () {
+	$form = new Form;
+	$form->addText('1');
+	$form->addText('2');
+	$form->addText('3')
+		->addConditionOn($form['1'], Form::NOT_EQUAL, 'x')
+			->addRule(Form::EQUAL, null, 'x')
+			->toggle('a')
+			->addConditionOn($form['2'], Form::NOT_EQUAL, 'x')
+				->toggle('b');
+
+	Assert::same([
+		'a' => true,
+		'b' => true,
+	], $form->getToggles());
+});
+
+
+test(function () {
+	$form = new Form;
+	$form->addText('1');
+	$form->addText('2');
+	$form->addText('3')
+		->addConditionOn($form['1'], Form::NOT_EQUAL, 'x')
+			->addRule(Form::EQUAL, null, 'x')
+			->toggle('a')
+			->addConditionOn($form['2'], Form::NOT_EQUAL, 'x')
+				->toggle('b');
+
+	Assert::same([
+		'a' => true,
+		'b' => true,
+	], $form->getToggles());
+});