zoriya/react-native-web
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-web.git synced 2026-08-15 18:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Prevent href navigation for disabled Pressables

Browse Source 
Close #2299
This commit is contained in:
Mike
2022-06-10 10:13:15 -07:00
committed by Nicolas Gallagher
parent ae2ee87404
commit 094bd0efc5
5 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native-web/src/exports/Button/__tests__/__snapshots__/index-test.js.snap
+1 -1
View File
@@ -32,7 +32,7 @@ exports[`components/Button prop "color" 1`] = `
exports[`components/Button prop "disabled" 1`] = ` exports[`components/Button prop "disabled" 1`] = `
<div <div
aria-disabled="true" aria-disabled="true"
class="css-view-175oi2r r-transitionProperty-1i6wzkk r-userSelect-lrvibr r-borderRadius-1jkafct r-backgroundColor-11mpjr4" class="css-view-175oi2r r-transitionProperty-1i6wzkk r-userSelect-lrvibr r-borderRadius-1jkafct r-backgroundColor-11mpjr4 r-pointerEvents-633pao"
role="button" role="button"
style="transition-duration: 0s;" style="transition-duration: 0s;"
tabindex="-1" tabindex="-1"
packages/react-native-web/src/exports/Pressable/__tests__/__snapshots__/index-test.js.snap
+1 -1
View File
@@ -152,7 +152,7 @@ exports[`components/Pressable prop "accessibilityRole" value is set 1`] = `
exports[`components/Pressable prop "disabled" 1`] = ` exports[`components/Pressable prop "disabled" 1`] = `
<div <div
aria-disabled="true" aria-disabled="true"
class="css-view-175oi2r" class="css-view-175oi2r r-pointerEvents-633pao"
tabindex="-1" tabindex="-1"
/> />
`; `;
packages/react-native-web/src/exports/Pressable/index.js
Vendored
+1
View File
@@ -205,6 +205,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
onContextMenu={contextMenuHandler} onContextMenu={contextMenuHandler}
onFocus={focusHandler} onFocus={focusHandler}
onKeyDown={keyDownHandler} onKeyDown={keyDownHandler}
pointerEvents={disabled ? 'none' : rest.pointerEvents}
ref={setRef} ref={setRef}
style={[ style={[
!disabled && styles.root, !disabled && styles.root,
packages/react-native-web/src/exports/TouchableHighlight/index.js
Vendored
+1
View File
@@ -167,6 +167,7 @@ function TouchableHighlight(props: Props, forwardedRef): React.Node {
{...pressEventHandlers} {...pressEventHandlers}
accessibilityDisabled={disabled} accessibilityDisabled={disabled}
focusable={!disabled && focusable !== false} focusable={!disabled && focusable !== false}
pointerEvents={disabled ? 'none' : undefined}
ref={setRef} ref={setRef}
style={[ style={[
styles.root, styles.root,
packages/react-native-web/src/exports/TouchableOpacity/index.js
Vendored
+1
View File
@@ -126,6 +126,7 @@ function TouchableOpacity(props: Props, forwardedRef): React.Node {
{...pressEventHandlers} {...pressEventHandlers}
accessibilityDisabled={disabled} accessibilityDisabled={disabled}
focusable={!disabled && focusable !== false} focusable={!disabled && focusable !== false}
pointerEvents={disabled ? 'none' : undefined}
ref={setRef} ref={setRef}
style={[ style={[
styles.root, styles.root,