Skip to content

Commit

Permalink
Merge branch 'release/v1.32.0' into fix/search-no-redirect
Browse files Browse the repository at this point in the history
  • Loading branch information
kennylam authored Mar 17, 2022
2 parents fcabb0b + d06b45a commit 8111c5d
Show file tree
Hide file tree
Showing 41 changed files with 543 additions and 90 deletions.
Binary file removed .yarn/offline-mirror/@carbon-grid-10.42.0.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/@carbon-grid-10.43.0.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/@carbon-icons-10.47.0.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/@carbon-icons-10.48.0.tgz
Binary file not shown.
Binary file not shown.
Binary file added .yarn/offline-mirror/@carbon-telemetry-0.1.0.tgz
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/offline-mirror/@carbon-type-10.42.0.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/@carbon-type-10.43.1.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/carbon-components-10.54.0.tgz
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
"@babel/runtime": "^7.5.5",
"@carbon/ibmdotcom-services": "1.32.0-rc.0",
"@carbon/ibmdotcom-styles": "1.32.0-rc.0",
"@carbon/ibmdotcom-utilities": "1.31.0",
"@carbon/telemetry": "^0.0.0-alpha.6",
"@carbon/ibmdotcom-utilities": "1.32.0-rc.0",
"@carbon/telemetry": "^0.1.0",
"autosuggest-highlight": "^3.1.1",
"carbon-components": "10.54.0",
"carbon-components": "10.55.1",
"carbon-components-react": "7.54.2",
"carbon-icons": "7.0.7",
"classnames": "2.3.1",
Expand Down Expand Up @@ -202,7 +202,7 @@
"whatwg-fetch": "^2.0.3"
},
"resolutions": {
"@carbon/icons-react": "10.47.0"
"@carbon/icons-react": "10.48.0"
},
"sideEffects": false,
"bundleSizeThreshold": 300000,
Expand Down
10 changes: 10 additions & 0 deletions packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -39996,6 +39996,7 @@ exports[`Storyshots Components|Dotcom shell Default (footer language only) 1`] =
className="bx--tableofcontents__mobile__select__wrapper"
>
<select
aria-label="Jump to"
className="bx--tableofcontents__mobile__select"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -47045,6 +47046,7 @@ exports[`Storyshots Components|Dotcom shell Default 1`] = `
className="bx--tableofcontents__mobile__select__wrapper"
>
<select
aria-label="Jump to"
className="bx--tableofcontents__mobile__select"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -53390,6 +53392,7 @@ exports[`Storyshots Components|Dotcom shell Search open 1`] = `
className="bx--tableofcontents__mobile__select__wrapper"
>
<select
aria-label="Jump to"
className="bx--tableofcontents__mobile__select"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -64982,6 +64985,7 @@ exports[`Storyshots Components|Dotcom shell With L1 1`] = `
className="bx--tableofcontents__mobile__select__wrapper"
>
<select
aria-label="Jump to"
className="bx--tableofcontents__mobile__select"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -71559,6 +71563,7 @@ exports[`Storyshots Components|Dotcom shell With micro footer (language only) 1`
className="bx--tableofcontents__mobile__select__wrapper"
>
<select
aria-label="Jump to"
className="bx--tableofcontents__mobile__select"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -77603,6 +77608,7 @@ exports[`Storyshots Components|Dotcom shell With micro footer 1`] = `
className="bx--tableofcontents__mobile__select__wrapper"
>
<select
aria-label="Jump to"
className="bx--tableofcontents__mobile__select"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -83397,6 +83403,7 @@ exports[`Storyshots Components|Dotcom shell With platform 1`] = `
className="bx--tableofcontents__mobile__select__wrapper"
>
<select
aria-label="Jump to"
className="bx--tableofcontents__mobile__select"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -89978,6 +89985,7 @@ exports[`Storyshots Components|Dotcom shell With short footer (language only) 1`
className="bx--tableofcontents__mobile__select__wrapper"
>
<select
aria-label="Jump to"
className="bx--tableofcontents__mobile__select"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -97092,6 +97100,7 @@ exports[`Storyshots Components|Dotcom shell With short footer 1`] = `
className="bx--tableofcontents__mobile__select__wrapper"
>
<select
aria-label="Jump to"
className="bx--tableofcontents__mobile__select"
onBlur={[Function]}
onChange={[Function]}
Expand Down Expand Up @@ -138462,6 +138471,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras molestie condiment
className="bx--tableofcontents__mobile__select__wrapper"
>
<select
aria-label="Jump to"
className="bx--tableofcontents__mobile__select"
onBlur={[Function]}
onChange={[Function]}
Expand Down
12 changes: 11 additions & 1 deletion packages/react/src/components/Masthead/MastheadL1.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

