Skip to content

Add spinner pattern and Spinner component #132

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 3 commits into from
Jul 1, 2021
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
36 changes: 36 additions & 0 deletions images/icons/spinner.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/components/Spinner.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import classnames from 'classnames';

import { registerIcons, SvgIcon } from './SvgIcon';

// Register the spinner icon for use
registerIcons({
/** @ts-ignore - TS doesn't understand require here */
'hyp-spinner': require('../../images/icons/spinner.svg'),
});

/**
* @typedef SpinnerProps
* @prop {string} [classes] - Additional CSS classes to apply
* @prop {'small'|'medium'|'large'} [size='medium'] - Relative size of spinner
* to surrounding content
*/

/**
* Loading indicator.
*
* @param {SpinnerProps} props
*/
export function Spinner({ classes = '', size = 'medium' }) {
const baseClass = `Hyp-Spinner--${size}`;
return <SvgIcon name="spinner" className={classnames(baseClass, classes)} />;
}
31 changes: 31 additions & 0 deletions src/components/test/Spinner-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { mount } from 'enzyme';

import { Spinner } from '../Spinner';

import { checkAccessibility } from '../../../test/util/accessibility';

describe('Spinner', () => {
const createSpinner = (props = {}) => mount(<Spinner {...props} />);

it('renders', () => {
createSpinner();
assert.exists('span.Hyp-Spinner--medium');
});

it('applies additional classes', () => {
createSpinner({ classes: 'foo bar' });
assert.exists('span.Hyp-Spinner--medium.foo.bar');
});

it('sets indicated size', () => {
createSpinner({ size: 'xlarge' });
assert.exists('span.Hyp-Spinner--large.foo.bar');
});

it(
'should pass a11y checks',
checkAccessibility({
content: () => createSpinner(),
})
);
});
1 change: 1 addition & 0 deletions src/icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ export default {
edit: require('../images/icons/edit.svg'),
logo: require('../images/icons/logo.svg'),
profile: require('../images/icons/profile.svg'),
spinner: require('../images/icons/spinner.svg'),
trash: require('../images/icons/trash.svg'),
};
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export { Frame, Card, Actions } from './components/containers';
export { Dialog } from './components/Dialog';
export { Modal, ConfirmModal } from './components/Modal';
export { Panel } from './components/Panel';
export { Spinner } from './components/Spinner';
export { SvgIcon, registerIcons } from './components/SvgIcon';
export { TextInput, TextInputWithButton } from './components/TextInput';

Expand Down
28 changes: 28 additions & 0 deletions src/pattern-library/components/patterns/SpinnerComponents.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { Spinner } from '../../..';

import {
PatternPage,
Pattern,
PatternExamples,
PatternExample,
} from '../PatternPage';

export default function SpinnerComponents() {
return (
<PatternPage title="Spinner">
<Pattern title="Spinner">
<PatternExamples>
<PatternExample details="basic loading spinner">
<Spinner />
</PatternExample>
<PatternExample details="loading spinner, large">
<Spinner size="large" />
</PatternExample>
<PatternExample details="loading spinner, small">
<Spinner size="small" />
</PatternExample>
</PatternExamples>
</Pattern>
</PatternPage>
);
}
37 changes: 37 additions & 0 deletions src/pattern-library/components/patterns/SpinnerPatterns.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import {
PatternExample,
PatternExamples,
PatternPage,
Pattern,
} from '../PatternPage';

import { SvgIcon } from '../../..';

export default function SpinnerPatterns() {
return (
<PatternPage title="Spinners">
<p>
The <code>spinner</code> pattern can be used to show loading states. It
is an animated SVG.
</p>
<Pattern title="Spinner">
<p>
The spinner is <code>em-sized</code>; it renders at <code>1em</code>{' '}
square, by default. Other relative sizes are available as follows. For
manual sizing control, adjust the font-size of a parent element.
</p>
<PatternExamples>
<PatternExample details="basic spinner">
<SvgIcon name="spinner" className="hyp-spinner" />
</PatternExample>
<PatternExample details="spinner, large size">
<SvgIcon name="spinner" className="hyp-spinner--large" />
</PatternExample>
<PatternExample details="spinner, small size">
<SvgIcon name="spinner" className="hyp-spinner--small" />
</PatternExample>
</PatternExamples>
</Pattern>
</PatternPage>
);
}
14 changes: 14 additions & 0 deletions src/pattern-library/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ import LayoutFoundations from './components/patterns/LayoutFoundations';
import FormPatterns from './components/patterns/FormPatterns';
import ContainerPatterns from './components/patterns/ContainerPatterns';
import PanelPatterns from './components/patterns/PanelPatterns';
import SpinnerPatterns from './components/patterns/SpinnerPatterns';

import ButtonComponents from './components/patterns/ButtonComponents';
import ContainerComponents from './components/patterns/ContainerComponents';
import DialogComponents from './components/patterns/DialogComponents';
import FormComponents from './components/patterns/FormComponents';
import PanelComponents from './components/patterns/PanelComponents';
import SpinnerComponents from './components/patterns/SpinnerComponents';

/**
* @typedef {'home'|'foundations'|'patterns'|'components'} PlaygroundRouteGroup
Expand Down Expand Up @@ -63,6 +65,12 @@ const routes = [
component: PanelPatterns,
group: 'patterns',
},
{
route: '/patterns-spinners',
title: 'Spinners',
component: SpinnerPatterns,
group: 'patterns',
},
{
route: '/components-buttons',
title: 'Buttons',
Expand Down Expand Up @@ -93,6 +101,12 @@ const routes = [
component: PanelComponents,
group: 'components',
},
{
route: '/components-spinner',
title: 'Spinner',
component: SpinnerComponents,
group: 'components',
},
];

/**
Expand Down
14 changes: 14 additions & 0 deletions styles/components/Spinner.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@use '../mixins/patterns/spinners';

.Hyp-Spinner--small {
@include spinners.spinner($size: 1em);
}

.Hyp-Spinner,
.Hyp-Spinner--medium {
@include spinners.spinner($size: 2em);
}

.Hyp-Spinner--large {
@include spinners.spinner($size: 3em);
}
1 change: 1 addition & 0 deletions styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@use './components/Dialog';
@use './components/Modal';
@use './components/Panel';
@use './components/Spinner';
@use './components/SvgIcon';
@use './components/TextInput';
@use './components/buttons/styles';
9 changes: 9 additions & 0 deletions styles/mixins/patterns/_spinners.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@use '../../variables' as var;

// Style an SVG as a loading spinner
@mixin spinner($size: 2em) {
color: var.$color-grey-6;
// Assure that the spinner SVG is sized proportinally to local font-size
width: $size;
height: $size;
}
14 changes: 14 additions & 0 deletions styles/patterns/_spinners.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@use '../mixins/patterns/spinners';

.hyp-spinner--small {
@include spinners.spinner($size: 1em);
}

.hyp-spinner,
.hyp-spinner--medium {
@include spinners.spinner($size: 2em);
}

.hyp-spinner--large {
@include spinners.spinner($size: 3em);
}
1 change: 1 addition & 0 deletions styles/patterns/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use 'containers';
@use 'forms';
@use 'panels';
@use 'spinners';
Loading