diff --git a/DropdownAlert.js b/DropdownAlert.js index 2f173d14..af3b005c 100644 --- a/DropdownAlert.js +++ b/DropdownAlert.js @@ -3,7 +3,6 @@ import { StyleSheet, SafeAreaView, View, TouchableOpacity, Animated, StatusBar, import PropTypes from 'prop-types'; import { DEFAULT_IMAGE_DIMENSIONS, - IS_IOS, IS_ANDROID, IS_IOS_BELOW_11, TYPE, @@ -180,7 +179,6 @@ export default class DropdownAlert extends Component { this.panResponder = this.getPanResponder(); } componentWillUnmount() { - this.clearCloseTimeoutID(); if (this.state.isOpen) { this.closeAction(ACTION.programmatic); } @@ -329,13 +327,12 @@ export default class DropdownAlert extends Component { } else { StatusBar.setBackgroundColor(inactiveStatusBarBackgroundColor, true); } - } else if (IS_IOS) { - const { inactiveStatusBarStyle, activeStatusBarStyle } = this.props; - if (active) { - StatusBar.setBarStyle(activeStatusBarStyle, true); - } else { - StatusBar.setBarStyle(inactiveStatusBarStyle, true); - } + } + const { inactiveStatusBarStyle, activeStatusBarStyle } = this.props; + if (active) { + StatusBar.setBarStyle(activeStatusBarStyle, true); + } else { + StatusBar.setBarStyle(inactiveStatusBarStyle, true); } } }; diff --git a/constants.js b/constants.js index a52d810d..d9451a66 100644 --- a/constants.js +++ b/constants.js @@ -1,49 +1,36 @@ import { StatusBar, Platform, Dimensions } from 'react-native'; -const DEFAULT_IMAGE_DIMENSIONS = 36; -const WINDOW = Dimensions.get('window'); -const HEIGHT = WINDOW.height; -const WIDTH = WINDOW.width; +export const DEFAULT_IMAGE_DIMENSIONS = 36; +export const WINDOW = Dimensions.get('window'); +export const HEIGHT = WINDOW.height; +export const WIDTH = WINDOW.width; +export const IS_ANDROID = Platform.OS == 'android'; const IS_IOS = Platform.OS == 'ios'; -const IS_ANDROID = Platform.OS == 'android'; -const IS_IOS_BELOW_11 = IS_IOS && parseInt(Platform.Version, 10) < 11; -const TYPE = { +const PLATFORM_VERSION = parseInt(Platform.Version, 10); +export const IS_IOS_BELOW_11 = IS_IOS && PLATFORM_VERSION < 11; +export const TYPE = { info: 'info', warn: 'warn', error: 'error', success: 'success', custom: 'custom', }; -const ACTION = { +export const ACTION = { automatic: 'automatic', cancel: 'cancel', pan: 'pan', programmatic: 'programmatic', tap: 'tap', }; -const getDefaultStatusBarStyle = () => { +export function getDefaultStatusBarStyle() { if (StatusBar._defaultProps) { return StatusBar._defaultProps.barStyle.value; } return 'default'; }; -const getDefaultStatusBarBackgroundColor = () => { +export function getDefaultStatusBarBackgroundColor() { if (StatusBar._defaultProps) { return StatusBar._defaultProps.backgroundColor.value; } return 'black'; }; - -module.exports = { - DEFAULT_IMAGE_DIMENSIONS, - WINDOW, - HEIGHT, - WIDTH, - IS_IOS, - IS_ANDROID, - IS_IOS_BELOW_11, - TYPE, - ACTION, - getDefaultStatusBarStyle, - getDefaultStatusBarBackgroundColor, -};