diff --git a/.yarn/offline-mirror/@carbon-grid-10.42.0.tgz b/.yarn/offline-mirror/@carbon-grid-10.42.0.tgz deleted file mode 100644 index 9ee735ab938..00000000000 Binary files a/.yarn/offline-mirror/@carbon-grid-10.42.0.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/@carbon-grid-10.43.0.tgz b/.yarn/offline-mirror/@carbon-grid-10.43.0.tgz new file mode 100644 index 00000000000..748f132a4e5 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-grid-10.43.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-icons-10.47.0.tgz b/.yarn/offline-mirror/@carbon-icons-10.47.0.tgz deleted file mode 100644 index 345d3ac9f1f..00000000000 Binary files a/.yarn/offline-mirror/@carbon-icons-10.47.0.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/@carbon-icons-10.48.0.tgz b/.yarn/offline-mirror/@carbon-icons-10.48.0.tgz new file mode 100644 index 00000000000..31f15ca5d7e Binary files /dev/null and b/.yarn/offline-mirror/@carbon-icons-10.48.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-icons-react-10.48.0.tgz b/.yarn/offline-mirror/@carbon-icons-react-10.48.0.tgz new file mode 100644 index 00000000000..abe4d1b98a5 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-icons-react-10.48.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-telemetry-0.1.0.tgz b/.yarn/offline-mirror/@carbon-telemetry-0.1.0.tgz new file mode 100644 index 00000000000..20f9f30c5f9 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-telemetry-0.1.0.tgz differ diff --git a/.yarn/offline-mirror/@carbon-themes-10.52.0.tgz b/.yarn/offline-mirror/@carbon-themes-10.53.1.tgz similarity index 65% rename from .yarn/offline-mirror/@carbon-themes-10.52.0.tgz rename to .yarn/offline-mirror/@carbon-themes-10.53.1.tgz index 80ca83ea3a2..2b5ccc4a997 100644 Binary files a/.yarn/offline-mirror/@carbon-themes-10.52.0.tgz and b/.yarn/offline-mirror/@carbon-themes-10.53.1.tgz differ diff --git a/.yarn/offline-mirror/@carbon-type-10.42.0.tgz b/.yarn/offline-mirror/@carbon-type-10.42.0.tgz deleted file mode 100644 index 8b3da1e25cf..00000000000 Binary files a/.yarn/offline-mirror/@carbon-type-10.42.0.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/@carbon-type-10.43.1.tgz b/.yarn/offline-mirror/@carbon-type-10.43.1.tgz new file mode 100644 index 00000000000..4c643e5f3c4 Binary files /dev/null and b/.yarn/offline-mirror/@carbon-type-10.43.1.tgz differ diff --git a/.yarn/offline-mirror/carbon-components-10.54.0.tgz b/.yarn/offline-mirror/carbon-components-10.54.0.tgz deleted file mode 100644 index c87774aca31..00000000000 Binary files a/.yarn/offline-mirror/carbon-components-10.54.0.tgz and /dev/null differ diff --git a/.yarn/offline-mirror/carbon-components-10.55.1.tgz b/.yarn/offline-mirror/carbon-components-10.55.1.tgz new file mode 100644 index 00000000000..6fae512b6cd Binary files /dev/null and b/.yarn/offline-mirror/carbon-components-10.55.1.tgz differ diff --git a/packages/react/package.json b/packages/react/package.json index 81b3b083ee2..de8998894ea 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -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", @@ -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, diff --git a/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap b/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap index d2a2a8d9197..23ef4fed812 100644 --- a/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap +++ b/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap @@ -39996,6 +39996,7 @@ exports[`Storyshots Components|Dotcom shell Default (footer language only) 1`] = className="bx--tableofcontents__mobile__select__wrapper" > { }); 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); diff --git a/packages/react/src/components/Masthead/MastheadTopNav.js b/packages/react/src/components/Masthead/MastheadTopNav.js index 7dcabcfef7f..328ace295b5 100755 --- a/packages/react/src/components/Masthead/MastheadTopNav.js +++ b/packages/react/src/components/Masthead/MastheadTopNav.js @@ -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'; @@ -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 * diff --git a/packages/react/src/components/TableOfContents/TOCMobile.js b/packages/react/src/components/TableOfContents/TOCMobile.js index 054b2f432cb..cb45c4d7f16 100644 --- a/packages/react/src/components/TableOfContents/TOCMobile.js +++ b/packages/react/src/components/TableOfContents/TOCMobile.js @@ -79,6 +79,7 @@ const TOCMobile = ({ menuItems, selectedId, menuLabel, updateState }) => { data-autoid={`${stablePrefix}--tableofcontents__mobile`}>
+ +
@@ -93,7 +96,10 @@
-
@@ -139,7 +145,10 @@
-
diff --git a/renovate.json b/renovate.json index 870ac289c9e..e1ca98036ad 100644 --- a/renovate.json +++ b/renovate.json @@ -15,5 +15,6 @@ "rangeStrategy": "replace", "vulnerabilityAlerts": { "enabled": true - } + }, + "rebaseWhen": "never" } diff --git a/yarn.lock b/yarn.lock index e62e75165df..7fe79f9d6f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1348,10 +1348,10 @@ resolved "https://registry.yarnpkg.com/@carbon/feature-flags/-/feature-flags-0.7.0.tgz#fe8068b482439ae7af519ccdbf627f31373bb646" integrity sha512-nxVvnSMC6Ia/xn0j02FHPATfB/Iv6nnkZAQ6GrEdPLivSF1T2oaTvgawUsXBO8RBX7wQBq5l7uW8qH/0WfjIFw== -"@carbon/grid@10.42.0", "@carbon/grid@^10.42.0": - version "10.42.0" - resolved "https://registry.yarnpkg.com/@carbon/grid/-/grid-10.42.0.tgz#9c0ab3c4afef3028265b6ed8fa539180c5de69c6" - integrity sha512-8kqW60tWgM4x3V1XQWSii4KDan5YLfjW7OFeqaJ/cE11sbKqKQtZ5T3JWamDF4Tc1nzWZ4+9PTJ7tX3n7Jskog== +"@carbon/grid@10.43.0", "@carbon/grid@^10.43.0": + version "10.43.0" + resolved "https://registry.yarnpkg.com/@carbon/grid/-/grid-10.43.0.tgz#3040f82094cb985c8bdc79ae1cdb25a2b4a7d7af" + integrity sha512-nVyS36Q99GRgda/ntHaUfQpf9+Hts3loqqclwq+l2D1QpuqqL5FTYfJEvLj63AM+/Rt71O+Z8PuXnYJTw0PwGA== dependencies: "@carbon/import-once" "^10.7.0" "@carbon/layout" "^10.37.0" @@ -1383,10 +1383,19 @@ "@carbon/telemetry" "0.0.0-alpha.6" prop-types "^15.7.2" -"@carbon/icons@10.47.0": - version "10.47.0" - resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-10.47.0.tgz#58f55a15b7f58e25db2e714eaea051bc092ba94d" - integrity sha512-I1HhB/YGuUoFVp4/hithMuBDtv3z+fVFG9Q169NQ8gzkwE1PMxjUoHlgrKR3kLcRstzC60e5y30uWSRhOBGWBw== +"@carbon/icons-react@10.48.0": + version "10.48.0" + resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.48.0.tgz#3d29a28277f64e6d04d4f7dbbec655619d03c0cd" + integrity sha512-cYSUXKAIiBxj4KiaXMUtRJK46mpdBPkYW6xT2u266Oh3HFwoJbbsbn4fT2K9CnoL+n28eU7x8o0hjSXfIItEmA== + dependencies: + "@carbon/icon-helpers" "^10.28.0" + "@carbon/telemetry" "0.0.0-alpha.6" + prop-types "^15.7.2" + +"@carbon/icons@10.48.0": + version "10.48.0" + resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-10.48.0.tgz#a517812f42fc816ef9735409383111d8f23e7bff" + integrity sha512-wLvTfQy4k/vF8oVH2T/esISogdyjWJ34KdlfD//A0bKa6YViJStnvyoJA8Pmi7XolVyKm5Cw1ho7CjV1TFBJSg== "@carbon/import-once@10.7.0", "@carbon/import-once@^10.7.0": version "10.7.0" @@ -1412,7 +1421,7 @@ "@carbon/telemetry" "0.0.0-alpha.6" prop-types "^15.7.2" -"@carbon/telemetry@0.0.0-alpha.6", "@carbon/telemetry@^0.0.0-alpha.6": +"@carbon/telemetry@0.0.0-alpha.6": version "0.0.0-alpha.6" resolved "https://registry.yarnpkg.com/@carbon/telemetry/-/telemetry-0.0.0-alpha.6.tgz#1d11e64f310e98f32c3db0c55f02e047f2398087" integrity sha512-DCE8ui/tFi+qvCH+mewbUbWzsiq5Ko3HU1lgrVbpjWv1LfswLKFmMg4Os+PmX6edYoBj39qVChJPeaN/UyfJDw== @@ -1428,22 +1437,27 @@ winston "^3.3.3" yargs "^16.1.1" -"@carbon/themes@10.52.0": - version "10.52.0" - resolved "https://registry.yarnpkg.com/@carbon/themes/-/themes-10.52.0.tgz#417d539d2b89c1564f8a34713447c9f8ef5da493" - integrity sha512-cQGShDLWHffV7k2+HRVJht8VxcaS6zopJUkmF74W+jIUrNq0St7cb7f/pT2IMlHVp0XdjCYJ8OLAAAWVonKWlQ== +"@carbon/telemetry@0.1.0", "@carbon/telemetry@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@carbon/telemetry/-/telemetry-0.1.0.tgz#57b331cd5a855b4abbf55457456da8211624d879" + integrity sha512-kNWt0bkgPwGW0i5h7HFuljbKRXPvIhsKbB+1tEURAYLXoJg9iJLF1eGvWN5iVoFCS2zje4GR3OGOsvvKVe7Hlg== + +"@carbon/themes@10.53.1": + version "10.53.1" + resolved "https://registry.yarnpkg.com/@carbon/themes/-/themes-10.53.1.tgz#dabb920e62024120deba72899489c8d4fc53d6f7" + integrity sha512-3k1nhkUtlYH6vOWPab2x9JFYoP1k0IA1ba78xSiNnKYMFSWIwVQ2ekDlyJugg1k45Prl2S2YUok2C43hVzEIuw== dependencies: "@carbon/colors" "^10.37.0" "@carbon/layout" "^10.37.0" - "@carbon/type" "^10.42.0" + "@carbon/type" "^10.43.1" color "^3.1.2" -"@carbon/type@10.42.0", "@carbon/type@^10.42.0": - version "10.42.0" - resolved "https://registry.yarnpkg.com/@carbon/type/-/type-10.42.0.tgz#3be06607b89abbb7a9e721d6ebe77e21a2d1d395" - integrity sha512-EV14OZc/ry/JXIq1Oexgt4TaBgY/bA0HFxUFhDsDx1PtQuinKJwa4tprhPo8moSq9JybApc14MoFBXOG0g1M1Q== +"@carbon/type@10.43.1", "@carbon/type@^10.43.1": + version "10.43.1" + resolved "https://registry.yarnpkg.com/@carbon/type/-/type-10.43.1.tgz#6674664d19d474573ebc47eb0237bc0dcf137db2" + integrity sha512-zfXcmUeqXhaugDtBR0GMiS3drr4mpVZ6n2CiS8B6X6P+aTMgzjsbzgRNe5uXNFGot74IhhxgaKogFd/SBviCmg== dependencies: - "@carbon/grid" "^10.42.0" + "@carbon/grid" "^10.43.0" "@carbon/import-once" "^10.7.0" "@cnakazawa/watch@^1.0.3": @@ -7330,10 +7344,10 @@ carbon-components@10.52.0: lodash.debounce "^4.0.8" warning "^3.0.0" -carbon-components@10.54.0: - version "10.54.0" - resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.54.0.tgz#f70d0a9fcc7e84f8fb00a45b6b9894d77155acce" - integrity sha512-gl0b4wRG1E/ns02nG/M0FaNm4FCT91iTr1XFzqY+h1wFsjG1/2OOu7A6lth8Qtk0jsr//YZcB0MNjq8WFaFciw== +carbon-components@10.55.1: + version "10.55.1" + resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.55.1.tgz#366f6a98181ca9c29bc7b1b22661defab94d8e37" + integrity sha512-GpFzQRmARMWgmdE4Wz5IZ10TqGFH5+p+wPXHdemEh0bUrjYS1pEy2GylREZ884ldjK5EncguT3o0xhXNeP9H7A== dependencies: "@carbon/telemetry" "0.0.0-alpha.6" flatpickr "4.6.1"