@atlaskit/menu 2.6.1 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/menu
 
+## 2.7.0
+
+### Minor Changes
+
+- [#117121](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117121)
+  [`a3a6ca91979d4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a3a6ca91979d4) -
+  Adds a new optional `UNSAFE_shouldDisableRouterLink` prop, which when set to `true`, will opt out
+  of using a router link and instead use a regular anchor element.
+
+## 2.6.2
+
+### Patch Changes
+
+- [#116025](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116025)
+  [`cd506a937e44f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cd506a937e44f) -
+  Internal change to how typography is applied. There should be no visual change.
+
 ## 2.6.1
 
 ### Patch Changes

package/dist/cjs/internal/components/menu-item-primitive.js

@@ -38,7 +38,7 @@ var contentStyles = (0, _primitives.xcss)({
   textAlign: 'left'
 });
 var baseContentStyles = (0, _primitives.xcss)({
-  lineHeight: "var(--ds-font-lineHeight-100, 16px)"
+  lineHeight: '16px'
 });
 var truncateStyles = (0, _react2.css)({
   display: 'block',
@@ -56,7 +56,7 @@ var descriptionStyles = (0, _react2.css)({
   color: "var(--ds-text-subtlest, ".concat(_colors.N200, ")")
 });
 var baseDescriptionStyles = (0, _react2.css)({
-  fontSize: "var(--ds-font-size-075, 12px)",
+  fontSize: '12px',
   marginBlockStart: "var(--ds-space-050, 4px)"
 });
 var tokenizedDescriptionStyles = (0, _react2.css)({
@@ -88,7 +88,7 @@ var primitiveStyles = (0, _react2.css)({
   }
 });
 var primitiveBaseStyles = (0, _react2.css)({
-  fontSize: "var(--ds-font-size-100, 14px)"
+  fontSize: '14px'
 });
 var spacingMapStyles = {
   cozy: (0, _react2.css)({

package/dist/cjs/menu-item/link-item.js

@@ -14,7 +14,7 @@ var _deprecationWarning = require("@atlaskit/ds-lib/deprecation-warning");
 var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _menuItemPrimitive = _interopRequireDefault(require("../internal/components/menu-item-primitive"));
-var _excluded = ["children", "href", "cssFn", "description", "iconAfter", "iconBefore", "isDisabled", "isSelected", "onClick", "testId", "overrides", "onMouseDown", "shouldTitleWrap", "shouldDescriptionWrap", "className"];
+var _excluded = ["children", "href", "cssFn", "description", "iconAfter", "iconBefore", "isDisabled", "isSelected", "onClick", "testId", "overrides", "onMouseDown", "shouldTitleWrap", "shouldDescriptionWrap", "className", "UNSAFE_shouldDisableRouterLink"];
 /**
  * @jsxRuntime classic
  */
@@ -55,6 +55,7 @@ function (props, ref) {
     shouldTitleWrap = props.shouldTitleWrap,
     shouldDescriptionWrap = props.shouldDescriptionWrap,
     UNSAFE_className = props.className,
+    UNSAFE_shouldDisableRouterLink = props.UNSAFE_shouldDisableRouterLink,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var onMouseDownHandler = onMouseDown;
   var RouterLink = (0, _appProvider.useRouterLink)();
@@ -71,13 +72,13 @@ function (props, ref) {
    * - it's not an external link (starting with `http://` or `https://`)
    * - it's not a non-HTTP-based link (e.g. emails, phone numbers, hash links etc.).
    */
-  var isRouterLink = RouterLink && !isExternal && !isNonHttpBased;
-  var Component = (0, _platformFeatureFlags.getBooleanFF)('platform.wanjel.use-router-links-for-the-linkitem-component') && isRouterLink ? RouterLink : 'a';
+  var isRouterLink = !UNSAFE_shouldDisableRouterLink && RouterLink && !isExternal && !isNonHttpBased;
+  var Component = isRouterLink && (0, _platformFeatureFlags.fg)('platform.wanjel.use-router-links-for-the-linkitem-component') ? RouterLink : 'a';
   (0, _deprecationWarning.propDeprecationWarning)("@atlaskit/menu" || '', 'cssFn', cssFn !== _noop.default, '' // TODO: Create DAC post when primitives/xcss are available as alternatives
   );
   return (0, _react2.jsx)(_menuItemPrimitive.default, (0, _extends2.default)({}, rest, {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.unsafe-overrides-killswitch_c8j9m') ? undefined : UNSAFE_className
+    className: (0, _platformFeatureFlags.fg)('platform.design-system-team.unsafe-overrides-killswitch_c8j9m') ? undefined : UNSAFE_className
     // eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
     ,
     overrides: overrides,

package/dist/es2019/internal/components/menu-item-primitive.js

@@ -27,7 +27,7 @@ const contentStyles = xcss({
   textAlign: 'left'
 });
 const baseContentStyles = xcss({
-  lineHeight: "var(--ds-font-lineHeight-100, 16px)"
+  lineHeight: '16px'
 });
 const truncateStyles = css({
   display: 'block',
@@ -45,7 +45,7 @@ const descriptionStyles = css({
   color: `var(--ds-text-subtlest, ${N200})`
 });
 const baseDescriptionStyles = css({
-  fontSize: "var(--ds-font-size-075, 12px)",
+  fontSize: '12px',
   marginBlockStart: "var(--ds-space-050, 4px)"
 });
 const tokenizedDescriptionStyles = css({
@@ -77,7 +77,7 @@ const primitiveStyles = css({
   }
 });
 const primitiveBaseStyles = css({
-  fontSize: "var(--ds-font-size-100, 14px)"
+  fontSize: '14px'
 });
 const spacingMapStyles = {
   cozy: css({

package/dist/es2019/menu-item/link-item.js

@@ -10,7 +10,7 @@ import { jsx } from '@emotion/react';
 import { useRouterLink } from '@atlaskit/app-provider';
 import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
 import noop from '@atlaskit/ds-lib/noop';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import MenuItemPrimitive from '../internal/components/menu-item-primitive';
 const IS_EXTERNAL_LINK_REGEX = /^(?:(http|https):\/\/)/;
 const IS_NON_HTTP_BASED = /^(((mailto|tel|sms):)|(#))/;
@@ -49,6 +49,7 @@ const LinkItem = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(
     // picked it out and supressed the expected type error.
     // @ts-expect-error
     className: UNSAFE_className,
+    UNSAFE_shouldDisableRouterLink,
     ...rest
   } = props;
   const onMouseDownHandler = onMouseDown;
@@ -66,13 +67,13 @@ const LinkItem = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(
    * - it's not an external link (starting with `http://` or `https://`)
    * - it's not a non-HTTP-based link (e.g. emails, phone numbers, hash links etc.).
    */
-  const isRouterLink = RouterLink && !isExternal && !isNonHttpBased;
-  const Component = getBooleanFF('platform.wanjel.use-router-links-for-the-linkitem-component') && isRouterLink ? RouterLink : 'a';
+  const isRouterLink = !UNSAFE_shouldDisableRouterLink && RouterLink && !isExternal && !isNonHttpBased;
+  const Component = isRouterLink && fg('platform.wanjel.use-router-links-for-the-linkitem-component') ? RouterLink : 'a';
   propDeprecationWarning("@atlaskit/menu" || '', 'cssFn', cssFn !== noop, '' // TODO: Create DAC post when primitives/xcss are available as alternatives
   );
   return jsx(MenuItemPrimitive, _extends({}, rest, {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: getBooleanFF('platform.design-system-team.unsafe-overrides-killswitch_c8j9m') ? undefined : UNSAFE_className
+    className: fg('platform.design-system-team.unsafe-overrides-killswitch_c8j9m') ? undefined : UNSAFE_className
     // eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
     ,
     overrides: overrides,

package/dist/esm/internal/components/menu-item-primitive.js

@@ -30,7 +30,7 @@ var contentStyles = xcss({
   textAlign: 'left'
 });
 var baseContentStyles = xcss({
-  lineHeight: "var(--ds-font-lineHeight-100, 16px)"
+  lineHeight: '16px'
 });
 var truncateStyles = css({
   display: 'block',
@@ -48,7 +48,7 @@ var descriptionStyles = css({
   color: "var(--ds-text-subtlest, ".concat(N200, ")")
 });
 var baseDescriptionStyles = css({
-  fontSize: "var(--ds-font-size-075, 12px)",
+  fontSize: '12px',
   marginBlockStart: "var(--ds-space-050, 4px)"
 });
 var tokenizedDescriptionStyles = css({
@@ -80,7 +80,7 @@ var primitiveStyles = css({
   }
 });
 var primitiveBaseStyles = css({
-  fontSize: "var(--ds-font-size-100, 14px)"
+  fontSize: '14px'
 });
 var spacingMapStyles = {
   cozy: css({

package/dist/esm/menu-item/link-item.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "href", "cssFn", "description", "iconAfter", "iconBefore", "isDisabled", "isSelected", "onClick", "testId", "overrides", "onMouseDown", "shouldTitleWrap", "shouldDescriptionWrap", "className"];
+var _excluded = ["children", "href", "cssFn", "description", "iconAfter", "iconBefore", "isDisabled", "isSelected", "onClick", "testId", "overrides", "onMouseDown", "shouldTitleWrap", "shouldDescriptionWrap", "className", "UNSAFE_shouldDisableRouterLink"];
 /**
  * @jsxRuntime classic
  */
@@ -12,7 +12,7 @@ import { jsx } from '@emotion/react';
 import { useRouterLink } from '@atlaskit/app-provider';
 import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
 import noop from '@atlaskit/ds-lib/noop';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import MenuItemPrimitive from '../internal/components/menu-item-primitive';
 var IS_EXTERNAL_LINK_REGEX = /^(?:(http|https):\/\/)/;
 var IS_NON_HTTP_BASED = /^(((mailto|tel|sms):)|(#))/;
@@ -49,6 +49,7 @@ function (props, ref) {
     shouldTitleWrap = props.shouldTitleWrap,
     shouldDescriptionWrap = props.shouldDescriptionWrap,
     UNSAFE_className = props.className,
+    UNSAFE_shouldDisableRouterLink = props.UNSAFE_shouldDisableRouterLink,
     rest = _objectWithoutProperties(props, _excluded);
   var onMouseDownHandler = onMouseDown;
   var RouterLink = useRouterLink();
@@ -65,13 +66,13 @@ function (props, ref) {
    * - it's not an external link (starting with `http://` or `https://`)
    * - it's not a non-HTTP-based link (e.g. emails, phone numbers, hash links etc.).
    */
-  var isRouterLink = RouterLink && !isExternal && !isNonHttpBased;
-  var Component = getBooleanFF('platform.wanjel.use-router-links-for-the-linkitem-component') && isRouterLink ? RouterLink : 'a';
+  var isRouterLink = !UNSAFE_shouldDisableRouterLink && RouterLink && !isExternal && !isNonHttpBased;
+  var Component = isRouterLink && fg('platform.wanjel.use-router-links-for-the-linkitem-component') ? RouterLink : 'a';
   propDeprecationWarning("@atlaskit/menu" || '', 'cssFn', cssFn !== noop, '' // TODO: Create DAC post when primitives/xcss are available as alternatives
   );
   return jsx(MenuItemPrimitive, _extends({}, rest, {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: getBooleanFF('platform.design-system-team.unsafe-overrides-killswitch_c8j9m') ? undefined : UNSAFE_className
+    className: fg('platform.design-system-team.unsafe-overrides-killswitch_c8j9m') ? undefined : UNSAFE_className
     // eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
     ,
     overrides: overrides,

package/dist/types/types.d.ts

@@ -237,6 +237,11 @@ export interface LinkItemProps extends MenuItemProps {
      * Use this to override the accessibility role for the element.
      */
     role?: string;
+    /**
+     * Use this to opt out of using a router link and instead use a regular anchor element.
+     * Marked as "unsafe" because ideally, router links should be used for all internal links.
+     */
+    UNSAFE_shouldDisableRouterLink?: boolean;
 }
 export interface CustomItemComponentProps {
     /**

package/dist/types-ts4.5/types.d.ts

@@ -237,6 +237,11 @@ export interface LinkItemProps extends MenuItemProps {
      * Use this to override the accessibility role for the element.
      */
     role?: string;
+    /**
+     * Use this to opt out of using a router link and instead use a regular anchor element.
+     * Marked as "unsafe" because ideally, router links should be used for all internal links.
+     */
+    UNSAFE_shouldDisableRouterLink?: boolean;
 }
 export interface CustomItemComponentProps {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/menu",
-	"version": "2.6.1",
+	"version": "2.7.0",
 	"description": "A list of options to help users navigate, or perform actions.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"