Skip to content
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.

Sign up for GitHub

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

feat(InlineLoading): add support for warning status #4810

Closed
wants to merge 7 commits into from
Closed

feat(InlineLoading): add support for warning status #4810

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6cc883f
feat(InlineLoading): add support for warning status
janhassel Dec 3, 2019
91c9099
fix(InlineLoading): correct unnecessary else-if statements
janhassel Dec 4, 2019
8e74a52
Merge branch 'master' into inline-loading-warning
tw15egan Jan 8, 2020
6531850
Merge branch 'master' into inline-loading-warning
tw15egan Jan 13, 2020
e0ae74c
Merge branch 'master' into inline-loading-warning
janhassel Jan 22, 2020
f16e1ea
Merge branch 'master' into inline-loading-warning
tw15egan Jan 24, 2020
b09ce89
Merge branch 'master' into inline-loading-warning
janhassel Jan 27, 2020
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
17 changes: 15 additions & 2 deletions packages/components/src/components/inline-loading/_inline-loading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
animation-fill-mode: forwards;
}

.#{$prefix}--inline-loading--error {
fill: $support-01;
.#{$prefix}--inline-loading--error,
.#{$prefix}--inline-loading--warning {
width: rem(16px);
height: rem(16px);

Expand All @@ -82,6 +82,19 @@
}
}

.#{$prefix}--inline-loading--error {
fill: $support-01;
}

.#{$prefix}--inline-loading--warning {
fill: $support-03;
}

.#{$prefix}--inline-loading--warning path[opacity='0'] {
fill: $carbon__black-100;
opacity: 1;
}

.#{$prefix}--loading--small .#{$prefix}--inline-loading__svg {
stroke: $interactive-04;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/InlineLoading/InlineLoading-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import InlineLoading from '../InlineLoading';
const props = () => ({
status: select(
'Loading status (status)',
['inactive', 'active', 'finished', 'error'],
['inactive', 'active', 'finished', 'error', 'warning'],
'active'
),
iconDescription: text(
Expand Down
26 changes: 19 additions & 7 deletions packages/react/src/components/InlineLoading/InlineLoading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { CheckmarkFilled16, Error20 } from '@carbon/icons-react';
import {
CheckmarkFilled16,
ErrorFilled16,
WarningFilled16,
} from '@carbon/icons-react';
import { settings } from 'carbon-components';
import deprecate from '../../prop-types/deprecate';
import Loading from '../Loading';
Expand All @@ -28,9 +32,12 @@ export default function InlineLoading({
const loadingClasses = classNames(`${prefix}--inline-loading`, className);
const getLoading = () => {
if (status === 'error') {
return <Error20 className={`${prefix}--inline-loading--error`} />;
}
if (status === 'finished') {
return <ErrorFilled16 className={`${prefix}--inline-loading--error`} />;
} else if (status === 'warning') {
return (
<WarningFilled16 className={`${prefix}--inline-loading--warning`} />
);
} else if (status === 'finished') {
setTimeout(() => {
if (onSuccess) {
onSuccess();
Expand All @@ -41,8 +48,7 @@ export default function InlineLoading({
className={`${prefix}--inline-loading__checkmark-container`}
/>
);
}
if (status === 'inactive' || status === 'active') {
} else if (status === 'inactive' || status === 'active') {
return (
<Loading
small
Expand Down Expand Up @@ -89,7 +95,13 @@ InlineLoading.propTypes = {
/**
* Specify the loading status
*/
status: PropTypes.oneOf(['inactive', 'active', 'finished', 'error']),
status: PropTypes.oneOf([
'inactive',
'active',
'finished',
'error',
'warning',
]),

/**
* Specify the description for the inline loading text
Expand Down