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.

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

fix(styles): update notification to new token format #9582

Merged
merged 8 commits into from
Sep 2, 2021
2 changes: 1 addition & 1 deletion config/eslint-config-carbon/plugins/react.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module.exports = {
// In these cases, we don't need to handle prop type validation like we
// would for code we ship to users.
{
files: ['*-story.js'],
files: ['*-story.js', '*.stories.js'],
rules: {
'react/display-name': 0,
'react/prop-types': 0,
Expand Down
8 changes: 4 additions & 4 deletions packages/carbon-react/.storybook/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
// LICENSE file in the root directory of this source tree.
//

$feature-flags: (
enable-v11-release: true,
);

@use '../index.scss' as styles with (
$css--font-face: true,
$css--plex-arabic: true,
Expand All @@ -32,6 +28,10 @@ $feature-flags: (
@include styles.theme(styles.$g100, button.$g100, tag.$g100);
}

body {
background: styles.$background;
}

html[lang='en'] body {
font-family: 'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ const toastNotificationProps = () => ({

export default {
title: 'Components/Notifications',
parameters: {
controls: {
hideNoControlsWarning: true,
},
},
};

export const Toast = () => (
Expand All @@ -35,6 +40,45 @@ export const Toast = () => (
/>
);

export const ToastPlayground = ({
kind = 'info',
title = 'Notification title',
subtitle = 'Notification subtitle',
caption = '00:00:00 AM',
lowContrast = false,
}) => {
return (
<ToastNotification
kind={kind}
title={title}
subtitle={subtitle}
lowContrast={lowContrast}
caption={caption}
/>
);
};
ToastPlayground.argTypes = {
kind: {
options: [
'error',
'info',
'info-square',
'success',
'warning',
'warning-alt',
],
control: {
type: 'select',
},
},
lowContrast: {
value: false,
control: {
type: 'boolean',
},
},
};

export const Inline = () => (
<InlineNotification
{...notificationProps()}
Expand Down

This file was deleted.

44 changes: 44 additions & 0 deletions packages/styles/scss/components/__tests__/notification-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/**
* Copyright IBM Corp. 2018, 2018
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*
* @jest-environment node
*/

'use strict';

const { SassRenderer } = require('@carbon/test-utils/scss');

const { render } = SassRenderer.create(__dirname);

describe('scss/components/notification', () => {
test('Public API', async () => {
const { unwrap } = await render(`
@use 'sass:map';
@use 'sass:meta';
@use '../notification';
$_: get('mixins', (
toast-notification: meta.mixin-exists('toast-notification', 'notification'),
inline-notification: meta.mixin-exists('inline-notification', 'notification'),
));
$_: get('tokens', map.keys(meta.module-variables('notification')));
`);

expect(unwrap('mixins')).toEqual({
'toast-notification': true,
'inline-notification': true,
});
expect(unwrap('tokens')).toEqual([
'notification-background-error',
'notification-background-success',
'notification-background-info',
'notification-background-warning',
'notification-action-hover',
'notification-tokens',
]);
});
});

This file was deleted.

7 changes: 5 additions & 2 deletions packages/styles/scss/components/notification/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
@forward 'inline-notification';
@forward 'toast-notification';

@use 'inline-notification';
@use 'toast-notification';
@use '../../theme';
@use './tokens';
@use './inline-notification';
@use './toast-notification';

@include theme.add-component-tokens(tokens.$notification-tokens);
@include inline-notification.inline-notification;
@include toast-notification.toast-notification;
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
@use '../../themes' as *;
@use '../../type' as *;
@use '../../utilities/convert' as *;
@use '../../utilities/component-tokens' as *;
@use '../../utilities/high-contrast-mode' as *;
@use '../../utilities/focus-outline' as *;
@use './tokens' as *;

/// Inline notification styles
/// @access public
Expand Down Expand Up @@ -102,7 +102,7 @@
.#{$prefix}--inline-notification--low-contrast.#{$prefix}--inline-notification--error {
@include notification--experimental(
$support-error,
get-token(var(--cds-background-error))
$notification-background-error
);

&::before {
Expand All @@ -120,7 +120,7 @@
.#{$prefix}--inline-notification--low-contrast.#{$prefix}--inline-notification--success {
@include notification--experimental(
$support-success,
get-token-value(var(--cds-background-success))
$notification-background-success
);

&::before {
Expand All @@ -140,7 +140,7 @@
.#{$prefix}--inline-notification--low-contrast.#{$prefix}--inline-notification--info-square {
@include notification--experimental(
$support-info,
get-token-value(var(--cds-background-info))
$notification-background-info
);

&::before {
Expand All @@ -160,7 +160,7 @@
.#{$prefix}--inline-notification--low-contrast.#{$prefix}--inline-notification--warning-alt {
@include notification--experimental(
$support-warning,
get-token-value(var(--cds-background-warning))
$notification-background-warning
);

&::before {
Expand Down Expand Up @@ -241,7 +241,7 @@
.#{$prefix}--inline-notification__action-button.#{$prefix}--btn--ghost:active,
.#{$prefix}--inline-notification--low-contrast
.#{$prefix}--inline-notification__action-button.#{$prefix}--btn--ghost:hover {
background-color: get-token-value(var(--cds-action-hover));
background-color: $notification-action-hover;
}

.#{$prefix}--inline-notification__action-button.#{$prefix}--btn--ghost:focus {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
@use '../../utilities/convert' as *;
@use '../../utilities/high-contrast-mode' as *;
@use '../../utilities/focus-outline' as *;
@use './tokens' as *;

/// Toast notification styles
/// @access public
Expand Down Expand Up @@ -82,7 +83,7 @@
.#{$prefix}--toast-notification--low-contrast.#{$prefix}--toast-notification--error {
@include notification--experimental(
$support-error,
get-token(var(--cds-background-error))
$notification-background-error
);
}

Expand All @@ -96,7 +97,7 @@
.#{$prefix}--toast-notification--low-contrast.#{$prefix}--toast-notification--success {
@include notification--experimental(
$support-success,
get-token(var(--cds-background-success))
$notification-background-success
);
}

Expand All @@ -112,7 +113,7 @@
.#{$prefix}--toast-notification--low-contrast.#{$prefix}--toast-notification--info-square {
@include notification--experimental(
$support-info,
get-token(var(--cds-background-info))
$notification-background-info
);
}

Expand All @@ -128,7 +129,7 @@
.#{$prefix}--toast-notification--low-contrast.#{$prefix}--toast-notification--warning-alt {
@include notification--experimental(
$support-warning,
get-token(var(--cds-background-warning))
$notification-background-warning
);
}

Expand Down
Loading