@carbon-labs/react-ui-shell 0.43.0 → 0.44.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/es/components/SideNav.js +3 -1
  2. package/es/components/SideNavItems.js +3 -1
  3. package/es/components/SideNavMenu.js +2 -2
  4. package/lib/components/SideNav.js +3 -1
  5. package/lib/components/SideNavItems.js +3 -1
  6. package/lib/components/SideNavMenu.js +2 -2
  7. package/package.json +2 -2
package/es/components/SideNav.js CHANGED
@@ -346,7 +346,9 @@ function SideNavRenderFunction(_ref, ref) {
346
346
  function resetNodeTabIndices() {
347
347
  const items = sideNavRef?.current?.querySelectorAll('[tabIndex="0"]') ?? [];
348
348
  items.forEach(item => {
349
- if (item.classList.contains(`${prefix}--side-nav__toggle`) || item.classList.contains(`${prefix}--side-nav__back-button`)) {
349
+ if (item.classList.contains(`${prefix}--side-nav__toggle`) || item.classList.contains(`${prefix}--side-nav__back-button`) ||
350
+ // checks if a link is in primary nav
351
+ item.classList.contains(`${prefix}--side-nav__link`) && item.closest(`ul`)?.getAttribute('aria-label') === ariaLabel) {
350
352
  return;
351
353
  }
352
354
  item.tabIndex = -1;
package/es/components/SideNavItems.js CHANGED
@@ -21,7 +21,8 @@ const SideNavItems = _ref => {
21
21
  accessibilityLabel: accessibilityLabel
22
22
  } = _ref;
23
23
  const {
24
- isTreeview
24
+ isTreeview,
25
+ currentPrimaryMenu
25
26
  } = useContext(SideNavContext);
26
27
  const listRef = useRef(null); // Adjust type if necessary
27
28
  const prefix = usePrefix();
@@ -57,6 +58,7 @@ const SideNavItems = _ref => {
57
58
  return /*#__PURE__*/React.createElement("ul", _extends({}, isTreeview && accessibilityLabel, {
58
59
  ref: listRef,
59
60
  className: className,
61
+ tabIndex: currentPrimaryMenu ? -1 : undefined,
60
62
  role: isTreeview ? 'tree' : ''
61
63
  }), childrenWithExpandedState);
62
64
  };
package/es/components/SideNavMenu.js CHANGED
@@ -343,7 +343,7 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
343
343
  size: 20
344
344
  })) : _ChevronDown || (_ChevronDown = /*#__PURE__*/React.createElement(ChevronDown, {
345
345
  size: 20
346
- })))), primary && /*#__PURE__*/React.createElement("div", {
346
+ })))), primary ? /*#__PURE__*/React.createElement("div", {
347
347
  className: primaryClassNames
348
348
  }, /*#__PURE__*/React.createElement(SideNavItems, {
349
349
  accessibilityLabel: {
@@ -356,7 +356,7 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
356
356
  onClick: handleOnBackButtonClick,
357
357
  className: `${prefix}--side-nav__back-button`,
358
358
  renderIcon: backButtonRenderIcon
359
- }, backButtonTitle), childrenToRender)), /*#__PURE__*/React.createElement("ul", {
359
+ }, backButtonTitle), childrenToRender)) : /*#__PURE__*/React.createElement("ul", {
360
360
  className: `${prefix}--side-nav__menu`,
361
361
  role: "group"
362
362
  }, childrenToRender));
package/lib/components/SideNav.js CHANGED
@@ -348,7 +348,9 @@ function SideNavRenderFunction(_ref, ref) {
348
348
  function resetNodeTabIndices() {
349
349
  const items = sideNavRef?.current?.querySelectorAll('[tabIndex="0"]') ?? [];
350
350
  items.forEach(item => {
351
- if (item.classList.contains(`${prefix}--side-nav__toggle`) || item.classList.contains(`${prefix}--side-nav__back-button`)) {
351
+ if (item.classList.contains(`${prefix}--side-nav__toggle`) || item.classList.contains(`${prefix}--side-nav__back-button`) ||
352
+ // checks if a link is in primary nav
353
+ item.classList.contains(`${prefix}--side-nav__link`) && item.closest(`ul`)?.getAttribute('aria-label') === ariaLabel) {
352
354
  return;
353
355
  }
354
356
  item.tabIndex = -1;
package/lib/components/SideNavItems.js CHANGED
@@ -23,7 +23,8 @@ const SideNavItems = _ref => {
23
23
  accessibilityLabel: accessibilityLabel
24
24
  } = _ref;
25
25
  const {
26
- isTreeview
26
+ isTreeview,
27
+ currentPrimaryMenu
27
28
  } = React.useContext(SideNav.SideNavContext);
28
29
  const listRef = React.useRef(null); // Adjust type if necessary
29
30
  const prefix = usePrefix.usePrefix();
@@ -59,6 +60,7 @@ const SideNavItems = _ref => {
59
60
  return /*#__PURE__*/React.createElement("ul", _rollupPluginBabelHelpers.extends({}, isTreeview && accessibilityLabel, {
60
61
  ref: listRef,
61
62
  className: className,
63
+ tabIndex: currentPrimaryMenu ? -1 : undefined,
62
64
  role: isTreeview ? 'tree' : ''
63
65
  }), childrenWithExpandedState);
64
66
  };
package/lib/components/SideNavMenu.js CHANGED
@@ -345,7 +345,7 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
345
345
  size: 20
346
346
  })) : _ChevronDown || (_ChevronDown = /*#__PURE__*/React.createElement(bucket3.ChevronDown, {
347
347
  size: 20
348
- })))), primary && /*#__PURE__*/React.createElement("div", {
348
+ })))), primary ? /*#__PURE__*/React.createElement("div", {
349
349
  className: primaryClassNames
350
350
  }, /*#__PURE__*/React.createElement(SideNavItems.SideNavItems, {
351
351
  accessibilityLabel: {
@@ -358,7 +358,7 @@ const SideNavMenu = /*#__PURE__*/React.forwardRef(function SideNavMenu(_ref, ref
358
358
  onClick: handleOnBackButtonClick,
359
359
  className: `${prefix}--side-nav__back-button`,
360
360
  renderIcon: backButtonRenderIcon
361
- }, backButtonTitle), childrenToRender)), /*#__PURE__*/React.createElement("ul", {
361
+ }, backButtonTitle), childrenToRender)) : /*#__PURE__*/React.createElement("ul", {
362
362
  className: `${prefix}--side-nav__menu`,
363
363
  role: "group"
364
364
  }, childrenToRender));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@carbon-labs/react-ui-shell",
3
- "version": "0.43.0",
3
+ "version": "0.44.0",
4
4
  "publishConfig": {
5
5
  "access": "public",
6
6
  "provenance": true
@@ -41,5 +41,5 @@
41
41
  "dependencies": {
42
42
  "@ibm/telemetry-js": "^1.9.1"
43
43
  },
44
- "gitHead": "ec6300a09920e5feccecc82262079791e56d821b"
44
+ "gitHead": "425b9b0b5fbd6937849032a39c66ccf2726d4c3b"
45
45
  }