@atlaskit/navigation-system 5.12.1 → 5.12.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlassian/navigation-system
 
+## 5.12.2
+
+### Patch Changes
+
+- [`fd574581c5176`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fd574581c5176) -
+  Refactor ExpandableMenuItemTrigger props type to use RouterLinkComponentProps generic instead of
+  explicit href prop definition
+- Updated dependencies
+
 ## 5.12.1
 
 ### Patch Changes

package/dist/cjs/ui/menu-item/expandable-menu-item/expandable-menu-item-trigger.js

@@ -12,6 +12,7 @@ var _runtime = require("@compiled/react/runtime");
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _new = require("@atlaskit/button/new");
+var _forwardRefWithGeneric = _interopRequireDefault(require("@atlaskit/ds-lib/forward-ref-with-generic"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
 var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
 var _menuItem = require("../menu-item");
@@ -52,7 +53,7 @@ var ExpandableMenuItemIcon = function ExpandableMenuItemIcon(_ref) {
  *
  * The trigger component for an `ExpandableMenuItem`. Interacting with it will expand or collapse the expandable.
  */
-var ExpandableMenuItemTrigger = exports.ExpandableMenuItemTrigger = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, forwardedRef) {
+var ExpandableMenuItemTrigger = exports.ExpandableMenuItemTrigger = (0, _forwardRefWithGeneric.default)(function (_ref2, forwardedRef) {
   var actions = _ref2.actions,
     isSelected = _ref2.isSelected,
     href = _ref2.href,

package/dist/es2019/ui/menu-item/expandable-menu-item/expandable-menu-item-trigger.js

@@ -2,8 +2,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import "./expandable-menu-item-trigger.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-import React, { forwardRef, useCallback, useId, useRef } from 'react';
+import React, { useCallback, useId, useRef } from 'react';
 import { IconButton } from '@atlaskit/button/new';
+import forwardRefWithGeneric from '@atlaskit/ds-lib/forward-ref-with-generic';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
 import { MenuItemBase, nestedOpenPopupCSSSelector } from '../menu-item';
@@ -44,7 +45,7 @@ const ExpandableMenuItemIcon = ({
  *
  * The trigger component for an `ExpandableMenuItem`. Interacting with it will expand or collapse the expandable.
  */
-export const ExpandableMenuItemTrigger = /*#__PURE__*/forwardRef(({
+export const ExpandableMenuItemTrigger = forwardRefWithGeneric(({
   actions,
   isSelected,
   href,

package/dist/esm/ui/menu-item/expandable-menu-item/expandable-menu-item-trigger.js

@@ -2,8 +2,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import "./expandable-menu-item-trigger.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-import React, { forwardRef, useCallback, useId, useRef } from 'react';
+import React, { useCallback, useId, useRef } from 'react';
 import { IconButton } from '@atlaskit/button/new';
+import forwardRefWithGeneric from '@atlaskit/ds-lib/forward-ref-with-generic';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
 import { MenuItemBase, nestedOpenPopupCSSSelector } from '../menu-item';
@@ -43,7 +44,7 @@ var ExpandableMenuItemIcon = function ExpandableMenuItemIcon(_ref) {
  *
  * The trigger component for an `ExpandableMenuItem`. Interacting with it will expand or collapse the expandable.
  */
-export var ExpandableMenuItemTrigger = /*#__PURE__*/forwardRef(function (_ref2, forwardedRef) {
+export var ExpandableMenuItemTrigger = forwardRefWithGeneric(function (_ref2, forwardedRef) {
   var actions = _ref2.actions,
     isSelected = _ref2.isSelected,
     href = _ref2.href,

package/dist/types/ui/menu-item/expandable-menu-item/expandable-menu-item-trigger.d.ts

@@ -5,8 +5,9 @@
  */
 import React, { type ReactNode } from 'react';
 import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
+import type { RouterLinkComponentProps } from '@atlaskit/app-provider';
 import type { MenuItemCommonProps, MenuItemSlots } from '../types';
-export type ExpandableMenuItemTriggerProps = MenuItemCommonProps & Omit<MenuItemSlots, 'actionsOnHover' | 'elemBefore'> & {
+export type ExpandableMenuItemTriggerProps<RouterLinkConfig extends Record<string, any> = never> = MenuItemCommonProps & Omit<RouterLinkComponentProps<RouterLinkConfig>, 'href'> & Omit<MenuItemSlots, 'actionsOnHover' | 'elemBefore'> & {
     /**
      * `ReactNode` to be placed visually after the `children` and will
      * only be displayed on hover or focus, or when the expandable menu item
@@ -41,7 +42,7 @@ export type ExpandableMenuItemTriggerProps = MenuItemCommonProps & Omit<MenuItem
      *
      * If a `href` is not provided, the chevron icon is rendered as part of the element.
      */
-    href?: string;
+    href?: RouterLinkComponentProps<RouterLinkConfig>['href'];
     /**
      * Called when the user has clicked on the trigger content.
      *
@@ -61,4 +62,4 @@ export type ExpandableMenuItemTriggerProps = MenuItemCommonProps & Omit<MenuItem
  *
  * The trigger component for an `ExpandableMenuItem`. Interacting with it will expand or collapse the expandable.
  */
-export declare const ExpandableMenuItemTrigger: React.ForwardRefExoticComponent<React.PropsWithoutRef<ExpandableMenuItemTriggerProps> & React.RefAttributes<HTMLButtonElement | HTMLAnchorElement>>;
+export declare const ExpandableMenuItemTrigger: <RouterLinkConfig extends Record<string, any> = never>(props: ExpandableMenuItemTriggerProps<RouterLinkConfig> & React.RefAttributes<HTMLButtonElement | HTMLAnchorElement>) => React.ReactElement | null;

package/dist/types-ts4.5/ui/menu-item/expandable-menu-item/expandable-menu-item-trigger.d.ts

@@ -5,8 +5,9 @@
  */
 import React, { type ReactNode } from 'react';
 import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
+import type { RouterLinkComponentProps } from '@atlaskit/app-provider';
 import type { MenuItemCommonProps, MenuItemSlots } from '../types';
-export type ExpandableMenuItemTriggerProps = MenuItemCommonProps & Omit<MenuItemSlots, 'actionsOnHover' | 'elemBefore'> & {
+export type ExpandableMenuItemTriggerProps<RouterLinkConfig extends Record<string, any> = never> = MenuItemCommonProps & Omit<RouterLinkComponentProps<RouterLinkConfig>, 'href'> & Omit<MenuItemSlots, 'actionsOnHover' | 'elemBefore'> & {
     /**
      * `ReactNode` to be placed visually after the `children` and will
      * only be displayed on hover or focus, or when the expandable menu item
@@ -41,7 +42,7 @@ export type ExpandableMenuItemTriggerProps = MenuItemCommonProps & Omit<MenuItem
      *
      * If a `href` is not provided, the chevron icon is rendered as part of the element.
      */
-    href?: string;
+    href?: RouterLinkComponentProps<RouterLinkConfig>['href'];
     /**
      * Called when the user has clicked on the trigger content.
      *
@@ -61,4 +62,4 @@ export type ExpandableMenuItemTriggerProps = MenuItemCommonProps & Omit<MenuItem
  *
  * The trigger component for an `ExpandableMenuItem`. Interacting with it will expand or collapse the expandable.
  */
-export declare const ExpandableMenuItemTrigger: React.ForwardRefExoticComponent<React.PropsWithoutRef<ExpandableMenuItemTriggerProps> & React.RefAttributes<HTMLButtonElement | HTMLAnchorElement>>;
+export declare const ExpandableMenuItemTrigger: <RouterLinkConfig extends Record<string, any> = never>(props: ExpandableMenuItemTriggerProps<RouterLinkConfig> & React.RefAttributes<HTMLButtonElement | HTMLAnchorElement>) => React.ReactElement | null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/navigation-system",
-	"version": "5.12.1",
+	"version": "5.12.2",
 	"description": "The latest navigation system for Atlassian apps.",
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"author": "Atlassian Pty Ltd",
@@ -71,7 +71,7 @@
 		"@atlaskit/button": "^23.8.0",
 		"@atlaskit/css": "^0.18.0",
 		"@atlaskit/ds-lib": "^5.3.0",
-		"@atlaskit/icon": "^29.2.0",
+		"@atlaskit/icon": "^29.3.0",
 		"@atlaskit/layering": "^3.4.0",
 		"@atlaskit/logo": "^19.9.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
@@ -102,7 +102,7 @@
 		"@atlaskit/banner": "^14.0.0",
 		"@atlaskit/breadcrumbs": "^15.3.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
-		"@atlaskit/form": "^15.0.0",
+		"@atlaskit/form": "^15.1.0",
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/lozenge": "^13.2.0",