@atlaskit/dropdown-menu 16.0.4 → 16.0.6

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/dropdown-menu
 
+## 16.0.6
+
+### Patch Changes
+
+- [#171641](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/171641)
+  [`1d4741f638def`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1d4741f638def) -
+  Removed UFO metric interactionName FG from platform
+- Updated dependencies
+
+## 16.0.5
+
+### Patch Changes
+
+- [#171540](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/171540)
+  [`ff686344ec2f4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ff686344ec2f4) -
+  Removed FG that fixes dropdown menu keyboard nav with disabled options
+
 ## 16.0.4
 
 ### Patch Changes

package/dist/cjs/checkbox/dropdown-item-checkbox.js

@@ -13,7 +13,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
 var _menu = require("@atlaskit/menu");
 var _buttonItem = _interopRequireDefault(require("@atlaskit/menu/button-item"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _checkboxIcon = _interopRequireDefault(require("../internal/components/checkbox-icon"));
 var _useCheckboxState3 = _interopRequireDefault(require("../internal/hooks/use-checkbox-state"));
 var _useRegisterItemWithFocusManager = _interopRequireDefault(require("../internal/hooks/use-register-item-with-focus-manager"));
@@ -79,9 +78,9 @@ var DropdownItemCheckbox = function DropdownItemCheckbox(_ref) {
     role: "menuitemcheckbox",
     shouldDescriptionWrap: shouldDescriptionWrap,
     shouldTitleWrap: shouldTitleWrap,
-    testId: testId
-  }, (0, _platformFeatureFlags.fg)('platform_button_item-add-ufo-metrics') && {
+    testId: testId,
     interactionName: interactionName
+    // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   }, rest), children));
 };
 var _default = exports.default = DropdownItemCheckbox;

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

@@ -13,7 +13,6 @@ var _mergeRefs = _interopRequireDefault(require("@atlaskit/ds-lib/merge-refs"));
 var _buttonItem = _interopRequireDefault(require("@atlaskit/menu/button-item"));
 var _customItem = _interopRequireDefault(require("@atlaskit/menu/custom-item"));
 var _linkItem = _interopRequireDefault(require("@atlaskit/menu/link-item"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _useRegisterItemWithFocusManager = _interopRequireDefault(require("./internal/hooks/use-register-item-with-focus-manager"));
 var _excluded = ["children", "component", "description", "elemAfter", "elemBefore", "href", "isDisabled", "isSelected", "onClick", "rel", "shouldDescriptionWrap", "shouldTitleWrap", "target", "testId", "UNSAFE_shouldDisableRouterLink", "returnFocusRef", "interactionName", "role"];
 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); }
@@ -78,9 +77,9 @@ var DropdownMenuItem = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
       // @ts-expect-error
       ,
       target: target,
-      rel: rel
-    }, (0, _platformFeatureFlags.fg)('platform_button_item-add-ufo-metrics') && {
+      rel: rel,
       interactionName: interactionName
+      // DSP-13312 TODO: remove spread props in future major release
     }, rest), children);
   } else if (href) {
     return /*#__PURE__*/_react.default.createElement(_linkItem.default, (0, _extends2.default)({
@@ -98,9 +97,9 @@ var DropdownMenuItem = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
       shouldTitleWrap: shouldTitleWrap,
       target: target,
       testId: testId,
-      UNSAFE_shouldDisableRouterLink: UNSAFE_shouldDisableRouterLink
-    }, (0, _platformFeatureFlags.fg)('platform_button_item-add-ufo-metrics') && {
+      UNSAFE_shouldDisableRouterLink: UNSAFE_shouldDisableRouterLink,
       interactionName: interactionName
+      // DSP-13312 TODO: remove spread props in future major release
     }, rest), children);
   } else {
     return /*#__PURE__*/_react.default.createElement(_buttonItem.default, (0, _extends2.default)({
@@ -120,9 +119,9 @@ var DropdownMenuItem = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
       // @ts-expect-error
       ,
       target: target,
-      rel: rel
-    }, (0, _platformFeatureFlags.fg)('platform_button_item-add-ufo-metrics') && {
+      rel: rel,
       interactionName: interactionName
+      // DSP-13312 TODO: remove spread props in future major release
     }, rest), children);
   }
 });

package/dist/cjs/dropdown-menu.js

@@ -310,8 +310,7 @@ var DropdownMenu = function DropdownMenu(_ref) {
         },
         onClick: handleTriggerClicked,
         testId: testId && "".concat(testId, "--trigger"),
-        "aria-label": label
-      }, (0, _platformFeatureFlags.fg)('platform_button_item-add-ufo-metrics') && {
+        "aria-label": label,
         interactionName: interactionName
       }), _trigger);
     },

package/dist/cjs/internal/utils/handle-focus.js

@@ -18,26 +18,16 @@ var actionMap = (0, _defineProperty2.default)((0, _defineProperty2.default)((0,
  * return undefined.
  */
 var getNextFocusableElement = function getNextFocusableElement(refs, currentFocusedIdx) {
-  if ((0, _platformFeatureFlags.fg)('dropdown-menu-disabled-navigation-fix')) {
-    for (var i = 0; i < refs.length - 1; i++) {
-      if (currentFocusedIdx + 1 === refs.length) {
-        currentFocusedIdx = 0;
-      } else {
-        currentFocusedIdx++;
-      }
-      var element = refs[currentFocusedIdx].current;
-      var isValid = !!element && !element.hasAttribute('disabled');
-      if (isValid) {
-        return element;
-      }
+  for (var i = 0; i < refs.length - 1; i++) {
+    if (currentFocusedIdx + 1 === refs.length) {
+      currentFocusedIdx = 0;
+    } else {
+      currentFocusedIdx++;
     }
-  } else {
-    while (currentFocusedIdx + 1 < refs.length) {
-      var _element = refs[++currentFocusedIdx].current;
-      var _isValid = !!_element && !_element.hasAttribute('disabled');
-      if (_isValid) {
-        return _element;
-      }
+    var element = refs[currentFocusedIdx].current;
+    var isValid = !!element && !element.hasAttribute('disabled');
+    if (isValid) {
+      return element;
     }
   }
 };
@@ -49,26 +39,16 @@ var getNextFocusableElement = function getNextFocusableElement(refs, currentFocu
  * return undefined.
  */
 var getPrevFocusableElement = function getPrevFocusableElement(refs, currentFocusedIdx) {
-  if ((0, _platformFeatureFlags.fg)('dropdown-menu-disabled-navigation-fix')) {
-    for (var i = 0; i < refs.length - 1; i++) {
-      if (currentFocusedIdx === 0) {
-        currentFocusedIdx = refs.length - 1;
-      } else {
-        currentFocusedIdx--;
-      }
-      var element = refs[currentFocusedIdx].current;
-      var isValid = !!element && !element.hasAttribute('disabled');
-      if (isValid) {
-        return element;
-      }
+  for (var i = 0; i < refs.length - 1; i++) {
+    if (currentFocusedIdx === 0) {
+      currentFocusedIdx = refs.length - 1;
+    } else {
+      currentFocusedIdx--;
     }
-  } else {
-    while (currentFocusedIdx > 0) {
-      var _element2 = refs[--currentFocusedIdx].current;
-      var _isValid2 = !!_element2 && !_element2.hasAttribute('disabled');
-      if (_isValid2) {
-        return _element2;
-      }
+    var element = refs[currentFocusedIdx].current;
+    var isValid = !!element && !element.hasAttribute('disabled');
+    if (isValid) {
+      return element;
     }
   }
 };
@@ -110,50 +90,26 @@ function handleFocus(refs, isLayerDisabled, onClose) {
       case 'next':
         // Always cancelling the event to prevent scrolling
         e.preventDefault();
-        if ((0, _platformFeatureFlags.fg)('dropdown-menu-disabled-navigation-fix')) {
-          var _nextFocusableElement = getNextFocusableElement(currentRefs, currentFocusedIdx);
-          _nextFocusableElement === null || _nextFocusableElement === void 0 || _nextFocusableElement.focus();
-          break;
-        }
-
-        // Remove on FG cleanup dropdown-menu-disabled-navigation-fix
-        if (currentFocusedIdx < currentRefs.length - 1) {
-          var _nextFocusableElement2 = getNextFocusableElement(currentRefs, currentFocusedIdx);
-          _nextFocusableElement2 === null || _nextFocusableElement2 === void 0 || _nextFocusableElement2.focus();
-        } else {
-          var firstFocusableElement = getNextFocusableElement(currentRefs, -1);
-          firstFocusableElement === null || firstFocusableElement === void 0 || firstFocusableElement.focus();
-        }
+        var nextFocusableElement = getNextFocusableElement(currentRefs, currentFocusedIdx);
+        nextFocusableElement === null || nextFocusableElement === void 0 || nextFocusableElement.focus();
         break;
       case 'prev':
         // Always cancelling the event to prevent scrolling
         e.preventDefault();
-        if ((0, _platformFeatureFlags.fg)('dropdown-menu-disabled-navigation-fix')) {
-          var _prevFocusableElement = getPrevFocusableElement(currentRefs, currentFocusedIdx);
-          _prevFocusableElement === null || _prevFocusableElement === void 0 || _prevFocusableElement.focus();
-          break;
-        }
-
-        // Remove on FG cleanup dropdown-menu-disabled-navigation-fix
-        if (currentFocusedIdx > 0) {
-          var _prevFocusableElement2 = getPrevFocusableElement(currentRefs, currentFocusedIdx);
-          _prevFocusableElement2 === null || _prevFocusableElement2 === void 0 || _prevFocusableElement2.focus();
-        } else {
-          var lastFocusableElement = getPrevFocusableElement(currentRefs, currentRefs.length);
-          lastFocusableElement === null || lastFocusableElement === void 0 || lastFocusableElement.focus();
-        }
+        var prevFocusableElement = getPrevFocusableElement(currentRefs, currentFocusedIdx);
+        prevFocusableElement === null || prevFocusableElement === void 0 || prevFocusableElement.focus();
         break;
       case 'first':
         e.preventDefault();
         // Search for first non-disabled element if first element is disabled
-        var nextFocusableElement = getNextFocusableElement(currentRefs, -1);
-        nextFocusableElement === null || nextFocusableElement === void 0 || nextFocusableElement.focus();
+        var firstFocusableElement = getNextFocusableElement(currentRefs, -1);
+        firstFocusableElement === null || firstFocusableElement === void 0 || firstFocusableElement.focus();
         break;
       case 'last':
         e.preventDefault();
         // Search for last non-disabled element if last element is disabled
-        var prevFocusableElement = getPrevFocusableElement(currentRefs, currentRefs.length);
-        prevFocusableElement === null || prevFocusableElement === void 0 || prevFocusableElement.focus();
+        var lastFocusableElement = getPrevFocusableElement(currentRefs, currentRefs.length);
+        lastFocusableElement === null || lastFocusableElement === void 0 || lastFocusableElement.focus();
         break;
       default:
         return;

package/dist/cjs/radio/dropdown-item-radio.js

@@ -13,7 +13,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
 var _menu = require("@atlaskit/menu");
 var _buttonItem = _interopRequireDefault(require("@atlaskit/menu/button-item"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _radioIcon = _interopRequireDefault(require("../internal/components/radio-icon"));
 var _useRadioState3 = _interopRequireDefault(require("../internal/hooks/use-radio-state"));
 var _useRegisterItemWithFocusManager = _interopRequireDefault(require("../internal/hooks/use-register-item-with-focus-manager"));
@@ -86,9 +85,9 @@ var DropdownItemRadio = function DropdownItemRadio(_ref) {
     // it's not in the component's prop types.
     // @ts-expect-error
     ,
-    title: title
-  }, (0, _platformFeatureFlags.fg)('platform_button_item-add-ufo-metrics') && {
+    title: title,
     interactionName: interactionName
+    // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   }, rest), children));
 };
 var _default = exports.default = DropdownItemRadio;

package/dist/es2019/checkbox/dropdown-item-checkbox.js

@@ -3,7 +3,6 @@ import React, { useCallback } from 'react';
 import noop from '@atlaskit/ds-lib/noop';
 import { SELECTION_STYLE_CONTEXT_DO_NOT_USE } from '@atlaskit/menu';
 import ButtonItem from '@atlaskit/menu/button-item';
-import { fg } from '@atlaskit/platform-feature-flags';
 import CheckboxIcon from '../internal/components/checkbox-icon';
 import useCheckboxState from '../internal/hooks/use-checkbox-state';
 import useRegisterItemWithFocusManager from '../internal/hooks/use-register-item-with-focus-manager';
@@ -61,9 +60,9 @@ const DropdownItemCheckbox = ({
     role: "menuitemcheckbox",
     shouldDescriptionWrap: shouldDescriptionWrap,
     shouldTitleWrap: shouldTitleWrap,
-    testId: testId
-  }, fg('platform_button_item-add-ufo-metrics') && {
-    interactionName
+    testId: testId,
+    interactionName: interactionName
+    // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   }, rest), children));
 };
 export default DropdownItemCheckbox;

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

@@ -4,7 +4,6 @@ import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import ButtonItem from '@atlaskit/menu/button-item';
 import CustomItem from '@atlaskit/menu/custom-item';
 import LinkItem from '@atlaskit/menu/link-item';
-import { fg } from '@atlaskit/platform-feature-flags';
 import useRegisterItemWithFocusManager from './internal/hooks/use-register-item-with-focus-manager';
 /**
  * __Dropdown menu item__
@@ -66,9 +65,9 @@ const DropdownMenuItem = /*#__PURE__*/forwardRef(({
       // @ts-expect-error
       ,
       target: target,
-      rel: rel
-    }, fg('platform_button_item-add-ufo-metrics') && {
-      interactionName
+      rel: rel,
+      interactionName: interactionName
+      // DSP-13312 TODO: remove spread props in future major release
     }, rest), children);
   } else if (href) {
     return /*#__PURE__*/React.createElement(LinkItem, _extends({
@@ -86,9 +85,9 @@ const DropdownMenuItem = /*#__PURE__*/forwardRef(({
       shouldTitleWrap: shouldTitleWrap,
       target: target,
       testId: testId,
-      UNSAFE_shouldDisableRouterLink: UNSAFE_shouldDisableRouterLink
-    }, fg('platform_button_item-add-ufo-metrics') && {
-      interactionName
+      UNSAFE_shouldDisableRouterLink: UNSAFE_shouldDisableRouterLink,
+      interactionName: interactionName
+      // DSP-13312 TODO: remove spread props in future major release
     }, rest), children);
   } else {
     return /*#__PURE__*/React.createElement(ButtonItem, _extends({
@@ -108,9 +107,9 @@ const DropdownMenuItem = /*#__PURE__*/forwardRef(({
       // @ts-expect-error
       ,
       target: target,
-      rel: rel
-    }, fg('platform_button_item-add-ufo-metrics') && {
-      interactionName
+      rel: rel,
+      interactionName: interactionName
+      // DSP-13312 TODO: remove spread props in future major release
     }, rest), children);
   }
 });

package/dist/es2019/dropdown-menu.js

@@ -282,9 +282,8 @@ const DropdownMenu = ({
         })),
         onClick: handleTriggerClicked,
         testId: testId && `${testId}--trigger`,
-        "aria-label": label
-      }, fg('platform_button_item-add-ufo-metrics') && {
-        interactionName
+        "aria-label": label,
+        interactionName: interactionName
       }), trigger);
     },
     content: ({

package/dist/es2019/internal/utils/handle-focus.js

@@ -15,30 +15,18 @@ const actionMap = {
  * return undefined.
  */
 const getNextFocusableElement = (refs, currentFocusedIdx) => {
-  if (fg('dropdown-menu-disabled-navigation-fix')) {
-    for (let i = 0; i < refs.length - 1; i++) {
-      if (currentFocusedIdx + 1 === refs.length) {
-        currentFocusedIdx = 0;
-      } else {
-        currentFocusedIdx++;
-      }
-      const {
-        current: element
-      } = refs[currentFocusedIdx];
-      const isValid = !!element && !element.hasAttribute('disabled');
-      if (isValid) {
-        return element;
-      }
+  for (let i = 0; i < refs.length - 1; i++) {
+    if (currentFocusedIdx + 1 === refs.length) {
+      currentFocusedIdx = 0;
+    } else {
+      currentFocusedIdx++;
     }
-  } else {
-    while (currentFocusedIdx + 1 < refs.length) {
-      const {
-        current: element
-      } = refs[++currentFocusedIdx];
-      const isValid = !!element && !element.hasAttribute('disabled');
-      if (isValid) {
-        return element;
-      }
+    const {
+      current: element
+    } = refs[currentFocusedIdx];
+    const isValid = !!element && !element.hasAttribute('disabled');
+    if (isValid) {
+      return element;
     }
   }
 };
@@ -50,30 +38,18 @@ const getNextFocusableElement = (refs, currentFocusedIdx) => {
  * return undefined.
  */
 const getPrevFocusableElement = (refs, currentFocusedIdx) => {
-  if (fg('dropdown-menu-disabled-navigation-fix')) {
-    for (let i = 0; i < refs.length - 1; i++) {
-      if (currentFocusedIdx === 0) {
-        currentFocusedIdx = refs.length - 1;
-      } else {
-        currentFocusedIdx--;
-      }
-      const {
-        current: element
-      } = refs[currentFocusedIdx];
-      const isValid = !!element && !element.hasAttribute('disabled');
-      if (isValid) {
-        return element;
-      }
+  for (let i = 0; i < refs.length - 1; i++) {
+    if (currentFocusedIdx === 0) {
+      currentFocusedIdx = refs.length - 1;
+    } else {
+      currentFocusedIdx--;
     }
-  } else {
-    while (currentFocusedIdx > 0) {
-      const {
-        current: element
-      } = refs[--currentFocusedIdx];
-      const isValid = !!element && !element.hasAttribute('disabled');
-      if (isValid) {
-        return element;
-      }
+    const {
+      current: element
+    } = refs[currentFocusedIdx];
+    const isValid = !!element && !element.hasAttribute('disabled');
+    if (isValid) {
+      return element;
     }
   }
 };
@@ -116,50 +92,26 @@ export default function handleFocus(refs, isLayerDisabled, onClose) {
       case 'next':
         // Always cancelling the event to prevent scrolling
         e.preventDefault();
-        if (fg('dropdown-menu-disabled-navigation-fix')) {
-          const nextFocusableElement = getNextFocusableElement(currentRefs, currentFocusedIdx);
-          nextFocusableElement === null || nextFocusableElement === void 0 ? void 0 : nextFocusableElement.focus();
-          break;
-        }
-
-        // Remove on FG cleanup dropdown-menu-disabled-navigation-fix
-        if (currentFocusedIdx < currentRefs.length - 1) {
-          const nextFocusableElement = getNextFocusableElement(currentRefs, currentFocusedIdx);
-          nextFocusableElement === null || nextFocusableElement === void 0 ? void 0 : nextFocusableElement.focus();
-        } else {
-          const firstFocusableElement = getNextFocusableElement(currentRefs, -1);
-          firstFocusableElement === null || firstFocusableElement === void 0 ? void 0 : firstFocusableElement.focus();
-        }
+        const nextFocusableElement = getNextFocusableElement(currentRefs, currentFocusedIdx);
+        nextFocusableElement === null || nextFocusableElement === void 0 ? void 0 : nextFocusableElement.focus();
         break;
       case 'prev':
         // Always cancelling the event to prevent scrolling
         e.preventDefault();
-        if (fg('dropdown-menu-disabled-navigation-fix')) {
-          const prevFocusableElement = getPrevFocusableElement(currentRefs, currentFocusedIdx);
-          prevFocusableElement === null || prevFocusableElement === void 0 ? void 0 : prevFocusableElement.focus();
-          break;
-        }
-
-        // Remove on FG cleanup dropdown-menu-disabled-navigation-fix
-        if (currentFocusedIdx > 0) {
-          const prevFocusableElement = getPrevFocusableElement(currentRefs, currentFocusedIdx);
-          prevFocusableElement === null || prevFocusableElement === void 0 ? void 0 : prevFocusableElement.focus();
-        } else {
-          const lastFocusableElement = getPrevFocusableElement(currentRefs, currentRefs.length);
-          lastFocusableElement === null || lastFocusableElement === void 0 ? void 0 : lastFocusableElement.focus();
-        }
+        const prevFocusableElement = getPrevFocusableElement(currentRefs, currentFocusedIdx);
+        prevFocusableElement === null || prevFocusableElement === void 0 ? void 0 : prevFocusableElement.focus();
         break;
       case 'first':
         e.preventDefault();
         // Search for first non-disabled element if first element is disabled
-        const nextFocusableElement = getNextFocusableElement(currentRefs, -1);
-        nextFocusableElement === null || nextFocusableElement === void 0 ? void 0 : nextFocusableElement.focus();
+        const firstFocusableElement = getNextFocusableElement(currentRefs, -1);
+        firstFocusableElement === null || firstFocusableElement === void 0 ? void 0 : firstFocusableElement.focus();
         break;
       case 'last':
         e.preventDefault();
         // Search for last non-disabled element if last element is disabled
-        const prevFocusableElement = getPrevFocusableElement(currentRefs, currentRefs.length);
-        prevFocusableElement === null || prevFocusableElement === void 0 ? void 0 : prevFocusableElement.focus();
+        const lastFocusableElement = getPrevFocusableElement(currentRefs, currentRefs.length);
+        lastFocusableElement === null || lastFocusableElement === void 0 ? void 0 : lastFocusableElement.focus();
         break;
       default:
         return;

package/dist/es2019/radio/dropdown-item-radio.js

@@ -3,7 +3,6 @@ import React, { useCallback } from 'react';
 import noop from '@atlaskit/ds-lib/noop';
 import { SELECTION_STYLE_CONTEXT_DO_NOT_USE } from '@atlaskit/menu';
 import ButtonItem from '@atlaskit/menu/button-item';
-import { fg } from '@atlaskit/platform-feature-flags';
 import RadioIcon from '../internal/components/radio-icon';
 import useRadioState from '../internal/hooks/use-radio-state';
 import useRegisterItemWithFocusManager from '../internal/hooks/use-register-item-with-focus-manager';
@@ -68,9 +67,9 @@ const DropdownItemRadio = ({
     // it's not in the component's prop types.
     // @ts-expect-error
     ,
-    title: title
-  }, fg('platform_button_item-add-ufo-metrics') && {
-    interactionName
+    title: title,
+    interactionName: interactionName
+    // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   }, rest), children));
 };
 export default DropdownItemRadio;

package/dist/esm/checkbox/dropdown-item-checkbox.js

@@ -6,7 +6,6 @@ import React, { useCallback } from 'react';
 import noop from '@atlaskit/ds-lib/noop';
 import { SELECTION_STYLE_CONTEXT_DO_NOT_USE } from '@atlaskit/menu';
 import ButtonItem from '@atlaskit/menu/button-item';
-import { fg } from '@atlaskit/platform-feature-flags';
 import CheckboxIcon from '../internal/components/checkbox-icon';
 import useCheckboxState from '../internal/hooks/use-checkbox-state';
 import useRegisterItemWithFocusManager from '../internal/hooks/use-register-item-with-focus-manager';
@@ -70,9 +69,9 @@ var DropdownItemCheckbox = function DropdownItemCheckbox(_ref) {
     role: "menuitemcheckbox",
     shouldDescriptionWrap: shouldDescriptionWrap,
     shouldTitleWrap: shouldTitleWrap,
-    testId: testId
-  }, fg('platform_button_item-add-ufo-metrics') && {
+    testId: testId,
     interactionName: interactionName
+    // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   }, rest), children));
 };
 export default DropdownItemCheckbox;

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

@@ -6,7 +6,6 @@ import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import ButtonItem from '@atlaskit/menu/button-item';
 import CustomItem from '@atlaskit/menu/custom-item';
 import LinkItem from '@atlaskit/menu/link-item';
-import { fg } from '@atlaskit/platform-feature-flags';
 import useRegisterItemWithFocusManager from './internal/hooks/use-register-item-with-focus-manager';
 /**
  * __Dropdown menu item__
@@ -69,9 +68,9 @@ var DropdownMenuItem = /*#__PURE__*/forwardRef(function (_ref, ref) {
       // @ts-expect-error
       ,
       target: target,
-      rel: rel
-    }, fg('platform_button_item-add-ufo-metrics') && {
+      rel: rel,
       interactionName: interactionName
+      // DSP-13312 TODO: remove spread props in future major release
     }, rest), children);
   } else if (href) {
     return /*#__PURE__*/React.createElement(LinkItem, _extends({
@@ -89,9 +88,9 @@ var DropdownMenuItem = /*#__PURE__*/forwardRef(function (_ref, ref) {
       shouldTitleWrap: shouldTitleWrap,
       target: target,
       testId: testId,
-      UNSAFE_shouldDisableRouterLink: UNSAFE_shouldDisableRouterLink
-    }, fg('platform_button_item-add-ufo-metrics') && {
+      UNSAFE_shouldDisableRouterLink: UNSAFE_shouldDisableRouterLink,
       interactionName: interactionName
+      // DSP-13312 TODO: remove spread props in future major release
     }, rest), children);
   } else {
     return /*#__PURE__*/React.createElement(ButtonItem, _extends({
@@ -111,9 +110,9 @@ var DropdownMenuItem = /*#__PURE__*/forwardRef(function (_ref, ref) {
       // @ts-expect-error
       ,
       target: target,
-      rel: rel
-    }, fg('platform_button_item-add-ufo-metrics') && {
+      rel: rel,
       interactionName: interactionName
+      // DSP-13312 TODO: remove spread props in future major release
     }, rest), children);
   }
 });

package/dist/esm/dropdown-menu.js

@@ -302,8 +302,7 @@ var DropdownMenu = function DropdownMenu(_ref) {
         },
         onClick: handleTriggerClicked,
         testId: testId && "".concat(testId, "--trigger"),
-        "aria-label": label
-      }, fg('platform_button_item-add-ufo-metrics') && {
+        "aria-label": label,
         interactionName: interactionName
       }), _trigger);
     },

package/dist/esm/internal/utils/handle-focus.js

@@ -11,26 +11,16 @@ var actionMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(
  * return undefined.
  */
 var getNextFocusableElement = function getNextFocusableElement(refs, currentFocusedIdx) {
-  if (fg('dropdown-menu-disabled-navigation-fix')) {
-    for (var i = 0; i < refs.length - 1; i++) {
-      if (currentFocusedIdx + 1 === refs.length) {
-        currentFocusedIdx = 0;
-      } else {
-        currentFocusedIdx++;
-      }
-      var element = refs[currentFocusedIdx].current;
-      var isValid = !!element && !element.hasAttribute('disabled');
-      if (isValid) {
-        return element;
-      }
+  for (var i = 0; i < refs.length - 1; i++) {
+    if (currentFocusedIdx + 1 === refs.length) {
+      currentFocusedIdx = 0;
+    } else {
+      currentFocusedIdx++;
     }
-  } else {
-    while (currentFocusedIdx + 1 < refs.length) {
-      var _element = refs[++currentFocusedIdx].current;
-      var _isValid = !!_element && !_element.hasAttribute('disabled');
-      if (_isValid) {
-        return _element;
-      }
+    var element = refs[currentFocusedIdx].current;
+    var isValid = !!element && !element.hasAttribute('disabled');
+    if (isValid) {
+      return element;
     }
   }
 };
@@ -42,26 +32,16 @@ var getNextFocusableElement = function getNextFocusableElement(refs, currentFocu
  * return undefined.
  */
 var getPrevFocusableElement = function getPrevFocusableElement(refs, currentFocusedIdx) {
-  if (fg('dropdown-menu-disabled-navigation-fix')) {
-    for (var i = 0; i < refs.length - 1; i++) {
-      if (currentFocusedIdx === 0) {
-        currentFocusedIdx = refs.length - 1;
-      } else {
-        currentFocusedIdx--;
-      }
-      var element = refs[currentFocusedIdx].current;
-      var isValid = !!element && !element.hasAttribute('disabled');
-      if (isValid) {
-        return element;
-      }
+  for (var i = 0; i < refs.length - 1; i++) {
+    if (currentFocusedIdx === 0) {
+      currentFocusedIdx = refs.length - 1;
+    } else {
+      currentFocusedIdx--;
     }
-  } else {
-    while (currentFocusedIdx > 0) {
-      var _element2 = refs[--currentFocusedIdx].current;
-      var _isValid2 = !!_element2 && !_element2.hasAttribute('disabled');
-      if (_isValid2) {
-        return _element2;
-      }
+    var element = refs[currentFocusedIdx].current;
+    var isValid = !!element && !element.hasAttribute('disabled');
+    if (isValid) {
+      return element;
     }
   }
 };
@@ -103,50 +83,26 @@ export default function handleFocus(refs, isLayerDisabled, onClose) {
       case 'next':
         // Always cancelling the event to prevent scrolling
         e.preventDefault();
-        if (fg('dropdown-menu-disabled-navigation-fix')) {
-          var _nextFocusableElement = getNextFocusableElement(currentRefs, currentFocusedIdx);
-          _nextFocusableElement === null || _nextFocusableElement === void 0 || _nextFocusableElement.focus();
-          break;
-        }
-
-        // Remove on FG cleanup dropdown-menu-disabled-navigation-fix
-        if (currentFocusedIdx < currentRefs.length - 1) {
-          var _nextFocusableElement2 = getNextFocusableElement(currentRefs, currentFocusedIdx);
-          _nextFocusableElement2 === null || _nextFocusableElement2 === void 0 || _nextFocusableElement2.focus();
-        } else {
-          var firstFocusableElement = getNextFocusableElement(currentRefs, -1);
-          firstFocusableElement === null || firstFocusableElement === void 0 || firstFocusableElement.focus();
-        }
+        var nextFocusableElement = getNextFocusableElement(currentRefs, currentFocusedIdx);
+        nextFocusableElement === null || nextFocusableElement === void 0 || nextFocusableElement.focus();
         break;
       case 'prev':
         // Always cancelling the event to prevent scrolling
         e.preventDefault();
-        if (fg('dropdown-menu-disabled-navigation-fix')) {
-          var _prevFocusableElement = getPrevFocusableElement(currentRefs, currentFocusedIdx);
-          _prevFocusableElement === null || _prevFocusableElement === void 0 || _prevFocusableElement.focus();
-          break;
-        }
-
-        // Remove on FG cleanup dropdown-menu-disabled-navigation-fix
-        if (currentFocusedIdx > 0) {
-          var _prevFocusableElement2 = getPrevFocusableElement(currentRefs, currentFocusedIdx);
-          _prevFocusableElement2 === null || _prevFocusableElement2 === void 0 || _prevFocusableElement2.focus();
-        } else {
-          var lastFocusableElement = getPrevFocusableElement(currentRefs, currentRefs.length);
-          lastFocusableElement === null || lastFocusableElement === void 0 || lastFocusableElement.focus();
-        }
+        var prevFocusableElement = getPrevFocusableElement(currentRefs, currentFocusedIdx);
+        prevFocusableElement === null || prevFocusableElement === void 0 || prevFocusableElement.focus();
         break;
       case 'first':
         e.preventDefault();
         // Search for first non-disabled element if first element is disabled
-        var nextFocusableElement = getNextFocusableElement(currentRefs, -1);
-        nextFocusableElement === null || nextFocusableElement === void 0 || nextFocusableElement.focus();
+        var firstFocusableElement = getNextFocusableElement(currentRefs, -1);
+        firstFocusableElement === null || firstFocusableElement === void 0 || firstFocusableElement.focus();
         break;
       case 'last':
         e.preventDefault();
         // Search for last non-disabled element if last element is disabled
-        var prevFocusableElement = getPrevFocusableElement(currentRefs, currentRefs.length);
-        prevFocusableElement === null || prevFocusableElement === void 0 || prevFocusableElement.focus();
+        var lastFocusableElement = getPrevFocusableElement(currentRefs, currentRefs.length);
+        lastFocusableElement === null || lastFocusableElement === void 0 || lastFocusableElement.focus();
         break;
       default:
         return;

package/dist/esm/radio/dropdown-item-radio.js

@@ -6,7 +6,6 @@ import React, { useCallback } from 'react';
 import noop from '@atlaskit/ds-lib/noop';
 import { SELECTION_STYLE_CONTEXT_DO_NOT_USE } from '@atlaskit/menu';
 import ButtonItem from '@atlaskit/menu/button-item';
-import { fg } from '@atlaskit/platform-feature-flags';
 import RadioIcon from '../internal/components/radio-icon';
 import useRadioState from '../internal/hooks/use-radio-state';
 import useRegisterItemWithFocusManager from '../internal/hooks/use-register-item-with-focus-manager';
@@ -77,9 +76,9 @@ var DropdownItemRadio = function DropdownItemRadio(_ref) {
     // it's not in the component's prop types.
     // @ts-expect-error
     ,
-    title: title
-  }, fg('platform_button_item-add-ufo-metrics') && {
+    title: title,
     interactionName: interactionName
+    // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   }, rest), children));
 };
 export default DropdownItemRadio;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/dropdown-menu",
-	"version": "16.0.4",
+	"version": "16.0.6",
 	"description": "A dropdown menu displays a list of actions or options to a user.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -36,7 +36,7 @@
 		"@atlaskit/primitives": "^14.8.0",
 		"@atlaskit/spinner": "^18.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tokens": "^5.1.0",
+		"@atlaskit/tokens": "^5.2.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
@@ -52,7 +52,7 @@
 		"@atlaskit/atlassian-navigation": "^5.3.0",
 		"@atlaskit/avatar": "^25.1.0",
 		"@atlaskit/checkbox": "^17.1.0",
-		"@atlaskit/docs": "^10.0.0",
+		"@atlaskit/docs": "^11.0.0",
 		"@atlaskit/form": "^12.0.0",
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/link": "^3.2.0",
@@ -77,9 +77,6 @@
 		"platform_dst_popup-disable-focuslock": {
 			"type": "boolean"
 		},
-		"platform_button_item-add-ufo-metrics": {
-			"type": "boolean"
-		},
 		"platform-visual-refresh-icons": {
 			"type": "boolean"
 		},
@@ -90,9 +87,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"dropdown-menu-disabled-navigation-fix": {
-			"type": "boolean"
-		},
 		"platform_design_system_team_dropdown_return_focus": {
 			"type": "boolean"
 		}