Merge branch 'master' into fix/tabs-extended_selected-item

carbon-design-system · Apr 27, 2021 · 59b3416 · 59b3416
2 parents d4c62b8 + c0ec381
commit 59b3416
Show file tree

Hide file tree

Showing 32 changed files with 1,414 additions and 1,102 deletions.
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.18.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-react@1.18.1-rc.1...@carbon/ibmdotcom-react@1.18.1) (2021-04-27)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-react
+
+
+
+
+
 ## [1.18.1-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-react@1.18.1-rc.0...@carbon/ibmdotcom-react@1.18.1-rc.1) (2021-04-26)
 
 **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.18.1-rc.1",
+  "version": "1.18.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,9 +58,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@carbon/ibmdotcom-services": "1.18.1-rc.1",
-    "@carbon/ibmdotcom-styles": "1.18.1-rc.0",
-    "@carbon/ibmdotcom-utilities": "1.18.1-rc.0",
+    "@carbon/ibmdotcom-services": "1.18.1",
+    "@carbon/ibmdotcom-styles": "1.18.1",
+    "@carbon/ibmdotcom-utilities": "1.18.1",
     "@carbon/telemetry": "^0.0.0-alpha.6",
     "autosuggest-highlight": "^3.1.1",
     "carbon-components": "10.32.1",

