From d7dced62b9a40015979ff1a979b3995403cd45d2 Mon Sep 17 00:00:00 2001
From: dpyzo0o <dpyzo0o@outlook.com>
Date: Thu, 31 Dec 2020 16:32:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(wechat):=20=E4=BF=AE=E5=A4=8D=20ScrollView?=
 =?UTF-8?q?=20=E7=BB=84=E4=BB=B6=E7=BC=BA=E5=A4=B1=E7=9A=84=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__snapshots__/ScrollView.test.tsx.snap    |  5 +++++
 .../src/hostComponents/ScrollView/index.ts    | 21 +++++++++++++++++++
 .../src/hostComponents/ScrollView/node.ts     |  9 +++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/packages/remax-wechat/src/__tests__/components/__snapshots__/ScrollView.test.tsx.snap b/packages/remax-wechat/src/__tests__/components/__snapshots__/ScrollView.test.tsx.snap
index 725c5c677..f8ee9c17a 100644
--- a/packages/remax-wechat/src/__tests__/components/__snapshots__/ScrollView.test.tsx.snap
+++ b/packages/remax-wechat/src/__tests__/components/__snapshots__/ScrollView.test.tsx.snap
@@ -2,9 +2,13 @@
 
 exports[`ScrollView render correctly 1`] = `
 <scroll-view
+  bounces={true}
   enableBackToTop={false}
   enableFlex={false}
+  enhanced={false}
+  fastDeceleration={false}
   lowerThreshold={50}
+  pagingEnabled={false}
   refresherBackground="#fff"
   refresherDefaultStyle="black"
   refresherEnabled={false}
@@ -14,6 +18,7 @@ exports[`ScrollView render correctly 1`] = `
   scrollWithAnimation={false}
   scrollX={false}
   scrollY={false}
+  showScrollbar={true}
   upperThreshold={50}
 />
 `;
diff --git a/packages/remax-wechat/src/hostComponents/ScrollView/index.ts b/packages/remax-wechat/src/hostComponents/ScrollView/index.ts
index 6afac5db7..6d21eeddb 100644
--- a/packages/remax-wechat/src/hostComponents/ScrollView/index.ts
+++ b/packages/remax-wechat/src/hostComponents/ScrollView/index.ts
@@ -49,6 +49,22 @@ export interface ScrollViewProps extends BaseProps {
   onRefresherRestore?: (event: GenericEvent) => void;
   /** 自定义下拉刷新被中止 2.10.1 */
   onRefresherAbort?: (event: GenericEvent) => void;
+  /** (default: false) 启用 scroll-view 增强特性 2.12.0 */
+  enhanced?: boolean;
+  /** (default: true) iOS 下 scroll-view 边界弹性控制 (同时开启 enhanced 属性后生效) 2.12.0 */
+  bounces?: boolean;
+  /** (default: true) 滚动条显隐控制 (同时开启 enhanced 属性后生效) 2.12.0 */
+  showScrollbar?: boolean;
+  /** (default: false) 分页滑动效果 (同时开启 enhanced 属性后生效) 2.12.0 */
+  pagingEnabled?: boolean;
+  /** (default: false) 滑动减速速率控制 (同时开启 enhanced 属性后生效) 2.12.0 */
+  fastDeceleration?: boolean;
+  /** 滑动开始事件 (同时开启 enhanced 属性后生效) detail { scrollTop, scrollLeft } 2.12.0 */
+  onDragStart?: (event: GenericEvent) => void;
+  /** 滑动事件 (同时开启 enhanced 属性后生效) detail { scrollTop, scrollLeft } 2.12.0 */
+  onDragging?: (event: GenericEvent) => void;
+  /** 滑动结束事件 (同时开启 enhanced 属性后生效) detail { scrollTop, scrollLeft, velocity } 2.12.0 */
+  onDragEnd?: (event: GenericEvent) => void;
 }
 
 export const ScrollView: React.ComponentType<ScrollViewProps> = createHostComponent<ScrollViewProps>('scroll-view');
@@ -67,4 +83,9 @@ ScrollView.defaultProps = {
   refresherDefaultStyle: 'black',
   refresherBackground: '#fff',
   refresherTriggered: false,
+  enhanced: false,
+  bounces: true,
+  showScrollbar: true,
+  pagingEnabled: false,
+  fastDeceleration: false,
 };
diff --git a/packages/remax-wechat/src/hostComponents/ScrollView/node.ts b/packages/remax-wechat/src/hostComponents/ScrollView/node.ts
index 3ca42fe3b..6ab4d5ced 100644
--- a/packages/remax-wechat/src/hostComponents/ScrollView/node.ts
+++ b/packages/remax-wechat/src/hostComponents/ScrollView/node.ts
@@ -22,7 +22,6 @@ export const alias = {
   onTouchMove: 'bindtouchmove',
   onTouchCancel: 'bindtouchcancel',
   onClick: 'bindtap',
-
   scrollAnchoring: 'scroll-anchoring',
   refresherEnabled: 'refresher-enabled',
   refresherThreshold: 'refresher-threshold',
@@ -33,6 +32,14 @@ export const alias = {
   onRefresherRefresh: 'bindrefresherrefresh',
   onRefresherRestore: 'bindrefresherrestore',
   onRefresherAbort: 'bindrefresherabort',
+  enhanced: 'enhanced',
+  bounces: 'bounces',
+  showScrollbar: 'show-scrollbar',
+  pagingEnabled: 'paging-enabled',
+  fastDeceleration: 'fast-deceleration',
+  onDragStart: 'binddragstart',
+  onDragging: 'binddragging',
+  onDragEnd: 'binddragend',
 };
 
 export const props = Object.values(alias);