@carbon/styles 1.4.0 → 1.6.0-rc.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/styles",
   "description": "Styles for the Carbon Design System",
-  "version": "1.4.0",
+  "version": "1.6.0-rc.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -32,21 +32,22 @@
     "sass": "^1.33.0"
   },
   "dependencies": {
-    "@carbon/colors": "^11.2.0-rc.0",
-    "@carbon/feature-flags": "^0.7.0",
-    "@carbon/grid": "^11.2.0-rc.0",
-    "@carbon/layout": "^11.2.0-rc.0",
-    "@carbon/motion": "^11.1.0-rc.0",
-    "@carbon/themes": "^11.3.0-rc.0",
-    "@carbon/type": "^11.3.0-rc.0",
+    "@carbon/colors": "^11.3.0",
+    "@carbon/feature-flags": "^0.8.0",
+    "@carbon/grid": "^11.3.0",
+    "@carbon/layout": "^11.3.0",
+    "@carbon/motion": "^11.2.0",
+    "@carbon/themes": "^11.4.0",
+    "@carbon/type": "^11.4.0",
     "@ibm/plex": "6.0.0-next.6"
   },
   "devDependencies": {
-    "@carbon/test-utils": "^10.24.0-rc.0",
+    "@carbon/test-utils": "^10.25.0",
     "autoprefixer": "^10.4.7",
     "browserslist-config-carbon": "^11.0.0",
     "css": "^3.0.0",
     "cssnano": "^5.1.9",
+    "lodash.isequal": "^4.5.0",
     "postcss": "^8.4.14",
     "postcss-flexbugs-fixes": "^5.0.2",
     "rimraf": "^3.0.2",
@@ -55,7 +56,8 @@
   "sideEffects": [
     "index.scss",
     "scss/**/*.scss",
-    "scss/**/*.css"
+    "scss/**/*.css",
+    "css/**/*.css"
   ],
-  "gitHead": "3536b86f990a6016dfbeac9dd118fc21c4431dcb"
+  "gitHead": "82f5f0dcc24dc63a8feebbfb653333ae08425984"
 }

package/scss/__tests__/zone-test.js

