Merge pull request GeekyAnts#2133 from GeekyAnts/fix/header/topPadder

Fix for issue GeekyAnts#2128 (Vertical alignment of Items in Header on iPhone X)
ratanasoth · Jul 16, 2018 · 0f58c14 · 0f58c14
2 parents f93b115 + ad49245
commit 0f58c14
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/basic/Header.js b/src/basic/Header.js
@@ -33,8 +33,8 @@ class Header extends Component {
     let oldHeight = null;
     if (this.props.style.height != undefined) {
       oldHeight = this.props.style.height;
-    }else if(this.props.style[1]){
-      oldHeight= this.props.style[1].height ? this.props.style[1].height : this.props.style[0].height;
+    } else if (this.props.style[1]) {
+      oldHeight = this.props.style[1].height ? this.props.style[1].height : this.props.style[0].height;
     } else {
       oldHeight = this.props.style[0].height;
     }
@@ -51,7 +51,7 @@ class Header extends Component {
     const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
     let topPadder = null;
     let style = StyleSheet.flatten(this.props.style);
-    if (style.padding !== undefined && style.paddingTop !== undefined) {
+    if (style.padding !== undefined || style.paddingTop !== undefined) {
       topPadder = (style.paddingTop ? style.paddingTop : style.padding) + InsetValues.topInset;
     } else {
       topPadder = InsetValues.topInset;