From f546b1d6f9acb4ce3e0847f37b706c555e6cc457 Mon Sep 17 00:00:00 2001 From: wb-swz637624 Date: Tue, 22 Feb 2022 17:21:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:disableScroll=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E4=B8=BAfalse=E6=97=B6=E8=BF=98=E5=8E=9Fcss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rax-scrollview/src/web/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/rax-scrollview/src/web/index.tsx b/packages/rax-scrollview/src/web/index.tsx index 3a966776..3633da15 100644 --- a/packages/rax-scrollview/src/web/index.tsx +++ b/packages/rax-scrollview/src/web/index.tsx @@ -257,6 +257,8 @@ const ScrollView: ForwardRefExoticComponent = forwardRef( if (disableScroll) { scrollerStyle.overflow = 'hidden'; + } else { + scrollerStyle.overflow = 'scroll'; } const webProps = { From cbe4e9a557cd40ccfd908771d3d17d2396a92499 Mon Sep 17 00:00:00 2001 From: wb-swz637624 Date: Tue, 22 Feb 2022 18:14:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?chore:rax-scrollview=E7=9A=84version?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rax-scrollview/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rax-scrollview/package.json b/packages/rax-scrollview/package.json index f1817e13..e92ba574 100644 --- a/packages/rax-scrollview/package.json +++ b/packages/rax-scrollview/package.json @@ -1,6 +1,6 @@ { "name": "rax-scrollview", - "version": "3.7.1", + "version": "3.7.2", "description": "ScrollView component for Rax.", "license": "BSD-3-Clause", "main": "lib/index.js", From 1d5d656a546c0d4ba2134399d3dc646fb1f84020 Mon Sep 17 00:00:00 2001 From: wb-swz637624 Date: Wed, 23 Feb 2022 10:51:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E5=85=88=E5=88=A4?= =?UTF-8?q?=E6=96=ADdisableScroll=E5=86=8D=E5=88=A4=E6=96=ADhorizontal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rax-scrollview/src/web/index.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/rax-scrollview/src/web/index.tsx b/packages/rax-scrollview/src/web/index.tsx index 3633da15..03fdc84d 100644 --- a/packages/rax-scrollview/src/web/index.tsx +++ b/packages/rax-scrollview/src/web/index.tsx @@ -247,6 +247,11 @@ const ScrollView: ForwardRefExoticComponent = forwardRef( } scrollerStyle.WebkitOverflowScrolling = 'touch'; + + if (disableScroll) { + scrollerStyle.overflow = 'hidden'; + } + if (horizontal) { scrollerStyle.overflowX = 'scroll'; scrollerStyle.overflowY = 'hidden'; @@ -254,12 +259,7 @@ const ScrollView: ForwardRefExoticComponent = forwardRef( scrollerStyle.overflowX = 'hidden'; scrollerStyle.overflowY = 'scroll'; } - - if (disableScroll) { - scrollerStyle.overflow = 'hidden'; - } else { - scrollerStyle.overflow = 'scroll'; - } + const webProps = { ...props From b22b19411439b2cbfaf045368aab85772d8dadf6 Mon Sep 17 00:00:00 2001 From: wb-swz637624 Date: Wed, 23 Feb 2022 17:02:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rax-scrollview/src/web/index.tsx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/rax-scrollview/src/web/index.tsx b/packages/rax-scrollview/src/web/index.tsx index 03fdc84d..63f0e1e8 100644 --- a/packages/rax-scrollview/src/web/index.tsx +++ b/packages/rax-scrollview/src/web/index.tsx @@ -250,16 +250,12 @@ const ScrollView: ForwardRefExoticComponent = forwardRef( if (disableScroll) { scrollerStyle.overflow = 'hidden'; - } - - if (horizontal) { - scrollerStyle.overflowX = 'scroll'; - scrollerStyle.overflowY = 'hidden'; } else { - scrollerStyle.overflowX = 'hidden'; - scrollerStyle.overflowY = 'scroll'; + scrollerStyle.overflowX = horizontal ? 'scroll' : 'hidden'; + scrollerStyle.overflowY = horizontal ? 'hidden' : 'scroll'; } - + + const webProps = { ...props From abe06d5aab94573ce13f95c3c5298c6699be5909 Mon Sep 17 00:00:00 2001 From: wb-swz637624 Date: Mon, 28 Feb 2022 11:19:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rax-scrollview/src/web/index.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/rax-scrollview/src/web/index.tsx b/packages/rax-scrollview/src/web/index.tsx index 63f0e1e8..8c301b61 100644 --- a/packages/rax-scrollview/src/web/index.tsx +++ b/packages/rax-scrollview/src/web/index.tsx @@ -255,8 +255,6 @@ const ScrollView: ForwardRefExoticComponent = forwardRef( scrollerStyle.overflowY = horizontal ? 'hidden' : 'scroll'; } - - const webProps = { ...props };