Skip to content

Fix incorrect step count in multi-step form #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Toflar merged 5 commits into from
May 19, 2025
Merged

Fix incorrect step count in multi-step form #92

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c90beb6
Fix incorrect step count in multi-step form
qzminski May 19, 2025
caeead8
If the last form field is not a page break, we need to merge the last…
qzminski May 19, 2025
7af906c
Update src/FormManager.php
qzminski May 19, 2025
ed1cbb8
Fix a potential issue if no page breaks are inside the form
qzminski May 19, 2025
64930f3
Use array_pop instead of unset
qzminski May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/FormManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,16 +414,21 @@ private function prepare(): void
}

$i = 0;
$isPageBreakLastFormField = false;

foreach ($this->formFieldModels as $k => $formField) {
$this->formFieldsPerStep[$i][$k] = $formField;

if ($this->isPageBreak($formField)) {
$isPageBreakLastFormField = true;

// Set the name on the model, otherwise one has to enter it in the back end every time
$formField->name = $formField->type;

// Increase counter
++$i;
} else {
$isPageBreakLastFormField = false;
}

// If we have a regular submit form field, that's a misconfiguration
Expand All @@ -432,6 +437,20 @@ private function prepare(): void
}
}

// If the last form field is not a page break, we need to merge the last step into the previous one
if (!$isPageBreakLastFormField) {
$lastStepIndex = count($this->formFieldsPerStep) - 1;
Comment thread
qzminski marked this conversation as resolved.

if (isset($this->formFieldsPerStep[$lastStepIndex], $this->formFieldsPerStep[$lastStepIndex - 1])) {
$this->formFieldsPerStep[$lastStepIndex - 1] = [
...$this->formFieldsPerStep[$lastStepIndex - 1], // Second last step
...$this->formFieldsPerStep[$lastStepIndex], // Last step
];

array_pop($this->formFieldsPerStep);
}
}

$this->prepared = true;
$this->preparing = false;
}
Expand Down