From 030752b4cc26317fdf45ce82f34720550c7dd4c9 Mon Sep 17 00:00:00 2001
From: Woramat Ngamkham <meet.ice1@gmail.com>
Date: Thu, 20 Oct 2022 12:58:40 +0700
Subject: [PATCH] feat(form): Add radio (#111)

---
 apps/demo/src/pages/index.astro          | 15 +++++++++++
 packages/form/Form.astro                 | 33 ++++++++++++++++++++++--
 packages/form/components/Field.astro     | 33 ++++++++++++++----------
 packages/form/core/form-control-types.ts | 11 ++++++--
 packages/form/core/form-control.ts       | 12 ++++++---
 5 files changed, 83 insertions(+), 21 deletions(-)

diff --git a/apps/demo/src/pages/index.astro b/apps/demo/src/pages/index.astro
index 93572ae..f1523d6 100644
--- a/apps/demo/src/pages/index.astro
+++ b/apps/demo/src/pages/index.astro
@@ -23,6 +23,21 @@ const form = new FormGroup([
     type: "password",
     validators: [Validators.required, Validators.minLength(8)],
   },
+  {
+    name: "rating",
+    label: "Rating",
+    type: "radio",
+    value: ["1", "2", "3", "4", "5"]
+  },
+  {
+    name: "agreement",
+    label: "Agreement",
+    type: "radio",
+    value: [
+      { label: "Agree", value: "yes" },
+      { label: "Disagree", value: "no", labelPosition: "right" }
+    ]
+  }
 ]);
 
 form.name = "Simple Form";
diff --git a/packages/form/Form.astro b/packages/form/Form.astro
index 408e9ae..9402cd5 100644
--- a/packages/form/Form.astro
+++ b/packages/form/Form.astro
@@ -1,5 +1,5 @@
 ---
-import { Submit, FormGroup, FormControl } from './core';
+import { Submit, FormGroup, FormControl, Radio, RadioOption } from './core';
 import Field from './components/Field.astro';
 import FieldSet from './components/FieldSet.astro';
 
@@ -21,8 +21,37 @@ const formName = Array.isArray(form) ? null : form?.name || null;
 		Array.isArray(form)
 			? form?.map((group) => <FieldSet showValidationHints={showValidationHints} group={group} />)
 			: form?.controls.map((control) => (
+				control.type === "radio" ? 
+				(
+					[
+						(<Field showValidationHints={showValidationHints} control={control} showOnlyLabel={true} />),
+						...(control as Radio)?.value?.map((v: string | RadioOption) => (
+							<Field
+								showValidationHints={showValidationHints} 
+								control={
+									(typeof v === "string") ?
+										new FormControl({
+											name: control.name,
+											type: "radio",
+											id: control.name + v,
+											label: v,
+											value: v
+										}) : 
+										new FormControl({
+											name: control.name,
+											type: "radio",
+											id: control.name + v.label,
+											...(v as RadioOption)
+										})
+								}
+							/>
+						))
+					]
+			  	) :
+				(
 					<Field showValidationHints={showValidationHints} control={control} />
-			  ))
+			 	)
+			))
 	}
 	{
 		submitControl && (
diff --git a/packages/form/components/Field.astro b/packages/form/components/Field.astro
index 207f625..6116642 100644
--- a/packages/form/components/Field.astro
+++ b/packages/form/components/Field.astro
@@ -4,9 +4,10 @@ import type { FormControl } from '../core/form-control';
 export interface Props {
 	control: FormControl;
 	showValidationHints: boolean;
+	showOnlyLabel?: boolean;
 }
 
-const { control, showValidationHints } = Astro.props;
+const { control, showValidationHints, showOnlyLabel = false } = Astro.props;
 
 const { validators = [] } = control;
 
@@ -31,28 +32,32 @@ const validatorAttirbutes: Record<string, string> = validators?.reduce(
 <div class="field" data-validator-hints={showValidationHints.toString()}>
 	{
 		control.label && control.labelPosition === 'left' && (
-			<label for={control.name}>
+			<label for={control?.id ?? control.name}>
 				{isRequired && <span>*</span>}
 				{control.label}
 			</label>
 		)
 	}
 
-	<input
-		name={control.name}
-		id={control.name}
-		type={control.type}
-		value={control.value}
-		checked={control.value === 'checked'}
-		placeholder={control.placeholder}
-		data-label={control.label}
-		data-label-position={control.labelPosition}
-		{...validatorAttirbutes}
-	/>
+	{
+		!showOnlyLabel && (
+			<input
+				name={control.name}
+				id={control?.id ?? control.name}
+				type={control.type}
+				value={control.value?.toString()} 
+				checked={control.value === 'checked'}
+				placeholder={control.placeholder}
+				data-label={control.label}
+				data-label-position={control.labelPosition}
+				{...validatorAttirbutes}
+			/>
+		)
+	}
 
 	{
 		control.label && control.labelPosition === 'right' && (
-			<label for={control.name}>
+			<label for={control?.id ?? control.name}>
 				{isRequired && <span>*</span>}
 				{control.label}
 			</label>
diff --git a/packages/form/core/form-control-types.ts b/packages/form/core/form-control-types.ts
index 275568d..3c8eeb0 100644
--- a/packages/form/core/form-control-types.ts
+++ b/packages/form/core/form-control-types.ts
@@ -29,6 +29,7 @@ export type ControlConfig = ControlBase | Checkbox | Radio | Submit | Button;
 
 export interface ControlBase {
 	name: string;
+	id?: string;
 	type?: ControlType;
 	value?: string | number | string[];
 	label?: string;
@@ -42,9 +43,15 @@ export interface Checkbox extends ControlBase {
 	checked: boolean;
 }
 
-export interface Radio extends ControlBase {
+export interface Radio extends Omit<ControlBase, 'value'> {
 	type: 'radio';
-	checked: boolean;
+	value: string[] | RadioOption[];
+}
+
+export interface RadioOption extends Omit<ControlBase, 'name'> {
+	label: string;
+	value: string;
+	checked?: boolean;
 }
 
 export interface Submit extends ControlBase {
diff --git a/packages/form/core/form-control.ts b/packages/form/core/form-control.ts
index 9bd9f5e..250e06e 100644
--- a/packages/form/core/form-control.ts
+++ b/packages/form/core/form-control.ts
@@ -1,9 +1,10 @@
-import type { ControlConfig, ControlType } from './form-control-types';
+import type { ControlConfig, ControlType, RadioOption } from './form-control-types';
 
 export class FormControl {
 	private _name = '';
+	private _id = '';
 	private _type: ControlType = 'text';
-	private _value?: string | number | null | string[];
+	private _value?: string | number | null | string[] | RadioOption[];
 	private _label?: string;
 	private _labelPosition?: 'right' | 'left' = 'left';
 	private _isValid = true;
@@ -12,8 +13,9 @@ export class FormControl {
 	private _validators?: string[];
 
 	constructor(config: ControlConfig) {
-		const { name, type, value, label, labelPosition, placeholder, validators } = config;
+		const { name, id, type, value, label, labelPosition, placeholder, validators } = config;
 		this._name = name;
+		this._id = id ?? name;
 		this._type = type ?? 'text';
 		this._value = value ?? null;
 		this._label = label ?? '';
@@ -26,6 +28,10 @@ export class FormControl {
 		return this._name;
 	}
 
+	get id() {
+		return this._id;
+	}
+
 	get type() {
 		return this._type;
 	}