review changes

facebook · Sep 9, 2022 · ad116e0 · ad116e0
1 parent 13b5e10
commit ad116e0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 15 deletions.
diff --git a/Libraries/Components/Pressable/Pressable.js b/Libraries/Components/Pressable/Pressable.js
@@ -249,9 +249,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
     ...android_rippleConfig?.viewProps,
     accessible: accessible !== false,
     accessibilityViewIsModal:
-      restProps['aria-modal'] !== null
-        ? restProps['aria-modal']
-        : restProps.accessibilityViewIsModal,
+      restProps['aria-modal'] ?? restProps.accessibilityViewIsModal,
     accessibilityLiveRegion,
     accessibilityState: _accessibilityState,
     focusable: focusable !== false,

diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
@@ -165,9 +165,7 @@ class TouchableBounce extends React.Component<Props, State> {
             : this.props.importantForAccessibility
         }
         accessibilityViewIsModal={
-          this.props['aria-modal'] !== null
-            ? this.props['aria-modal']
-            : this.props.accessibilityViewIsModal
+          this.props['aria-modal'] ?? this.props.accessibilityViewIsModal
         }
         accessibilityElementsHidden={
           this.props['aria-hidden'] ?? this.props.accessibilityElementsHidden

diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -311,9 +311,7 @@ class TouchableHighlight extends React.Component<Props, State> {
             : this.props.importantForAccessibility
         }
         accessibilityViewIsModal={
-          this.props['aria-modal'] !== null
-            ? this.props['aria-modal']
-            : this.props.accessibilityViewIsModal
+          this.props['aria-modal'] ?? this.props.accessibilityViewIsModal
         }
         accessibilityLiveRegion={accessibilityLiveRegion}
         accessibilityElementsHidden={

diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.js b/Libraries/Components/Touchable/TouchableNativeFeedback.js
@@ -302,9 +302,7 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
             ? 'no-hide-descendants'
             : this.props.importantForAccessibility,
         accessibilityViewIsModal:
-          this.props['aria-modal'] !== null
-            ? this.props['aria-modal']
-            : this.props.accessibilityViewIsModal,
+          this.props['aria-modal'] ?? this.props.accessibilityViewIsModal,
         accessibilityLiveRegion: accessibilityLiveRegion,
         accessibilityElementsHidden:
           this.props['aria-hidden'] ?? this.props.accessibilityElementsHidden,

diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -257,9 +257,7 @@ class TouchableOpacity extends React.Component<Props, State> {
             : this.props.importantForAccessibility
         }
         accessibilityViewIsModal={
-          this.props['aria-modal'] !== null
-            ? this.props['aria-modal']
-            : this.props.accessibilityViewIsModal
+          this.props['aria-modal'] ?? this.props.accessibilityViewIsModal
         }
         accessibilityLiveRegion={accessibilityLiveRegion}
         accessibilityElementsHidden={