Fix issue with Carousel's containerWidth being reset and throw an exc…

…eption (#1769)
wix · Jan 10, 2022 · 2efaabc · 2efaabc
1 parent 2d3894d
commit 2efaabc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/components/carousel/index.tsx b/src/components/carousel/index.tsx
@@ -273,15 +273,19 @@ class Carousel extends Component<CarouselProps, CarouselState> {
       layout: {width: containerWidth, height: containerHeight}
     }
   }: LayoutChangeEvent) => {
-    const {pageWidth = containerWidth, pageHeight = containerHeight} = this.props;
+    const {pageWidth = containerWidth, pageHeight = containerHeight, horizontal} = this.props;
 
     const initialOffset = presenter.calcOffset(this.props, {
       currentPage: this.state.currentPage,
       pageWidth,
       pageHeight
     });
 
-    this.setState({containerWidth, pageWidth, pageHeight, initialOffset});
+    // NOTE: This is to avoid resetting containerWidth to 0 - an issue that happens
+    // on Android in some case when onLayout is re-triggered
+    if ((horizontal && containerWidth) || (!horizontal && containerHeight)) {
+      this.setState({containerWidth, pageWidth, pageHeight, initialOffset});
+    }
   };
 
   onMomentumScrollEnd = () => {