diff --git a/Libraries/Components/Pressable/Pressable.js b/Libraries/Components/Pressable/Pressable.js index ef597ff558d259..50a297bc50a2e7 100644 --- 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 index 62b351e285f94f..3012f51b5e6958 100644 --- a/Libraries/Components/Touchable/TouchableBounce.js +++ b/Libraries/Components/Touchable/TouchableBounce.js @@ -165,9 +165,7 @@ class TouchableBounce extends React.Component { : 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 index 206fda0deead27..bc50cc98efc556 100644 --- a/Libraries/Components/Touchable/TouchableHighlight.js +++ b/Libraries/Components/Touchable/TouchableHighlight.js @@ -311,9 +311,7 @@ class TouchableHighlight extends React.Component { : 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 index d010ada7a9b946..5fae61cb4d5e58 100644 --- a/Libraries/Components/Touchable/TouchableNativeFeedback.js +++ b/Libraries/Components/Touchable/TouchableNativeFeedback.js @@ -302,9 +302,7 @@ class TouchableNativeFeedback extends React.Component { ? '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 index d2fef96d6a7e20..17a0af5753210c 100644 --- a/Libraries/Components/Touchable/TouchableOpacity.js +++ b/Libraries/Components/Touchable/TouchableOpacity.js @@ -257,9 +257,7 @@ class TouchableOpacity extends React.Component { : 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={