@atlaskit/navigation-system 5.12.1 → 5.12.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlassian/navigation-system
 
+## 5.12.3
+
+### Patch Changes
+
+- [`4026de04805f9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4026de04805f9) -
+  Clean up flag.
+
+## 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/cjs/ui/top-nav-items/nav-logo/logo-renderer.js

@@ -7,31 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.LogoRenderer = LogoRenderer;
 exports.themedLogoText = exports.themedLogoIcon = void 0;
+var React = _interopRequireWildcard(require("react"));
 var _runtime = require("@compiled/react/runtime");
-var _react = _interopRequireWildcard(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _hasCustomThemeContext = require("../themed/has-custom-theme-context");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var themedLogoIcon = exports.themedLogoIcon = '--ds-top-bar-logo-icon';
 var themedLogoText = exports.themedLogoText = '--ds-top-bar-logo-text';
 function LogoRenderer(_ref) {
-  var logoOrIcon = _ref.logoOrIcon,
+  var LogoOrIcon = _ref.logoOrIcon,
     shouldUseNewLogoDesign = _ref.shouldUseNewLogoDesign;
-  return (0, _platformFeatureFlags.fg)('jiv-20710-fix-nav-rerender') ? /*#__PURE__*/_react.default.createElement(LogoRendererMemo, {
-    logoOrIcon: logoOrIcon,
-    shouldUseNewLogoDesign: shouldUseNewLogoDesign
-  }) : /*#__PURE__*/_react.default.createElement(LogoRendererNoMemo, {
-    logoOrIcon: logoOrIcon,
-    shouldUseNewLogoDesign: shouldUseNewLogoDesign
-  });
-}
-var LogoRendererMemo = /*#__PURE__*/(0, _react.memo)(LogoRendererNoMemo);
-function LogoRendererNoMemo(_ref2) {
-  var LogoOrIcon = _ref2.logoOrIcon,
-    shouldUseNewLogoDesign = _ref2.shouldUseNewLogoDesign;
   var hasCustomTheme = (0, _hasCustomThemeContext.useHasCustomTheme)();
   if (hasCustomTheme) {
-    return /*#__PURE__*/_react.default.createElement(LogoOrIcon, {
+    return /*#__PURE__*/React.createElement(LogoOrIcon, {
       label: "",
       size: "small",
       shouldUseNewLogoDesign: shouldUseNewLogoDesign,
@@ -39,7 +26,7 @@ function LogoRendererNoMemo(_ref2) {
       textColor: "var(".concat(themedLogoText, ")")
     });
   }
-  return /*#__PURE__*/_react.default.createElement(LogoOrIcon, {
+  return /*#__PURE__*/React.createElement(LogoOrIcon, {
     size: "small",
     shouldUseNewLogoDesign: shouldUseNewLogoDesign,
     label: "",

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/es2019/ui/top-nav-items/nav-logo/logo-renderer.js

@@ -1,24 +1,10 @@
 /* logo-renderer.tsx generated by @compiled/babel-plugin v0.38.1 */
+import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import React, { memo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useHasCustomTheme } from '../themed/has-custom-theme-context';
 export const themedLogoIcon = '--ds-top-bar-logo-icon';
 export const themedLogoText = '--ds-top-bar-logo-text';
 export function LogoRenderer({
-  logoOrIcon,
-  shouldUseNewLogoDesign
-}) {
-  return fg('jiv-20710-fix-nav-rerender') ? /*#__PURE__*/React.createElement(LogoRendererMemo, {
-    logoOrIcon: logoOrIcon,
-    shouldUseNewLogoDesign: shouldUseNewLogoDesign
-  }) : /*#__PURE__*/React.createElement(LogoRendererNoMemo, {
-    logoOrIcon: logoOrIcon,
-    shouldUseNewLogoDesign: shouldUseNewLogoDesign
-  });
-}
-const LogoRendererMemo = /*#__PURE__*/memo(LogoRendererNoMemo);
-function LogoRendererNoMemo({
   logoOrIcon: LogoOrIcon,
   shouldUseNewLogoDesign
 }) {

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/esm/ui/top-nav-items/nav-logo/logo-renderer.js

@@ -1,25 +1,12 @@
 /* logo-renderer.tsx generated by @compiled/babel-plugin v0.38.1 */
+import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import React, { memo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useHasCustomTheme } from '../themed/has-custom-theme-context';
 export var themedLogoIcon = '--ds-top-bar-logo-icon';
 export var themedLogoText = '--ds-top-bar-logo-text';
 export function LogoRenderer(_ref) {
-  var logoOrIcon = _ref.logoOrIcon,
+  var LogoOrIcon = _ref.logoOrIcon,
     shouldUseNewLogoDesign = _ref.shouldUseNewLogoDesign;
-  return fg('jiv-20710-fix-nav-rerender') ? /*#__PURE__*/React.createElement(LogoRendererMemo, {
-    logoOrIcon: logoOrIcon,
-    shouldUseNewLogoDesign: shouldUseNewLogoDesign
-  }) : /*#__PURE__*/React.createElement(LogoRendererNoMemo, {
-    logoOrIcon: logoOrIcon,
-    shouldUseNewLogoDesign: shouldUseNewLogoDesign
-  });
-}
-var LogoRendererMemo = /*#__PURE__*/memo(LogoRendererNoMemo);
-function LogoRendererNoMemo(_ref2) {
-  var LogoOrIcon = _ref2.logoOrIcon,
-    shouldUseNewLogoDesign = _ref2.shouldUseNewLogoDesign;
   var hasCustomTheme = useHasCustomTheme();
   if (hasCustomTheme) {
     return /*#__PURE__*/React.createElement(LogoOrIcon, {

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/ui/top-nav-items/nav-logo/logo-renderer.d.ts

@@ -2,13 +2,10 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-import React from 'react';
 import type { LogoProps } from '@atlaskit/logo';
 export declare const themedLogoIcon = "--ds-top-bar-logo-icon";
 export declare const themedLogoText = "--ds-top-bar-logo-text";
-export declare function LogoRenderer({ logoOrIcon, shouldUseNewLogoDesign, }: React.ComponentProps<typeof LogoRendererNoMemo>): JSX.Element;
-declare function LogoRendererNoMemo({ logoOrIcon: LogoOrIcon, shouldUseNewLogoDesign, }: {
+export declare function LogoRenderer({ logoOrIcon: LogoOrIcon, shouldUseNewLogoDesign, }: {
     logoOrIcon: (props: LogoProps) => JSX.Element;
     shouldUseNewLogoDesign?: boolean;
 }): JSX.Element;
-export {};

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/dist/types-ts4.5/ui/top-nav-items/nav-logo/logo-renderer.d.ts

@@ -2,13 +2,10 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-import React from 'react';
 import type { LogoProps } from '@atlaskit/logo';
 export declare const themedLogoIcon = "--ds-top-bar-logo-icon";
 export declare const themedLogoText = "--ds-top-bar-logo-text";
-export declare function LogoRenderer({ logoOrIcon, shouldUseNewLogoDesign, }: React.ComponentProps<typeof LogoRendererNoMemo>): JSX.Element;
-declare function LogoRendererNoMemo({ logoOrIcon: LogoOrIcon, shouldUseNewLogoDesign, }: {
+export declare function LogoRenderer({ logoOrIcon: LogoOrIcon, shouldUseNewLogoDesign, }: {
     logoOrIcon: (props: LogoProps) => JSX.Element;
     shouldUseNewLogoDesign?: boolean;
 }): JSX.Element;
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/navigation-system",
-	"version": "5.12.1",
+	"version": "5.12.3",
 	"description": "The latest navigation system for Atlassian apps.",
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"author": "Atlassian Pty Ltd",
@@ -71,11 +71,11 @@
 		"@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",
-		"@atlaskit/popup": "^4.7.0",
+		"@atlaskit/popup": "^4.8.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.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",
@@ -116,7 +116,7 @@
 		"@atlaskit/skeleton": "^2.1.0",
 		"@atlaskit/textfield": "^8.2.0",
 		"@atlassian/feature-flags-test-utils": "^1.0.0",
-		"@atlassian/gemini": "^1.24.0",
+		"@atlassian/gemini": "^1.25.0",
 		"@atlassian/search-dialog": "^9.10.0",
 		"@atlassian/ssr-tests": "workspace:^",
 		"@atlassian/test-utils": "^1.0.0",
@@ -164,9 +164,6 @@
 		"platform-team25-app-icon-tiles": {
 			"type": "boolean"
 		},
-		"jiv-20710-fix-nav-rerender": {
-			"type": "boolean"
-		},
 		"platform_dst_nav4_layering_in_main_slot_fixes": {
 			"type": "boolean"
 		},