@@ -0,0 +1,76 @@
+/**
+ * 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 css = require('css');
+const isEqual = require('lodash.isequal');
+
+const { render } = SassRenderer.create(__dirname);
+
+describe('zone', () => {
+  it('should set a component token value to the theme of a zone', async () => {
+    const { get, result } = await render(`
+      @use '../themes';
+      @use '../components/button/tokens';
+      @use '../zone';
+
+      $_: get('themes', (
+        white: themes.$white,
+        g10: themes.$g10,
+        g90: themes.$g90,
+        g100: themes.$g100,
+      ));
+      $_: get('tokens', tokens.$button-tokens);
+    `);
+
+    const themes = Array.from(Object.entries(get('themes').value));
+    const tokensByTheme = new Map(
+      themes.map(([theme]) => {
+        return [theme, new Map()];
+      })
+    );
+
+    // Group each of the button tokens into their values by theme
+    const buttonTokens = get('tokens');
+    for (const [token, { values }] of Object.entries(buttonTokens.value)) {
+      for (const { theme, value } of values) {
+        const match = themes.find(([_id, themeMap]) => {
+          return isEqual(themeMap, theme);
+        });
+
+        tokensByTheme.get(match[0]).set(token, value);
+      }
+    }
+
+    // When including the `_zone.scss` file, we generate a stylesheet with four
+    // classes, one per theme.
+    const { stylesheet } = css.parse(result.css.toString());
+
+    for (const rule of stylesheet.rules) {
+      // For each selector, we check that every button token that we have
+      // defined for this theme is emitted in CSS with the expected value
+      const [_prefix, theme] = rule.selectors[0].split('--');
+      const tokens = tokensByTheme.get(theme);
+      const includesComponentTokens = Array.from(tokens.entries()).every(
+        ([token, value]) => {
+          return rule.declarations.find((declaration) => {
+            return (
+              declaration.property.includes(token) &&
+              declaration.value === value
+            );
+          });
+        }
+      );
+
+      expect(includesComponentTokens).toBe(true);
+    }
+  });
+});

package/scss/_breakpoint.scss

@@ -6,5 +6,5 @@
 //
 
 @use './config';
-@forward '@carbon/grid/scss/breakpoint'
-  show breakpoint, breakpoint-between, breakpoint-down, breakpoint-up;
+@forward '@carbon/grid/scss/breakpoint' show breakpoint, breakpoint-between,
+  breakpoint-down, breakpoint-up;

package/scss/_config.scss

@@ -67,9 +67,8 @@ $flex-grid-columns: 16 !default;
 /// @group config
 $use-flexbox-grid: false !default;
 
-@forward '@carbon/grid/scss/config'
-  hide $prefix, $flex-grid-columns
-  with (
-  $prefix: $prefix,
-  $flex-grid-columns: $flex-grid-columns,
-);
+@forward '@carbon/grid/scss/config' hide $prefix,
+  $flex-grid-columns with (
+    $prefix: $prefix,
+    $flex-grid-columns: $flex-grid-columns
+  );

package/scss/_feature-flags.scss

@@ -11,5 +11,6 @@
     'enable-use-controlled-state-with-value': true,
     'enable-css-grid': true,
     'enable-v11-release': true,
-  ) !default
+  )
+  !default
 );

package/scss/_spacing.scss

@@ -5,23 +5,7 @@
 // LICENSE file in the root directory of this source tree.
 //
 
-@forward '@carbon/layout/scss/spacing'
-show
-  $spacing,
-  $spacing-01,
-  $spacing-02,
-  $spacing-03,
-  $spacing-04,
-  $spacing-05,
-  $spacing-06,
-  $spacing-07,
-  $spacing-08,
-  $spacing-09,
-  $spacing-10,
-  $spacing-11,
-  $spacing-12,
-  $spacing-13,
-  $fluid-spacing-01,
-  $fluid-spacing-02,
-  $fluid-spacing-03,
-  $fluid-spacing-04;
+@forward '@carbon/layout/scss/spacing' show $spacing, $spacing-01, $spacing-02,
+  $spacing-03, $spacing-04, $spacing-05, $spacing-06, $spacing-07, $spacing-08,
+  $spacing-09, $spacing-10, $spacing-11, $spacing-12, $spacing-13,
+  $fluid-spacing-01, $fluid-spacing-02, $fluid-spacing-03, $fluid-spacing-04;

package/scss/_zone.scss

@@ -78,9 +78,9 @@ $-components: (
           $theme-values: map.get($value, values);
 
           @each $theme-value in $theme-values {
-            $theme: map.get($theme-value, theme);
             $value: map.get($theme-value, value);
-            @if theme.matches($theme, theme.$theme) and
+
+            @if theme.matches(map.get($theme-value, theme), $theme) and
               meta.type-of($value) ==
               color
             {

package/scss/components/data-table/sort/_data-table-sort.scss

@@ -70,6 +70,7 @@
     > .#{$prefix}--table-header-label {
     padding-right: $spacing-05;
     padding-left: $spacing-05;
+    line-height: 1;
   }
 
   // -------------------------------------

package/scss/components/modal/_modal.scss

@@ -142,8 +142,9 @@
   // text/p gets 20% right padding
   .#{$prefix}--modal-content p,
   .#{$prefix}--modal-content__regular-content {
-    padding-right: 20%;
     @include type-style('body-01');
+    // padding should take into account the left and right padding of modal container
+    padding-right: calc(20% - $spacing-07);
   }
 
   //TO-DO: remove .#{$prefix}--modal-content--with-form in v11 since hasForm has been deprecated\

package/scss/components/notification/_actionable-notification.scss

@@ -180,8 +180,6 @@
     }
   }
 
-  .#{$prefix}--actionable-notification--warning
-    .#{$prefix}--inline-notification__icon,
   .#{$prefix}--actionable-notification--warning
     .#{$prefix}--toast-notification__icon
     path[opacity='0'] {
@@ -229,6 +227,7 @@
     @include type-style('body-compact-01');
 
     display: flex;
+    flex-wrap: wrap;
     word-break: break-word;
   }
 

package/scss/components/notification/_toast-notification.scss

@@ -5,7 +5,7 @@
 // LICENSE file in the root directory of this source tree.
 //
 
-@use 'mixins' as*;
+@use 'mixins' as *;
 @use 'tokens' as *;
 @use '../../breakpoint' as *;
 @use '../../colors' as *;

package/scss/components/notification/_tokens.scss

@@ -6,7 +6,7 @@
 //
 
 @use 'sass:color';
-@use "sass:map";
+@use 'sass:map';
 @use 'sass:list';
 @use '../../config';
 @use '../../colors';

package/scss/components/structured-list/_structured-list.scss

@@ -7,12 +7,12 @@
 
 @use '../../config' as *;
 @use '../../feature-flags' as *;
-@use "../../type" as *;
+@use '../../type' as *;
 @use '../../motion';
 @use '../../theme' as *;
-@use "../../utilities/focus-outline" as *;
-@use "../../utilities/skeleton" as *;
-@use "../../utilities/high-contrast-mode" as *;
+@use '../../utilities/focus-outline' as *;
+@use '../../utilities/skeleton' as *;
+@use '../../utilities/high-contrast-mode' as *;
 @use '../../utilities/convert' as *;
 @use 'mixins' as *;
 

package/scss/components/tabs/_tabs.scss

@@ -455,6 +455,12 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
     }
   }
 
+  .#{$prefix}--tab-content--interactive {
+    &:focus {
+      outline: none;
+    }
+  }
+
   //-----------------------------
   // Skeleton state
   //-----------------------------

package/scss/components/treeview/_treeview.scss

@@ -12,7 +12,7 @@
 @use '../../type' as *;
 @use '../../utilities/convert' as *;
 @use '../../utilities/focus-outline' as *;
-@use "../../utilities/skeleton" as *;
+@use '../../utilities/skeleton' as *;
 
 /// Treeview styles
 /// @access public
@@ -20,154 +20,154 @@
 @mixin treeview {
   .#{$prefix}--tree {
     overflow: hidden;
+  }
 
-    .#{$prefix}--tree-node {
-      padding-left: $spacing-05;
-      background-color: $layer-01;
-      color: $text-secondary;
-
-      &:focus {
-        outline: none;
-      }
-    }
+  .#{$prefix}--tree-node {
+    padding-left: $spacing-05;
+    background-color: $layer-01;
+    color: $text-secondary;
 
-    .#{$prefix}--tree-node:focus > .#{$prefix}--tree-node__label {
-      @include focus-outline('outline');
-    }
-
-    .#{$prefix}--tree-node--disabled:focus > .#{$prefix}--tree-node__label {
+    &:focus {
       outline: none;
     }
+  }
 
-    .#{$prefix}--tree-node--disabled,
-    .#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__label:hover,
-    .#{$prefix}--tree-node--disabled
-      .#{$prefix}--tree-node__label:hover
-      .#{$prefix}--tree-node__label__details {
-      background-color: $field-01;
-      color: $text-disabled;
-    }
+  .#{$prefix}--tree-node:focus > .#{$prefix}--tree-node__label {
+    @include focus-outline('outline');
+  }
 
-    .#{$prefix}--tree-node--disabled .#{$prefix}--tree-parent-node__toggle-icon,
-    .#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__icon,
-    .#{$prefix}--tree-node--disabled
-      .#{$prefix}--tree-node__label:hover
-      .#{$prefix}--tree-parent-node__toggle-icon,
-    .#{$prefix}--tree-node--disabled
-      .#{$prefix}--tree-node__label:hover
-      .#{$prefix}--tree-node__icon {
-      fill: $icon-disabled;
-    }
+  .#{$prefix}--tree-node--disabled:focus > .#{$prefix}--tree-node__label {
+    outline: none;
+  }
 
-    .#{$prefix}--tree-node--disabled,
-    .#{$prefix}--tree-node--disabled
-      .#{$prefix}--tree-parent-node__toggle-icon:hover {
-      cursor: not-allowed;
-    }
+  .#{$prefix}--tree-node--disabled,
+  .#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__label:hover,
+  .#{$prefix}--tree-node--disabled
+    .#{$prefix}--tree-node__label:hover
+    .#{$prefix}--tree-node__label__details {
+    background-color: $field-01;
+    color: $text-disabled;
+  }
+
+  .#{$prefix}--tree-node--disabled .#{$prefix}--tree-parent-node__toggle-icon,
+  .#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__icon,
+  .#{$prefix}--tree-node--disabled
+    .#{$prefix}--tree-node__label:hover
+    .#{$prefix}--tree-parent-node__toggle-icon,
+  .#{$prefix}--tree-node--disabled
+    .#{$prefix}--tree-node__label:hover
+    .#{$prefix}--tree-node__icon {
+    fill: $icon-disabled;
+  }
 
-    .#{$prefix}--tree-node__label {
-      @include type-style('body-compact-01');
+  .#{$prefix}--tree-node--disabled,
+  .#{$prefix}--tree-node--disabled
+    .#{$prefix}--tree-parent-node__toggle-icon:hover {
+    cursor: not-allowed;
+  }
 
-      display: flex;
-      min-height: rem(32px);
-      flex: 1;
-      align-items: center;
+  .#{$prefix}--tree-node__label {
+    @include type-style('body-compact-01');
 
-      &:hover {
-        background-color: $layer-hover-01;
-        color: $text-primary;
-      }
-    }
+    display: flex;
+    min-height: rem(32px);
+    flex: 1;
+    align-items: center;
 
-    .#{$prefix}--tree-node__label:hover .#{$prefix}--tree-node__label__details {
+    &:hover {
+      background-color: $layer-hover-01;
       color: $text-primary;
     }
+  }
 
-    .#{$prefix}--tree-node__label:hover
-      .#{$prefix}--tree-parent-node__toggle-icon,
-    .#{$prefix}--tree-node__label:hover .#{$prefix}--tree-node__icon {
-      fill: $icon-primary;
-    }
+  .#{$prefix}--tree-node__label:hover .#{$prefix}--tree-node__label__details {
+    color: $text-primary;
+  }
 
-    .#{$prefix}--tree-leaf-node {
-      display: flex;
-      padding-left: $spacing-08;
-    }
+  .#{$prefix}--tree-node__label:hover
+    .#{$prefix}--tree-parent-node__toggle-icon,
+  .#{$prefix}--tree-node__label:hover .#{$prefix}--tree-node__icon {
+    fill: $icon-primary;
+  }
 
-    .#{$prefix}--tree-leaf-node.#{$prefix}--tree-node--with-icon {
-      padding-left: $spacing-07;
-    }
+  .#{$prefix}--tree-leaf-node {
+    display: flex;
+    padding-left: $spacing-08;
+  }
 
-    .#{$prefix}--tree-node__label__details {
-      display: flex;
-      align-items: center;
-    }
+  .#{$prefix}--tree-leaf-node.#{$prefix}--tree-node--with-icon {
+    padding-left: $spacing-07;
+  }
 
-    .#{$prefix}--tree-node--with-icon .#{$prefix}--tree-parent-node__toggle {
-      margin-right: 0;
-    }
+  .#{$prefix}--tree-node__label__details {
+    display: flex;
+    align-items: center;
+  }
 
-    .#{$prefix}--tree-parent-node__toggle {
-      padding: 0;
-      border: 0;
-      margin-right: $spacing-03;
+  .#{$prefix}--tree-node--with-icon .#{$prefix}--tree-parent-node__toggle {
+    margin-right: 0;
+  }
 
-      &:hover {
-        cursor: pointer;
-      }
+  .#{$prefix}--tree-parent-node__toggle {
+    padding: 0;
+    border: 0;
+    margin-right: $spacing-03;
 
-      &:focus {
-        outline: none;
-      }
+    &:hover {
+      cursor: pointer;
     }
 
-    .#{$prefix}--tree-parent-node__toggle-icon {
-      fill: $icon-secondary;
-      transform: rotate(-90deg);
-      transition: all $duration-fast-02 motion(standard, productive);
+    &:focus {
+      outline: none;
     }
+  }
 
-    .#{$prefix}--tree-parent-node__toggle-icon--expanded {
-      transform: rotate(0);
-    }
+  .#{$prefix}--tree-parent-node__toggle-icon {
+    fill: $icon-secondary;
+    transform: rotate(-90deg);
+    transition: all $duration-fast-02 motion(standard, productive);
+  }
 
-    .#{$prefix}--tree-node__icon {
-      min-width: 1rem;
-      min-height: 1rem;
-      margin-right: $spacing-03;
-      fill: $icon-secondary;
-    }
+  .#{$prefix}--tree-parent-node__toggle-icon--expanded {
+    transform: rotate(0);
+  }
 
-    .#{$prefix}--tree-node--selected > .#{$prefix}--tree-node__label {
-      background-color: $layer-selected-01;
-      color: $text-primary;
+  .#{$prefix}--tree-node__icon {
+    min-width: 1rem;
+    min-height: 1rem;
+    margin-right: $spacing-03;
+    fill: $icon-secondary;
+  }
 
-      &:hover {
-        background-color: $layer-selected-hover-01;
-      }
-    }
+  .#{$prefix}--tree-node--selected > .#{$prefix}--tree-node__label {
+    background-color: $layer-selected-01;
+    color: $text-primary;
 
-    .#{$prefix}--tree-node--selected
-      > .#{$prefix}--tree-node__label
-      .#{$prefix}--tree-parent-node__toggle-icon,
-    .#{$prefix}--tree-node--selected
-      > .#{$prefix}--tree-node__label
-      .#{$prefix}--tree-node__icon {
-      fill: $icon-primary;
+    &:hover {
+      background-color: $layer-selected-hover-01;
     }
+  }
+
+  .#{$prefix}--tree-node--selected
+    > .#{$prefix}--tree-node__label
+    .#{$prefix}--tree-parent-node__toggle-icon,
+  .#{$prefix}--tree-node--selected
+    > .#{$prefix}--tree-node__label
+    .#{$prefix}--tree-node__icon {
+    fill: $icon-primary;
+  }
 
-    .#{$prefix}--tree-node--active > .#{$prefix}--tree-node__label {
-      position: relative;
-
-      &::before {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: rem(4px);
-        height: 100%;
-        background-color: $interactive;
-        content: '';
-      }
+  .#{$prefix}--tree-node--active > .#{$prefix}--tree-node__label {
+    position: relative;
+
+    &::before {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: rem(4px);
+      height: 100%;
+      background-color: $interactive;
+      content: '';
     }
   }
 

package/scss/fonts/README.md

@@ -25,7 +25,7 @@ Plex Sans, and IBM Plex Serif. To bring in additional fonts, you can include the
 @use '@carbon/styles/scss/fonts' with (
   $fonts: (
     IBM-Plex-Sans-Arabic: true,
-  ),
+  )
 );
 ```
 
@@ -35,7 +35,7 @@ You can also configure it to disable specific fonts:
 @use '@carbon/styles/scss/fonts' with (
   $fonts: (
     IBM-Plex-Sans: false,
-  ),
+  )
 );
 ```
 
@@ -44,7 +44,7 @@ in:
 
 ```scss
 @use '@carbon/styles/scss/config' with (
-  $css--font-face: false,
+  $css--font-face: false
 );
 ```
 
@@ -88,7 +88,7 @@ The `$font-path` options is available in `scss/config`:
 
 ```scss
 @use '@carbon/styles/scss/config' with (
-  $font-path: 'https://cdn.custom-font-path.com/fonts',
+  $font-path: 'https://cdn.custom-font-path.com/fonts'
 );
 ```
 

package/scss/grid/_index.scss

@@ -6,12 +6,8 @@
 //
 
 @use '../config';
-@forward '@carbon/grid' show
-  $grid-gutter,
-  $grid-gutter-condensed,
-  $grid-breakpoints,
-  flex-grid,
-  css-grid;
+@forward '@carbon/grid' show $grid-gutter, $grid-gutter-condensed,
+  $grid-breakpoints, flex-grid, css-grid;
 @use '@carbon/grid';
 
 @if config.$use-flexbox-grid == true {

package/scss/theme/_theme.scss

@@ -7,14 +7,14 @@
 
 @use '../config' as *;
 @use '@carbon/themes/scss/config' with (
-  $prefix: $prefix,
+  $prefix: $prefix
 );
 @use '../compat/themes' as compat;
 @use '../themes';
 
 @forward '@carbon/themes/scss/theme' with (
   $fallback: themes.$white !default,
-  $theme: compat.$white !default,
+  $theme: compat.$white !default
 );
 @forward '@carbon/themes/scss/tokens';
 

package/scss/type/_index.scss

@@ -6,6 +6,8 @@
 //
 
 @use '../config';
+
+// prettier-ignore
 @forward '@carbon/type' show
   // Mixins
   reset,
@@ -47,7 +49,7 @@
   $display-02,
   $display-03,
   $display-04,
-  $font-families, 
+  $font-families,
   $font-weights,
   $tokens;
 

package/scss/utilities/_convert.scss

@@ -6,7 +6,7 @@
 //
 
 @use 'sass:meta';
-@use "sass:math";
+@use 'sass:math';
 
 /// Default font size
 /// @type Number