Merge branch 'master' into card-theme-zoning

carbon-design-system · Dec 9, 2020 · 9875ef7 · 9875ef7
2 parents 1cfb724 + 47b6265
commit 9875ef7
Show file tree

Hide file tree

Showing 130 changed files with 769 additions and 498 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug Report 🐛
 about: Something isn't working as expected? Here is the right place to report.
 labels: bug
-assignees: jeffchew, wonilsuhibm, ljcarot, RobertaJHahn, RaphaelAmadeu, JennySanchez, IgnacioBecerra
+assignees: jeffchew, wonilsuhibm, ljcarot, RobertaJHahn, andysherman2121, IgnacioBecerra
 ---
 
 <!-- Feel free to remove sections that aren't relevant.

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -3,7 +3,7 @@ name: Feature Request 💡
 about: Suggest a new idea for the project.
 title: ''
 labels: Feature request
-assignees: jeffchew, wonilsuhibm, RaphaelAmadeu, JennySanchez, IgnacioBecerra
+assignees: jeffchew, wonilsuhibm, andysherman2121, IgnacioBecerra
 ---
 
 <!-- replace _{{...}}_ with your own words -->

diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
@@ -2,7 +2,7 @@
 name: Question 🤔
 about: Usage question or discussion about Carbon for IBM.com.
 labels: question
-assignees: jeffchew, wonilsuhibm, ljcarot, RobertaJHahn, RaphaelAmadeu, JennySanchez, IgnacioBecerra
+assignees: jeffchew, wonilsuhibm, ljcarot, RobertaJHahn, andysherman2121, IgnacioBecerra
 ---
 
 <!--

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -7,6 +7,8 @@ on:
 jobs:
   automerge:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Merge to master
@@ -16,3 +18,7 @@ jobs:
           target_branch: 'master'
         env:
           GITHUB_TOKEN: ${{secrets.MERGE_ACTION}}
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
diff --git a/.github/workflows/deploy-canary.yml b/.github/workflows/deploy-canary.yml
@@ -8,6 +8,8 @@ on:
 jobs:
   react:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -38,8 +40,14 @@ jobs:
           cf-app: ibmdotcom-react-canary
           cf-manifest: manifest-canary.yml
           deploy-dir: packages/react
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
   react-experimental:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -71,8 +79,14 @@ jobs:
           cf-app: ibmdotcom-react-experimental
           cf-manifest: manifest-experimental.yml
           deploy-dir: packages/react
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
   react-rtl:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -104,8 +118,14 @@ jobs:
           cf-app: ibmdotcom-react-rtl
           cf-manifest: manifest-rtl.yml
           deploy-dir: packages/react
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
   web-components:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -136,8 +156,14 @@ jobs:
           cf-app: ibmdotcom-web-components-canary
           cf-manifest: manifest-canary.yml
           deploy-dir: packages/web-components
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
   web-components-rtl:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -169,8 +195,14 @@ jobs:
           cf-app: ibmdotcom-web-components-rtl
           cf-manifest: manifest-rtl.yml
           deploy-dir: packages/web-components
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
   web-components-experimental:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -202,8 +234,14 @@ jobs:
           cf-app: ibmdotcom-web-components-experimental
           cf-manifest: manifest-experimental.yml
           deploy-dir: packages/web-components
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
   services:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -234,8 +272,14 @@ jobs:
           cf-app: ibmdotcom-services
           cf-manifest: manifest.yml
           deploy-dir: packages/services
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
   utilities:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -266,8 +310,14 @@ jobs:
           cf-app: ibmdotcom-utilities
           cf-manifest: manifest.yml
           deploy-dir: packages/utilities
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
   carbon-expressive:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -298,3 +348,7 @@ jobs:
           cf-app: carbon-expressive
           cf-manifest: manifest.yml
           deploy-dir: packages/styles
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -8,6 +8,8 @@ on:
 jobs:
   react:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -38,8 +40,14 @@ jobs:
           cf-app: ibmdotcom-react-staging
           cf-manifest: manifest-staging.yml
           deploy-dir: packages/react
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
   web-components:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -70,3 +78,7 @@ jobs:
           cf-app: ibmdotcom-web-components-staging
           cf-manifest: manifest-staging.yml
           deploy-dir: packages/web-components
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
diff --git a/.github/workflows/publish-canary.yml b/.github/workflows/publish-canary.yml
@@ -8,6 +8,8 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -34,3 +36,7 @@ jobs:
           repository: carbon-design-system/carbon-for-ibm-dotcom-web-components-test
           token: ${{ secrets.GH_DISPATCH_TOKEN }}
           event-type: deploy-canary
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
diff --git a/.github/workflows/publish-nightly.yml b/.github/workflows/publish-nightly.yml
@@ -7,6 +7,8 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-16.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 12.x
@@ -23,3 +25,7 @@ jobs:
         run: echo "//registry.npmjs.org/:_authToken=$NPM_API_KEY" >> .npmrc
       - name: Run Lerna
         run: yarn lerna publish --canary minor --dist-tag nightly --preid nightly.${{github.run_id}} --no-push --no-git-tag-version --yes
