mirror of
https://github.com/zhigang1992/react-native-web.git
synced 2026-04-01 09:27:14 +08:00
[fix] ScrollView disabling of scroll
Make sure 'scrollEnabled={false}' works on desktop browsers and no longer
relies on using 'e.preventDefault()'.
Fix #1491
This commit is contained in:
@@ -27,9 +27,9 @@ export default function Horizontal() {
|
||||
}}
|
||||
/>
|
||||
<Button
|
||||
label="Scroll to 200px"
|
||||
label="Scroll to 50px"
|
||||
onPress={() => {
|
||||
scrollRef.current.scrollTo({ x: 200 });
|
||||
scrollRef.current.scrollTo({ x: 50 });
|
||||
}}
|
||||
/>
|
||||
<Button
|
||||
|
||||
@@ -23,9 +23,9 @@ export default function Vertical() {
|
||||
}}
|
||||
/>
|
||||
<Button
|
||||
label="Scroll to 200px"
|
||||
label="Scroll to 50px"
|
||||
onPress={() => {
|
||||
scrollRef.current.scrollTo({ y: 200 });
|
||||
scrollRef.current.scrollTo({ y: 50 });
|
||||
}}
|
||||
/>
|
||||
<Button
|
||||
|
||||
@@ -125,9 +125,6 @@ export default class ScrollViewBase extends React.Component<Props> {
|
||||
if (handler) {
|
||||
handler(e);
|
||||
}
|
||||
} else {
|
||||
// To disable scrolling in all browsers except Chrome
|
||||
e.preventDefault();
|
||||
}
|
||||
};
|
||||
};
|
||||
@@ -185,6 +182,8 @@ export default class ScrollViewBase extends React.Component<Props> {
|
||||
// https://developers.google.com/web/updates/2017/01/scrolling-intervention
|
||||
const styles = StyleSheet.create({
|
||||
scrollDisabled: {
|
||||
overflowX: 'hidden',
|
||||
overflowY: 'hidden',
|
||||
touchAction: 'none'
|
||||
},
|
||||
hideScrollbar: {
|
||||
|
||||
Reference in New Issue
Block a user