Merge pull request #1923 from TokkoLabs/development

Release
TokkoLabs · Jul 15, 2024 · ba845ce · ba845ce
2 parents afc39c6 + 0dfaed9
commit ba845ce
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 10 deletions.
diff --git a/docs/iframe.html b/docs/iframe.html
@@ -345,4 +345,4 @@
 
 
 
-            window['STORIES'] = [];</script><script src="runtime~main.9390b27b.iframe.bundle.js"></script><script src="vendors~main.2eb898cf.iframe.bundle.js"></script><script src="main.6baa0b0c.iframe.bundle.js"></script></body></html>
+            window['STORIES'] = [];</script><script src="runtime~main.9390b27b.iframe.bundle.js"></script><script src="vendors~main.2eb898cf.iframe.bundle.js"></script><script src="main.0e1c9460.iframe.bundle.js"></script></body></html>
diff --git a/docs/main.0e1c9460.iframe.bundle.js b/docs/main.0e1c9460.iframe.bundle.js
diff --git a/...ain.6baa0b0c.iframe.bundle.js.LICENSE.txt → ...ain.0e1c9460.iframe.bundle.js.LICENSE.txt b/...ain.6baa0b0c.iframe.bundle.js.LICENSE.txt → ...ain.0e1c9460.iframe.bundle.js.LICENSE.txt
diff --git a/docs/main.0e1c9460.iframe.bundle.js.map b/docs/main.0e1c9460.iframe.bundle.js.map
diff --git a/docs/main.6baa0b0c.iframe.bundle.js b/docs/main.6baa0b0c.iframe.bundle.js
diff --git a/docs/main.6baa0b0c.iframe.bundle.js.map b/docs/main.6baa0b0c.iframe.bundle.js.map
diff --git a/packages/carousel/src/components/ButtonsMainImage.js b/packages/carousel/src/components/ButtonsMainImage.js
@@ -11,13 +11,13 @@ export const ButtonsMainImage = ({
   planos = [],
   frontCoverBlueprints = [],
   setTabSelected,
-  handleTouchToogle,
+  setFullscreen,
   setIndex,
 }) => {
   const handleClick = (e, type) => {
     e.stopPropagation()
     setTabSelected(type)
-    handleTouchToogle()
+    setFullscreen(true)
     setIndex(0)
   }
   return (

diff --git a/packages/carousel/src/components/ImageCard.js b/packages/carousel/src/components/ImageCard.js
@@ -20,7 +20,9 @@ export const ImageCard = ({ url, styles, children, ...props }) => {
   const [rectangle, setRectangle] = useState(false)
   const [errorImage, setErrorImage] = useState(false)
   const [showSkeleton, setShowSkeleton] = useState(true)
+
   const isRectangle = async () => {
+    setErrorImage(false)
     try {
       const isRectangle = await validateImageDimensions(url)
       return setRectangle(isRectangle)
@@ -39,7 +41,7 @@ export const ImageCard = ({ url, styles, children, ...props }) => {
     }
   }, [url])
 
-  if (errorImage) {
+  if (url && errorImage) {
     return <ImageErrorFallback {...props}>{children}</ImageErrorFallback>
   }
 

diff --git a/packages/carousel/src/components/SliderSwap.js b/packages/carousel/src/components/SliderSwap.js
@@ -7,6 +7,7 @@ import { ImageErrorFallback } from './ImageErrorFallback'
 
 export const SliderSwap = ({
   files = [],
+  toggleFullscreen,
   setFullscreen,
   otherButton,
   fullScreen = false,
@@ -243,6 +244,7 @@ export const SliderSwap = ({
           ))}
         {!fullScreen && files.length === 0 && (
           <Box
+            onClick={() => toggleFullscreen()}
             __css={{
               display: 'flex',
               justifyContent: 'center',
@@ -251,6 +253,7 @@ export const SliderSwap = ({
               height: '100%',
               backgroundColor: theme.colors.neutralGray7,
               borderRadius: '12px',
+              cursor: 'pointer',
             }}
           >
             <Icon

diff --git a/packages/carousel/src/index.js b/packages/carousel/src/index.js
@@ -49,6 +49,7 @@ export const Carousel = ({
   const mainImageSkeletonRef = useRef()
   const mainImageWidthSkeleton = mainImageSkeletonRef.current?.clientWidth
   const allPictures = [...imgWithCover, ...bluePrintsWithCover]
+
   if (video.length > 0) {
     tabContainers.push('Videos')
   }
@@ -110,6 +111,7 @@ export const Carousel = ({
     }
     if (emptyArray) setEmptyImgArray(emptyArray)
   }, [followImgColumns, windowResize])
+
   const toggleFullscreen = () => {
     if (
       otherButton ||
@@ -223,6 +225,7 @@ export const Carousel = ({
               <SliderSwap
                 files={allPictures}
                 setFullscreen={setFullscreen}
+                toggleFullscreen={toggleFullscreen}
                 otherButton={otherButton}
                 handleImageClickToFullscreen={handleImageClickToFullscreen}
                 setIndex={setIndex}
@@ -242,7 +245,7 @@ export const Carousel = ({
                     frontCoverBlueprints={frontCoverBlueprints}
                     setTabSelected={setTabSelected}
                     setIndex={setIndex}
-                    handleTouchToogle={toggleFullscreen}
+                    setFullscreen={setFullscreen}
                   />
                 </Box>
               )}
@@ -292,7 +295,7 @@ export const Carousel = ({
                     frontCoverBlueprints={frontCoverBlueprints}
                     setTabSelected={setTabSelected}
                     setIndex={setIndex}
-                    handleTouchToogle={toggleFullscreen}
+                    setFullscreen={setFullscreen}
                   />
                 )}
               </ImageCard>
@@ -341,6 +344,7 @@ export const Carousel = ({
                           <Box
                             __css={{
                               borderRadius: '50%',
+                              position: 'absolute',
                               width: '46px',
                               height: '46px',
                               display: 'flex',
Original file line number	Diff line number	Diff line change
Expand Up		@@ -345,4 +345,4 @@



		window['STORIES'] = [];</script><script src="runtime~main.9390b27b.iframe.bundle.js"></script><script src="vendors~main.2eb898cf.iframe.bundle.js"></script><script src="main.6baa0b0c.iframe.bundle.js"></script></body></html>
		window['STORIES'] = [];</script><script src="runtime~main.9390b27b.iframe.bundle.js"></script><script src="vendors~main.2eb898cf.iframe.bundle.js"></script><script src="main.0e1c9460.iframe.bundle.js"></script></body></html>