Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Neem Serra committed Nov 4, 2019
2 parents b05b33f + 4526671 commit 6d1fc2a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-material-dropdown",
"version": "0.11.0",
"version": "0.11.1",
"license": "BSD-3-Clause",
"author": "Alexander Nazarov <[email protected]>",

Expand Down
4 changes: 3 additions & 1 deletion src/components/dropdown/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export default class Dropdown extends PureComponent {

dropdownPosition: PropTypes.number,

rippleColor: PropTypes.string,
rippleCentered: PropTypes.bool,
rippleSequential: PropTypes.bool,

Expand Down Expand Up @@ -524,6 +525,7 @@ export default class Dropdown extends PureComponent {
renderRipple() {
let {
baseColor,
rippleColor = baseColor,
rippleOpacity,
rippleDuration,
rippleCentered,
Expand All @@ -541,7 +543,7 @@ export default class Dropdown extends PureComponent {
return (
<Ripple
style={style}
rippleColor={baseColor}
rippleColor={rippleColor}
rippleDuration={rippleDuration}
rippleOpacity={rippleOpacity}
rippleCentered={rippleCentered}
Expand Down

0 comments on commit 6d1fc2a

Please sign in to comment.