diff --git a/.gitignore b/.gitignore index 53edafe8..2278d594 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ emojione.json package-lock.json coverage anchor-ui +yarn.lock diff --git a/docs/src/components/checkbox/index.jsx b/docs/src/components/checkbox/index.jsx index bd3c21a6..cd6df37a 100644 --- a/docs/src/components/checkbox/index.jsx +++ b/docs/src/components/checkbox/index.jsx @@ -19,9 +19,6 @@ const style = { margin: 0, padding: '20px' }, - checkbox: { - margin: '10px' - }, list: { paddingLeft: '24px', listStyle: 'initial' @@ -69,13 +66,11 @@ class CheckboxDoc extends Component { diff --git a/docs/src/components/select.jsx b/docs/src/components/select.jsx index b7cdb67e..6d4a2c59 100644 --- a/docs/src/components/select.jsx +++ b/docs/src/components/select.jsx @@ -19,7 +19,10 @@ const style = { margin: 0, padding: '20px' }, - select: { margin: '10px' } + select: { + margin: '10px', + maxWidth: '256px' + } }; class SelectDoc extends Component { diff --git a/package.json b/package.json index 009db796..78cbd5f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "anchor-ui", - "version": "6.3.1", + "version": "6.3.2", "description": "React Component UI Kit", "main": "index.js", "files": [ @@ -49,8 +49,8 @@ "chai": "^3.5.0", "chance": "^1.0.13", "codecov": "^3.0.0", - "enzyme": "^3.1.0", - "enzyme-adapter-react-16": "^1.0.3", + "enzyme": "3.1.0", + "enzyme-adapter-react-16": "1.0.3", "eslint": "^4.11.0", "eslint-config-airbnb": "^16.0.0", "eslint-plugin-import": "^2.8.0", diff --git a/src/checkbox/styles.js b/src/checkbox/styles.js index 6545826c..e0e8465e 100644 --- a/src/checkbox/styles.js +++ b/src/checkbox/styles.js @@ -5,7 +5,7 @@ export default { display: 'flex', flexDirection: 'row', alignItems: 'center', - padding: '4px', + padding: '4px 8px', cursor: 'pointer', color: colors.primaryText, position: 'relative', diff --git a/src/input/styles.js b/src/input/styles.js index a54f6976..020c393b 100644 --- a/src/input/styles.js +++ b/src/input/styles.js @@ -2,7 +2,7 @@ import colors from '../settings/colors'; export default { root: { - maxWidth: '250px', + maxWidth: '256px', width: '100%', }, inputRoot: { @@ -38,7 +38,6 @@ export default { boxSizing: 'border-box', display: 'block', paddingBottom: '8px', - paddingLeft: '8px', textTransform: 'capitalize', width: '100%' }, diff --git a/src/menu/component.jsx b/src/menu/component.jsx index c3d761d9..0cbec3b6 100644 --- a/src/menu/component.jsx +++ b/src/menu/component.jsx @@ -80,9 +80,13 @@ class Menu extends Component { ...custom } = this.props; - const menuItems = React.Children.map(children, child => ( - cloneElement(child, { closeMenu }) - )); + const menuItems = React.Children.map(children, (child) => { + if (!child) { + return null; + } + + return cloneElement(child, { closeMenu }); + }); let rootStyle = getStyles.root(open, position, style); diff --git a/src/radio-button/styles.js b/src/radio-button/styles.js index 9e74c644..4e33e8d8 100644 --- a/src/radio-button/styles.js +++ b/src/radio-button/styles.js @@ -5,7 +5,7 @@ export default { display: 'flex', flexDirection: 'row', alignItems: 'center', - padding: '5px', + padding: '4px 8px', cursor: 'pointer', color: colors.primaryText, ':hover': { @@ -28,6 +28,6 @@ export default { icon: { width: '24px', height: '24px', - marginRight: '10px' + marginRight: '8px' } }; diff --git a/src/select/component.jsx b/src/select/component.jsx index cbc102fe..f10f8284 100644 --- a/src/select/component.jsx +++ b/src/select/component.jsx @@ -167,7 +167,7 @@ class Select extends Component { return (
{ this.container = container; }} - style={combineStyles(styles.root, style)} + style={style} {...custom} > {label} diff --git a/src/select/styles.js b/src/select/styles.js index a7bc5849..23cc7530 100644 --- a/src/select/styles.js +++ b/src/select/styles.js @@ -3,10 +3,6 @@ import darken from '../internal/darken'; import styles from '../settings/styles'; export default { - container: { - position: 'relative', - minWidth: '200px' - }, header: { minHeight: '32px', minWidth: '100%', @@ -55,7 +51,7 @@ export default { fontSize: '16px', color: colors.secondaryText, fontWeight: 'bolder', - padding: '0 0 8px 8px', + padding: '0 0 8px', display: 'inline-block' }, error: {