kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-09 09:13:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix applying barStyle

Browse Source
This commit is contained in:
satyajit.happy
2019-10-21 14:56:04 +02:00
parent 40d64bc662
commit 5b7de5ccc3
5 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/material-bottom-tabs/example/package.json
View File

@@ -17,7 +17,7 @@
"react": "16.8.3",
"react-native": "https://github.com/expo/react-native/archive/sdk-34.0.0.tar.gz",
"react-native-gesture-handler": "~1.3.0",
"react-native-paper": "^3.0.0-alpha.7",
"react-native-paper": "^3.0.0-alpha.8",
"react-native-reanimated": "~1.1.0",
"react-navigation": "^4.0.7",
"react-navigation-stack": "^1.5.4"

8
packages/material-bottom-tabs/example/yarn.lock
View File

@@ -9361,10 +9361,10 @@ react-native-gesture-handler@~1.3.0:
invariant "^2.2.2"
prop-types "^15.5.10"
react-native-paper@^3.0.0-alpha.7:
version "3.0.0-alpha.7"
resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-3.0.0-alpha.7.tgz#fbbfe5dc9ef8dbd18932786aa3d7f0479501538b"
integrity sha512-tjqewrUMnucLM4yqMiVtCOnrqilnvDDNr2guIImwsUpJ6HWaJKBEFKqB25SEdMvuo88MWSdA0gyRNtS3WRpS3w==
react-native-paper@^3.0.0-alpha.8:
version "3.0.0-alpha.8"
resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-3.0.0-alpha.8.tgz#365a0c4f0aa20a737a03a8e341e569a4594edf68"
integrity sha512-9+0pJhcpkBfiBZOHOkP7ElsbM1kTTL0RoMg7IBgfjBS5yUhqAlf7ff+vK8m2d0R3fST/Peim5PSbW0b1053+hQ==
dependencies:
"@callstack/react-theme-provider" "^3.0.5"
color "^3.1.2"

2
packages/material-bottom-tabs/package.json
View File

@@ -59,7 +59,7 @@
"react": "16.8.3",
"react-native": "~0.59.8",
"react-native-gesture-handler": "^1.4.1",
"react-native-paper": "^3.0.0-alpha.7",
"react-native-paper": "^3.0.0-alpha.8",
"react-native-reanimated": "^1.2.0",
"react-navigation": "^4.0.7",
"release-it": "^12.3.6",

8
packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx
View File

@@ -71,13 +71,7 @@ export default class MaterialBottomTabView extends React.Component<Props> {
_getBarStyle = () => {
let { barStyle, barStyleLight, barStyleDark } = this.props;
if (this.context === 'dark' && barStyleDark) {
return barStyleDark;
} else if (barStyleLight) {
return barStyleLight;
} else {
return barStyle;
}
return [barStyle, this.context === 'dark' ? barStyleDark : barStyleLight];
};
_isVisible() {

8
packages/material-bottom-tabs/yarn.lock
View File

@@ -7274,10 +7274,10 @@ react-native-gesture-handler@^1.4.1:
invariant "^2.2.4"
prop-types "^15.7.2"
react-native-paper@^3.0.0-alpha.7:
version "3.0.0-alpha.7"
resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-3.0.0-alpha.7.tgz#fbbfe5dc9ef8dbd18932786aa3d7f0479501538b"
integrity sha512-tjqewrUMnucLM4yqMiVtCOnrqilnvDDNr2guIImwsUpJ6HWaJKBEFKqB25SEdMvuo88MWSdA0gyRNtS3WRpS3w==
react-native-paper@^3.0.0-alpha.8:
version "3.0.0-alpha.8"
resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-3.0.0-alpha.8.tgz#365a0c4f0aa20a737a03a8e341e569a4594edf68"
integrity sha512-9+0pJhcpkBfiBZOHOkP7ElsbM1kTTL0RoMg7IBgfjBS5yUhqAlf7ff+vK8m2d0R3fST/Peim5PSbW0b1053+hQ==
dependencies:
"@callstack/react-theme-provider" "^3.0.5"
color "^3.1.2"