From e8c7ea89d1cdbd5100b6c9fee6c1b3df86927fb6 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Thu, 20 Oct 2022 16:10:54 +0200
Subject: [PATCH 1/2] [feat] add reset option to update method of enhance

It's not uncommon to want the form values be preserved, so it makes sense to have this configurable
---
 .changeset/nervous-students-march.md                   |  6 ++++++
 documentation/docs/06-form-actions.md                  |  2 +-
 .../templates/default/src/routes/sverdle/+page.svelte  | 10 +++-------
 packages/kit/src/runtime/app/forms.js                  |  9 ++++++---
 packages/kit/types/ambient.d.ts                        |  8 ++++++--
 5 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/nervous-students-march.md

diff --git a/.changeset/nervous-students-march.md b/.changeset/nervous-students-march.md
new file mode 100644
index 000000000000..8efe61cff274
--- /dev/null
+++ b/.changeset/nervous-students-march.md
@@ -0,0 +1,6 @@
+---
+'default-template': patch
+'@sveltejs/kit': patch
+---
+
+[feat] add reset option to update method of enhance
diff --git a/documentation/docs/06-form-actions.md b/documentation/docs/06-form-actions.md
index 401e09f14ca3..05dcde8467e3 100644
--- a/documentation/docs/06-form-actions.md
+++ b/documentation/docs/06-form-actions.md
@@ -250,7 +250,7 @@ The easiest way to progressively enhance a form is to add the `use:enhance` acti
 Without an argument, `use:enhance` will emulate the browser-native behaviour, just without the full-page reloads. It will:
 
 - update the `form` property, `$page.form` and `$page.status` on a successful or invalid response, but only if the action is on the same page you're submitting from. So for example if your form looks like `<form action="/somewhere/else" ..>`, `form` and `$page` will _not_ be updated. This is because in the native form submission case you would be redirected to the page the action is on.
-- invalidate all data using `invalidateAll` on a successful response
+- reset the `<form>` element and invalidate all data using `invalidateAll` on a successful response
 - call `goto` on a redirect response
 - render the nearest `+error` boundary if an error occurs
 
diff --git a/packages/create-svelte/templates/default/src/routes/sverdle/+page.svelte b/packages/create-svelte/templates/default/src/routes/sverdle/+page.svelte
index 6f3352278dea..894afab18ff7 100644
--- a/packages/create-svelte/templates/default/src/routes/sverdle/+page.svelte
+++ b/packages/create-svelte/templates/default/src/routes/sverdle/+page.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
 	import { confetti } from '@neoconfetti/svelte';
-	import { applyAction, enhance } from '$app/forms';
+	import { enhance } from '$app/forms';
 	import type { PageData, ActionData } from './$types';
-	import { invalidateAll } from '$app/navigation';
 
 	/** @type {import('./$types').PageData} */
 	export let data: PageData;
@@ -84,11 +83,8 @@
 	action="?/enter"
 	use:enhance={() => {
 		// prevent default callback from resetting the form
-		return async ({ result }) => {
-			if (result.type === 'success') {
-				await invalidateAll();
-			}
-			await applyAction(result);
+		return ({ update }) => {
+			update({ reset: false });
 		};
 	}}
 >
diff --git a/packages/kit/src/runtime/app/forms.js b/packages/kit/src/runtime/app/forms.js
index 4a93d633d9f3..21525236e468 100644
--- a/packages/kit/src/runtime/app/forms.js
+++ b/packages/kit/src/runtime/app/forms.js
@@ -21,11 +21,14 @@ export function enhance(form, submit = () => {}) {
 	 * @param {{
 	 *   action: URL;
 	 *   result: import('types').ActionResult;
+	 *   reset?: boolean
 	 * }} opts
 	 */
-	const fallback_callback = async ({ action, result }) => {
+	const fallback_callback = async ({ action, result, reset }) => {
 		if (result.type === 'success') {
-			form.reset();
+			if (reset !== false) {
+				form.reset();
+			}
 			await invalidateAll();
 		}
 
@@ -97,7 +100,7 @@ export function enhance(form, submit = () => {}) {
 			action,
 			data,
 			form,
-			update: () => fallback_callback({ action, result }),
+			update: (opts) => fallback_callback({ action, result, reset: opts?.reset }),
 			// @ts-expect-error generic constraints stuff we don't care about
 			result,
 			// TODO remove for 1.0
diff --git a/packages/kit/types/ambient.d.ts b/packages/kit/types/ambient.d.ts
index b6fb5d535188..a16e439f81ed 100644
--- a/packages/kit/types/ambient.d.ts
+++ b/packages/kit/types/ambient.d.ts
@@ -110,7 +110,11 @@ declare module '$app/forms' {
 				form: HTMLFormElement;
 				action: URL;
 				result: ActionResult<Success, Invalid>;
-				update: () => Promise<void>;
+				/**
+				 * Call this to get the default behavior of a form submission response.
+				 * @param options Set `reset: false` if you don't want the `<form>` values to be reset after a successful submission.
+				 */
+				update: (options?: { reset: boolean }) => Promise<void>;
 		  }) => void);
 
 	/**
@@ -133,7 +137,7 @@ declare module '$app/forms' {
 		 * If this function or its return value isn't set, it
 		 * - falls back to updating the `form` prop with the returned data if the action is one same page as the form
 		 * - updates `$page.status`
-		 * - invalidates all data in case of successful submission with no redirect response
+		 * - resets the `<form>` element and invalidates all data in case of successful submission with no redirect response
 		 * - redirects in case of a redirect response
 		 * - redirects to the nearest error page in case of an unexpected error
 		 *

From 8f36ef0a334581b3e57e2a26cf3e96a8fbf9df1a Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 20 Oct 2022 16:23:12 +0200
Subject: [PATCH 2/2] Update .changeset/nervous-students-march.md

Co-authored-by: gtmnayan <50981692+gtm-nayan@users.noreply.github.com>
---
 .changeset/nervous-students-march.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/nervous-students-march.md b/.changeset/nervous-students-march.md
index 8efe61cff274..c79099c5944c 100644
--- a/.changeset/nervous-students-march.md
+++ b/.changeset/nervous-students-march.md
@@ -1,5 +1,5 @@
 ---
-'default-template': patch
+'create-svelte': patch
 '@sveltejs/kit': patch
 ---