@carbon/react 1.80.1 → 1.81.0-rc.0

package/es/components/UIShell/HeaderMenu.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React from 'react';
+import React, { type JSX } from 'react';
 import PropTypes from 'prop-types';
 /**
  * `HeaderMenu` is used to render submenu's in the `Header`. Most often children
@@ -117,106 +117,9 @@ declare class HeaderMenu extends React.Component<HeaderMenuProps, HeaderMenuStat
          * Optionally provide a tabIndex for the underlying menu button
          */
         tabIndex: PropTypes.Requireable<number>;
-        0: string;
-        length: 1;
-        toString(): string;
-        toLocaleString(): string;
-        toLocaleString(locales: string | string[], options?: Intl.NumberFormatOptions & Intl.DateTimeFormatOptions): string;
-        pop(): string | undefined;
-        push(...items: string[]): number;
-        concat(...items: ConcatArray<string>[]): string[];
-        concat(...items: (string | ConcatArray<string>)[]): string[];
-        join(separator?: string): string;
-        reverse(): string[];
-        shift(): string | undefined;
-        slice(start?: number, end?: number): string[];
-        sort(compareFn?: ((a: string, b: string) => number) | undefined): [key: string];
-        splice(start: number, deleteCount?: number): string[];
-        splice(start: number, deleteCount: number, ...items: string[]): string[];
-        unshift(...items: string[]): number;
-        indexOf(searchElement: string, fromIndex?: number): number;
-        lastIndexOf(searchElement: string, fromIndex?: number): number;
-        every<S extends string>(predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): this is S[];
-        every(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): boolean;
-        some(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): boolean;
-        forEach(callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any): void;
-        map<U>(callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any): U[];
-        filter<S extends string>(predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): S[];
-        filter(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): string[];
-        reduce(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string;
-        reduce(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string;
-        reduce<U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U;
-        reduceRight(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string;
-        reduceRight(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string;
-        reduceRight<U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U;
-        find<S extends string>(predicate: (value: string, index: number, obj: string[]) => value is S, thisArg?: any): S | undefined;
-        find(predicate: (value: string, index: number, obj: string[]) => unknown, thisArg?: any): string | undefined;
-        findIndex(predicate: (value: string, index: number, obj: string[]) => unknown, thisArg?: any): number;
-        fill(value: string, start?: number, end?: number): [key: string];
-        copyWithin(target: number, start: number, end?: number): [key: string];
-        entries(): ArrayIterator<[number, string]>;
-        keys(): ArrayIterator<number>;
-        values(): ArrayIterator<string>;
-        includes(searchElement: string, fromIndex?: number): boolean;
-        flatMap<U, This = undefined>(callback: (this: This, value: string, index: number, array: string[]) => U | readonly U[], thisArg?: This | undefined): U[];
-        flat<A, D extends number = 1>(this: A, depth?: D | undefined): FlatArray<A, D>[];
-        at(index: number): string | undefined;
-        findLast<S extends string>(predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): S | undefined;
-        findLast(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): string | undefined;
-        findLastIndex(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): number;
-        toReversed(): string[];
-        toSorted(compareFn?: ((a: string, b: string) => number) | undefined): string[];
-        toSpliced(start: number, deleteCount: number, ...items: string[]): string[];
-        toSpliced(start: number, deleteCount?: number): string[];
-        with(index: number, value: string): string[];
-        [Symbol.iterator](): ArrayIterator<string>;
-        [Symbol.unscopables]: {
-            [x: number]: boolean | undefined;
-            length?: boolean | undefined;
-            toString?: boolean | undefined;
-            toLocaleString?: boolean | undefined;
-            pop?: boolean | undefined;
-            push?: boolean | undefined;
-            concat?: boolean | undefined;
-            join?: boolean | undefined;
-            reverse?: boolean | undefined;
-            shift?: boolean | undefined;
-            slice?: boolean | undefined;
-            sort?: boolean | undefined;
-            splice?: boolean | undefined;
-            unshift?: boolean | undefined;
-            indexOf?: boolean | undefined;
-            lastIndexOf?: boolean | undefined;
-            every?: boolean | undefined;
-            some?: boolean | undefined;
-            forEach?: boolean | undefined;
-            map?: boolean | undefined;
-            filter?: boolean | undefined;
-            reduce?: boolean | undefined;
-            reduceRight?: boolean | undefined;
-            find?: boolean | undefined;
-            findIndex?: boolean | undefined;
-            fill?: boolean | undefined;
-            copyWithin?: boolean | undefined;
-            entries?: boolean | undefined;
-            keys?: boolean | undefined;
-            values?: boolean | undefined;
-            includes?: boolean | undefined;
-            flatMap?: boolean | undefined;
-            flat?: boolean | undefined;
-            at?: boolean | undefined;
-            findLast?: boolean | undefined;
-            findLastIndex?: boolean | undefined;
-            toReversed?: boolean | undefined;
-            toSorted?: boolean | undefined;
-            toSpliced?: boolean | undefined;
-            with?: boolean | undefined;
-            [Symbol.iterator]?: boolean | undefined;
-            readonly [Symbol.unscopables]?: boolean | undefined;
-        };
     };
     static contextType: React.Context<string>;
-    _subMenus: React.RefObject<HTMLUListElement>;
+    _subMenus: React.RefObject<HTMLUListElement | null>;
     private items;
     private menuButtonRef;
     constructor(props: any);

package/es/components/UIShell/HeaderMenu.js

@@ -157,9 +157,15 @@ class HeaderMenu extends React__default.Component {
       onKeyDown,
       ...rest
     } = this.props;
-    const hasActiveDescendant = childrenArg => React__default.Children.toArray(childrenArg).some(child => /*#__PURE__*/React__default.isValidElement(child) && (
-    // This is the type guard
-    child.props.isActive || child.props.isCurrentPage || Array.isArray(child.props.children) && hasActiveDescendant(child.props.children)));
+    const hasActiveDescendant = childrenArg => React__default.Children.toArray(childrenArg).some(child => {
+      if (! /*#__PURE__*/React__default.isValidElement(child)) {
+        return false;
+      }
+
+      // Explicitly type the element to access props safely
+      const element = child;
+      return element.props.isActive || element.props.isCurrentPage || Array.isArray(element.props.children) && hasActiveDescendant(element.props.children);
+    });
     const accessibilityLabel = {
       'aria-label': ariaLabel,
       'aria-labelledby': ariaLabelledBy
@@ -203,6 +209,7 @@ class HeaderMenu extends React__default.Component {
       className: `${this.context}--header__menu-arrow`
     })), /*#__PURE__*/React__default.createElement("ul", _extends({}, accessibilityLabel, {
       ref: this._subMenus,
+      onClick: this.handleOnClick,
       className: `${prefix}--header__menu`
     }), React__default.Children.map(children, this._renderMenuItem)));
   }

