Skip to content

Commit

Permalink
BC: Make LayoutCenter more generic: call it simply Center and sto…
Browse files Browse the repository at this point in the history
…p it from taking up 100 % of viewport height (#143)

It's now necessary to set the desired height on the parent of the `Center` layout,
eg. when you're using `Login` screen component which is expected to spread over
entire viewport.
  • Loading branch information
adamkudrna committed Sep 11, 2020
1 parent 9f36a41 commit 9b324ac
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 42 deletions.
25 changes: 13 additions & 12 deletions src/demo/pages/DemoContainer.jsx

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/demo/pages/navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ export default [
{
items: [
{
link: '#layout-components-centered-layout',
title: 'Centered Layout',
link: '#layout-components-center',
title: 'Center',
},
{
link: '#layout-components-cta',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import PropTypes from 'prop-types';
import React from 'react';
import styles from './LayoutCenter.scss';
import styles from './Center.scss';

const LayoutCenter = (props) => (
export const Center = (props) => (
<div className={styles.root}>
<div>
{props.children}
</div>
</div>
);

LayoutCenter.defaultProps = {
Center.defaultProps = {
children: null,
};

LayoutCenter.propTypes = {
Center.propTypes = {
children: PropTypes.node,
};

export default LayoutCenter;
export default Center;
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
justify-content: center;
width: 100%;
height: 100%;
min-height: 100vh;
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import React from 'react';
import { shallow } from 'enzyme';
import { shallowToJson } from 'enzyme-to-json';
import LayoutCenter from '..';
import { Center } from '../Center';

describe('rendering', () => {
it('renders correctly', () => {
const tree = shallow(<LayoutCenter />);
const tree = shallow(<Center />);

expect(shallowToJson(tree)).toMatchSnapshot();
});

it('renders correctly with children', () => {
const tree = shallow(<LayoutCenter><div>test</div></LayoutCenter>);
const tree = shallow(<Center><div>test</div></Center>);

expect(shallowToJson(tree)).toMatchSnapshot();
});
Expand Down
1 change: 1 addition & 0 deletions src/lib/components/layout/Center/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './Center';
1 change: 0 additions & 1 deletion src/lib/components/layout/LayoutCenter/index.js

This file was deleted.

48 changes: 30 additions & 18 deletions src/lib/index.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
// Layout components
export { default as LayoutCenter } from './components/layout/LayoutCenter';
export { CTA } from './components/layout/CTA';
export { CTACenter } from './components/layout/CTA';
export { CTAEnd } from './components/layout/CTA';
export { CTAStart } from './components/layout/CTA';
export { FormLayout } from './components/layout/FormLayout';
export { FormLayoutCustomField } from './components/layout/FormLayout';
export { default as Center } from './components/layout/Center';
export {
CTA,
CTACenter,
CTAEnd,
CTAStart,
} from './components/layout/CTA';
export {
FormLayout,
FormLayoutCustomField,
} from './components/layout/FormLayout';
export { default as Grid } from './components/layout/Grid';
export { List } from './components/layout/List';
export { ListItem } from './components/layout/List';
export { Media } from './components/layout/Media';
export { MediaBody } from './components/layout/Media';
export { MediaObject } from './components/layout/Media';
export { Toolbar } from './components/layout/Toolbar';
export { ToolbarGroup } from './components/layout/Toolbar';
export { ToolbarItem } from './components/layout/Toolbar';
export {
List,
ListItem,
} from './components/layout/List';
export {
Media,
MediaBody,
MediaObject,
} from './components/layout/Media';
export {
Toolbar,
ToolbarGroup,
ToolbarItem,
} from './components/layout/Toolbar';

// Screens
export { default as ForgotPassword } from './components/screens/Login/ForgotPassword';
Expand All @@ -26,9 +36,11 @@ export { default as Alert } from './components/ui/Alert';
export { default as Badge } from './components/ui/Badge';
export { default as Button } from './components/ui/Button';
export { default as ButtonGroup } from './components/ui/ButtonGroup';
export { Card } from './components/ui/Card';
export { CardBody } from './components/ui/Card';
export { CardFooter } from './components/ui/Card';
export {
Card,
CardBody,
CardFooter,
} from './components/ui/Card';
export { default as CheckboxField } from './components/ui/CheckboxField';
export { default as Modal } from './components/ui/Modal';
export { default as MultipleSelectField } from './components/ui/MultipleSelectField';
Expand Down

0 comments on commit 9b324ac

Please sign in to comment.