fix: serialize intent

edmundhung · May 27, 2024 · 1e5cdab · 1e5cdab
1 parent f83d133
commit 1e5cdab
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/packages/conform-dom/form.ts b/packages/conform-dom/form.ts
@@ -346,7 +346,7 @@ function handleIntent<Error>(
 			const name = formatName(intent.payload.name, intent.payload.index);
 
 			if (typeof value !== 'undefined') {
-				updateValue(meta, name ?? '', serialize(value));
+				updateValue(meta, name ?? '', value);
 			}
 
 			if (typeof validated !== 'undefined') {

diff --git a/packages/conform-dom/submission.ts b/packages/conform-dom/submission.ts
@@ -166,13 +166,12 @@ export function parse<FormValue, FormError>(
 		switch (intent.type) {
 			case 'update': {
 				const name = formatName(intent.payload.name, intent.payload.index);
-				const value = serialize(intent.payload.value);
+				const value = intent.payload.value;
 
-				if (typeof value !== 'undefined') {
+				if (typeof intent.payload.value !== 'undefined') {
 					if (name) {
 						setValue(context.payload, name, () => value);
 					} else {
-						// @ts-expect-error FIXME - it must be an object if there is no name
 						context.payload = value;
 					}
 				}
@@ -188,16 +187,7 @@ export function parse<FormValue, FormError>(
 				}
 				break;
 			}
-			case 'insert': {
-				setListValue(context.payload, {
-					type: intent.type,
-					payload: {
-						...intent.payload,
-						defaultValue: serialize(intent.payload.defaultValue),
-					},
-				});
-				break;
-			}
+			case 'insert':
 			case 'remove':
 			case 'reorder': {
 				setListValue(context.payload, intent);
@@ -395,7 +385,26 @@ export function getIntent(
 }
 
 export function serializeIntent<Schema>(intent: Intent<Schema>): string {
-	return JSON.stringify(intent);
+	switch (intent.type) {
+		case 'insert':
+			return JSON.stringify({
+				type: intent.type,
+				payload: {
+					...intent.payload,
+					defaultValue: serialize(intent.payload.defaultValue),
+				},
+			});
+		case 'update':
+			return JSON.stringify({
+				type: intent.type,
+				payload: {
+					...intent.payload,
+					value: serialize(intent.payload.value),
+				},
+			});
+		default:
+			return JSON.stringify(intent);
+	}
 }
 
 export function updateList(

diff --git a/packages/conform-react/helpers.ts b/packages/conform-react/helpers.ts
@@ -259,10 +259,9 @@ export function getInputProps<Schema, Options extends InputOptions>(
 	if (typeof options.value === 'undefined' || options.value) {
 		if (options.type === 'checkbox' || options.type === 'radio') {
 			props.value = typeof options.value === 'string' ? options.value : 'on';
-			props.defaultChecked =
-				typeof metadata.initialValue === 'boolean'
-					? metadata.initialValue
-					: metadata.initialValue === props.value;
+			props.defaultChecked = Array.isArray(metadata.initialValue)
+				? metadata.initialValue.includes(options.value)
+				: metadata.initialValue === props.value;
 		} else if (typeof metadata.initialValue === 'string') {
 			props.defaultValue = metadata.initialValue;
 		}