From b39d262058a3ae3b4a9a12ae858dde8c9c868462 Mon Sep 17 00:00:00 2001
From: Gaz Jones <hello@gazjones.dev>
Date: Wed, 2 Oct 2024 19:30:39 +0100
Subject: [PATCH] fix: replace defaultProps with default parameters in
 SpreadsheetImport (#7406)

This PR addresses https://github.com/twentyhq/twenty/issues/6827

React has deprecated the use of `defaultProps` on function components
and will remove support in a future major release. This commit replaces
the usage of `defaultProps` in the `SpreadsheetImport` component with
default parameters to fix the following warning:

**Changes:**

- Removed `SpreadsheetImport.defaultProps =
defaultSpreadsheetImportProps;`
- Merged `defaultSpreadsheetImportProps` with incoming `props` using
object spread syntax.
- Adjusted the component to use the merged props (`mergedProps`) instead
of `props`.
---
 .../provider/components/SpreadsheetImport.tsx         | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImport.tsx b/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImport.tsx
index 50bc89f43..032f632a9 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImport.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImport.tsx
@@ -24,13 +24,16 @@ export const defaultSpreadsheetImportProps: Partial<
 export const SpreadsheetImport = <T extends string>(
   props: SpreadsheetImportProps<T>,
 ) => {
+  const mergedProps = {
+    ...defaultSpreadsheetImportProps,
+    ...props,
+  } as SpreadsheetImportProps<T>;
+
   return (
-    <ReactSpreadsheetImportContextProvider values={props}>
-      <ModalWrapper isOpen={props.isOpen} onClose={props.onClose}>
+    <ReactSpreadsheetImportContextProvider values={mergedProps}>
+      <ModalWrapper isOpen={mergedProps.isOpen} onClose={mergedProps.onClose}>
         <SpreadsheetImportStepperContainer />
       </ModalWrapper>
     </ReactSpreadsheetImportContextProvider>
   );
 };
-
-SpreadsheetImport.defaultProps = defaultSpreadsheetImportProps;