Skip to content

Commit

Permalink
Merge pull request #482 from yamov/allow-contentContainerCustomStyle-…
Browse files Browse the repository at this point in the history
…override-default-paddings

Allow contentContainerCustomStyle override default paddings.
  • Loading branch information
Benoît Delmaire authored May 21, 2019
2 parents a04bd7e + ae5df95 commit 610e55f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/carousel/Carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -1270,14 +1270,14 @@ export default class Carousel extends Component {
{ width: sliderWidth, flexDirection: this._needsRTLAdaptations() ? 'row-reverse' : 'row' }
];
const contentContainerStyle = [
contentContainerCustomStyle || {},
vertical ? {
paddingTop: this._getContainerInnerMargin(),
paddingBottom: this._getContainerInnerMargin(true)
} : {
paddingLeft: this._getContainerInnerMargin(),
paddingRight: this._getContainerInnerMargin(true)
}
},
contentContainerCustomStyle || {}
];

const specificProps = !this._needsScrollView() ? {
Expand Down

0 comments on commit 610e55f

Please sign in to comment.