diff --git a/.eslintrc b/.eslintrc index 9deec39..7bdb53d 100644 --- a/.eslintrc +++ b/.eslintrc @@ -17,7 +17,8 @@ "@typescript-eslint/no-explicit-any": 0, "@typescript-eslint/no-non-null-assertion": 0, "@typescript-eslint/no-unused-vars": 0, - "@typescript-eslint/no-empty-function": 0 + "@typescript-eslint/no-empty-function": 0, + "react/prop-types": 0 }, "env": { "browser": true, diff --git a/src/ReactSpreadsheetImport.tsx b/src/ReactSpreadsheetImport.tsx index 1671c78..637ef2d 100644 --- a/src/ReactSpreadsheetImport.tsx +++ b/src/ReactSpreadsheetImport.tsx @@ -23,7 +23,8 @@ export const defaultRSIProps: Partial> = { parseRaw: true, } as const -export const ReactSpreadsheetImport = (props: RsiProps) => { +export const ReactSpreadsheetImport = (propsWithoutDefaults: RsiProps) => { + const props = merge(defaultRSIProps, propsWithoutDefaults) const mergedTranslations = props.translations !== translations ? merge(translations, props.translations) : translations const mergedThemes = props.rtl @@ -38,5 +39,3 @@ export const ReactSpreadsheetImport = (props: RsiProps) => ) } - -ReactSpreadsheetImport.defaultProps = defaultRSIProps