Skip to content

fix:disableScroll属性为false时还原css #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix:disableScroll属性为false时还原css #436

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f546b1d
fix:disableScroll属性为false时还原css
Feb 22, 2022
cbe4e9a
chore:rax-scrollview的version升级
Feb 22, 2022
1d5d656
fix: 🐛 先判断disableScroll再判断horizontal
Feb 23, 2022
b22b194
fix: 🐛 修复覆盖逻辑问题
Feb 23, 2022
abe06d5
fix: 🐛 删除多余空格
Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/rax-scrollview/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
10 changes: 6 additions & 4 deletions packages/rax-scrollview/src/web/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,17 +247,19 @@ const ScrollView: ForwardRefExoticComponent<ScrollViewProps> = forwardRef(
}

scrollerStyle.WebkitOverflowScrolling = 'touch';

if (disableScroll) {
scrollerStyle.overflow = 'hidden';
}

if (horizontal) {
scrollerStyle.overflowX = 'scroll';
scrollerStyle.overflowY = 'hidden';
} else {
scrollerStyle.overflowX = 'hidden';
scrollerStyle.overflowY = 'scroll';
}

if (disableScroll) {
scrollerStyle.overflow = 'hidden';
}


const webProps = {
...props
Expand Down