Skip to content

Commit

Permalink
Merge pull request #156 from anchorchat/develop
Browse files Browse the repository at this point in the history
[1.7.11] Fixed Button props validation for labelTextStyle
  • Loading branch information
IanCStewart committed Aug 14, 2018
2 parents ed436e9 + 72adcca commit b2d89c4
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/button/component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { View, ViewPropTypes } from 'react-native';
import { View, ViewPropTypes, Text as NativeText } from 'react-native';
import Text from '../text';
import getStyles from './styles';
import Touchable from '../touchable';
Expand All @@ -21,7 +21,7 @@ const propTypes = {
*/
labelTextProps: PropTypes.object, // eslint-disable-line react/forbid-prop-types
/** Override the styles of the labelText container */
labelTextStyle: PropTypes.object, // eslint-disable-line react/forbid-prop-types
labelTextStyle: NativeText.propTypes.style,
/** Icon for the left hand side of the Button */
icon: PropTypes.node,
/** Override the styles of the icon container */
Expand Down
20 changes: 19 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
{
"name": "anchor-ui-native",
"version": "1.7.10",
"version": "1.7.11",
"main": "index.js",
"files": [
"/*"
],
"repository": {
"type": "git",
"url": "git+https://github.com/anchorchat/anchor-ui-native.git"
},
"keywords": [
"react-native",
"ui kit",
"Anchor.CHAT"
],
"author": "Ian Stewart <ian.stewart@anchor.chat>",
"contributors": [
"Sjaak Luthart <sjaak.luthart@anchor.chat>",
"Lars Tadema <lars.tadema@anchor.chat>"
],
"license": "MIT",
"bugs": {
"url": "https://github.com/anchorchat/anchor-ui-native/issues"
},
"devDependencies": {
"babel-eslint": "^8.2.3",
"eslint": "^4.19.1",
Expand Down

0 comments on commit b2d89c4

Please sign in to comment.