From 7f9e0ad33badd29f3990eff2bb30b958c38de4af Mon Sep 17 00:00:00 2001 From: Brent Vatne Date: Mon, 24 Sep 2018 09:41:56 -0700 Subject: [PATCH] Merge pull request #23 from michael-palmes/iphonexs-max-and-iphonexr-support Added window dimensions for iPhone XS Max and iPhone XR --- packages/stack/src/views/StackView/StackViewLayout.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/stack/src/views/StackView/StackViewLayout.js b/packages/stack/src/views/StackView/StackViewLayout.js index f0462c99..88a3f71c 100644 --- a/packages/stack/src/views/StackView/StackViewLayout.js +++ b/packages/stack/src/views/StackView/StackViewLayout.js @@ -28,12 +28,17 @@ import { supportsImprovedSpringAnimation } from '../../utils/ReactNativeFeatures const emptyFunction = () => {}; +const IPHONE_XS_HEIGHT = 812; // iPhone X and XS +const IPHONE_XR_HEIGHT = 896; // iPhone XR and XS Max const { width: WINDOW_WIDTH, height: WINDOW_HEIGHT } = Dimensions.get('window'); const IS_IPHONE_X = Platform.OS === 'ios' && !Platform.isPad && !Platform.isTVOS && - (WINDOW_HEIGHT === 812 || WINDOW_WIDTH === 812); + (WINDOW_HEIGHT === IPHONE_XS_HEIGHT || + WINDOW_WIDTH === IPHONE_XS_HEIGHT || + WINDOW_HEIGHT === IPHONE_XR_HEIGHT || + WINDOW_WIDTH === IPHONE_XR_HEIGHT); const EaseInOut = Easing.inOut(Easing.ease);