Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/failed-submit-not-recorded.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@lucas-barake/effect-form": patch
---

a failed `onSubmit` is no longer recorded as a successful submit (`lastSubmittedValues` only updates when `onSubmit` succeeds)
28 changes: 18 additions & 10 deletions packages/form/src/FormAtoms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -483,18 +483,26 @@ export const make = <TFields extends Field.FieldsRecord, R, A, E, SubmitArgs = v
)
)
const submitState = operations.createSubmitState(state.value)
get.set(
stateAtom,
Option.some({
...submitState,
lastSubmittedValues: Option.some({ encoded: values, decoded })
})
)
get.set(stateAtom, Option.some(submitState))
const result = config.onSubmit(args, { decoded, encoded: values, get })
if (Effect.isEffect(result)) {
return yield* result as Effect.Effect<A, E, R>
const output = Effect.isEffect(result)
? yield* (result as Effect.Effect<A, E, R>)
: (result as A)
// Only record the values as "last submitted" once onSubmit has
// succeeded. A failed onSubmit must not be reported as a successful
// submit, otherwise revertToLastSubmit / hasChangedSinceSubmit would
// treat unsaved, failed values as persisted.
const afterSubmit = get(stateAtom)
if (Option.isSome(afterSubmit)) {
get.set(
stateAtom,
Option.some({
...afterSubmit.value,
lastSubmittedValues: Option.some({ encoded: values, decoded })
})
)
}
return result as A
return output
}),
config.reactivityKeys ? { reactivityKeys: config.reactivityKeys } : undefined
)
Expand Down
28 changes: 28 additions & 0 deletions packages/form/test/FormAtoms.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1598,6 +1598,34 @@ describe("FormAtoms", () => {
expect(Option.isSome(finalState.lastSubmittedValues)).toBe(true)
expect(Option.getOrThrow(finalState.lastSubmittedValues).encoded.email).toBe("first@example.com")
})

it("does not record lastSubmittedValues when onSubmit itself fails", async () => {
const runtime = Atom.runtime(Layer.empty)
const EmailField = Field.makeField(
"email",
Schema.String.pipe(Schema.check(Schema.isNonEmpty({ message: "Email is required" })))
)
const form = FormBuilder.empty.addField(EmailField)
const onSubmit = vi.fn(() => Effect.fail("network error"))
const atoms = FormAtoms.make({ runtime, formBuilder: form, onSubmit })
const registry = AtomRegistry.make()

const initialState = atoms.operations.createInitialState({ email: "valid@example.com" })
registry.set(atoms.stateAtom, Option.some(initialState))
registry.mount(atoms.stateAtom)
registry.mount(atoms.lastSubmittedValuesAtom)
registry.mount(atoms.submitAtom)
registry.set(atoms.submitAtom, undefined)

await new Promise((resolve) => setTimeout(resolve, 50))

// onSubmit ran (validation passed) but FAILED. The submit did not succeed,
// so the form must not report these values as "last submitted".
expect(onSubmit).toHaveBeenCalledTimes(1)
const stateAfter = registry.get(atoms.stateAtom).pipe(Option.getOrThrow)
expect(Option.isNone(stateAfter.lastSubmittedValues)).toBe(true)
expect(Option.isNone(registry.get(atoms.lastSubmittedValuesAtom))).toBe(true)
})
})

describe("rootErrorAtom", () => {
Expand Down
Loading