Fixed initialValues not being cleared when options `clearAfterSubmi…

…t` and `setInitialValuesOnSuccess` are both `true`
jalik · May 8, 2024 · 5f0e711 · 5f0e711
1 parent a912558
commit 5f0e711
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.4.1 (2024-05-08)
+
+- Fixed `initialValues` not being cleared when options `clearAfterSubmit` and `setInitialValuesOnSuccess` are both `true`
+
 ## 5.4.0 (2024-05-06)
 
 - Fixed submit success not being updated when promise returned no result

diff --git a/src/useFormReducer.ts b/src/useFormReducer.ts
@@ -528,9 +528,9 @@ function useFormReducer<V extends Values, E, R> (
         ...(action.data.clear ? initialState : state),
         debug: state.debug,
         initialized: true,
-        initialValues: action.data.setInitialValuesOnSuccess
-          ? state.values
-          : state.initialValues,
+        initialValues: action.data.clear
+          ? initialState.initialValues
+          : (action.data.setInitialValuesOnSuccess ? state.values : state.initialValues),
         modified: false,
         modifiedFields: {},
         submitCount: 0,