diff --git a/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap b/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap
diff --git a/packages/react/src/components/CardGroup/CardGroup.js b/packages/react/src/components/CardGroup/CardGroup.js
@@ -67,7 +67,6 @@ const CardGroup = ({ cards, cta }) => {
         );
 
         splitItemEyebrows.forEach(row => {
-          console.log(row);
           sameHeight(
             row.filter(e => {
               return e;

diff --git a/packages/react/src/components/DotcomShell/__stories__/DotcomShell.stories.js b/packages/react/src/components/DotcomShell/__stories__/DotcomShell.stories.js
@@ -293,6 +293,7 @@ WithL1.story = {
       DotcomShell: () => {
         const { Masthead: mastheadKnobs } = l1Story.story.parameters.knobs;
         return {
+          platform: mastheadKnobs.l1Platform,
           mastheadProps: {
             ...mastheadKnobs({ groupId: 'Masthead' }),
           },

diff --git a/packages/react/src/components/Masthead/Masthead.js b/packages/react/src/components/Masthead/Masthead.js
@@ -305,6 +305,7 @@ const Masthead = ({
               <div ref={mastheadL1Ref}>
                 <MastheadL1
                   {...mastheadL1Data}
+                  platform={platform}
                   isShort={isMastheadSticky}
                   navType={navType}
                   selectedMenuItem={selectedMenuItem}
@@ -403,14 +404,16 @@ Masthead.propTypes = {
    */
   mastheadL1Data: PropTypes.shape({
     /**
-     * Title for the masthead L1 (experimental).
+     * Platform name that appears on L1.
+     * Includes platform name
+     * Object requires `name` and `url`.
+     * See [docs](http://ibmdotcom-react.mybluemix.net/?path=/docs/components-masthead--default#platform) for more details.
      */
-    title: PropTypes.string,
+    platform: PropTypes.shape({
+      name: PropTypes.string,
+      url: PropTypes.string,
+    }),
 
-    /**
-     * Title optional link for the masthead L1 (experimental).
-     */
-    titleLink: PropTypes.string,
     /**
      * Text for the eyebrow link in masthead L1 (experimental).
      */

diff --git a/packages/react/src/components/Masthead/MastheadL1.js b/packages/react/src/components/Masthead/MastheadL1.js
@@ -22,7 +22,7 @@ const { prefix } = settings;
 /**
  * MastHead L1 component.
  */
-const MastheadL1 = ({ title, titleLink, navigationL1, ...rest }) => {
+const MastheadL1 = ({ navigationL1, ...rest }) => {
   const className = cx({
     [`${prefix}--masthead__l1`]: true,
   });
@@ -65,7 +65,7 @@ const MastheadL1 = ({ title, titleLink, navigationL1, ...rest }) => {
             className={`${prefix}--masthead__l1-name`}
             aria-selected={!rest.selectedMenuItem}>
             <span className={`${prefix}--masthead__l1-name-title`}>
-              <a href={titleLink}>{title}</a>
+              <a href={rest.platform.url}>{rest.platform.name}</a>
             </span>
           </div>
           <HeaderNavContainer>

diff --git a/packages/react/src/components/Masthead/README.stories.mdx b/packages/react/src/components/Masthead/README.stories.mdx
@@ -74,8 +74,10 @@ object that contains the navigation data of L1 nav:
 
 ```javascipt
 const mastheadL1Data = {
-  title: 'Stock Charts',
-  titleLink: 'https://example.com/',
+  platform: {
+    name: 'Stock Charts',
+    url: 'https://example.com/',
+  },
   navigationL1: (The nav links),
 }
 

diff --git a/packages/react/src/components/Masthead/__stories__/Masthead.stories.js b/packages/react/src/components/Masthead/__stories__/Masthead.stories.js
@@ -213,6 +213,7 @@ WithL1.story = {
       escapeHTML: false,
       Masthead: ({ groupId }) => {
         return {
+          platform: mastheadKnobs.l1Platform,
           hasProfile: boolean(
             'show the profile functionality (hasProfile)',
             true,
@@ -229,12 +230,6 @@ WithL1.story = {
             groupId
           ),
           mastheadL1Data: {
-            title: text('L1 title (title)', 'Stock Charts', groupId),
-            titleLink: text(
-              'L1 title link (titleLink)',
-              'https://example.com/',
-              groupId
-            ),
             navigationL1: mastheadKnobs.navigation.custom,
           },
           selectedMenuItem: text(

diff --git a/packages/react/src/components/Masthead/__stories__/data/Masthead.stories.knobs.js b/packages/react/src/components/Masthead/__stories__/data/Masthead.stories.knobs.js
@@ -25,6 +25,10 @@ const mastheadKnobs = {
       url: 'https://www.ibm.com/cloud',
     },
   },
+  l1Platform: {
+    name: 'Stock Charts',
+    url: 'https://www.example.com',
+  },
   mastheadLogo: {
     defaultNoTooltip: {
       denylist: [],

diff --git a/packages/services-store/CHANGELOG.md b/packages/services-store/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.18.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/master/packages/services-store/compare/@carbon/ibmdotcom-services-store@1.18.1-rc.2...@carbon/ibmdotcom-services-store@1.18.1) (2021-04-27)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-services-store
+
+
+
+
+
 ## [1.18.1-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/master/packages/services-store/compare/@carbon/ibmdotcom-services-store@1.18.1-rc.1...@carbon/ibmdotcom-services-store@1.18.1-rc.2) (2021-04-27)
 
 

diff --git a/packages/services-store/package.json b/packages/services-store/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-services-store",
   "private": true,
-  "version": "1.18.1-rc.2",
+  "version": "1.18.1",
   "description": "Redux store for Carbon for IBM.com Services",
   "license": "Apache-2.0",
   "main": "lib/store.js",
@@ -39,8 +39,8 @@
     "prettier": "^1.19.0"
   },
   "dependencies": {
-    "@carbon/ibmdotcom-services": "1.18.1-rc.1",
-    "@carbon/ibmdotcom-utilities": "1.18.1-rc.0",
+    "@carbon/ibmdotcom-services": "1.18.1",
+    "@carbon/ibmdotcom-utilities": "1.18.1",
     "carbon-components": "10.32.1",
     "redux": "^4.0.0",
     "redux-logger": "^3.0.0",

diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.18.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-services@1.18.1-rc.1...@carbon/ibmdotcom-services@1.18.1) (2021-04-27)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-services
+
+
+
+
+
 ## [1.18.1-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-services@1.18.1-rc.0...@carbon/ibmdotcom-services@1.18.1-rc.1) (2021-04-26)
 
 

diff --git a/packages/services/package.json b/packages/services/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-services",
   "description": "Carbon for IBM.com Services",
-  "version": "1.18.1-rc.1",
+  "version": "1.18.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.5.0",
-    "@carbon/ibmdotcom-utilities": "1.18.1-rc.0",
+    "@carbon/ibmdotcom-utilities": "1.18.1",
     "@carbon/telemetry": "0.0.0-alpha.6",
     "axios": "^0.21.1",
     "window-or-global": "^1.0.1"

diff --git a/packages/styles/CHANGELOG.md b/packages/styles/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.18.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-styles@1.18.1-rc.0...@carbon/ibmdotcom-styles@1.18.1) (2021-04-27)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-styles
+
+
+
+
+
 ## [1.18.1-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-styles@1.18.0...@carbon/ibmdotcom-styles@1.18.1-rc.0) (2021-04-22)
 
 

diff --git a/packages/styles/package.json b/packages/styles/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-styles",
   "description": "Carbon for IBM.com Styles",
-  "version": "1.18.1-rc.0",
+  "version": "1.18.1",
   "license": "Apache-2.0",
   "main": "dist/ibm-dotcom-styles.min.css",
   "module": "src/scss",

diff --git a/packages/styles/scss/components/masthead/_masthead-leftnav.scss b/packages/styles/scss/components/masthead/_masthead-leftnav.scss
@@ -372,11 +372,13 @@
     }
 
     &[aria-haspopup='true'] {
-      height: carbon--mini-units(6);
+      height: $container-04;
       &.bx--side-nav__submenu-platform {
+        border-top: 1px solid $ui-03;
         border-bottom: 1px solid $ui-04;
         text-decoration: none;
         color: $text-01;
+        height: $container-04;
 
         @include carbon--type-style(expressive-heading-02);
       }

diff --git a/packages/styles/scss/components/masthead/_masthead-megamenu.scss b/packages/styles/scss/components/masthead/_masthead-megamenu.scss
@@ -61,6 +61,7 @@
     .#{$prefix}--header__menu-title[role='menuitem'][aria-expanded='false']
       + .#{$prefix}--header__menu {
       ::slotted(#{$dds-prefix}-megamenu),
+      ::slotted(#{$dds-prefix}-cloud-megamenu),
       .#{$prefix}--masthead__megamenu {
         animation: $transition--expansion motion(standard, expressive) collapse;
       }
@@ -78,6 +79,7 @@
       width: var(--#{$dds-prefix}-ce--viewport-width, 100vw);
 
       ::slotted(#{$dds-prefix}-megamenu),
+      ::slotted(#{$dds-prefix}-cloud-megamenu),
       .#{$prefix}--masthead__megamenu {
         animation: $transition--expansion motion(standard, expressive) expand;
       }
@@ -99,6 +101,7 @@
   }
 
   :host(#{$dds-prefix}-megamenu),
+  :host(#{$dds-prefix}-cloud-megamenu),
   .#{$prefix}--masthead__megamenu {
     display: block;
     overflow-y: overlay;

diff --git a/packages/utilities/CHANGELOG.md b/packages/utilities/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.18.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-utilities@1.18.1-rc.0...@carbon/ibmdotcom-utilities@1.18.1) (2021-04-27)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-utilities
+
+
+
+
+
 ## [1.18.1-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-utilities@1.18.0...@carbon/ibmdotcom-utilities@1.18.1-rc.0) (2021-04-22)
 
 

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

diff --git a/packages/web-components/CHANGELOG.md b/packages/web-components/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/master/packages/web-components/compare/@carbon/ibmdotcom-web-components@1.3.1-rc.2...@carbon/ibmdotcom-web-components@1.3.1) (2021-04-27)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-web-components
+
+
+
+
+
 ## [1.3.1-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/master/packages/web-components/compare/@carbon/ibmdotcom-web-components@1.3.1-rc.1...@carbon/ibmdotcom-web-components@1.3.1-rc.2) (2021-04-27)
 
 **Note:** Version bump only for package @carbon/ibmdotcom-web-components

diff --git a/packages/web-components/package.json b/packages/web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carbon/ibmdotcom-web-components",
-  "version": "1.3.1-rc.2",
+  "version": "1.3.1",
   "description": "Carbon for IBM.com Web Components",
   "license": "Apache-2.0",
   "exports": {
@@ -76,9 +76,9 @@
     "prettier": "^1.19.0"
   },
   "dependencies": {
-    "@carbon/ibmdotcom-services": "1.18.1-rc.1",
-    "@carbon/ibmdotcom-styles": "1.18.1-rc.0",
-    "@carbon/ibmdotcom-utilities": "1.18.1-rc.0",
+    "@carbon/ibmdotcom-services": "1.18.1",
+    "@carbon/ibmdotcom-styles": "1.18.1",
+    "@carbon/ibmdotcom-utilities": "1.18.1",
     "@carbon/layout": "10.22.0",
     "@carbon/telemetry": "0.0.0-alpha.6",
     "carbon-components": "10.32.1",
@@ -113,7 +113,7 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/template": "^7.8.0",
     "@babel/traverse": "^7.8.0",
-    "@carbon/ibmdotcom-services-store": "1.18.1-rc.2",
+    "@carbon/ibmdotcom-services-store": "1.18.1",
     "@carbon/icon-helpers": "10.15.0",
     "@carbon/icons": "10.29.0",
     "@open-wc/semantic-dom-diff": "^0.15.0",