patch non pagebuilder content

fnhipster · fnhipster · commit de0c2e98638a · 2020-10-06T17:27:48.000-05:00
diff --git a/components/Product/Product.styled.tsx b/components/Product/Product.styled.tsx
@@ -46,12 +46,15 @@ export const Images = styled.div`
 export const Image = styled(ImageComponent)`
     width: 100%;
     height: 100%;
-    object-fit: cover;
+    object-fit: contain;
     object-position: center;
+    max-height: 70vh;
+
     filter: unset;
 
     @media ${props => props.theme.breakpoints.smallOnly} {
         max-height: 70vh;
+        object-fit: cover;
     }
 `
 
diff --git a/components/Product/Product.tsx b/components/Product/Product.tsx
@@ -14,6 +14,7 @@ import Breadcrumbs from '@storystore/ui/dist/components/Breadcrumbs'
 import PageBuilder from '~/components/PageBuilder'
 import useHtml from '~/hooks/useHtml'
 import { OtherProducts } from './OtherProducts'
+import { isPageBuilderHtml } from '../PageBuilder/lib/utils'
 
 const SimpleProduct = dynamic(() => import('./ProductTypes/SimpleProduct'))
 const GroupedProduct = dynamic(() => import('./ProductTypes/GroupedProduct'))
@@ -132,6 +133,8 @@ export const Product: FunctionComponent<QueryResult> = ({ loading, data }) => {
         )
     }
 
+    const isDescriptionPageBuilder = product?.description?.html ? isPageBuilderHtml(product.description.html) : false
+
     return (
         <ProductContext.Provider value={{ setPrice: handleUpdatePrice, setGallery: handleUpdateGallery }}>
             {product && <Head title={product.metaTitle || product.title} description={product.metaDescription} keywords={product.metaKeywords} />}
@@ -191,15 +194,17 @@ export const Product: FunctionComponent<QueryResult> = ({ loading, data }) => {
                                         {/* TODO: ... */}
                                         {product.type === 'GiftCard' && <GiftCard {...product} />}
 
-                                        {product.descriptionContainer === 'container1' && product?.description?.html && <Description as={PageBuilder} html={product.description.html} />}
+                                        {(product.descriptionContainer === 'container1' || !isDescriptionPageBuilder) && product?.description?.html && (
+                                            <Description as={PageBuilder} html={product.description.html} />
+                                        )}
                                     </React.Fragment>
                                 )}
                             </Info>
                         </InfoInnerWrapper>
                     </InfoWrapper>
                 </Wrapper>
 
-                {product?.descriptionContainer === 'container2' && product?.description?.html && <Description as={PageBuilder} html={product.description.html} />}
+                {product?.descriptionContainer === 'container2' && isDescriptionPageBuilder && product?.description?.html && <Description as={PageBuilder} html={product.description.html} />}
 
                 {product?.urlKey && <OtherProducts urlKey={product.urlKey} />}
             </Root>
