refactor: update weaverse sections

Weaverse · May 23, 2023 · bc30d8a · bc30d8a
1 parent 6aa89c2
commit bc30d8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/weaverse/components/main.tsx b/app/weaverse/components/main.tsx
@@ -7,7 +7,8 @@ import {forwardRef} from 'react';
 export interface MainProps extends HydrogenComponentProps {}
 
 let Main = forwardRef<HTMLDivElement, MainProps>((props, ref) => {
-  return <div ref={ref} {...props} />;
+  let {data, ...rest} = props;
+  return <div ref={ref} {...rest} />;
 });
 
 export default Main;

diff --git a/app/weaverse/sections/image-with-text.tsx b/app/weaverse/sections/image-with-text.tsx
@@ -7,13 +7,14 @@ import {fetchWithServerCache} from '@weaverse/hydrogen';
 import {forwardRef} from 'react';
 
 export interface ImageWithTextProps
-  extends HydrogenComponentProps<Awaited<ReturnType<typeof loader>>> {
-  image: string;
-}
+  extends HydrogenComponentProps<
+    {image: string},
+    Awaited<ReturnType<typeof loader>>
+  > {}
 
 let ImageWithText = forwardRef<HTMLElement, ImageWithTextProps>(
   (props, ref) => {
-    let {loaderData, image, ...rest} = props;
+    let {loaderData, data, ...rest} = props;
     return (
       <section ref={ref} {...rest}>
         <div className="text-gray-600 body-font bg-slate-300">
@@ -39,7 +40,7 @@ let ImageWithText = forwardRef<HTMLElement, ImageWithTextProps>(
               <img
                 className="object-cover object-center rounded"
                 alt="hero"
-                src={loaderData?.thumbnailUrl || image}
+                src={loaderData?.thumbnailUrl || data.image}
               />
             </div>
           </div>