Skip to content

Commit

Permalink
Omit style on View if scrollable since style is passed down to contai…
Browse files Browse the repository at this point in the history
…ner style
  • Loading branch information
co2-git committed Feb 20, 2017
1 parent 8767547 commit 6e8e75f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ reactors change log

# Versions

## v2.1.3

- Omit style on View if scrollable since style is passed down to container style

## v2.1.2

- Remove `onPress` prop to mobile View
Expand Down
3 changes: 2 additions & 1 deletion app/Component/View/mobile.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import React, {Component} from 'react';
import {ScrollView, View} from 'react-native';
import omit from 'lodash/omit';

export default class ReactorsViewMobile extends Component {

Expand All @@ -24,7 +25,7 @@ export default class ReactorsViewMobile extends Component {
return (
<ScrollView
ref="__internalView"
{...props}
{...omit(props, ['style'])}
contentContainerStyle={this.props.style}
>
{this.props.children}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "reactors",
"version": "2.1.2",
"version": "2.1.3",
"description": "View components and APIs that work web, mobile and desktop!",
"main": "dist/index.js",
"keywords": [
Expand Down Expand Up @@ -32,7 +32,7 @@
"eslint": "eslint app",
"flow": "flow",
"prepush": "npm run eslint && npm test",
"up": "npm run babel && npm prepush && npm publish",
"push": "npm run babel && npm run prepush && npm publish",
"test": "jest --colors --debug --notify --verbose"
},
"author": {
Expand Down

0 comments on commit 6e8e75f

Please sign in to comment.