+      - uses: act10ns/slack@v1
+        with:
+          status: ${{ job.status }}
+        if: failure()
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.14.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2020-12-08)
+
+### Bug Fixes
+
+- **locale-modal:** replaced href target to avoid storybook refresh
+  ([#4647](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/4647))
+  ([9ba076e](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/9ba076e))
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 # [1.14.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2020-12-04)
 
 **Note:** Version bump only for package @carbon/ibmdotcom-react

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-react",
   "description": "Carbon for IBM.com React Components",
-  "version": "1.14.0-rc.0",
+  "version": "1.14.0-rc.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

diff --git a/packages/react/src/components/LocaleModal/LocaleModalRegions.js b/packages/react/src/components/LocaleModal/LocaleModalRegions.js
@@ -150,14 +150,16 @@ export const addLocaleBackBtnListeners = (
         : returnButtonLabel
     );
 
-    btn.addEventListener('click', function click() {
+    btn.addEventListener('click', function click(e) {
       localeBackActive(btn, setIsFiltering, setClearResults);
       btn.removeEventListener('click', click);
+      e.preventDefault();
     });
     btn.addEventListener('keyup', function keyup(e) {
       if (e.keyCode === 32 || e.keyCode === 13) {
         localeBackActive(btn, setIsFiltering, setClearResults);
         btn.removeEventListener('keyup', keyup);
+        e.preventDefault();
       }
     });
   });

diff --git a/packages/react/src/components/Masthead/MastheadSearch.js b/packages/react/src/components/Masthead/MastheadSearch.js
@@ -169,12 +169,14 @@ const MastheadSearch = ({
     /**
      * Close search when click detected outside of component.
      * This is necessary otherwise search stays open even when
-     * elements other than the close button are clicked.
+     * elements other than the close button and the
+     * profile button are clicked.
      *
-     * @param {*} event Click event outside search component
+     * @param {*} event Click event outside masthead component
      */
     const handleClickOutside = event => {
-      if (ref.current && !ref.current.contains(event.target)) {
+      let mastheadRef = ref.current?.closest('.bx--masthead');
+      if (mastheadRef && !mastheadRef.contains(event.target)) {
         // If a click was detected outside the Search ref but there is a text value in state, don't hide the Search.
         if (state.val.length === 0) {
           dispatch({ type: 'setSearchClosed' });

diff --git a/packages/styles/scss/components/card-group/_card-group.scss b/packages/styles/scss/components/card-group/_card-group.scss
@@ -77,15 +77,13 @@
     }
   }
 
-  :host(#{$dds-prefix}-card-group),
-  .#{$prefix}--card-group__row {
+  .#{$prefix}--card-group__row,
+  .#{$prefix}--card-group__cards__row {
     @include carbon--make-row;
   }
 
   :host(#{$dds-prefix}-card-group),
   .#{$prefix}--card-group__cards__row {
-    @include carbon--make-row;
-
     position: relative;
 
     &::after {
@@ -101,7 +99,6 @@
     }
   }
 
-  :host(#{$dds-prefix}-card-group-item),
   .#{$prefix}--card-group__cards__col {
     @include carbon--make-col-ready;
 
@@ -111,7 +108,10 @@
     @include carbon--breakpoint('lg') {
       @include carbon--make-col(1, 3);
     }
+  }
 
+  :host(#{$dds-prefix}-card-group-item),
+  .#{$prefix}--card-group__cards__col {
     padding-left: $carbon--grid-gutter--condensed / 2;
     padding-right: $carbon--grid-gutter--condensed / 2;
 

diff --git a/packages/styles/scss/components/dotcom-shell/_dotcom-shell.scss b/packages/styles/scss/components/dotcom-shell/_dotcom-shell.scss
@@ -19,7 +19,7 @@
     padding-top: $carbon--layout-04;
 
     .#{$prefix}--tableofcontents__sidebar {
-      top: 49px;
+      top: 48px;
     }
   }
 

diff --git a/packages/styles/scss/components/layout/_layout.scss b/packages/styles/scss/components/layout/_layout.scss
@@ -19,7 +19,7 @@
 
 @mixin layout {
   .#{$prefix}--layout--sticky-mobile {
-    @include carbon--breakpoint-down('lg') {
+    @include carbon--breakpoint('lg') {
       position: sticky;
       top: 0;
       z-index: 1;

diff --git a/packages/web-components/.storybook/config.ts b/packages/web-components/.storybook/config.ts
@@ -58,9 +58,11 @@ addParameters({
 addDecorator((story, { parameters }) => {
   const result = story();
   const { hasMainTag } = result as any;
-  const { hasGrid, hasVerticalSpacingInComponent, useRawContainer } = parameters;
+  const { hasCardGroup, hasCardGroupStandalone, hasGrid, hasVerticalSpacingInComponent, useRawContainer } = parameters;
   const classes = classMap({
     'dds-ce-demo-devenv--container': !useRawContainer,
+    'dds-ce-demo-devenv--container--has-card-group': hasCardGroup,
+    'dds-ce-demo-devenv--container--has-card-group-standalone': hasCardGroupStandalone,
     'dds-ce-demo-devenv--container--has-grid': hasGrid,
     'dds-ce-demo-devenv--container--has-vertical-spacing-in-component': hasVerticalSpacingInComponent,
   });