refactor(upload): rename Error component to ErrorComponent

bosonprotocol · Oct 23, 2024 · 61b5497 · 61b5497
1 parent 182fad2
commit 61b5497
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/packages/react-kit/src/components/form/Field.styles.ts b/packages/react-kit/src/components/form/Field.styles.ts
@@ -125,10 +125,10 @@ export type FileUploadWrapperTheme = Partial<{
   error: Partial<{
     borderColor: CSSProperties["borderColor"];
   }>;
+  overrides: Partial<CSSProperties>;
 }>;
 export const FileUploadWrapper = styled.div<{
   $error: unknown;
-  $v2?: boolean;
   theme: FileUploadWrapperTheme | undefined;
 }>`
   position: relative;
@@ -189,19 +189,7 @@ export const FileUploadWrapper = styled.div<{
     cursor: not-allowed;
     opacity: 0.5;
   }
-  ${({ $v2 }) =>
-    $v2 &&
-    css`
-      aspect-ratio: 1/1;
-      padding-inline: 1.5rem;
-      background: ${colors.white};
-      min-width: 9.375rem;
-      width: auto;
-      height: auto;
-      border-radius: 12px;
-      border: 2px solid ${theme.colors.light.border};
-      color: ${theme.colors.light.greyText};
-    `}
+  ${({ theme: { overrides } }) => overrides}
 `;
 
 export const FieldFileUpload = styled(FieldInput)`

diff --git a/packages/react-kit/src/components/form/Upload/BaseUpload.tsx b/packages/react-kit/src/components/form/Upload/BaseUpload.tsx
@@ -53,7 +53,6 @@ function BaseUpload({
   removeFile,
   saveButtonTheme,
   errorComponent,
-  v2,
   theme,
   ...props
 }: UploadPropsWithNoIpfs & WithUploadToIpfsProps) {
@@ -220,7 +219,7 @@ function BaseUpload({
       }
       handleLoading(true);
       try {
-        const files = await saveToIpfs(efiles, true);
+        const files = await saveToIpfs(efiles, { throwOnError: true });
         setErrorMessage(undefined);
         if (files) {
           setFiles(files);
@@ -233,6 +232,8 @@ function BaseUpload({
       } catch (err) {
         if (err instanceof Error) {
           setErrorMessage(err.message);
+        } else {
+          setErrorMessage("Something went wrong");
         }
       } finally {
         handleLoading(false);
@@ -319,7 +320,6 @@ function BaseUpload({
             data-disabled={disabled}
             onClick={handleChooseFile}
             $error={errorMessage}
-            $v2={v2}
             style={style}
             theme={theme?.triggerTheme}
           >

diff --git a/packages/react-kit/src/components/form/Upload/WithUploadToIpfs.tsx b/packages/react-kit/src/components/form/Upload/WithUploadToIpfs.tsx
@@ -23,7 +23,7 @@ export const SUPPORTED_FORMATS = [
 export interface WithUploadToIpfsProps {
   saveToIpfs: (
     files: File[] | null,
-    throwOnError?: boolean
+    options?: { throwOnError?: boolean }
   ) => Promise<false | FileProps[] | undefined>;
   loadMedia: (src: string) => Promise<string | undefined>;
   removeFile: (src: string) => Promise<void>;
@@ -40,7 +40,10 @@ export function WithUploadToIpfs<P extends WithUploadToIpfsProps>(
     const { saveFile, loadMedia, removeFile } = useSaveImageToIpfs();
 
     const saveToIpfs: WithUploadToIpfsProps["saveToIpfs"] = useCallback(
-      async (filesArray: File[] | null, throwOnError?: boolean) => {
+      async (
+        filesArray: File[] | null,
+        options: { throwOnError?: boolean } = {}
+      ) => {
         if (!filesArray) {
           return;
         }
@@ -54,12 +57,12 @@ export function WithUploadToIpfs<P extends WithUploadToIpfsProps>(
             const err = `File ${
               file?.name
             } size cannot exceed more than ${bytesToSize(sizeValidation)}!`;
-            if (throwOnError) throw new Error(err);
+            if (options?.throwOnError) throw new Error(err);
             filesErrors.push(err);
           }
           if (!formatValidation.includes(file?.type)) {
             const err = `Uploaded file has unsupported format of ${file?.type}!`;
-            if (throwOnError) throw new Error(err);
+            if (options?.throwOnError) throw new Error(err);
             filesErrors.push(err);
           }
         }

diff --git a/packages/react-kit/src/components/form/types.ts b/packages/react-kit/src/components/form/types.ts
@@ -138,9 +138,11 @@ export type UploadProps = BaseProps & {
   width?: number;
   height?: number;
   errorComponent?: (errorMessage: string) => React.ReactNode;
-  v2?: boolean;
   imgPreviewStyle?: Pick<CSSProperties, "objectFit">;
-  theme?: Partial<{ triggerTheme: FileUploadWrapperTheme }>;
+  theme?: Partial<{
+    triggerTheme: FileUploadWrapperTheme;
+    overrides: React.CSSProperties;
+  }>;
 } & (
     | {
         withEditor: true;