Skip to content

Commit

Permalink
Merge pull request #30 from rsuite/typos
Browse files Browse the repository at this point in the history
Serious typos
  • Loading branch information
simonguo committed May 13, 2018
2 parents f5cd28f + d36ecb6 commit b3ff7d9
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 36 deletions.
14 changes: 7 additions & 7 deletions src/FlexboxGird.js → src/FlexboxGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import classNames from 'classnames';
import setStatic from 'recompose/setStatic';

import { defaultProps, prefix } from './utils';
import FlexboxGirdItem from './FlexboxGirdItem';
import FlexboxGridItem from './FlexboxGridItem';

type Props = {
className?: string,
Expand All @@ -14,7 +14,7 @@ type Props = {
classPrefix: string
};

class FlexboxGird extends React.Component<Props> {
class FlexboxGrid extends React.Component<Props> {
static defaultProps = {
align: 'top',
justify: 'start'
Expand All @@ -27,10 +27,10 @@ class FlexboxGird extends React.Component<Props> {
}
}

const EnhancedFlexboxGird = defaultProps({
classPrefix: 'flex-box-gird'
})(FlexboxGird);
const EnhancedFlexboxGrid = defaultProps({
classPrefix: 'flex-box-grid'
})(FlexboxGrid);

setStatic('Item', FlexboxGirdItem)(EnhancedFlexboxGird);
setStatic('Item', FlexboxGridItem)(EnhancedFlexboxGrid);

export default EnhancedFlexboxGird;
export default EnhancedFlexboxGrid;
6 changes: 3 additions & 3 deletions src/FlexboxGirdItem.js → src/FlexboxGridItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ type Props = {
classPrefix: string
};

class FlexboxGirdItem extends React.Component<Props> {
class FlexboxGridItem extends React.Component<Props> {
static defaultProps = {
colspan: 0,
order: 0
Expand All @@ -30,5 +30,5 @@ class FlexboxGirdItem extends React.Component<Props> {
}

export default defaultProps({
classPrefix: 'flex-box-gird-item'
})(FlexboxGirdItem);
classPrefix: 'flex-box-grid-item'
})(FlexboxGridItem);
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export Grid from './Grid';
export Row from './Row';
export Col from './Col';

export FlexboxGird from './FlexboxGird';
export FlexboxGrid from './FlexboxGrid';

export Container from './Container';
export Content from './Content';
Expand Down
2 changes: 1 addition & 1 deletion styles/less/flexbox-grid.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Flex-box grid wrapper
.@{ns}flex-box-gird {
.@{ns}flex-box-grid {
display: flex;
flex-flow: row wrap;

Expand Down
4 changes: 2 additions & 2 deletions styles/less/mixins/flexbox-grid.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Common styles for all sizes of grid columns.
.calc-flex-box-item(@index) when (@index > 0) {
.@{ns}flex-box-gird-item-@{index} {
.@{ns}flex-box-grid-item-@{index} {
// Provide positioning for child elements.
position: relative;
display: block;
Expand All @@ -17,7 +17,7 @@
.loop-flex-box-items((@index - 1));

// Generate order styles.
.@{ns}flex-box-gird-item-order-@{index} {
.@{ns}flex-box-grid-item-order-@{index} {
order: @index;
}
}
Expand Down
22 changes: 11 additions & 11 deletions test/FlexboxGirdItemSpec.js → test/FlexboxGridItemSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@ import React from 'react';
import { findDOMNode } from 'react-dom';
import ReactTestUtils from 'react-dom/test-utils';

import FlexboxGirdItem from '../src/FlexboxGirdItem';
import FlexboxGridItem from '../src/FlexboxGridItem';

describe('FlexboxGirdItem', () => {
it('Should render a FlexboxGirdItem', () => {
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGirdItem>Test</FlexboxGirdItem>);
assert.include(findDOMNode(instance).className, 'rs-flex-box-gird-item');
describe('FlexboxGridItem', () => {
it('Should render a FlexboxGridItem', () => {
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGridItem>Test</FlexboxGridItem>);
assert.include(findDOMNode(instance).className, 'rs-flex-box-grid-item');
});

it('Should be colspan', () => {
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGirdItem colspan={1} />);
assert.include(findDOMNode(instance).className, 'rs-flex-box-gird-item-1');
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGridItem colspan={1} />);
assert.include(findDOMNode(instance).className, 'rs-flex-box-grid-item-1');
});

it('Should be order', () => {
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGirdItem order={1} />);
assert.include(findDOMNode(instance).className, 'rs-flex-box-gird-item-order-1');
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGridItem order={1} />);
assert.include(findDOMNode(instance).className, 'rs-flex-box-grid-item-order-1');
});

it('Should have a custom className', () => {
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGirdItem className="custom" />);
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGridItem className="custom" />);
assert.ok(findDOMNode(instance).className.match(/\bcustom\b/));
});

it('Should have a custom style', () => {
const fontSize = '12px';
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGirdItem style={{ fontSize }} />);
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGridItem style={{ fontSize }} />);
assert.equal(findDOMNode(instance).style.fontSize, fontSize);
});
});
22 changes: 11 additions & 11 deletions test/FlexboxGirdSpec.js → test/FlexboxGridSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@ import React from 'react';
import { findDOMNode } from 'react-dom';
import ReactTestUtils from 'react-dom/test-utils';

import FlexboxGird from '../src/FlexboxGird';
import FlexboxGrid from '../src/FlexboxGrid';

describe('FlexboxGird', () => {
it('Should render a FlexboxGird', () => {
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGird>Test</FlexboxGird>);
assert.include(findDOMNode(instance).className, 'rs-flex-box-gird');
describe('FlexboxGrid', () => {
it('Should render a FlexboxGrid', () => {
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGrid>Test</FlexboxGrid>);
assert.include(findDOMNode(instance).className, 'rs-flex-box-grid');
});

it('Should be aligned on the top', () => {
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGird align="top" />);
assert.include(findDOMNode(instance).className, 'rs-flex-box-gird-top');
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGrid align="top" />);
assert.include(findDOMNode(instance).className, 'rs-flex-box-grid-top');
});

it('Should be justify content on the center', () => {
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGird justify="center" />);
assert.include(findDOMNode(instance).className, 'rs-flex-box-gird-center');
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGrid justify="center" />);
assert.include(findDOMNode(instance).className, 'rs-flex-box-grid-center');
});

it('Should have a custom className', () => {
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGird className="custom" />);
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGrid className="custom" />);
assert.ok(findDOMNode(instance).className.match(/\bcustom\b/));
});

it('Should have a custom style', () => {
const fontSize = '12px';
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGird style={{ fontSize }} />);
const instance = ReactTestUtils.renderIntoDocument(<FlexboxGrid style={{ fontSize }} />);
assert.equal(findDOMNode(instance).style.fontSize, fontSize);
});
});

0 comments on commit b3ff7d9

Please sign in to comment.