diff --git a/dist/NativeButton.js b/dist/NativeButton.js index 61b1bcf..704a86e 100644 --- a/dist/NativeButton.js +++ b/dist/NativeButton.js @@ -42,8 +42,8 @@ var NativeButton = (0, _createReactClass2.default)({ propTypes: _extends({}, _reactNative.TouchableWithoutFeedback.propTypes, { - textStyle: _propTypes2.default.object, - disabledStyle: _propTypes2.default.object, + textStyle: _propTypes2.default.any, + disabledStyle: _propTypes2.default.any, children: _propTypes2.default.node.isRequired, underlayColor: _propTypes2.default.string, background: _propTypes2.default.any diff --git a/dist/index.js b/dist/index.js index 3dfa268..d4a976c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -87,10 +87,10 @@ var SwipeoutBtn = (0, _createReactClass2.default)({ width: btn.width }]); - var styleSwipeoutBtnText = _extends({}, _styles2.default.swipeoutBtnText); + var styleSwipeoutBtnText = [_styles2.default.swipeoutBtnText]; // apply text color - if (btn.color) styleSwipeoutBtnText = _extends({}, styleSwipeoutBtnText, { color: btn.color }); + if (btn.color) styleSwipeoutBtnText.push({ color: btn.color }); return _react2.default.createElement( _NativeButton2.default, diff --git a/package.json b/package.json index aace06a..1ad232a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-swipeout", - "version": "2.3.5", + "version": "2.3.6", "description": "iOS-style swipeout buttons behind component", "main": "dist/index.js", "types": "index.d.ts", diff --git a/src/NativeButton.js b/src/NativeButton.js index 7134376..408f2ec 100644 --- a/src/NativeButton.js +++ b/src/NativeButton.js @@ -33,7 +33,7 @@ const NativeButton = createReactClass({ // Extract parent props ...TouchableWithoutFeedback.propTypes, textStyle: PropTypes.any, - disabledStyle: PropTypes.object, + disabledStyle: PropTypes.any, children: PropTypes.node.isRequired, underlayColor: PropTypes.string, background: PropTypes.any, diff --git a/src/index.js b/src/index.js index 7d24dc8..749a209 100644 --- a/src/index.js +++ b/src/index.js @@ -70,10 +70,10 @@ const SwipeoutBtn = createReactClass({ width: btn.width, }]); - var styleSwipeoutBtnText = { ...styles.swipeoutBtnText }; + var styleSwipeoutBtnText = [styles.swipeoutBtnText]; // apply text color - if (btn.color) styleSwipeoutBtnText = { ...styleSwipeoutBtnText, color: btn.color }; + if (btn.color) styleSwipeoutBtnText.push({color: btn.color }); return (