Skip to content

Commit

Permalink
fix(flexcol): change align default prop (#39)
Browse files Browse the repository at this point in the history
  • Loading branch information
poteirard committed Jun 21, 2019
1 parent 02a186f commit a3b5b68
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 35 deletions.
13 changes: 8 additions & 5 deletions src/components/layout/FlexCol/FlexCol.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ import React from 'react';
import styled, { css } from 'styled-components';
import grid from '../../../constants/grid';

export type TAlignSelf = 'flex-start' | 'center' | 'flex-end' | 'stretch';
export type TAlignSelf = 'flex-start' | 'center' | 'flex-end' | 'stretch' | 'auto';
export type TColWidth = number | 'fill' | 'auto' | 'hidden';

export interface IFlexColProps {
/**
* @default auto
*/
align?: TAlignSelf;
cols?: number;
gutter?: number;
Expand Down Expand Up @@ -64,16 +67,16 @@ const getWidth = (breakpoint, colWidth, cols) => {
};

const defaultProps: Partial<IFlexCol> = {
align: 'flex-start',
align: 'auto',
};

const StyledFlexCol = styled.div<IFlexCol>`
position: relative;
width: 100%;
min-height: 1px;
padding-right: ${props => props.gutter}px;
padding-left: ${props => props.gutter}px;
align-self: ${props => props.align};
padding-right: ${({ gutter }) => gutter}px;
padding-left: ${({ gutter }) => gutter}px;
align-self: ${({ align }) => align};
${props =>
Object.keys(grid.breakpoints)
.sort((a, b) => grid.breakpoints[a] - grid.breakpoints[b])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ exports[`<FlexCol /> renders a FlexCol component 1`] = `
min-height: 1px;
padding-right: px;
padding-left: px;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
}
<div
Expand Down
12 changes: 6 additions & 6 deletions src/components/molecules/Help/__snapshots__/Help.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ exports[`<Help /> renders the default Help component with no a11y violations 1`]
min-height: 1px;
padding-right: 16px;
padding-left: 16px;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
}
.c5 {
Expand All @@ -34,9 +34,9 @@ exports[`<Help /> renders the default Help component with no a11y violations 1`]
min-height: 1px;
padding-right: 16px;
padding-left: 16px;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
}
.c2 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ exports[`<Links /> renders the component 1`] = `
min-height: 1px;
padding-right: 16px;
padding-left: 16px;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
}
.c7 {
Expand All @@ -18,9 +18,9 @@ exports[`<Links /> renders the component 1`] = `
min-height: 1px;
padding-right: px;
padding-left: px;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
}
.c0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ exports[`<MiscLinks /> renders the component 1`] = `
min-height: 1px;
padding-right: 16px;
padding-left: 16px;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
}
.c0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ exports[`<SocialLinks /> renders the component 1`] = `
min-height: 1px;
padding-right: 16px;
padding-left: 16px;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
}
.c0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ exports[`<ZopaFooter /> renders the component with default props 1`] = `
min-height: 1px;
padding-right: 16px;
padding-left: 16px;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
}
.c9 {
Expand All @@ -134,9 +134,9 @@ exports[`<ZopaFooter /> renders the component with default props 1`] = `
min-height: 1px;
padding-right: px;
padding-left: px;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
}
.c12 {
Expand All @@ -145,9 +145,9 @@ exports[`<ZopaFooter /> renders the component with default props 1`] = `
min-height: 1px;
padding-right: 16px;
padding-left: 16px;
-webkit-align-self: flex-start;
-ms-flex-item-align: start;
align-self: flex-start;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
}
.c2 {
Expand Down

0 comments on commit a3b5b68

Please sign in to comment.