From e1584c9017411eb717b255788ab0949fa1b9958b Mon Sep 17 00:00:00 2001 From: fforres Date: Mon, 12 Feb 2018 13:31:05 -0800 Subject: [PATCH 1/2] Changing proptype precedence --- src/buttons/src/Button.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/buttons/src/Button.js b/src/buttons/src/Button.js index 7e9eefbf8..f33a0bf2e 100644 --- a/src/buttons/src/Button.js +++ b/src/buttons/src/Button.js @@ -45,7 +45,12 @@ export default class Button extends PureComponent { /** * The aim of the right icon. Useful to aim a triangle down. */ - iconAfterAim: PropTypes.oneOf(Object.keys(IconAim)) + iconAfterAim: PropTypes.oneOf(Object.keys(IconAim)), + + /** + * A JavaScript object to override css styling + */ + css: PropTypes.object } static defaultProps = { @@ -133,8 +138,8 @@ export default class Button extends PureComponent { margin={0} // Removes weird margins in Safari {...textStyle} css={{ - ...css, ...appearanceStyle + ...css, }} height={height} lineHeight={`${height}px`} From cbc01f28e9020fcaf3aaf7fafca88c5592b7007c Mon Sep 17 00:00:00 2001 From: fforres Date: Mon, 12 Feb 2018 13:37:26 -0800 Subject: [PATCH 2/2] fix eslint --- src/buttons/src/Button.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/buttons/src/Button.js b/src/buttons/src/Button.js index f33a0bf2e..2bf9ea383 100644 --- a/src/buttons/src/Button.js +++ b/src/buttons/src/Button.js @@ -138,8 +138,8 @@ export default class Button extends PureComponent { margin={0} // Removes weird margins in Safari {...textStyle} css={{ - ...appearanceStyle - ...css, + ...appearanceStyle, + ...css }} height={height} lineHeight={`${height}px`}