package/es/components/UIShell/HeaderMenuButton.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { type ComponentProps } from 'react';
+import { type ComponentProps, type JSX } from 'react';
 import PropTypes from 'prop-types';
 type HeaderMenuButtonBaseProps = Omit<ComponentProps<'button'>, 'title' | 'type'>;
 export interface HeaderMenuButtonProps extends HeaderMenuButtonBaseProps {
@@ -37,103 +37,6 @@ declare namespace HeaderMenuButton {
          * button fires it's onclick event
          */
         onClick: PropTypes.Requireable<(...args: any[]) => any>;
-        0: string;
-        length: 1;
-        toString(): string;
-        toLocaleString(): string;
-        toLocaleString(locales: string | string[], options?: Intl.NumberFormatOptions & Intl.DateTimeFormatOptions): string;
-        pop(): string | undefined;
-        push(...items: string[]): number;
-        concat(...items: ConcatArray<string>[]): string[];
-        concat(...items: (string | ConcatArray<string>)[]): string[];
-        join(separator?: string): string;
-        reverse(): string[];
-        shift(): string | undefined;
-        slice(start?: number, end?: number): string[];
-        sort(compareFn?: ((a: string, b: string) => number) | undefined): [key: string];
-        splice(start: number, deleteCount?: number): string[];
-        splice(start: number, deleteCount: number, ...items: string[]): string[];
-        unshift(...items: string[]): number;
-        indexOf(searchElement: string, fromIndex?: number): number;
-        lastIndexOf(searchElement: string, fromIndex?: number): number;
-        every<S extends string>(predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): this is S[];
-        every(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): boolean;
-        some(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): boolean;
-        forEach(callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any): void;
-        map<U>(callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any): U[];
-        filter<S extends string>(predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): S[];
-        filter(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): string[];
-        reduce(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string;
-        reduce(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string;
-        reduce<U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U;
-        reduceRight(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string;
-        reduceRight(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string;
-        reduceRight<U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U;
-        find<S extends string>(predicate: (value: string, index: number, obj: string[]) => value is S, thisArg?: any): S | undefined;
-        find(predicate: (value: string, index: number, obj: string[]) => unknown, thisArg?: any): string | undefined;
-        findIndex(predicate: (value: string, index: number, obj: string[]) => unknown, thisArg?: any): number;
-        fill(value: string, start?: number, end?: number): [key: string];
-        copyWithin(target: number, start: number, end?: number): [key: string];
-        entries(): ArrayIterator<[number, string]>;
-        keys(): ArrayIterator<number>;
-        values(): ArrayIterator<string>;
-        includes(searchElement: string, fromIndex?: number): boolean;
-        flatMap<U, This = undefined>(callback: (this: This, value: string, index: number, array: string[]) => U | readonly U[], thisArg?: This | undefined): U[];
-        flat<A, D extends number = 1>(this: A, depth?: D | undefined): FlatArray<A, D>[];
-        at(index: number): string | undefined;
-        findLast<S extends string>(predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): S | undefined;
-        findLast(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): string | undefined;
-        findLastIndex(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): number;
-        toReversed(): string[];
-        toSorted(compareFn?: ((a: string, b: string) => number) | undefined): string[];
-        toSpliced(start: number, deleteCount: number, ...items: string[]): string[];
-        toSpliced(start: number, deleteCount?: number): string[];
-        with(index: number, value: string): string[];
-        [Symbol.iterator](): ArrayIterator<string>;
-        [Symbol.unscopables]: {
-            [x: number]: boolean | undefined;
-            length?: boolean | undefined;
-            toString?: boolean | undefined;
-            toLocaleString?: boolean | undefined;
-            pop?: boolean | undefined;
-            push?: boolean | undefined;
-            concat?: boolean | undefined;
-            join?: boolean | undefined;
-            reverse?: boolean | undefined;
-            shift?: boolean | undefined;
-            slice?: boolean | undefined;
-            sort?: boolean | undefined;
-            splice?: boolean | undefined;
-            unshift?: boolean | undefined;
-            indexOf?: boolean | undefined;
-            lastIndexOf?: boolean | undefined;
-            every?: boolean | undefined;
-            some?: boolean | undefined;
-            forEach?: boolean | undefined;
-            map?: boolean | undefined;
-            filter?: boolean | undefined;
-            reduce?: boolean | undefined;
-            reduceRight?: boolean | undefined;
-            find?: boolean | undefined;
-            findIndex?: boolean | undefined;
-            fill?: boolean | undefined;
-            copyWithin?: boolean | undefined;
-            entries?: boolean | undefined;
-            keys?: boolean | undefined;
-            values?: boolean | undefined;
-            includes?: boolean | undefined;
-            flatMap?: boolean | undefined;
-            flat?: boolean | undefined;
-            at?: boolean | undefined;
-            findLast?: boolean | undefined;
-            findLastIndex?: boolean | undefined;
-            toReversed?: boolean | undefined;
-            toSorted?: boolean | undefined;
-            toSpliced?: boolean | undefined;
-            with?: boolean | undefined;
-            [Symbol.iterator]?: boolean | undefined;
-            readonly [Symbol.unscopables]?: boolean | undefined;
-        };
     };
 }
 export default HeaderMenuButton;

package/es/components/UIShell/HeaderMenuItem.d.ts

@@ -4,7 +4,8 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { type ComponentProps, type ForwardedRef, type ReactNode, ElementType, WeakValidationMap } from 'react';
+import { WeakValidationMap } from 'prop-types';
+import { type ComponentProps, type ReactNode, ElementType, JSX } from 'react';
 import { PolymorphicComponentPropWithRef } from '../../internal/PolymorphicProps';
 export interface HeaderMenuItemBaseProps {
     className?: string | undefined;
@@ -17,9 +18,7 @@ export interface HeaderMenuItemBaseProps {
 }
 export type HeaderMenuItemProps<E extends ElementType = 'a'> = PolymorphicComponentPropWithRef<E, HeaderMenuItemBaseProps>;
 export interface HeaderMenuItemComponent {
-    <E extends ElementType = 'a'>(props: HeaderMenuItemProps<E> & {
-        ref?: ForwardedRef<ElementType>;
-    }): JSX.Element | null;
+    <E extends ElementType = 'a'>(props: HeaderMenuItemProps<E>): JSX.Element | null;
     displayName?: string;
     propTypes?: WeakValidationMap<HeaderMenuItemProps<any>>;
 }

package/es/components/UIShell/HeaderMenuItem.js

@@ -9,11 +9,11 @@ import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js
 import PropTypes from 'prop-types';
 import React__default, { forwardRef } from 'react';
 import cx from 'classnames';
-import { LinkPropTypes, Link } from './Link.js';
+import Link, { LinkPropTypes } from './Link.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 import deprecate from '../../prop-types/deprecate.js';
 
-const HeaderMenuItem = /*#__PURE__*/forwardRef(function HeaderMenuItemRenderFunction(_ref, ref) {
+const HeaderMenuItem = /*#__PURE__*/forwardRef(function HeaderMenuItem(_ref, ref) {
   let {
     className,
     isActive,
@@ -21,7 +21,7 @@ const HeaderMenuItem = /*#__PURE__*/forwardRef(function HeaderMenuItemRenderFunc
     'aria-current': ariaCurrent,
     children,
     role,
-    tabIndex = 0,
+    tabIndex,
     ...rest
   } = _ref;
   const prefix = usePrefix();

package/es/components/UIShell/HeaderName.js

@@ -9,7 +9,7 @@ import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js
 import cx from 'classnames';
 import React__default from 'react';
 import PropTypes from 'prop-types';
-import { LinkPropTypes, Link } from './Link.js';
+import Link, { LinkPropTypes } from './Link.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 
 function HeaderName(_ref) {

package/es/components/UIShell/HeaderNavigation.d.ts

@@ -19,103 +19,6 @@ declare namespace HeaderNavigation {
          * Optionally provide a custom class to apply to the underlying <nav> node
          */
         className: PropTypes.Requireable<string>;
-        0: string;
-        length: 1;
-        toString(): string;
-        toLocaleString(): string;
-        toLocaleString(locales: string | string[], options?: Intl.NumberFormatOptions & Intl.DateTimeFormatOptions): string;
-        pop(): string | undefined;
-        push(...items: string[]): number;
-        concat(...items: ConcatArray<string>[]): string[];
-        concat(...items: (string | ConcatArray<string>)[]): string[];
-        join(separator?: string): string;
-        reverse(): string[];
-        shift(): string | undefined;
-        slice(start?: number, end?: number): string[];
-        sort(compareFn?: ((a: string, b: string) => number) | undefined): [key: string];
-        splice(start: number, deleteCount?: number): string[];
-        splice(start: number, deleteCount: number, ...items: string[]): string[];
-        unshift(...items: string[]): number;
-        indexOf(searchElement: string, fromIndex?: number): number;
-        lastIndexOf(searchElement: string, fromIndex?: number): number;
-        every<S extends string>(predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): this is S[];
-        every(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): boolean;
-        some(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): boolean;
-        forEach(callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any): void;
-        map<U>(callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any): U[];
-        filter<S extends string>(predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): S[];
-        filter(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): string[];
-        reduce(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string;
-        reduce(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string;
-        reduce<U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U;
-        reduceRight(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string;
-        reduceRight(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string;
-        reduceRight<U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U;
-        find<S extends string>(predicate: (value: string, index: number, obj: string[]) => value is S, thisArg?: any): S | undefined;
-        find(predicate: (value: string, index: number, obj: string[]) => unknown, thisArg?: any): string | undefined;
-        findIndex(predicate: (value: string, index: number, obj: string[]) => unknown, thisArg?: any): number;
-        fill(value: string, start?: number, end?: number): [key: string];
-        copyWithin(target: number, start: number, end?: number): [key: string];
-        entries(): ArrayIterator<[number, string]>;
-        keys(): ArrayIterator<number>;
-        values(): ArrayIterator<string>;
-        includes(searchElement: string, fromIndex?: number): boolean;
-        flatMap<U, This = undefined>(callback: (this: This, value: string, index: number, array: string[]) => U | readonly U[], thisArg?: This | undefined): U[];
-        flat<A, D extends number = 1>(this: A, depth?: D | undefined): FlatArray<A, D>[];
-        at(index: number): string | undefined;
-        findLast<S extends string>(predicate: (value: string, index: number, array: string[]) => value is S, thisArg?: any): S | undefined;
-        findLast(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): string | undefined;
-        findLastIndex(predicate: (value: string, index: number, array: string[]) => unknown, thisArg?: any): number;
-        toReversed(): string[];
-        toSorted(compareFn?: ((a: string, b: string) => number) | undefined): string[];
-        toSpliced(start: number, deleteCount: number, ...items: string[]): string[];
-        toSpliced(start: number, deleteCount?: number): string[];
-        with(index: number, value: string): string[];
-        [Symbol.iterator](): ArrayIterator<string>;
-        [Symbol.unscopables]: {
-            [x: number]: boolean | undefined;
-            length?: boolean | undefined;
-            toString?: boolean | undefined;
-            toLocaleString?: boolean | undefined;
-            pop?: boolean | undefined;
-            push?: boolean | undefined;
-            concat?: boolean | undefined;
-            join?: boolean | undefined;
-            reverse?: boolean | undefined;
-            shift?: boolean | undefined;
-            slice?: boolean | undefined;
-            sort?: boolean | undefined;
-            splice?: boolean | undefined;
-            unshift?: boolean | undefined;
-            indexOf?: boolean | undefined;
-            lastIndexOf?: boolean | undefined;
-            every?: boolean | undefined;
-            some?: boolean | undefined;
-            forEach?: boolean | undefined;
-            map?: boolean | undefined;
-            filter?: boolean | undefined;
-            reduce?: boolean | undefined;
-            reduceRight?: boolean | undefined;
-            find?: boolean | undefined;
-            findIndex?: boolean | undefined;
-            fill?: boolean | undefined;
-            copyWithin?: boolean | undefined;
-            entries?: boolean | undefined;
-            keys?: boolean | undefined;
-            values?: boolean | undefined;
-            includes?: boolean | undefined;
-            flatMap?: boolean | undefined;
-            flat?: boolean | undefined;
-            at?: boolean | undefined;
-            findLast?: boolean | undefined;
-            findLastIndex?: boolean | undefined;
-            toReversed?: boolean | undefined;
-            toSorted?: boolean | undefined;
-            toSpliced?: boolean | undefined;
-            with?: boolean | undefined;
-            [Symbol.iterator]?: boolean | undefined;
-            readonly [Symbol.unscopables]?: boolean | undefined;
-        };
     };
 }
 export default HeaderNavigation;

package/es/components/UIShell/Link.d.ts

@@ -4,24 +4,24 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import PropTypes from 'prop-types';
-import React, { ForwardedRef, type ElementType, type WeakValidationMap } from 'react';
+import PropTypes, { WeakValidationMap } from 'prop-types';
+import { JSX, type ElementType } from 'react';
 import { PolymorphicProps } from '../../types/common';
-import { HeaderMenuItemBaseProps } from './HeaderMenuItem';
 export interface LinkBaseProps {
     /**
      * @deprecated Use `as` instead
      */
-    element?: undefined;
-    ref?: ForwardedRef<ElementType>;
+    element?: ElementType | undefined;
+    as?: ElementType | undefined;
+    isSideNavExpanded?: boolean | undefined;
 }
-export type LinkProps<E extends React.ElementType> = PolymorphicProps<E, LinkBaseProps>;
+export type LinkProps<E extends ElementType = 'a'> = PolymorphicProps<E, LinkBaseProps>;
 export interface LinkComponent {
-    <E extends ElementType = 'a'>(props: LinkProps<E> | HeaderMenuItemBaseProps): JSX.Element | null;
+    <E extends ElementType = 'a'>(props: LinkProps<E>): JSX.Element | null;
     displayName?: string;
     propTypes?: WeakValidationMap<LinkProps<any>>;
 }
-export declare const Link: LinkComponent;
+declare const Link: LinkComponent;
 /**
  * Link is a custom component that allows us to supporting rendering elements
  * other than `a` in our markup. The goal is to allow users to support passing

package/es/components/UIShell/Link.js

@@ -10,10 +10,9 @@ import PropTypes from 'prop-types';
 import React__default from 'react';
 import deprecate from '../../prop-types/deprecate.js';
 
-// Note: Maybe we should use `as` instead of `element`? `as` appears to be
-// standard and is used in other places in this project.
+// First define the component without generics
 
-const Link = /*#__PURE__*/React__default.forwardRef(function LinkRenderFunction(_ref, ref) {
+const LinkBase = (_ref, ref) => {
   let {
     element,
     as: BaseComponent,
@@ -26,7 +25,11 @@ const Link = /*#__PURE__*/React__default.forwardRef(function LinkRenderFunction(
   return /*#__PURE__*/React__default.createElement(BaseComponentAsAny, _extends({
     ref: ref
   }, rest));
-});
+};
+
+// Use forwardRef with the non-generic function
+const Link = /*#__PURE__*/React__default.forwardRef(LinkBase);
+
 /**
  * Link is a custom component that allows us to supporting rendering elements
  * other than `a` in our markup. The goal is to allow users to support passing
@@ -56,4 +59,4 @@ const LinkPropTypes = {
 Link.displayName = 'Link';
 Link.propTypes = LinkPropTypes;
 
-export { Link, LinkPropTypes, Link as default };
+export { LinkPropTypes, Link as default };

package/es/components/UIShell/SideNav.d.ts

@@ -4,8 +4,8 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, { type ComponentProps, type FocusEvent, type KeyboardEvent, type MouseEventHandler } from 'react';
-export interface SideNavProps extends ComponentProps<'nav'> {
+import React, { type FocusEvent, type KeyboardEvent, type MouseEventHandler } from 'react';
+export interface SideNavProps {
     expanded?: boolean | undefined;
     defaultExpanded?: boolean | undefined;
     isChildOfHeader?: boolean | undefined;
@@ -25,5 +25,5 @@ interface SideNavContextData {
     isRail?: boolean | undefined;
 }
 export declare const SideNavContext: React.Context<SideNavContextData>;
-declare const SideNav: React.ForwardRefExoticComponent<Omit<SideNavProps, "ref"> & React.RefAttributes<HTMLElement>>;
+declare const SideNav: React.ForwardRefExoticComponent<Omit<SideNavProps & React.ClassAttributes<HTMLElement> & React.HTMLAttributes<HTMLElement>, "ref"> & React.RefAttributes<HTMLElement>>;
 export default SideNav;

package/es/components/UIShell/SideNav.js

@@ -171,7 +171,7 @@ function SideNavRenderFunction(_ref, ref) {
     tabIndex: -1,
     ref: navRef,
     className: `${prefix}--side-nav__navigation ${className}`,
-    inert: !isRail ? expanded || isLg ? undefined : -1 : undefined
+    inert: !isRail ? !(expanded || isLg) : undefined
   }, accessibilityLabel, eventHandlers, other), childrenToRender));
 }
 const SideNav = /*#__PURE__*/React__default.forwardRef(SideNavRenderFunction);

package/es/components/UIShell/SideNavHeader.js

@@ -41,7 +41,6 @@ SideNavHeader.propTypes = {
   /**
    * A component used to render an icon.
    */
-  // @ts-expect-error - PropTypes are unable to cover this case.
   renderIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).isRequired
 };
 

package/es/components/UIShell/SideNavLink.d.ts

@@ -4,7 +4,8 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { ComponentType, ElementType, ForwardedRef, ReactNode, WeakValidationMap } from 'react';
+import { WeakValidationMap } from 'prop-types';
+import { ComponentType, ElementType, JSX, ReactNode } from 'react';
 import { LinkProps } from './Link';
 export type SideNavLinkProps<E extends ElementType> = LinkProps<E> & {
     /**
@@ -46,9 +47,7 @@ export type SideNavLinkProps<E extends ElementType> = LinkProps<E> & {
     tabIndex?: number;
 };
 export interface SideNavLinkComponent {
-    <E extends ElementType = 'a'>(props: SideNavLinkProps<E> & {
-        ref?: ForwardedRef<ElementType>;
-    }): JSX.Element | null;
+    <E extends ElementType = 'a'>(props: SideNavLinkProps<E>): JSX.Element | null;
     displayName?: string;
     propTypes?: WeakValidationMap<SideNavLinkProps<any>>;
 }

package/es/components/UIShell/SideNavLink.js

@@ -9,14 +9,16 @@ import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React__default, { forwardRef, useContext } from 'react';
-import { LinkPropTypes, Link } from './Link.js';
+import Link, { LinkPropTypes } from './Link.js';
 import SideNavIcon from './SideNavIcon.js';
 import SideNavItem from './SideNavItem.js';
 import SideNavLinkText from './SideNavLinkText.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 import { SideNavContext } from './SideNav.js';
 
-const SideNavLink = /*#__PURE__*/forwardRef(function SideNavLink(_ref, ref) {
+// First define a non-generic base component to work with forwardRef
+
+const SideNavLinkBase = (_ref, ref) => {
   let {
     children,
     className: customClassName,
@@ -43,7 +45,10 @@ const SideNavLink = /*#__PURE__*/forwardRef(function SideNavLink(_ref, ref) {
   }), IconElement && /*#__PURE__*/React__default.createElement(SideNavIcon, {
     small: true
   }, /*#__PURE__*/React__default.createElement(IconElement, null)), /*#__PURE__*/React__default.createElement(SideNavLinkText, null, children)));
-});
+};
+
+// Use forwardRef with the non-generic function and cast to the generic component type
+const SideNavLink = /*#__PURE__*/forwardRef(SideNavLinkBase);
 SideNavLink.displayName = 'SideNavLink';
 SideNavLink.propTypes = {
   ...LinkPropTypes,

package/es/components/UIShell/SideNavMenu.js

@@ -112,7 +112,6 @@ SideNavMenu.propTypes = {
   /**
    * A component used to render an icon.
    */
-  // @ts-expect-error - PropTypes are unable to cover this case.
   renderIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
   /**
    * Optional prop to specify the tabIndex of the button. If undefined, it will be applied default validation

package/es/components/UIShell/SideNavMenuItem.d.ts

@@ -30,53 +30,5 @@ export type SideNavMenuItemProps = ComponentProps<typeof Link> & {
      */
     as?: ElementType;
 };
-declare const SideNavMenuItem: React.ForwardRefExoticComponent<((import("./HeaderMenuItem").HeaderMenuItemBaseProps & {
-    /**
-     * Specify the children to be rendered inside of the `SideNavMenuItem`
-     */
-    children?: React.ReactNode;
-    /**
-     * Provide an optional class to be applied to the containing node
-     */
-    className?: string;
-    /**
-     * Optionally specify whether the link is "active". An active link is one that
-     * has an href that is the same as the current page. Can also pass in
-     * `aria-current="page"`, as well.
-     */
-    isActive?: boolean;
-    /**
-     * Optionally provide an href for the underlying li`
-     */
-    href?: string;
-    /**
-     * Optional component to render instead of default Link
-     */
-    as?: ElementType;
-}) | Omit<import("./Link").LinkBaseProps & Omit<any, "as"> & {
-    as?: React.ElementType | undefined;
-} & {
-    /**
-     * Specify the children to be rendered inside of the `SideNavMenuItem`
-     */
-    children?: React.ReactNode;
-    /**
-     * Provide an optional class to be applied to the containing node
-     */
-    className?: string;
-    /**
-     * Optionally specify whether the link is "active". An active link is one that
-     * has an href that is the same as the current page. Can also pass in
-     * `aria-current="page"`, as well.
-     */
-    isActive?: boolean;
-    /**
-     * Optionally provide an href for the underlying li`
-     */
-    href?: string;
-    /**
-     * Optional component to render instead of default Link
-     */
-    as?: ElementType;
-}, "ref">) & React.RefAttributes<HTMLElement>>;
+declare const SideNavMenuItem: React.ForwardRefExoticComponent<Omit<SideNavMenuItemProps, "ref"> & React.RefAttributes<HTMLElement>>;
 export default SideNavMenuItem;

package/es/components/UIShell/SideNavMenuItem.js

@@ -10,7 +10,7 @@ import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React__default from 'react';
 import SideNavLinkText from './SideNavLinkText.js';
-import { Link } from './Link.js';
+import Link from './Link.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 
 const SideNavMenuItem = /*#__PURE__*/React__default.forwardRef(function SideNavMenuItem(props, ref) {