@atlaskit/menu 2.12.1 → 2.12.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/menu
 
+## 2.12.3
+
+### Patch Changes
+
+- [#144779](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/144779)
+  [`de2f4742e3595`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/de2f4742e3595) -
+  [ux] Removed menu section header capitalisation.
+
+## 2.12.2
+
+### Patch Changes
+
+- [#129726](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/129726)
+  [`778c15c1d279a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/778c15c1d279a) -
+  [ux] Removed feature flag `platform.design-system-team.menu-tokenised-typography-styles` resulting
+  in minor changes to typography and spacing.
+
 ## 2.12.1
 
 ### Patch Changes

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

@@ -9,7 +9,6 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _deprecationWarning = require("@atlaskit/ds-lib/deprecation-warning");
 var _focusRing = _interopRequireDefault(require("@atlaskit/focus-ring"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _colors = require("@atlaskit/theme/colors");
 var _menuContext = require("./menu-context");
@@ -37,9 +36,6 @@ var contentStyles = (0, _primitives.xcss)({
   overflow: 'hidden',
   textAlign: 'left'
 });
-var baseContentStyles = (0, _primitives.xcss)({
-  lineHeight: '16px'
-});
 var truncateStyles = (0, _react2.css)({
   display: 'block',
   overflow: 'hidden',
@@ -53,13 +49,7 @@ var wordBreakStyles = (0, _react2.css)({
   wordBreak: 'break-word'
 });
 var descriptionStyles = (0, _react2.css)({
-  color: "var(--ds-text-subtlest, ".concat(_colors.N200, ")")
-});
-var baseDescriptionStyles = (0, _react2.css)({
-  fontSize: '12px',
-  marginBlockStart: "var(--ds-space-050, 4px)"
-});
-var tokenizedDescriptionStyles = (0, _react2.css)({
+  color: "var(--ds-text-subtlest, ".concat(_colors.N200, ")"),
   font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
 });
 var disabledDescriptionStyles = (0, _react2.css)({
@@ -87,9 +77,6 @@ var primitiveStyles = (0, _react2.css)({
     textDecoration: 'none'
   }
 });
-var primitiveBaseStyles = (0, _react2.css)({
-  fontSize: '14px'
-});
 var spacingMapStyles = {
   cozy: (0, _react2.css)({
     // 8 * 2 (16) + icon (24) === 40
@@ -217,7 +204,7 @@ var MenuItemPrimitive = function MenuItemPrimitive(_ref) {
     return (0, _react2.jsx)(_focusRing.default, {
       isInset: true
     }, children({
-      className: cx([cn([positionRelativeStyles, primitiveStyles, (0, _platformFeatureFlags.fg)('platform.design-system-team.menu-tokenised-typography-styles') ? undefined : primitiveBaseStyles, spacingMapStyles[spacing], !isDisabled && !isSelected && unselectedStyles, !isDisabled && isSelected && [selectedStyles, [selectionStyle === 'border' && selectedBorderStyles, selectionStyle === 'notch' && selectedNotchStyles]], isDisabled ? disabledStyles : interactiveStyles]), UNSAFE_className]),
+      className: cx([cn([positionRelativeStyles, primitiveStyles, spacingMapStyles[spacing], !isDisabled && !isSelected && unselectedStyles, !isDisabled && isSelected && [selectedStyles, [selectionStyle === 'border' && selectedBorderStyles, selectionStyle === 'notch' && selectedNotchStyles]], isDisabled ? disabledStyles : interactiveStyles]), UNSAFE_className]),
       children: (0, _react2.jsx)(_primitives.Inline, {
         as: "span",
         spread: "space-between",
@@ -232,18 +219,14 @@ var MenuItemPrimitive = function MenuItemPrimitive(_ref) {
       }, iconBefore), title && (0, _react2.jsx)(_primitives.Stack, {
         alignBlock: "center",
         grow: "fill",
-        xcss:
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        (0, _platformFeatureFlags.fg)('platform.design-system-team.menu-tokenised-typography-styles') ? contentStyles : [contentStyles, baseContentStyles]
+        xcss: contentStyles
       }, renderTitle('span', {
         children: title,
-        className: cn((0, _platformFeatureFlags.fg)('platform.design-system-team.menu-tokenised-typography-styles') ? titleStyles : undefined, shouldTitleWrap ? wordBreakStyles : truncateStyles),
+        className: cn(titleStyles, shouldTitleWrap ? wordBreakStyles : truncateStyles),
         'data-item-title': true
       }), description && (0, _react2.jsx)("span", {
         "data-item-description": true,
-        css: [descriptionStyles,
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        (0, _platformFeatureFlags.fg)('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedDescriptionStyles : baseDescriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
+        css: [descriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
       }, description)), iconAfter && (0, _react2.jsx)("span", {
         "data-item-elem-after": true,
         css: beforeAfterElementStyles,

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

@@ -11,32 +11,18 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _deprecationWarning = require("@atlaskit/ds-lib/deprecation-warning");
 var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
-var _typography = require("@atlaskit/theme/typography");
 var _excluded = ["children", "testId", "headingLevel", "id", "cssFn", "className"];
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-var itemHeadingContentHeight = _typography.headingSizes.h100.lineHeight;
-var itemHeadingFontSize = _typography.headingSizes.h100.size;
 var headingStyles = (0, _react2.css)({
   color: "var(--ds-text-subtle, ".concat(_colors.N300, ")"),
+  font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
   paddingBlock: "var(--ds-space-0, 0px)",
-  paddingInline: "var(--ds-space-200, 16px)",
-  textTransform: 'uppercase'
-});
-var baseHeadingStyles = (0, _react2.css)({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  fontSize: itemHeadingFontSize,
-  fontWeight: "var(--ds-font-weight-bold, 700)",
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  lineHeight: itemHeadingContentHeight / itemHeadingFontSize
-});
-var tokenizedHeadingStyles = (0, _react2.css)({
-  font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
+  paddingInline: "var(--ds-space-200, 16px)"
 });
 
 /**
@@ -64,8 +50,6 @@ var HeadingItem = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var UNSAFE_overrides = (0, _react2.css)(cssFn(undefined));
   return (0, _react2.jsx)("div", (0, _extends2.default)({
     css: [headingStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    (0, _platformFeatureFlags.fg)('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedHeadingStyles : baseHeadingStyles,
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
     UNSAFE_overrides],
     role: "heading",

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

@@ -12,7 +12,6 @@ var _react2 = require("@emotion/react");
 var _appProvider = require("@atlaskit/app-provider");
 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", "UNSAFE_shouldDisableRouterLink", "UNSAFE_isDraggable"];
 /**
@@ -76,7 +75,7 @@ function (props, ref) {
    * - it doesn't have an empty href (e.g. href="" or href={undefined})
    */
   var isRouterLink = !UNSAFE_shouldDisableRouterLink && RouterLink && !isExternal && !isNonHttpBased && !isEmptyHref;
-  var Component = isRouterLink && (0, _platformFeatureFlags.fg)('platform.wanjel.use-router-links-for-the-linkitem-component') ? RouterLink : 'a';
+  var Component = isRouterLink ? 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, {

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

@@ -8,7 +8,6 @@ import { useContext } from 'react';
 import { ClassNames, css, jsx } from '@emotion/react';
 import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
 import FocusRing from '@atlaskit/focus-ring';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Inline, Stack, xcss } from '@atlaskit/primitives';
 import { N20, N200, N30 } from '@atlaskit/theme/colors';
 import { SELECTION_STYLE_CONTEXT_DO_NOT_USE, SpacingContext } from './menu-context';
@@ -26,9 +25,6 @@ const contentStyles = xcss({
   overflow: 'hidden',
   textAlign: 'left'
 });
-const baseContentStyles = xcss({
-  lineHeight: '16px'
-});
 const truncateStyles = css({
   display: 'block',
   overflow: 'hidden',
@@ -42,13 +38,7 @@ const wordBreakStyles = css({
   wordBreak: 'break-word'
 });
 const descriptionStyles = css({
-  color: `var(--ds-text-subtlest, ${N200})`
-});
-const baseDescriptionStyles = css({
-  fontSize: '12px',
-  marginBlockStart: "var(--ds-space-050, 4px)"
-});
-const tokenizedDescriptionStyles = css({
+  color: `var(--ds-text-subtlest, ${N200})`,
   font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
 });
 const disabledDescriptionStyles = css({
@@ -76,9 +66,6 @@ const primitiveStyles = css({
     textDecoration: 'none'
   }
 });
-const primitiveBaseStyles = css({
-  fontSize: '14px'
-});
 const spacingMapStyles = {
   cozy: css({
     // 8 * 2 (16) + icon (24) === 40
@@ -204,7 +191,7 @@ const MenuItemPrimitive = ({
     return jsx(FocusRing, {
       isInset: true
     }, children({
-      className: cx([cn([positionRelativeStyles, primitiveStyles, fg('platform.design-system-team.menu-tokenised-typography-styles') ? undefined : primitiveBaseStyles, spacingMapStyles[spacing], !isDisabled && !isSelected && unselectedStyles, !isDisabled && isSelected && [selectedStyles, [selectionStyle === 'border' && selectedBorderStyles, selectionStyle === 'notch' && selectedNotchStyles]], isDisabled ? disabledStyles : interactiveStyles]), UNSAFE_className]),
+      className: cx([cn([positionRelativeStyles, primitiveStyles, spacingMapStyles[spacing], !isDisabled && !isSelected && unselectedStyles, !isDisabled && isSelected && [selectedStyles, [selectionStyle === 'border' && selectedBorderStyles, selectionStyle === 'notch' && selectedNotchStyles]], isDisabled ? disabledStyles : interactiveStyles]), UNSAFE_className]),
       children: jsx(Inline, {
         as: "span",
         spread: "space-between",
@@ -219,18 +206,14 @@ const MenuItemPrimitive = ({
       }, iconBefore), title && jsx(Stack, {
         alignBlock: "center",
         grow: "fill",
-        xcss:
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        fg('platform.design-system-team.menu-tokenised-typography-styles') ? contentStyles : [contentStyles, baseContentStyles]
+        xcss: contentStyles
       }, renderTitle('span', {
         children: title,
-        className: cn(fg('platform.design-system-team.menu-tokenised-typography-styles') ? titleStyles : undefined, shouldTitleWrap ? wordBreakStyles : truncateStyles),
+        className: cn(titleStyles, shouldTitleWrap ? wordBreakStyles : truncateStyles),
         'data-item-title': true
       }), description && jsx("span", {
         "data-item-description": true,
-        css: [descriptionStyles,
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        fg('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedDescriptionStyles : baseDescriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
+        css: [descriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
       }, description)), iconAfter && jsx("span", {
         "data-item-elem-after": true,
         css: beforeAfterElementStyles,

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

@@ -9,26 +9,12 @@ import { memo } from 'react';
 import { css, jsx } from '@emotion/react';
 import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
 import noop from '@atlaskit/ds-lib/noop';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { N300 } from '@atlaskit/theme/colors';
-import { headingSizes } from '@atlaskit/theme/typography';
-const itemHeadingContentHeight = headingSizes.h100.lineHeight;
-const itemHeadingFontSize = headingSizes.h100.size;
 const headingStyles = css({
   color: `var(--ds-text-subtle, ${N300})`,
+  font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
   paddingBlock: "var(--ds-space-0, 0px)",
-  paddingInline: "var(--ds-space-200, 16px)",
-  textTransform: 'uppercase'
-});
-const baseHeadingStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  fontSize: itemHeadingFontSize,
-  fontWeight: "var(--ds-font-weight-bold, 700)",
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  lineHeight: itemHeadingContentHeight / itemHeadingFontSize
-});
-const tokenizedHeadingStyles = css({
-  font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
+  paddingInline: "var(--ds-space-200, 16px)"
 });
 
 /**
@@ -59,8 +45,6 @@ const HeadingItem = /*#__PURE__*/memo(({
   const UNSAFE_overrides = css(cssFn(undefined));
   return jsx("div", _extends({
     css: [headingStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    fg('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedHeadingStyles : baseHeadingStyles,
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
     UNSAFE_overrides],
     role: "heading",

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

@@ -10,7 +10,6 @@ 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 { 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):)|(#))/;
@@ -71,7 +70,7 @@ const LinkItem = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(
    * - it doesn't have an empty href (e.g. href="" or href={undefined})
    */
   const isRouterLink = !UNSAFE_shouldDisableRouterLink && RouterLink && !isExternal && !isNonHttpBased && !isEmptyHref;
-  const Component = isRouterLink && fg('platform.wanjel.use-router-links-for-the-linkitem-component') ? RouterLink : 'a';
+  const Component = isRouterLink ? RouterLink : 'a';
   propDeprecationWarning("@atlaskit/menu" || '', 'cssFn', cssFn !== noop, '' // TODO: Create DAC post when primitives/xcss are available as alternatives
   );
   return jsx(MenuItemPrimitive, _extends({}, rest, {

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

@@ -8,7 +8,6 @@ import { useContext } from 'react';
 import { ClassNames, css, jsx } from '@emotion/react';
 import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
 import FocusRing from '@atlaskit/focus-ring';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Inline, Stack, xcss } from '@atlaskit/primitives';
 import { N20, N200, N30 } from '@atlaskit/theme/colors';
 import { SELECTION_STYLE_CONTEXT_DO_NOT_USE, SpacingContext } from './menu-context';
@@ -29,9 +28,6 @@ var contentStyles = xcss({
   overflow: 'hidden',
   textAlign: 'left'
 });
-var baseContentStyles = xcss({
-  lineHeight: '16px'
-});
 var truncateStyles = css({
   display: 'block',
   overflow: 'hidden',
@@ -45,13 +41,7 @@ var wordBreakStyles = css({
   wordBreak: 'break-word'
 });
 var descriptionStyles = css({
-  color: "var(--ds-text-subtlest, ".concat(N200, ")")
-});
-var baseDescriptionStyles = css({
-  fontSize: '12px',
-  marginBlockStart: "var(--ds-space-050, 4px)"
-});
-var tokenizedDescriptionStyles = css({
+  color: "var(--ds-text-subtlest, ".concat(N200, ")"),
   font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
 });
 var disabledDescriptionStyles = css({
@@ -79,9 +69,6 @@ var primitiveStyles = css({
     textDecoration: 'none'
   }
 });
-var primitiveBaseStyles = css({
-  fontSize: '14px'
-});
 var spacingMapStyles = {
   cozy: css({
     // 8 * 2 (16) + icon (24) === 40
@@ -209,7 +196,7 @@ var MenuItemPrimitive = function MenuItemPrimitive(_ref) {
     return jsx(FocusRing, {
       isInset: true
     }, children({
-      className: cx([cn([positionRelativeStyles, primitiveStyles, fg('platform.design-system-team.menu-tokenised-typography-styles') ? undefined : primitiveBaseStyles, spacingMapStyles[spacing], !isDisabled && !isSelected && unselectedStyles, !isDisabled && isSelected && [selectedStyles, [selectionStyle === 'border' && selectedBorderStyles, selectionStyle === 'notch' && selectedNotchStyles]], isDisabled ? disabledStyles : interactiveStyles]), UNSAFE_className]),
+      className: cx([cn([positionRelativeStyles, primitiveStyles, spacingMapStyles[spacing], !isDisabled && !isSelected && unselectedStyles, !isDisabled && isSelected && [selectedStyles, [selectionStyle === 'border' && selectedBorderStyles, selectionStyle === 'notch' && selectedNotchStyles]], isDisabled ? disabledStyles : interactiveStyles]), UNSAFE_className]),
       children: jsx(Inline, {
         as: "span",
         spread: "space-between",
@@ -224,18 +211,14 @@ var MenuItemPrimitive = function MenuItemPrimitive(_ref) {
       }, iconBefore), title && jsx(Stack, {
         alignBlock: "center",
         grow: "fill",
-        xcss:
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        fg('platform.design-system-team.menu-tokenised-typography-styles') ? contentStyles : [contentStyles, baseContentStyles]
+        xcss: contentStyles
       }, renderTitle('span', {
         children: title,
-        className: cn(fg('platform.design-system-team.menu-tokenised-typography-styles') ? titleStyles : undefined, shouldTitleWrap ? wordBreakStyles : truncateStyles),
+        className: cn(titleStyles, shouldTitleWrap ? wordBreakStyles : truncateStyles),
         'data-item-title': true
       }), description && jsx("span", {
         "data-item-description": true,
-        css: [descriptionStyles,
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        fg('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedDescriptionStyles : baseDescriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
+        css: [descriptionStyles, isDisabled && disabledDescriptionStyles, shouldDescriptionWrap ? wordBreakStyles : truncateStyles]
       }, description)), iconAfter && jsx("span", {
         "data-item-elem-after": true,
         css: beforeAfterElementStyles,

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

@@ -11,26 +11,12 @@ import { memo } from 'react';
 import { css, jsx } from '@emotion/react';
 import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
 import noop from '@atlaskit/ds-lib/noop';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { N300 } from '@atlaskit/theme/colors';
-import { headingSizes } from '@atlaskit/theme/typography';
-var itemHeadingContentHeight = headingSizes.h100.lineHeight;
-var itemHeadingFontSize = headingSizes.h100.size;
 var headingStyles = css({
   color: "var(--ds-text-subtle, ".concat(N300, ")"),
+  font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
   paddingBlock: "var(--ds-space-0, 0px)",
-  paddingInline: "var(--ds-space-200, 16px)",
-  textTransform: 'uppercase'
-});
-var baseHeadingStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  fontSize: itemHeadingFontSize,
-  fontWeight: "var(--ds-font-weight-bold, 700)",
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  lineHeight: itemHeadingContentHeight / itemHeadingFontSize
-});
-var tokenizedHeadingStyles = css({
-  font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
+  paddingInline: "var(--ds-space-200, 16px)"
 });
 
 /**
@@ -58,8 +44,6 @@ var HeadingItem = /*#__PURE__*/memo(function (_ref) {
   var UNSAFE_overrides = css(cssFn(undefined));
   return jsx("div", _extends({
     css: [headingStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    fg('platform.design-system-team.menu-tokenised-typography-styles') ? tokenizedHeadingStyles : baseHeadingStyles,
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
     UNSAFE_overrides],
     role: "heading",

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

@@ -12,7 +12,6 @@ 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 { 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):)|(#))/;
@@ -70,7 +69,7 @@ function (props, ref) {
    * - it doesn't have an empty href (e.g. href="" or href={undefined})
    */
   var isRouterLink = !UNSAFE_shouldDisableRouterLink && RouterLink && !isExternal && !isNonHttpBased && !isEmptyHref;
-  var Component = isRouterLink && fg('platform.wanjel.use-router-links-for-the-linkitem-component') ? RouterLink : 'a';
+  var Component = isRouterLink ? RouterLink : 'a';
   propDeprecationWarning("@atlaskit/menu" || '', 'cssFn', cssFn !== noop, '' // TODO: Create DAC post when primitives/xcss are available as alternatives
   );
   return jsx(MenuItemPrimitive, _extends({}, rest, {

package/dist/types/types.d.ts

@@ -165,7 +165,7 @@ export interface MenuItemProps {
     /**
      * Event that's triggered when the element is clicked.
      */
-    onClick?: (event: React.MouseEvent | React.KeyboardEvent) => void;
+    onClick?: (e: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>) => void;
     /**
      * Event that's triggered when the element has been pressed.
      */

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

@@ -165,7 +165,7 @@ export interface MenuItemProps {
     /**
      * Event that's triggered when the element is clicked.
      */
-    onClick?: (event: React.MouseEvent | React.KeyboardEvent) => void;
+    onClick?: (e: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>) => void;
     /**
      * Event that's triggered when the element has been pressed.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/menu",
-	"version": "2.12.1",
+	"version": "2.12.3",
 	"description": "A list of options to help users navigate, or perform actions.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -17,10 +17,6 @@
 	"atlassian": {
 		"team": "Design System Team",
 		"runReact18": true,
-		"productPushConsumption": [
-			"jira"
-		],
-		"releaseModel": "continuous",
 		"website": {
 			"name": "Menu",
 			"subPages": [
@@ -44,12 +40,12 @@
 	},
 	"dependencies": {
 		"@atlaskit/app-provider": "^1.4.0",
-		"@atlaskit/ds-lib": "^2.4.0",
+		"@atlaskit/ds-lib": "^2.6.0",
 		"@atlaskit/focus-ring": "^1.6.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/primitives": "^12.0.0",
+		"@atlaskit/primitives": "^12.2.0",
 		"@atlaskit/theme": "^13.0.0",
-		"@atlaskit/tokens": "^1.58.0",
+		"@atlaskit/tokens": "^1.61.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
@@ -123,12 +119,6 @@
 	"platform-feature-flags": {
 		"platform.design-system-team.section-1px-seperator-borders": {
 			"type": "boolean"
-		},
-		"platform.design-system-team.menu-tokenised-typography-styles": {
-			"type": "boolean"
-		},
-		"platform.wanjel.use-router-links-for-the-linkitem-component": {
-			"type": "boolean"
 		}
 	},
 	"homepage": "https://atlassian.design/components/menu/"