Styling fixes

This commit is contained in:
Chi Vinh Le
2018-07-20 12:24:03 -03:00
parent e33ea6d0aa
commit b2e2e3e75d
7 changed files with 37 additions and 34 deletions
+9 -6
View File
@@ -46,6 +46,11 @@ const Flex: StatelessComponent<InnerProps> = props => {
...rest
} = props;
let alignItemsWithDefault = alignItems;
if (!direction || !direction.startsWith("column")) {
alignItemsWithDefault = "center";
}
const classObject: Record<string, boolean> = {
[classes.itemGutter]: itemGutter === true,
[classes.halfItemGutter]: itemGutter === "half",
@@ -59,8 +64,10 @@ const Flex: StatelessComponent<InnerProps> = props => {
] = true;
}
if (alignItems) {
classObject[(classes as any)[`align${pascalCase(alignItems)}`]] = true;
if (alignItemsWithDefault) {
classObject[
(classes as any)[`align${pascalCase(alignItemsWithDefault)}`]
] = true;
}
if (direction) {
@@ -72,10 +79,6 @@ const Flex: StatelessComponent<InnerProps> = props => {
return <div ref={forwardRef} className={classNames} {...rest} />;
};
Flex.defaultProps = {
alignItems: "center",
};
const enhanced = withForwardRef(withStyles(styles)(Flex));
export default enhanced;
export type FlexProps = PropTypesOf<typeof enhanced>;