import React, { useEffect } from 'react';
import cx from 'classnames';
import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
import HeaderMenu from '../carbon-components-react/UIShell/HeaderMenu';
Expand All @@ -13,7 +14,6 @@ import HeaderNavContainer from './HeaderNavContainer';
import HeaderNavigation from '../../internal/vendor/carbon-components-react/components/UIShell/HeaderNavigation';
import MegaMenu from './MastheadMegaMenu/MegaMenu';
import PropTypes from 'prop-types';
import React from 'react';
import root from 'window-or-global';
import settings from 'carbon-components/es/globals/js/settings';

Expand All @@ -29,6 +29,16 @@ const MastheadL1 = ({ navigationL1, ...rest }) => {
});
const childLinkChecker = rest.hasCurrentUrl();

useEffect(() => {
document
.querySelector(`.${prefix}--header__menu-bar`)
?.setAttribute('role', 'menu');
document.querySelectorAll(`.${prefix}--header__menu-bar li`).forEach(e => {
e.setAttribute('role', 'menuitem');
e.querySelector('a').removeAttribute('role');
});
}, []);

const mastheadL1Links = navigationL1.map((link, index) => {
const selectedUrlItem =
childLinkChecker && childLinkChecker(link, root.location?.href);
Expand Down
12 changes: 11 additions & 1 deletion packages/react/src/components/Masthead/MastheadTopNav.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

import React, { useState } from 'react';
import React, { useEffect, useState } from 'react';
import classnames from 'classnames';
import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
import HeaderMenu from '../carbon-components-react/UIShell/HeaderMenu';
Expand All @@ -29,6 +29,16 @@ const MastheadTopNav = ({ navigation, ...topNavProps }) => {

const childLinkChecker = topNavProps.hasCurrentUrl();

useEffect(() => {
document
.querySelector(`.${prefix}--header__menu-bar`)
?.setAttribute('role', 'menu');
document.querySelectorAll(`.${prefix}--header__menu-bar li`).forEach(e => {
e.setAttribute('role', 'menuitem');
e.querySelector('a').removeAttribute('role');
});
}, []);

/**
* Top masthead navigation
*
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/TableOfContents/TOCMobile.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ const TOCMobile = ({ menuItems, selectedId, menuLabel, updateState }) => {
data-autoid={`${stablePrefix}--tableofcontents__mobile`}>
<div className={`${prefix}--tableofcontents__mobile__select__wrapper`}>
<select
aria-label={menuLabel}
className={`${prefix}--tableofcontents__mobile__select`}
onBlur={handleOnBlur}
value={selectedOption}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Cypress.Commands.add('checkAxeA11y', (context, additionalRules) => {
context || null,
{
rules: rules,
includedImpacts: ['critical']
includedImpacts: ['critical', 'serious']
},
terminalLog,
true
Expand Down
2 changes: 1 addition & 1 deletion packages/services-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"@carbon/ibmdotcom-services": "1.32.0-rc.0",
"@carbon/ibmdotcom-utilities": "1.31.0",
"carbon-components": "10.54.0",
"carbon-components": "10.55.1",
"redux": "^4.0.0",
"redux-logger": "^3.0.0",
"redux-thunk": "^2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"dependencies": {
"@babel/runtime": "^7.5.0",
"@carbon/ibmdotcom-utilities": "1.31.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"@carbon/telemetry": "0.1.0",
"axios": "~0.21.4",
"marked": "^4.0.10",
"window-or-global": "^1.0.1"
Expand Down
12 changes: 6 additions & 6 deletions packages/styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
"upgrade-carbon": "yarn upgrade-interactive @carbon/grid @carbon/import-once @carbon/layout @carbon/motion @carbon/themes @carbon/type carbon-components @carbon/icons-react --latest --exact"
},
"dependencies": {
"@carbon/grid": "10.42.0",
"@carbon/icons-react": "10.47.0",
"@carbon/grid": "10.43.0",
"@carbon/icons-react": "10.48.0",
"@carbon/import-once": "10.7.0",
"@carbon/layout": "10.37.0",
"@carbon/motion": "10.29.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"@carbon/themes": "10.52.0",
"@carbon/type": "10.42.0",
"carbon-components": "10.54.0"
"@carbon/telemetry": "0.1.0",
"@carbon/themes": "10.53.1",
"@carbon/type": "10.43.1",
"carbon-components": "10.55.1"
},
"devDependencies": {
"autoprefixer": "^9.8.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright IBM Corp. 2016, 2021
* Copyright IBM Corp. 2016, 2022
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand All @@ -15,8 +15,9 @@
@mixin tabs-extended-media {
:host(#{$dds-prefix}-tabs-extended-media) {
margin: 0;
grid-column: 1 / span 16;
display: flex;
overflow-x: hidden;

@include carbon--breakpoint(sm) {
padding-top: $carbon--spacing-07;
padding-bottom: $carbon--spacing-12;
Expand All @@ -27,50 +28,38 @@
}

::slotted([slot='heading']) {
grid-column: 1 / span 1;
grid-row: 1;
margin-bottom: $carbon--spacing-09;
margin-left: $carbon--spacing-05;
margin-right: $carbon--spacing-05;
padding-left: $carbon--spacing-05;
padding-right: $carbon--spacing-05;

@include carbon--breakpoint(lg) {
padding-top: var(--cds-spacing-04, 0.75rem);
margin-left: 0;
margin-right: 0;
}
}

.#{$prefix}--tabs-extended-media {
display: grid;
column-gap: $carbon--spacing-07;
@include carbon--breakpoint(sm) {
grid-template-columns: repeat(1, 1fr);
}
@include carbon--breakpoint(lg) {
grid-template-columns: repeat(4, 1fr);
display: flex;
}
}

.#{$prefix}--tabs-extended {
@include carbon--breakpoint(sm) {
grid-column: 1 / span 1;
grid-row: 2;
}
.#{$prefix}--heading {
@include carbon--breakpoint(lg) {
grid-column: 2 / span 3;
grid-row: 1;
flex: 0 0 25%;
}
}

.#{$prefix}--tab-content {
padding: 0;
padding-left: $carbon--spacing-05;
padding-right: $carbon--spacing-05;
}

.#{$prefix}--accordion__content {
margin-top: -$carbon--spacing-07;
margin-bottom: $carbon--spacing-05;
padding-bottom: 0;
padding-left: 0;
padding-right: 0;
padding-left: $carbon--spacing-05;
padding-right: $carbon--spacing-05;

@include carbon--breakpoint(md) {
margin-bottom: -$carbon--spacing-05;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright IBM Corp. 2016, 2021
* Copyright IBM Corp. 2016, 2022
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand All @@ -26,7 +26,7 @@

.#{$prefix}--tabs__nav-item {
min-height: $spacing-09;
width: $spacing-13;
width: calc(100% / (12 / 2) - (#{$spacing-01} / 2));
height: auto;

p {
Expand Down Expand Up @@ -68,7 +68,7 @@
border: initial;
border-bottom: carbon--rem(2px) solid $ui-03;
display: inline-flex;
width: $spacing-13;
width: 100%;
text-align: left;

&[hasTooltip] {
Expand Down
4 changes: 2 additions & 2 deletions packages/utilities/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
"upgrade-carbon": "yarn upgrade-interactive carbon-components --latest --exact"
},
"dependencies": {
"@carbon/telemetry": "0.0.0-alpha.6",
"@carbon/telemetry": "0.1.0",
"axios": "~0.21.4",
"carbon-components": "10.54.0",
"carbon-components": "10.55.1",
"isomorphic-dompurify": "0.4.0",
"js-cookie": "^2.2.1",
"marked": "^4.0.10",
Expand Down
Loading

0 comments on commit 8111c5d

Please sign in to comment.