Skip to content
This repository has been archived by the owner on Feb 25, 2020. It is now read-only.

Commit

Permalink
fix: fix applying barStyle
Browse files Browse the repository at this point in the history
  • Loading branch information
@satya164
satya164 committed Oct 21, 2019
1 parent 9dcb29b commit 807d80e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 17 deletions.
2 changes: 1 addition & 1 deletion example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions example/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 1 addition & 7 deletions src/views/MaterialBottomTabView.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

1 comment on commit 807d80e

@erdarshandoshi
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cant see any option to pass my desired background color to selected active tabs

Please sign in to comment.