From 27038e0210417176af729099a18f761ec81bd9fa Mon Sep 17 00:00:00 2001
From: Mike <yum650350@gmail.com>
Date: Wed, 8 Jun 2022 10:33:18 +0800
Subject: [PATCH 1/2] fix: Fix Touchable with href is still clickable if
 disabled

---
 .../react-native-web/src/exports/TouchableHighlight/index.js     | 1 +
 packages/react-native-web/src/exports/TouchableOpacity/index.js  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/react-native-web/src/exports/TouchableHighlight/index.js b/packages/react-native-web/src/exports/TouchableHighlight/index.js
index 9cf254c7e6..c443d7a089 100644
--- a/packages/react-native-web/src/exports/TouchableHighlight/index.js
+++ b/packages/react-native-web/src/exports/TouchableHighlight/index.js
@@ -167,6 +167,7 @@ function TouchableHighlight(props: Props, forwardedRef): React.Node {
       {...pressEventHandlers}
       accessibilityDisabled={disabled}
       focusable={!disabled && focusable !== false}
+      pointerEvents={disabled ? 'none' : undefined}
       ref={setRef}
       style={[
         styles.root,
diff --git a/packages/react-native-web/src/exports/TouchableOpacity/index.js b/packages/react-native-web/src/exports/TouchableOpacity/index.js
index ee06736f99..fdfaf39b77 100644
--- a/packages/react-native-web/src/exports/TouchableOpacity/index.js
+++ b/packages/react-native-web/src/exports/TouchableOpacity/index.js
@@ -126,6 +126,7 @@ function TouchableOpacity(props: Props, forwardedRef): React.Node {
       {...pressEventHandlers}
       accessibilityDisabled={disabled}
       focusable={!disabled && focusable !== false}
+      pointerEvents={disabled ? 'none' : undefined}
       ref={setRef}
       style={[
         styles.root,

From e8bc59a7b7a4ed8db2ec77956307d72f41088f90 Mon Sep 17 00:00:00 2001
From: Mike <yum650350@gmail.com>
Date: Wed, 8 Jun 2022 15:47:33 +0800
Subject: [PATCH 2/2] test: update snapshots for disabled Button

---
 .../exports/Button/__tests__/__snapshots__/index-test.js.snap   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-native-web/src/exports/Button/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/Button/__tests__/__snapshots__/index-test.js.snap
index f0c0e57864..0ec867820c 100644
--- a/packages/react-native-web/src/exports/Button/__tests__/__snapshots__/index-test.js.snap
+++ b/packages/react-native-web/src/exports/Button/__tests__/__snapshots__/index-test.js.snap
@@ -32,7 +32,7 @@ exports[`components/Button prop "color" 1`] = `
 exports[`components/Button prop "disabled" 1`] = `
 <div
   aria-disabled="true"
-  class="css-view-1dbjc4n r-backgroundColor-11mpjr4 r-borderRadius-1jkafct r-transitionProperty-1i6wzkk r-userSelect-lrvibr"
+  class="css-view-1dbjc4n r-backgroundColor-11mpjr4 r-borderRadius-1jkafct r-pointerEvents-633pao r-transitionProperty-1i6wzkk r-userSelect-lrvibr"
   role="button"
   style="transition-duration: 0s;"
   tabindex="-1"