From 3ca47ec778c81ff0d4fd021a2ed29d5ccd509d05 Mon Sep 17 00:00:00 2001 From: Ron Arts Date: Mon, 19 Feb 2018 13:48:12 +0100 Subject: [PATCH] Fix react-native-web support for #3526 (#3546) * MaskedViewIOS use broke react-native-web support, this fixes it. * Fallback more gracefully. * Actually return the value ... --- src/PlatformHelpers.native.js | 3 ++- src/PlatformHelpers.web.js | 7 +++++-- src/views/Header/Header.js | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/PlatformHelpers.native.js b/src/PlatformHelpers.native.js index ba922c31..7c6ddb1a 100644 --- a/src/PlatformHelpers.native.js +++ b/src/PlatformHelpers.native.js @@ -1,8 +1,9 @@ import { BackAndroid as DeprecatedBackAndroid, BackHandler as ModernBackHandler, + MaskedViewIOS, } from 'react-native'; const BackHandler = ModernBackHandler || DeprecatedBackAndroid; -export { BackHandler }; +export { BackHandler, MaskedViewIOS }; diff --git a/src/PlatformHelpers.web.js b/src/PlatformHelpers.web.js index fb4aa019..e5546299 100644 --- a/src/PlatformHelpers.web.js +++ b/src/PlatformHelpers.web.js @@ -1,3 +1,6 @@ -import { BackHandler } from 'react-native'; +import React from 'react'; +import { BackHandler, View } from 'react-native'; -export { BackHandler }; +const MaskedViewIOS = () => {this.props.children}; + +export { BackHandler, MaskedViewIOS }; diff --git a/src/views/Header/Header.js b/src/views/Header/Header.js index d26f11f2..5de1f1d3 100644 --- a/src/views/Header/Header.js +++ b/src/views/Header/Header.js @@ -6,10 +6,10 @@ import { Image, Platform, StyleSheet, - MaskedViewIOS, View, ViewPropTypes, } from 'react-native'; +import { MaskedViewIOS } from '../../PlatformHelpers'; import SafeAreaView from 'react-native-safe-area-view'; import HeaderTitle from './HeaderTitle'; @@ -379,7 +379,7 @@ class Header extends React.PureComponent { if ( options.headerLeft || options.headerBackImage || - Platform.OS === 'android' || + Platform.OS !== 'ios' || transitionPreset !== 'uikit' ) { return (