diff --git a/packages/material-bottom-tabs/example/package.json b/packages/material-bottom-tabs/example/package.json index e1bdeb25..ebeefc0f 100644 --- a/packages/material-bottom-tabs/example/package.json +++ b/packages/material-bottom-tabs/example/package.json @@ -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" diff --git a/packages/material-bottom-tabs/example/yarn.lock b/packages/material-bottom-tabs/example/yarn.lock index 121d8e5b..a9201e1e 100644 --- a/packages/material-bottom-tabs/example/yarn.lock +++ b/packages/material-bottom-tabs/example/yarn.lock @@ -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" diff --git a/packages/material-bottom-tabs/package.json b/packages/material-bottom-tabs/package.json index 49900b52..0bce0b24 100644 --- a/packages/material-bottom-tabs/package.json +++ b/packages/material-bottom-tabs/package.json @@ -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", diff --git a/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx b/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx index 9a5e0ec0..619ce7fa 100644 --- a/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx +++ b/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx @@ -71,13 +71,7 @@ export default class MaterialBottomTabView extends React.Component { _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() { diff --git a/packages/material-bottom-tabs/yarn.lock b/packages/material-bottom-tabs/yarn.lock index 3187fbe0..ce45ba2b 100644 --- a/packages/material-bottom-tabs/yarn.lock +++ b/packages/material-bottom-tabs/yarn.lock @@ -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"