Skip to content

Feature/grid #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

# testing
/coverage
/www/src

# production
/build
Expand Down
25 changes: 25 additions & 0 deletions __tests__/Container.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { render } from 'enzyme';
import React from 'react';
import Container from '@/components/Container/Container';

describe('Container test', () => {
it('should render container', () => {
const container = render(
<div>
<Container/>
</div>
);

expect(container.find('.container').length).toBe(1);
});

it('should render fluid container', () => {
const container = render(
<div>
<Container fluid/>
</div>
);

expect(container.find('.container-fluid').length).toBe(1);
});
});
89 changes: 89 additions & 0 deletions __tests__/Grid.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
import { render } from 'enzyme';
import React from 'react';
import { Col, Grid, Row } from '@/components';

describe('Grid test', () => {
it('should render grid', () => {
const container = render(
<div>
<Grid />
</div>
);

expect(container.find('.grid').length).toBe(1);
});

it('should render grid rows', () => {
const container = render(
<div>
<Grid rows={5} />
</div>
);

expect(container.find('.grid.grid-rows-5').length).toBe(1);
});

it('should render grid columns', () => {
const container = render(
<div>
<Grid columns={5} />
</div>
);

expect(container.find('.grid.grid-columns-5').length).toBe(1);
});

it('should render grid gap', () => {
const container = render(
<div>
<Grid gap={5} />
</div>
);

expect(container.find('.grid.grid-gap-5').length).toBe(1);
});

it('should render rows', () => {
const container = render(
<div>
<Row />
</div>
);

expect(container.find('.row').length).toBe(1);
});

it('should render row within cols', () => {
const container = render(
<div>
<Row>
<Col>Test</Col>
<Col>Test</Col>
<Col>Test</Col>
</Row>
</div>
);

expect(container.find('.row .col').length).toBe(3);
});

it('should render cols with breakpoints set', () => {
const container = render(
<div>
<Row>
<Col width={5}>Test</Col>
<Col sm={5}>Test</Col>
<Col md={5}>Test</Col>
<Col lg={5}>Test</Col>
<Col xl={5}>Test</Col>
</Row>
</div>
);

expect(container.find('.row .col.col-5').length).toBe(1);
expect(container.find('.row .col.sm\\:col-5').length).toBe(1);
expect(container.find('.row .col.md\\:col-5').length).toBe(1);
expect(container.find('.row .col.lg\\:col-5').length).toBe(1);
expect(container.find('.row .col.xl\\:col-5').length).toBe(1);
});
});
35 changes: 35 additions & 0 deletions src/components/Container/Container.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';

interface ContainerProps extends React.HTMLAttributes<HTMLDivElement> {
fluid?: boolean;
}

const Container = React.forwardRef<HTMLDivElement, ContainerProps>((
{
children,
className,
fluid
},
ref
): React.ReactElement => (
<div
ref={ref}
className={clsx(
fluid ? 'container-fluid' : 'container',
className
)}
>
{children}
</div>
));

Container.displayName = 'Container';
Container.propTypes = {
className: PropTypes.string,
children: PropTypes.node,
fluid: PropTypes.bool
}

export default Container;
1 change: 1 addition & 0 deletions src/components/Container/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as Container } from './Container';
52 changes: 52 additions & 0 deletions src/components/Grid/Col.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import * as React from 'react';
import clsx from 'clsx';
import PropTypes from 'prop-types';

export interface ColProps extends React.HTMLAttributes<HTMLDivElement> {
lg?: number | string;
md?: number | string;
sm?: number | string;
width?: number | string;
xl?: number | string;
}

const Col = React.forwardRef<HTMLDivElement, ColProps>((
{
className,
children,
lg,
md,
sm,
width,
xl
},
ref
) => (
<div
ref={ref}
className={clsx(
'col',
className,
lg && `lg:col-${lg}`,
md && `md:col-${md}`,
sm && `sm:col-${sm}`,
width && `col-${width}`,
xl && `xl:col-${xl}`
)}
>
{children}
</div>
));

Col.displayName = 'Col';
Col.propTypes = {
className: PropTypes.string,
children: PropTypes.node,
lg: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
md: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
sm: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
width: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
xl: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
}

export default Col;
44 changes: 44 additions & 0 deletions src/components/Grid/Grid.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';

interface GridProps extends React.HTMLAttributes<HTMLDivElement> {
columns?: string | number;
gap?: string | number;
rows?: string | number;
}

const Grid = React.forwardRef<HTMLDivElement, GridProps>((
{
children,
className,
columns,
gap,
rows
},
ref
): React.ReactElement => (
<div
ref={ref}
className={clsx(
'grid',
rows && `grid-rows-${rows}`,
columns && `grid-columns-${columns}`,
gap && `grid-gap-${gap}`,
className
)}
>
{children}
</div>
));

Grid.displayName = 'Grid';
Grid.propTypes = {
className: PropTypes.string,
children: PropTypes.node,
columns: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
gap: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
rows: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
}

export default Grid;
31 changes: 31 additions & 0 deletions src/components/Grid/Row.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';

type RowProps = React.HTMLAttributes<HTMLDivElement>;

const Row = React.forwardRef<HTMLDivElement, RowProps>((
{
children,
className,
},
ref
): React.ReactElement => (
<div
ref={ref}
className={clsx(
'row',
className
)}
>
{children}
</div>
));

Row.displayName = 'Row';
Row.propTypes = {
className: PropTypes.string,
children: PropTypes.node
}

export default Row;
3 changes: 3 additions & 0 deletions src/components/Grid/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export { default as Grid } from './Grid';
export { default as Row } from './Row';
export { default as Col } from './Col';
2 changes: 2 additions & 0 deletions src/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
export * from './Card';
export * from './Container';
export * from './Grid';
export * from './Page';
export * from './Panel';
export * from './utils';
8 changes: 8 additions & 0 deletions src/style/base/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ $base-font-size: 16px;
$base-border-color: mixins.color('gray', 300);
$base-border-radius: 4px;
$base-gutter: 1rem;
$base-gutter-steps: 0.25;

$breakpoints: (
'sm': '640px',
'md': '768px',
'lg': '1024px',
'xl': '1280px'
);

:root {
--base-font-size: #{$base-font-size};
Expand Down
6 changes: 6 additions & 0 deletions src/style/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@
@use "components/page";
@use "components/panel";
@use "components/card";

/**
* 3. Layout
*/
@use "layout/grid";
@use "layout/helpers";
Loading