From c0b2f536f56fcb3e373f6d9e212a8f7c028204c9 Mon Sep 17 00:00:00 2001
From: Jessie Wei <jeswei@amazon.com>
Date: Tue, 31 Oct 2023 09:43:06 +1100
Subject: [PATCH] fix(FormRenderer-Wizard): Fix an issue where validation can
 be skipped in certain scenarios. Close #991 (#995)

---
 .../src/components/FormRenderer/components/Wizard/index.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/components/FormRenderer/components/Wizard/index.tsx b/packages/ui/src/components/FormRenderer/components/Wizard/index.tsx
index fd5ad531..4e7ebac4 100644
--- a/packages/ui/src/components/FormRenderer/components/Wizard/index.tsx
+++ b/packages/ui/src/components/FormRenderer/components/Wizard/index.tsx
@@ -64,6 +64,7 @@ const Wizard: FC<WizardProps> = ({
     const formOptions = useFormApi();
     const { isSubmitting } = useFormRendererContext();
     const [activeStepIndex, setActiveStepIndex] = useState(props.activeStepIndex || 0);
+    const [maxStepIndex, setMaxStepIndex] = useState(0);
     const [isLoadingNextStep, setIsLoadingNextStep] = useState(props.isLoadingNextStep || isSubmitting);
     const [errorText, setErrorText] = useState<string>();
 
@@ -132,6 +133,7 @@ const Wizard: FC<WizardProps> = ({
             const response = await handleNavigating(event);
             if (response.continued) {
                 setActiveStepIndex(requestedStepIndex);
+                setMaxStepIndex((prev) => (requestedStepIndex > prev ? requestedStepIndex : prev));
             } else {
                 setErrorText(response.errorText);
             }
@@ -144,7 +146,7 @@ const Wizard: FC<WizardProps> = ({
             setErrorText(undefined);
             const requestedStepIndex = event.detail.requestedStepIndex;
 
-            if (activeStepIndex < event.detail.requestedStepIndex) {
+            if (activeStepIndex < event.detail.requestedStepIndex || activeStepIndex < maxStepIndex) {
                 const state = formOptions.getState();
                 setShowError(true);
                 if (!(state.invalid || state.validating || state.submitting)) {
@@ -154,7 +156,7 @@ const Wizard: FC<WizardProps> = ({
                 processNavigate(requestedStepIndex, event);
             }
         },
-        [activeStepIndex, formOptions, processNavigate]
+        [activeStepIndex, maxStepIndex, formOptions, processNavigate]
     );
 
     return (