@atlaskit/menu 2.7.0 → 2.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +31 -0
- package/dist/cjs/menu-item/custom-item.js +5 -3
- package/dist/cjs/menu-item/link-item.js +5 -5
- package/dist/es2019/menu-item/custom-item.js +6 -4
- package/dist/es2019/menu-item/link-item.js +5 -5
- package/dist/esm/menu-item/custom-item.js +6 -4
- package/dist/esm/menu-item/link-item.js +5 -5
- package/dist/types/types.d.ts +1 -1
- package/dist/types-ts4.5/types.d.ts +1 -1
- package/package.json +6 -3
- package/extract-react-types/custom-item-hack-for-ert.tsx +0 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,36 @@
|
|
|
1
1
|
# @atlaskit/menu
|
|
2
2
|
|
|
3
|
+
## 2.7.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#119132](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/119132)
|
|
8
|
+
[`68ee7be8867d0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/68ee7be8867d0) -
|
|
9
|
+
Remove remnants of `extract-react-types` from tsconfig file.
|
|
10
|
+
|
|
11
|
+
## 2.7.3
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- [#119110](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/119110)
|
|
16
|
+
[`cb28fa67e9a16`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cb28fa67e9a16) -
|
|
17
|
+
Update Atlaskit docs so that they point to current ADS site. Remove remnants of
|
|
18
|
+
`extract-react-types`.
|
|
19
|
+
|
|
20
|
+
## 2.7.2
|
|
21
|
+
|
|
22
|
+
### Patch Changes
|
|
23
|
+
|
|
24
|
+
- Updated dependencies
|
|
25
|
+
|
|
26
|
+
## 2.7.1
|
|
27
|
+
|
|
28
|
+
### Patch Changes
|
|
29
|
+
|
|
30
|
+
- [`89377ac3c7f25`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/89377ac3c7f25) -
|
|
31
|
+
Removed internal props from link item and custom item that prevent drag and drop functionality
|
|
32
|
+
from being applied
|
|
33
|
+
|
|
3
34
|
## 2.7.0
|
|
4
35
|
|
|
5
36
|
### Minor Changes
|
|
@@ -62,7 +62,7 @@ var CustomItem = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardR
|
|
|
62
62
|
return (0, _react2.jsx)(_menuItemPrimitive.default
|
|
63
63
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
64
64
|
, (0, _extends2.default)({
|
|
65
|
-
className: (0, _platformFeatureFlags.
|
|
65
|
+
className: (0, _platformFeatureFlags.fg)('platform.design-system-team.unsafe-overrides-killswitch_c8j9m') ? undefined : UNSAFE_className
|
|
66
66
|
}, rest, {
|
|
67
67
|
// eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
|
|
68
68
|
overrides: overrides,
|
|
@@ -91,9 +91,11 @@ var CustomItem = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardR
|
|
|
91
91
|
}, rest, {
|
|
92
92
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
93
93
|
className: className,
|
|
94
|
-
ref: ref
|
|
94
|
+
ref: ref
|
|
95
|
+
}, (0, _platformFeatureFlags.fg)('platform.wanjel.remove-drag-override-in-menu-items_l1dib') ? {} : {
|
|
95
96
|
draggable: false,
|
|
96
|
-
onDragStart: preventEvent
|
|
97
|
+
onDragStart: preventEvent
|
|
98
|
+
}, {
|
|
97
99
|
onMouseDown: isDisabled ? preventEvent : onMouseDownHandler,
|
|
98
100
|
onClick: isDisabled ? preventEvent : onClick,
|
|
99
101
|
tabIndex: isDisabled ? -1 : undefined,
|
|
@@ -108,11 +108,11 @@ function (props, ref) {
|
|
|
108
108
|
className: className
|
|
109
109
|
// @ts-expect-error
|
|
110
110
|
,
|
|
111
|
-
href: isDisabled ? undefined : href
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
111
|
+
href: isDisabled ? undefined : href
|
|
112
|
+
}, (0, _platformFeatureFlags.fg)('platform.wanjel.remove-drag-override-in-menu-items_l1dib') ? {} : {
|
|
113
|
+
draggable: false,
|
|
114
|
+
onDragStart: preventEvent
|
|
115
|
+
}, {
|
|
116
116
|
onMouseDown: isDisabled ? preventEvent : onMouseDownHandler,
|
|
117
117
|
onClick: isDisabled ? preventEvent : onClick,
|
|
118
118
|
"aria-current": isSelected ? 'page' : undefined,
|
|
@@ -10,7 +10,7 @@ import { forwardRef, memo } from 'react';
|
|
|
10
10
|
import { css, jsx } from '@emotion/react';
|
|
11
11
|
import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
|
|
12
12
|
import noop from '@atlaskit/ds-lib/noop';
|
|
13
|
-
import {
|
|
13
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
14
14
|
import MenuItemPrimitive from '../internal/components/menu-item-primitive';
|
|
15
15
|
const preventEvent = e => {
|
|
16
16
|
e.preventDefault();
|
|
@@ -57,7 +57,7 @@ const CustomItem = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
|
|
|
57
57
|
return jsx(MenuItemPrimitive
|
|
58
58
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
59
59
|
, _extends({
|
|
60
|
-
className:
|
|
60
|
+
className: fg('platform.design-system-team.unsafe-overrides-killswitch_c8j9m') ? undefined : UNSAFE_className
|
|
61
61
|
}, rest, {
|
|
62
62
|
// eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
|
|
63
63
|
overrides: overrides,
|
|
@@ -86,9 +86,11 @@ const CustomItem = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
|
|
|
86
86
|
}, rest, {
|
|
87
87
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
88
88
|
className: className,
|
|
89
|
-
ref: ref
|
|
89
|
+
ref: ref
|
|
90
|
+
}, fg('platform.wanjel.remove-drag-override-in-menu-items_l1dib') ? {} : {
|
|
90
91
|
draggable: false,
|
|
91
|
-
onDragStart: preventEvent
|
|
92
|
+
onDragStart: preventEvent
|
|
93
|
+
}, {
|
|
92
94
|
onMouseDown: isDisabled ? preventEvent : onMouseDownHandler,
|
|
93
95
|
onClick: isDisabled ? preventEvent : onClick,
|
|
94
96
|
tabIndex: isDisabled ? -1 : undefined,
|
|
@@ -103,11 +103,11 @@ const LinkItem = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(
|
|
|
103
103
|
className: className
|
|
104
104
|
// @ts-expect-error
|
|
105
105
|
,
|
|
106
|
-
href: isDisabled ? undefined : href
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
106
|
+
href: isDisabled ? undefined : href
|
|
107
|
+
}, fg('platform.wanjel.remove-drag-override-in-menu-items_l1dib') ? {} : {
|
|
108
|
+
draggable: false,
|
|
109
|
+
onDragStart: preventEvent
|
|
110
|
+
}, {
|
|
111
111
|
onMouseDown: isDisabled ? preventEvent : onMouseDownHandler,
|
|
112
112
|
onClick: isDisabled ? preventEvent : onClick,
|
|
113
113
|
"aria-current": isSelected ? 'page' : undefined,
|
|
@@ -12,7 +12,7 @@ import { forwardRef, memo } from 'react';
|
|
|
12
12
|
import { css, jsx } from '@emotion/react';
|
|
13
13
|
import { propDeprecationWarning } from '@atlaskit/ds-lib/deprecation-warning';
|
|
14
14
|
import noop from '@atlaskit/ds-lib/noop';
|
|
15
|
-
import {
|
|
15
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
16
16
|
import MenuItemPrimitive from '../internal/components/menu-item-primitive';
|
|
17
17
|
var preventEvent = function preventEvent(e) {
|
|
18
18
|
e.preventDefault();
|
|
@@ -57,7 +57,7 @@ var CustomItem = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref, ref)
|
|
|
57
57
|
return jsx(MenuItemPrimitive
|
|
58
58
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
59
59
|
, _extends({
|
|
60
|
-
className:
|
|
60
|
+
className: fg('platform.design-system-team.unsafe-overrides-killswitch_c8j9m') ? undefined : UNSAFE_className
|
|
61
61
|
}, rest, {
|
|
62
62
|
// eslint-disable-next-line @repo/internal/react/no-unsafe-overrides
|
|
63
63
|
overrides: overrides,
|
|
@@ -86,9 +86,11 @@ var CustomItem = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (_ref, ref)
|
|
|
86
86
|
}, rest, {
|
|
87
87
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
88
88
|
className: className,
|
|
89
|
-
ref: ref
|
|
89
|
+
ref: ref
|
|
90
|
+
}, fg('platform.wanjel.remove-drag-override-in-menu-items_l1dib') ? {} : {
|
|
90
91
|
draggable: false,
|
|
91
|
-
onDragStart: preventEvent
|
|
92
|
+
onDragStart: preventEvent
|
|
93
|
+
}, {
|
|
92
94
|
onMouseDown: isDisabled ? preventEvent : onMouseDownHandler,
|
|
93
95
|
onClick: isDisabled ? preventEvent : onClick,
|
|
94
96
|
tabIndex: isDisabled ? -1 : undefined,
|
|
@@ -102,11 +102,11 @@ function (props, ref) {
|
|
|
102
102
|
className: className
|
|
103
103
|
// @ts-expect-error
|
|
104
104
|
,
|
|
105
|
-
href: isDisabled ? undefined : href
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
105
|
+
href: isDisabled ? undefined : href
|
|
106
|
+
}, fg('platform.wanjel.remove-drag-override-in-menu-items_l1dib') ? {} : {
|
|
107
|
+
draggable: false,
|
|
108
|
+
onDragStart: preventEvent
|
|
109
|
+
}, {
|
|
110
110
|
onMouseDown: isDisabled ? preventEvent : onMouseDownHandler,
|
|
111
111
|
onClick: isDisabled ? preventEvent : onClick,
|
|
112
112
|
"aria-current": isSelected ? 'page' : undefined,
|
package/dist/types/types.d.ts
CHANGED
|
@@ -273,7 +273,7 @@ export interface CustomItemComponentProps {
|
|
|
273
273
|
/**
|
|
274
274
|
* Turns off the element being draggable.
|
|
275
275
|
*/
|
|
276
|
-
draggable
|
|
276
|
+
draggable?: boolean;
|
|
277
277
|
/**
|
|
278
278
|
* React ref for the raw DOM element,
|
|
279
279
|
* make sure to place this on the outermost DOM element.
|
|
@@ -273,7 +273,7 @@ export interface CustomItemComponentProps {
|
|
|
273
273
|
/**
|
|
274
274
|
* Turns off the element being draggable.
|
|
275
275
|
*/
|
|
276
|
-
draggable
|
|
276
|
+
draggable?: boolean;
|
|
277
277
|
/**
|
|
278
278
|
* React ref for the raw DOM element,
|
|
279
279
|
* make sure to place this on the outermost DOM element.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/menu",
|
|
3
|
-
"version": "2.7.
|
|
3
|
+
"version": "2.7.4",
|
|
4
4
|
"description": "A list of options to help users navigate, or perform actions.",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"@atlaskit/ds-lib": "^2.3.0",
|
|
48
48
|
"@atlaskit/focus-ring": "^1.5.0",
|
|
49
49
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
50
|
-
"@atlaskit/primitives": "^
|
|
50
|
+
"@atlaskit/primitives": "^11.0.0",
|
|
51
51
|
"@atlaskit/theme": "^12.11.0",
|
|
52
52
|
"@atlaskit/tokens": "^1.53.0",
|
|
53
53
|
"@babel/runtime": "^7.0.0",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"@atlaskit/visual-regression": "*",
|
|
65
65
|
"@atlassian/feature-flags-test-utils": "*",
|
|
66
66
|
"@emotion/jest": "^11.8.0",
|
|
67
|
-
"@testing-library/dom": "^
|
|
67
|
+
"@testing-library/dom": "^10.1.0",
|
|
68
68
|
"@testing-library/react": "^12.1.5",
|
|
69
69
|
"@types/react-router-dom": "^4.3.1",
|
|
70
70
|
"ast-types": "^0.13.3",
|
|
@@ -132,6 +132,9 @@
|
|
|
132
132
|
},
|
|
133
133
|
"platform.wanjel.use-router-links-for-the-linkitem-component": {
|
|
134
134
|
"type": "boolean"
|
|
135
|
+
},
|
|
136
|
+
"platform.wanjel.remove-drag-override-in-menu-items_l1dib": {
|
|
137
|
+
"type": "boolean"
|
|
135
138
|
}
|
|
136
139
|
},
|
|
137
140
|
"homepage": "https://atlassian.design/components/menu/"
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import type { CustomItemProps } from '../src/types';
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* The props definition in custom-item.tsx breaks ERT unfortunately,
|
|
5
|
-
* because we had to typecast the component to make forwardRef work with generics
|
|
6
|
-
* (for the custom component props).
|
|
7
|
-
*/
|
|
8
|
-
export default function (_: CustomItemProps) {}
|