From b06871d329a7770f55321e4e71050b0ea2473cde Mon Sep 17 00:00:00 2001
From: jmfrancois <jmfrancois@talend.com>
Date: Tue, 10 Oct 2023 14:19:40 +0200
Subject: [PATCH] chore: fix build

---
 .../Form/Checkbox/Primitive/CheckboxPrimitive.tsx    | 12 ++++--------
 .../ToggleSwitch/Primitive/ToggleSwitchPrimitive.tsx |  4 +++-
 packages/design-system/src/components/Form/index.ts  |  7 +++++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/design-system/src/components/Form/Checkbox/Primitive/CheckboxPrimitive.tsx b/packages/design-system/src/components/Form/Checkbox/Primitive/CheckboxPrimitive.tsx
index d98d743a7d..de7cabfae8 100644
--- a/packages/design-system/src/components/Form/Checkbox/Primitive/CheckboxPrimitive.tsx
+++ b/packages/design-system/src/components/Form/Checkbox/Primitive/CheckboxPrimitive.tsx
@@ -16,10 +16,7 @@ import Label from '../../Label';
 
 import styles from './Checkbox.module.scss';
 
-type CheckboxProps = Omit<InputHTMLAttributes<HTMLInputElement>, 'onChange'> & {
-	// Redefine onChange
-	onChange?: (isChecked: boolean) => void;
-
+type CheckboxProps = InputHTMLAttributes<HTMLInputElement> & {
 	value?: string | number;
 };
 
@@ -72,10 +69,9 @@ const CheckboxPrimitive = forwardRef(
 					id={checkboxId}
 					checked={checked}
 					aria-checked={indeterminate ? 'mixed' : checked}
-					onChange={() =>
-						// If readonly, we return current check status ; Else we return opposite status as new status
-						onChange?.(Boolean(readOnly ? checked : !checked))
-					}
+					onChange={e => {
+						onChange?.(e);
+					}}
 					{...rest}
 				/>
 				<Label htmlFor={checkboxId} inline>
diff --git a/packages/design-system/src/components/Form/ToggleSwitch/Primitive/ToggleSwitchPrimitive.tsx b/packages/design-system/src/components/Form/ToggleSwitch/Primitive/ToggleSwitchPrimitive.tsx
index b761c24df1..2bff188ffe 100644
--- a/packages/design-system/src/components/Form/ToggleSwitch/Primitive/ToggleSwitchPrimitive.tsx
+++ b/packages/design-system/src/components/Form/ToggleSwitch/Primitive/ToggleSwitchPrimitive.tsx
@@ -8,7 +8,9 @@ import { CheckboxPrimitiveType } from '../../Checkbox/Primitive/CheckboxPrimitiv
 
 import styles from './ToggleSwitchPrimitive.module.scss';
 
-export type ToggleSwitchPrimitiveType = CheckboxPrimitiveType;
+export type ToggleSwitchPrimitiveType = Omit<CheckboxPrimitiveType, 'onChange'> & {
+	onChange?: (checked: boolean) => void;
+};
 
 const ToggleSwitchPrimitive = forwardRef(
 	(
diff --git a/packages/design-system/src/components/Form/index.ts b/packages/design-system/src/components/Form/index.ts
index 004128749a..04676895b1 100644
--- a/packages/design-system/src/components/Form/index.ts
+++ b/packages/design-system/src/components/Form/index.ts
@@ -8,10 +8,12 @@ import Fieldset from './Fieldset';
 import Form from './Form';
 import Label from './Label';
 import Row from './Row';
+import { Checkbox } from './Checkbox';
 
 export const FormComponent = Form as typeof Form & {
 	Row: typeof Row;
 	Color: typeof Input.Color;
+	Checkbox: typeof Checkbox;
 	Datalist: typeof Datalist;
 	Date: typeof Input.Date;
 	DatetimeLocal: typeof Input.DatetimeLocal;
@@ -41,6 +43,8 @@ export const FormComponent = Form as typeof Form & {
 FormComponent.Row = Row;
 
 FormComponent.Color = Input.Color;
+FormComponent.Copy = Input.Copy;
+FormComponent.Checkbox = Checkbox;
 FormComponent.Datalist = Datalist;
 FormComponent.Date = Input.Date;
 FormComponent.DatetimeLocal = Input.DatetimeLocal;
@@ -48,7 +52,6 @@ FormComponent.Email = Input.Email;
 FormComponent.Fieldset = Fieldset;
 FormComponent.File = Input.File;
 FormComponent.Hidden = Input.Hidden;
-FormComponent.Copy = Input.Copy;
 FormComponent.Label = Label;
 FormComponent.Month = Input.Month;
 FormComponent.Number = Input.Number;
@@ -56,6 +59,7 @@ FormComponent.Password = Input.Password;
 FormComponent.Radio = Input.Radio;
 FormComponent.Search = Input.Search;
 FormComponent.Select = Select;
+FormComponent.ToggleSwitch = ToggleSwitch;
 FormComponent.Tel = Input.Tel;
 FormComponent.Text = Input.Text;
 FormComponent.Textarea = Textarea;
@@ -63,7 +67,6 @@ FormComponent.Time = Input.Time;
 FormComponent.Url = Input.Url;
 FormComponent.Week = Input.Week;
 FormComponent.Input = Input;
-FormComponent.ToggleSwitch = ToggleSwitch;
 
 FormComponent.Buttons = Buttons;