Merge branch 'develop'

dohooo · dohooo · commit 901b97d1480c · 2022-05-02T13:41:29.000+08:00
diff --git a/src/Carousel.tsx b/src/Carousel.tsx
@@ -199,6 +199,7 @@ const Carousel = React.forwardRef<ICarouselInstance, TCarouselProps<any>>(
                     style={[
                         styles.container,
                         { width: width || '100%', height: height || '100%' },
+                        style,
                     ]}
                 >
                     <ScrollViewGesture
diff --git a/src/ScrollViewGesture.tsx b/src/ScrollViewGesture.tsx
@@ -39,7 +39,6 @@ const IScrollViewGesture: React.FC<Props> = (props) => {
     const {
         props: {
             vertical,
-            style,
             data,
             pagingEnabled,
             snapEnabled,
@@ -274,7 +273,7 @@ const IScrollViewGesture: React.FC<Props> = (props) => {
 
     return (
         <Animated.View
-            style={[styles.container, directionStyle, style]}
+            style={[styles.container, directionStyle]}
             onTouchStart={onTouchBegin}
             onTouchEnd={onTouchEnd}
         >

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,7 @@ const Carousel = React.forwardRef<ICarouselInstance, TCarouselProps<any>>(`
`199`	`199`	`style={[`
`200`	`200`	`styles.container,`
`201`	`201`	`{ width: width \|\| '100%', height: height \|\| '100%' },`
	`202`	`+ style,`
`202`	`203`	`]}`
`203`	`204`	`>`
`204`	`205`	`<ScrollViewGesture`