Merge branch 'main' of ariane:bosonprotocol/core-components into 819_…

…upload_component_fix
bosonprotocol · Oct 28, 2024 · 3a2e4d5 · 3a2e4d5
2 parents 61b5497 + f579af3
commit 3a2e4d5
Show file tree

Hide file tree

Showing 16 changed files with 77 additions and 94 deletions.
diff --git a/e2e/meta-tx-gateway/package.json b/e2e/meta-tx-gateway/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meta-tx-gateway",
-  "version": "1.7.10-alpha.17",
+  "version": "1.7.10-alpha.18",
   "description": "",
   "main": "index.js",
   "private": true,
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/bosonprotocol/core-components#readme",
   "dependencies": {
-    "@bosonprotocol/common": "^1.29.0-alpha.12",
+    "@bosonprotocol/common": "^1.29.0-alpha.13",
     "cors": "^2.8.5",
     "dotenv": "^16.0.2",
     "ethers": "^5.7.0",

diff --git a/e2e/opensea-api-mock/package.json b/e2e/opensea-api-mock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opensea-api-mock",
-  "version": "1.0.5-alpha.17",
+  "version": "1.0.5-alpha.18",
   "description": "",
   "main": "index.js",
   "private": true,
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/bosonprotocol/core-components#readme",
   "dependencies": {
-    "@bosonprotocol/common": "^1.29.0-alpha.12",
+    "@bosonprotocol/common": "^1.29.0-alpha.13",
     "@opensea/seaport-js": "^4.0.0",
     "cors": "^2.8.5",
     "dotenv": "^16.0.2",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bosonprotocol/common",
-  "version": "1.29.0-alpha.12",
+  "version": "1.29.0-alpha.13",
   "description": "Common configs, types, interfaces and utilities shared by the core components of the Boson Protocol.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

diff --git a/packages/core-sdk/package.json b/packages/core-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bosonprotocol/core-sdk",
-  "version": "1.41.0-alpha.26",
+  "version": "1.41.0-alpha.27",
   "description": "Facilitates interaction with the contracts and subgraphs of the Boson Protocol",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -35,7 +35,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@bosonprotocol/common": "^1.29.0-alpha.12",
+    "@bosonprotocol/common": "^1.29.0-alpha.13",
     "@ethersproject/abi": "^5.5.0",
     "@ethersproject/address": "^5.5.0",
     "@ethersproject/bignumber": "^5.5.0",

diff --git a/packages/eth-connect-sdk/package.json b/packages/eth-connect-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bosonprotocol/eth-connect-sdk",
-  "version": "1.7.0-alpha.12",
+  "version": "1.7.0-alpha.13",
   "description": "Implementation of the Web3LibAdapter interface and contract abstractions targeting eth-connect for the Boson Protocol.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@bosonprotocol/common": "^1.29.0-alpha.12"
+    "@bosonprotocol/common": "^1.29.0-alpha.13"
   },
   "devDependencies": {
     "eslint": "^8.10.0",

diff --git a/packages/ethers-sdk/package.json b/packages/ethers-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bosonprotocol/ethers-sdk",
-  "version": "1.15.0-alpha.12",
+  "version": "1.15.0-alpha.13",
   "description": "Implementation of the Web3LibAdapter interface and contract abstractions targeting ethers for the Boson Protocol.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -32,7 +32,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@bosonprotocol/common": "^1.29.0-alpha.12"
+    "@bosonprotocol/common": "^1.29.0-alpha.13"
   },
   "devDependencies": {
     "@typechain/ethers-v5": "^9.0.0",

diff --git a/packages/ipfs-storage/package.json b/packages/ipfs-storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bosonprotocol/ipfs-storage",
-  "version": "1.12.0-alpha.24",
+  "version": "1.12.0-alpha.25",
   "description": "IPFS metadata storage implementation for building on top of the Boson Protocol.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

diff --git a/packages/react-kit/package.json b/packages/react-kit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bosonprotocol/react-kit",
   "description": "React toolkit with smart components and hooks for building on top of the Boson Protocol.",
-  "version": "0.34.0-alpha.24",
+  "version": "0.34.0-alpha.25",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/cjs/index.d.ts",
@@ -15,9 +15,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9",
-    "@bosonprotocol/core-sdk": "^1.41.0-alpha.26",
-    "@bosonprotocol/ethers-sdk": "^1.15.0-alpha.12",
-    "@bosonprotocol/ipfs-storage": "^1.12.0-alpha.24",
+    "@bosonprotocol/core-sdk": "^1.41.0-alpha.27",
+    "@bosonprotocol/ethers-sdk": "^1.15.0-alpha.13",
+    "@bosonprotocol/ipfs-storage": "^1.12.0-alpha.25",
     "@davatar/react": "1.11.1",
     "@ethersproject/units": "5.6.0",
     "@glidejs/glide": "3.6.0",

diff --git a/packages/react-kit/src/components/buttons/BaseButton.tsx b/packages/react-kit/src/components/buttons/BaseButton.tsx
@@ -13,16 +13,17 @@ import { Typography } from "../ui/Typography";
 import { theme } from "../../theme";
 import { Loading } from "../ui/loading/Loading";
 import { ButtonSize } from "../ui/buttonSize";
-
+import { AddDollarPrefixToKeys } from "../../types/helpers";
 const colors = theme.colors.light;
 
-const ButtonWithThemeProps = styled.button<{
-  size: ButtonSizeProp;
-  fill: boolean | undefined;
-  theme: BaseButtonTheme;
-}>`
+const ButtonWithThemeProps = styled.button<
+  AddDollarPrefixToKeys<{
+    size: ButtonSizeProp;
+    fill: boolean | undefined;
+  }> & { theme: BaseButtonTheme }
+>`
   ${() => Styles.button};
-  ${(props) => Styles[props.size as keyof typeof Styles]}
+  ${(props) => Styles[props.$size as keyof typeof Styles]}
   border-style: solid;
   border-color: ${(props) => props.theme?.borderColor || "transparent"};
   border-width: ${(props) => props.theme?.borderWidth || 0}px;
@@ -35,7 +36,7 @@ const ButtonWithThemeProps = styled.button<{
     stroke: ${(props) => props.theme?.color || "#000000"};
   }
   ${(props) =>
-    props.fill
+    props.$fill
       ? css`
           width: 100%;
         `
@@ -175,8 +176,8 @@ export const BaseButton = forwardRef<HTMLButtonElement, BaseButtonProps>(
           <ButtonWithThemeProps
             onClick={onClick}
             type={type}
-            size={size}
-            fill={fill ? fill : undefined}
+            $size={size}
+            $fill={fill ? fill : undefined}
             theme={theme}
             {...rest}
             ref={ref}

diff --git a/packages/react-kit/src/components/form/Upload/BaseUpload.tsx b/packages/react-kit/src/components/form/Upload/BaseUpload.tsx
@@ -125,12 +125,12 @@ function BaseUpload({
     }
     handleLoading(true);
     try {
-      const imagePreview = await loadMedia(fileSrc || "");
-      if (imagePreview) {
-        setPreview(imagePreview);
+      const videoPreview = await loadMedia(fileSrc || "");
+      if (videoPreview) {
+        setPreview(videoPreview);
       } else {
         console.warn(
-          `imagePreview ${imagePreview} is falsy in loadIpfsImagePreview`
+          `videoPreview ${videoPreview} is falsy in loadIpfsImagePreview`
         );
       }
     } catch (error) {
@@ -246,7 +246,7 @@ function BaseUpload({
     borderRadius: borderRadius ? `${borderRadius}${borderRadiusUnit}` : "",
     width: width ? `100%` : ""
   };
-
+  const showPreview = field.value && field.value?.length !== 0 && preview;
   return (
     <>
       {withEditor && showEditor && (
@@ -327,17 +327,21 @@ function BaseUpload({
               <Loading size={2} />
             ) : (
               <>
-                {field.value && field.value?.length !== 0 && preview ? (
+                {showPreview ? (
                   <>
                     {isVideoOnly ? (
                       <VideoPreview
                         src={
                           preview?.startsWith("http")
                             ? preview
-                            : "data:video/mp4;base64," +
-                              preview?.substring(
-                                "data:application/octet-stream;base64,".length
-                              )
+                            : preview?.startsWith(
+                                  "data:application/octet-stream;base64,"
+                                )
+                              ? "data:video/mp4;base64," +
+                                preview?.substring(
+                                  "data:application/octet-stream;base64,".length
+                                )
+                              : preview
                         }
                         autoPlay
                         muted
@@ -355,7 +359,7 @@ function BaseUpload({
                 ) : (
                   <Image size={24} />
                 )}
-                {placeholder && (
+                {placeholder && !showPreview && (
                   <Typography tag="p" marginBottom={0} textAlign="center">
                     {placeholder}
                   </Typography>

diff --git a/packages/react-kit/src/components/ui/Video.tsx b/packages/react-kit/src/components/ui/Video.tsx
@@ -198,7 +198,7 @@ export const Video: React.FC<VideoProps> = ({
       return <ComponentWhileLoading />;
     }
     return (
-      <VideoWrapper {...rest}>
+      <VideoWrapper {...rest} className="video-container">
         <VideoPlaceholder $position="static">
           <Typography tag="div">
             <Loading />

diff --git a/packages/react-kit/src/components/wallet2/accountDrawer/IconButton.tsx b/packages/react-kit/src/components/wallet2/accountDrawer/IconButton.tsx
@@ -112,19 +112,19 @@ const IconBlock = forwardRef<
     borderRadius: CSSProperties["borderRadius"];
   }
 >(function IconBlock(props, ref) {
-  const { color, backgroundColor, borderRadius } = props;
   if ("href" in props) {
+    const { color, backgroundColor, borderRadius, ...restProps } = props;
     return (
       <IconBlockLink
         ref={ref as React.ForwardedRef<HTMLAnchorElement>}
         $color={color}
         $backgroundColor={backgroundColor}
         $borderRadius={borderRadius}
-        {...props}
+        {...restProps}
       />
     );
   }
-
+  const { color, backgroundColor, borderRadius, ...restProps } = props;
   return (
     <IconBlockButton
       // ignoring 'button' 'type' conflict between React and styled-components
@@ -134,7 +134,7 @@ const IconBlock = forwardRef<
       $color={color}
       $backgroundColor={backgroundColor}
       $borderRadius={borderRadius}
-      {...props}
+      {...restProps}
     />
   );
 });