@atlaskit/dropdown-menu 11.1.5 → 11.2.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/dropdown-menu
 
+## 11.2.0
+
+### Minor Changes
+
+- [`9a186cda60b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9a186cda60b) - Adds `component` prop to DropdownItem which allows overriding the item with a custom component.
+
+### Patch Changes
+
+- [`484bf3e9b12`](https://bitbucket.org/atlassian/atlassian-frontend/commits/484bf3e9b12) - [ux] DSP-4539 Update wrongly used tokens for radio/checkbox icons
+- Updated dependencies
+
 ## 11.1.5
 
 ### Patch Changes

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

@@ -15,11 +15,13 @@ var _react = _interopRequireDefault(require("react"));
 
 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 _useRegisterItemWithFocusManager = _interopRequireDefault(require("./internal/hooks/use-register-item-with-focus-manager"));
 
-var _excluded = ["elemBefore", "elemAfter", "href", "shouldTitleWrap", "shouldDescriptionWrap"];
+var _excluded = ["component", "elemBefore", "elemAfter", "shouldTitleWrap", "shouldDescriptionWrap"];
 
 /**
  * __Dropdown menu item__
@@ -31,9 +33,9 @@ var _excluded = ["elemBefore", "elemAfter", "href", "shouldTitleWrap", "shouldDe
  * - [Usage](https://atlassian.design/components/dropdown-item/usage)
  */
 var DropdownMenuItem = function DropdownMenuItem(props) {
-  var elemBefore = props.elemBefore,
+  var component = props.component,
+      elemBefore = props.elemBefore,
       elemAfter = props.elemAfter,
-      href = props.href,
       _props$shouldTitleWra = props.shouldTitleWrap,
       shouldTitleWrap = _props$shouldTitleWra === void 0 ? true : _props$shouldTitleWra,
       _props$shouldDescript = props.shouldDescriptionWrap,
@@ -41,9 +43,17 @@ var DropdownMenuItem = function DropdownMenuItem(props) {
       rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var itemRef = (0, _useRegisterItemWithFocusManager.default)();
 
-  if (href) {
+  if (component) {
+    return /*#__PURE__*/_react.default.createElement(_customItem.default, (0, _extends2.default)({
+      component: component,
+      iconBefore: elemBefore,
+      iconAfter: elemAfter,
+      shouldTitleWrap: shouldTitleWrap,
+      shouldDescriptionWrap: shouldDescriptionWrap
+    }, rest));
+  } else if (props.href) {
     return /*#__PURE__*/_react.default.createElement(_linkItem.default, (0, _extends2.default)({
-      href: href,
+      href: props.href,
       iconBefore: elemBefore,
       iconAfter: elemAfter,
       role: "menuitem",

package/dist/cjs/internal/utils/get-icon-colors.js

@@ -11,12 +11,12 @@ var getIconColors = function getIconColors(isSelected) {
   if (isSelected) {
     return {
       primary: "var(--ds-background-brand-bold, ".concat(_colors.B400, ")"),
-      secondary: "var(--ds-surface, ".concat(_colors.N40, ")")
+      secondary: "var(--ds-icon-inverse, ".concat(_colors.N40, ")")
     };
   }
 
   return {
-    primary: "var(--ds-border, ".concat(_colors.N40, ")"),
+    primary: "var(--ds-background-neutral, ".concat(_colors.N40, ")"),
     secondary: "var(--ds-UNSAFE_util-transparent, ".concat(_colors.N40, ")")
   };
 };

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/dropdown-menu",
-	"version": "11.1.5",
+	"version": "11.2.0",
 	"sideEffects": false
 }

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

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import ButtonItem from '@atlaskit/menu/button-item';
+import CustomItem from '@atlaskit/menu/custom-item';
 import LinkItem from '@atlaskit/menu/link-item';
 import useRegisterItemWithFocusManager from './internal/hooks/use-register-item-with-focus-manager';
 
@@ -15,18 +16,26 @@ import useRegisterItemWithFocusManager from './internal/hooks/use-register-item-
  */
 const DropdownMenuItem = props => {
   const {
+    component,
     elemBefore,
     elemAfter,
-    href,
     shouldTitleWrap = true,
     shouldDescriptionWrap = true,
     ...rest
   } = props;
   const itemRef = useRegisterItemWithFocusManager();
 
-  if (href) {
+  if (component) {
+    return /*#__PURE__*/React.createElement(CustomItem, _extends({
+      component: component,
+      iconBefore: elemBefore,
+      iconAfter: elemAfter,
+      shouldTitleWrap: shouldTitleWrap,
+      shouldDescriptionWrap: shouldDescriptionWrap
+    }, rest));
+  } else if (props.href) {
     return /*#__PURE__*/React.createElement(LinkItem, _extends({
-      href: href,
+      href: props.href,
       iconBefore: elemBefore,
       iconAfter: elemAfter,
       role: "menuitem",

package/dist/es2019/internal/utils/get-icon-colors.js

@@ -4,12 +4,12 @@ const getIconColors = isSelected => {
   if (isSelected) {
     return {
       primary: `var(--ds-background-brand-bold, ${B400})`,
-      secondary: `var(--ds-surface, ${N40})`
+      secondary: `var(--ds-icon-inverse, ${N40})`
     };
   }
 
   return {
-    primary: `var(--ds-border, ${N40})`,
+    primary: `var(--ds-background-neutral, ${N40})`,
     secondary: `var(--ds-UNSAFE_util-transparent, ${N40})`
   };
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/dropdown-menu",
-	"version": "11.1.5",
+	"version": "11.2.0",
 	"sideEffects": false
 }

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

@@ -1,8 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["elemBefore", "elemAfter", "href", "shouldTitleWrap", "shouldDescriptionWrap"];
+var _excluded = ["component", "elemBefore", "elemAfter", "shouldTitleWrap", "shouldDescriptionWrap"];
 import React from 'react';
 import ButtonItem from '@atlaskit/menu/button-item';
+import CustomItem from '@atlaskit/menu/custom-item';
 import LinkItem from '@atlaskit/menu/link-item';
 import useRegisterItemWithFocusManager from './internal/hooks/use-register-item-with-focus-manager';
 
@@ -16,9 +17,9 @@ import useRegisterItemWithFocusManager from './internal/hooks/use-register-item-
  * - [Usage](https://atlassian.design/components/dropdown-item/usage)
  */
 var DropdownMenuItem = function DropdownMenuItem(props) {
-  var elemBefore = props.elemBefore,
+  var component = props.component,
+      elemBefore = props.elemBefore,
       elemAfter = props.elemAfter,
-      href = props.href,
       _props$shouldTitleWra = props.shouldTitleWrap,
       shouldTitleWrap = _props$shouldTitleWra === void 0 ? true : _props$shouldTitleWra,
       _props$shouldDescript = props.shouldDescriptionWrap,
@@ -27,9 +28,17 @@ var DropdownMenuItem = function DropdownMenuItem(props) {
 
   var itemRef = useRegisterItemWithFocusManager();
 
-  if (href) {
+  if (component) {
+    return /*#__PURE__*/React.createElement(CustomItem, _extends({
+      component: component,
+      iconBefore: elemBefore,
+      iconAfter: elemAfter,
+      shouldTitleWrap: shouldTitleWrap,
+      shouldDescriptionWrap: shouldDescriptionWrap
+    }, rest));
+  } else if (props.href) {
     return /*#__PURE__*/React.createElement(LinkItem, _extends({
-      href: href,
+      href: props.href,
       iconBefore: elemBefore,
       iconAfter: elemAfter,
       role: "menuitem",

package/dist/esm/internal/utils/get-icon-colors.js

@@ -4,12 +4,12 @@ var getIconColors = function getIconColors(isSelected) {
   if (isSelected) {
     return {
       primary: "var(--ds-background-brand-bold, ".concat(B400, ")"),
-      secondary: "var(--ds-surface, ".concat(N40, ")")
+      secondary: "var(--ds-icon-inverse, ".concat(N40, ")")
     };
   }
 
   return {
-    primary: "var(--ds-border, ".concat(N40, ")"),
+    primary: "var(--ds-background-neutral, ".concat(N40, ")"),
     secondary: "var(--ds-UNSAFE_util-transparent, ".concat(N40, ")")
   };
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/dropdown-menu",
-	"version": "11.1.5",
+	"version": "11.2.0",
 	"sideEffects": false
 }

package/dist/types/internal/utils/get-icon-colors.d.ts

@@ -1,8 +1,8 @@
 declare const getIconColors: (isSelected: boolean | undefined) => {
     primary: "var(--ds-background-brand-bold)";
-    secondary: "var(--ds-surface)";
+    secondary: "var(--ds-icon-inverse)";
 } | {
-    primary: "var(--ds-border)";
+    primary: "var(--ds-background-neutral)";
     secondary: "var(--ds-UNSAFE_util-transparent)";
 };
 export default getIconColors;

package/dist/types/types.d.ts

@@ -1,5 +1,5 @@
 import { KeyboardEvent, MouseEvent, ReactElement, ReactNode, Ref } from 'react';
-import type { MenuGroupProps, SectionProps } from '@atlaskit/menu/types';
+import type { CustomItemProps, MenuGroupProps, SectionProps } from '@atlaskit/menu/types';
 import type { ContentProps, TriggerProps } from '@atlaskit/popup/types';
 export declare type FocusableElement = HTMLAnchorElement | HTMLButtonElement;
 export declare type Action = 'next' | 'prev' | 'first' | 'last';
@@ -125,6 +125,10 @@ export interface DropdownItemProps {
      * Primary content for the item.
      */
     children: React.ReactNode;
+    /**
+     * Custom component to render as an item.
+     */
+    component?: CustomItemProps['component'];
     /**
      * Description of the item.
      * This will render smaller text below the primary text of the item as well as slightly increasing the height of the item.

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@atlaskit/dropdown-menu",
-  "version": "11.1.5",
+  "version": "11.2.0",
   "description": "A dropdown menu displays a list of actions or options to a user.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
-  "repository": "https://bitbucket.org/atlassian/atlassian-frontend",
+  "repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
   "main": "dist/cjs/index.js",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@atlaskit/button": "^16.3.0",
-    "@atlaskit/codemod-utils": "^4.0.0",
+    "@atlaskit/codemod-utils": "^4.1.0",
     "@atlaskit/ds-lib": "^1.4.0",
     "@atlaskit/icon": "^21.10.0",
     "@atlaskit/menu": "^1.3.0",
@@ -40,7 +40,7 @@
     "react-dom": "^16.8.0"
   },
   "devDependencies": {
-    "@atlaskit/avatar": "^20.5.0",
+    "@atlaskit/avatar": "^21.0.0",
     "@atlaskit/docs": "*",
     "@atlaskit/lozenge": "11.1.11",
     "@atlaskit/modal-dialog": "^12.2.0",