Skip to content

Commit

Permalink
refactor(flex-grid): move to packages for split versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanoglesby08 committed Feb 14, 2018
1 parent 85f5d31 commit bbeb831
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 18 deletions.
6 changes: 3 additions & 3 deletions config/styleguide.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ module.exports = {
name: 'Grid',
components() {
return [
path.resolve('src/components/FlexGrid/FlexGrid.jsx'),
path.resolve('src/components/FlexGrid/Row/Row.jsx'),
path.resolve('src/components/FlexGrid/Col/Col.jsx'),
path.resolve('packages/FlexGrid/FlexGrid.jsx'),
path.resolve('packages/FlexGrid/Row/Row.jsx'),
path.resolve('packages/FlexGrid/Col/Col.jsx'),
]
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { Subscriber } from 'react-broadcast'

import { Col as ReactFlexboxGridCol } from 'react-flexbox-grid'

import joinClassNames from '../../../utils/joinClassNames'
import safeRest from '../../../utils/safeRest'
import joinClassNames from '../../../src/utils/joinClassNames'
import safeRest from '../../../src/utils/safeRest'
import styles from './Col.modules.scss'

const removeProps = ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@ When not supplied a `span` prop, Col components automatically expand to fill the
```jsx
<FlexGrid>
<FlexGrid.Row>
<FlexGrid.Col span={3}><Text>3 column</Text></FlexGrid.Col>
<FlexGrid.Col span={3}><Text>3 columns</Text></FlexGrid.Col>
<FlexGrid.Col span={6}><Text>6 columns</Text></FlexGrid.Col>
<FlexGrid.Col span={3}>
<Text>3 column</Text>
</FlexGrid.Col>
<FlexGrid.Col span={3}>
<Text>3 columns</Text>
</FlexGrid.Col>
<FlexGrid.Col span={6}>
<Text>6 columns</Text>
</FlexGrid.Col>
</FlexGrid.Row>
</FlexGrid>
```
Expand All @@ -19,7 +25,9 @@ Supplying an `offset` prop will add a left margin to your Col.
```jsx
<FlexGrid>
<FlexGrid.Row>
<FlexGrid.Col offset={3}><Text>3 columns away</Text></FlexGrid.Col>
<FlexGrid.Col offset={3}>
<Text>3 columns away</Text>
</FlexGrid.Col>
</FlexGrid.Row>
</FlexGrid>
```
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import { Grid } from 'react-flexbox-grid'
import Col from './Col/Col'
import Row from './Row/Row'

import safeRest from '../../utils/safeRest'
import joinClassNames from '../../utils/joinClassNames'
import safeRest from '../../src/utils/safeRest'
import joinClassNames from '../../src/utils/joinClassNames'

import styles from './FlexGrid.modules.scss'

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The `FlexGrid` component is a wrapper over [react-flexbox-grid](https://github.com/roylee0704/react-flexbox-grid).
The `FlexGrid` component is a wrapper over [react-flexbox-grid](https://github.com/roylee0704/react-flexbox-grid).

### Basic usage

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
@import '../../scss/utility/responsive';
@import '../../src/scss/utility/responsive';

$max-widths: (xs: auto, small: 576px, medium: 768px, large: 992px, xl: 1200px);
$max-widths: (
xs: auto,
small: 576px,
medium: 768px,
large: 992px,
xl: 1200px
);

.flexGrid {
padding: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Subscriber } from 'react-broadcast'

import { Row as ReactFlexboxGridRow } from 'react-flexbox-grid'

import safeRest from '../../../utils/safeRest'
import safeRest from '../../../src/utils/safeRest'

/**
* <span class="docs--badge__new">new</span> <span class="docs--badge__version">v0.34.0</span>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Grid } from 'react-flexbox-grid'

import FlexGrid from '../FlexGrid'

import mockMatchMedia from '../../../__mocks__/matchMedia'
import mockMatchMedia from '../../../src/__mocks__/matchMedia'

describe('FlexGrid', () => {
const doMount = (props = {}) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Notification/Notification.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'

import safeRest from '../../utils/safeRest'

import FlexGrid from '../../components/FlexGrid/FlexGrid'
import FlexGrid from '../../../packages/FlexGrid/FlexGrid'
import DecorativeIcon from '../Icons/DecorativeIcon/DecorativeIcon'
import ColoredTextProvider from '../Typography/ColoredTextProvider/ColoredTextProvider'
import Paragraph from '../Typography/Paragraph/Paragraph'
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export { default as DecorativeIcon } from './components/Icons/DecorativeIcon/Dec
export { default as DimpleDivider } from '../packages/DimpleDivider/DimpleDivider'
export { default as DisplayHeading } from './components/Typography/DisplayHeading/DisplayHeading'
export { default as ExpandCollapse } from './components/ExpandCollapse/ExpandCollapse'
export { default as FlexGrid } from './components/FlexGrid/FlexGrid'
export { default as FlexGrid } from '../packages/FlexGrid/FlexGrid'
export { default as HairlineDivider } from '../packages/HairlineDivider/HairlineDivider'
export { default as Heading } from './components/Typography/Heading/Heading'
export { default as Image } from './components/Image/Image'
Expand Down

0 comments on commit bbeb831

Please sign in to comment.