Skip to content

Fix to constants and setBarStyle #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 23, 2019
Merged

Fix to constants and setBarStyle #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e25b293
change export on constants
testshallpass Aug 19, 2019
0f725e4
setBarStyle on both platforms and remove close action at unmount
testshallpass Aug 19, 2019
6681c22
remove test case for unmount and it being closed
testshallpass Aug 19, 2019
93ba585
put back closeAction on component will unmount
testshallpass Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions DropdownAlert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
}
};
Expand Down
35 changes: 11 additions & 24 deletions constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
};