Merge pull request #92 from apgsn/master

Fix iOS 13 scrollbar bug with scrollIndicatorInsets prop
mochixuan · Nov 14, 2020 · ee72e78 · ee72e78
2 parents 9cf4681 + 4133644
commit ee72e78
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 0 deletions.
diff --git a/Example/app/widget/AutoDragSortableView.js b/Example/app/widget/AutoDragSortableView.js
@@ -588,6 +588,7 @@ export default class AutoDragSortableView extends Component{
             <ScrollView
                 bounces={false}
                 scrollEventThrottle={1}
+                scrollIndicatorInsets={this.props.scrollIndicatorInsets}
                 ref={(scrollRef)=> this.scrollRef = scrollRef}
                 scrollEnabled = {this.state.scrollEnabled}
                 onScroll={this.onScrollListener}
@@ -692,6 +693,12 @@ AutoDragSortableView.propTypes = {
     autoThrottle: PropTypes.number,
     autoThrottleDuration: PropTypes.number,
     renderHeaderView: PropTypes.element,
+    scrollIndicatorInsets: PropTypes.shape({
+      top: PropTypes.number,
+      left: PropTypes.number,
+      bottom: PropTypes.number,
+      right: PropTypes.number,
+    }),
     headerViewHeight: PropTypes.number,
     renderBottomView: PropTypes.element,
     bottomViewHeight: PropTypes.number,
@@ -713,6 +720,12 @@ AutoDragSortableView.defaultProps = {
     slideDuration: 300,
     autoThrottle: 2,
     autoThrottleDuration: 10,
+    scrollIndicatorInsets: {
+      top: 0,
+      left: 0,
+      bottom: 0,
+      right: 1,
+    },
     headerViewHeight: 0,
     bottomViewHeight: 0,
 }

diff --git a/README.md b/README.md
@@ -71,6 +71,12 @@ export { DragSortableView, AutoDragSortableView }
 - **autoThrottleDuration**: PropTypes.number;
 - **renderHeaderView**: PropTypes.element,
 - **headerViewHeight**: PropTypes.number,
+- **scrollIndicatorInsets**: PropTypes.shape({
+  top: PropTypes.number,
+  left: PropTypes.number,
+  bottom: PropTypes.number,
+  right: PropTypes.number
+}),
 - **renderBottomView**: PropTypes.element,
 - **bottomViewHeight**: PropTypes.number,
 

diff --git a/lib/AutoDragSortableView.js b/lib/AutoDragSortableView.js
@@ -588,6 +588,7 @@ export default class AutoDragSortableView extends Component{
             <ScrollView
                 bounces={false}
                 scrollEventThrottle={1}
+                scrollIndicatorInsets={this.props.scrollIndicatorInsets}
                 ref={(scrollRef)=> this.scrollRef = scrollRef}
                 scrollEnabled = {this.state.scrollEnabled}
                 onScroll={this.onScrollListener}
@@ -692,6 +693,12 @@ AutoDragSortableView.propTypes = {
     autoThrottle: PropTypes.number,
     autoThrottleDuration: PropTypes.number,
     renderHeaderView: PropTypes.element,
+    scrollIndicatorInsets: PropTypes.shape({
+      top: PropTypes.number,
+      left: PropTypes.number,
+      bottom: PropTypes.number,
+      right: PropTypes.number,
+    }),
     headerViewHeight: PropTypes.number,
     renderBottomView: PropTypes.element,
     bottomViewHeight: PropTypes.number,
@@ -713,6 +720,12 @@ AutoDragSortableView.defaultProps = {
     slideDuration: 300,
     autoThrottle: 2,
     autoThrottleDuration: 10,
+    scrollIndicatorInsets: {
+      top: 0,
+      left: 0,
+      bottom: 0,
+      right: 1,
+    },
     headerViewHeight: 0,
     bottomViewHeight: 0,
 }

diff --git a/lib/README.md b/lib/README.md
@@ -71,6 +71,12 @@ export { DragSortableView, AutoDragSortableView }
 - **autoThrottleDuration**: PropTypes.number;
 - **renderHeaderView**: PropTypes.element,
 - **headerViewHeight**: PropTypes.number,
+- **scrollIndicatorInsets**: PropTypes.shape({
+  top: PropTypes.number,
+  left: PropTypes.number,
+  bottom: PropTypes.number,
+  right: PropTypes.number
+}),
 - **renderBottomView**: PropTypes.element,
 - **bottomViewHeight**: PropTypes.number,
 

diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -36,6 +36,7 @@ interface AutoIProps extends IProps {
   autoThrottleDuration?: number,
   renderHeaderView?: any,
   headerViewHeight?: number,
+  scrollIndicatorInsets?: {top: number, left: number, bottom: number, right: number},
   renderBottomView?: any,
   bottomViewHeight?: number,
 }