@atlaskit/popup 1.9.2 → 1.10.0
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 +17 -0
- package/dist/cjs/popper-wrapper.js +8 -7
- package/dist/cjs/popup.js +3 -2
- package/dist/cjs/use-close-manager.js +7 -1
- package/dist/es2019/popper-wrapper.js +2 -0
- package/dist/es2019/popup.js +3 -2
- package/dist/es2019/use-close-manager.js +8 -1
- package/dist/esm/popper-wrapper.js +8 -6
- package/dist/esm/popup.js +3 -2
- package/dist/esm/use-close-manager.js +7 -1
- package/package.json +6 -4
- package/dist/cjs/version.json +0 -5
- package/dist/es2019/version.json +0 -5
- package/dist/esm/version.json +0 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @atlaskit/popup
|
|
2
2
|
|
|
3
|
+
## 1.10.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`f355884a4aa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f355884a4aa) - [ux] Support to press escape key and only close the top layer
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
|
|
13
|
+
## 1.9.3
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- [`84442a93613`](https://bitbucket.org/atlassian/atlassian-frontend/commits/84442a93613) - Adds support for surface detection when using design tokens. Enabling children to be styled with the surface color of the popup when using the `utility.elevation.surface.current` design token.
|
|
18
|
+
- Updated dependencies
|
|
19
|
+
|
|
3
20
|
## 1.9.2
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -7,29 +7,30 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.default = void 0;
|
|
8
8
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
9
9
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
10
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
11
|
var _react = require("react");
|
|
11
12
|
var _react2 = require("@emotion/react");
|
|
12
13
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
13
14
|
var _popper = require("@atlaskit/popper");
|
|
14
15
|
var _colors = require("@atlaskit/theme/colors");
|
|
15
16
|
var _constants = require("@atlaskit/theme/constants");
|
|
17
|
+
var _tokens = require("@atlaskit/tokens");
|
|
16
18
|
var _repositionOnUpdate = require("./reposition-on-update");
|
|
17
19
|
var _useCloseManager = require("./use-close-manager");
|
|
18
20
|
var _useFocusManager = require("./use-focus-manager");
|
|
21
|
+
var _css;
|
|
19
22
|
/** @jsx jsx */
|
|
20
|
-
|
|
21
|
-
var popupStyles = (0, _react2.css)({
|
|
23
|
+
var popupStyles = (0, _react2.css)((_css = {
|
|
22
24
|
display: 'block',
|
|
23
25
|
boxSizing: 'border-box',
|
|
24
26
|
zIndex: _constants.layers.layer(),
|
|
25
27
|
flex: '1 1 auto',
|
|
26
28
|
backgroundColor: "var(--ds-surface-overlay, ".concat(_colors.N0, ")"),
|
|
27
29
|
borderRadius: "var(--ds-border-radius, 3px)",
|
|
28
|
-
boxShadow: "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(_colors.N50A, ", 0 0 1px ").concat(_colors.N60A), ")")
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}, !(0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.render-popup-in-parent_f73ij') && {
|
|
30
|
+
boxShadow: "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(_colors.N50A, ", 0 0 1px ").concat(_colors.N60A), ")")
|
|
31
|
+
}, (0, _defineProperty2.default)(_css, _tokens.CURRENT_SURFACE_CSS_VAR, "var(--ds-surface-overlay, ".concat(_colors.N0, ")")), (0, _defineProperty2.default)(_css, ':focus', {
|
|
32
|
+
outline: 'none'
|
|
33
|
+
}), _css), !(0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.render-popup-in-parent_f73ij') && {
|
|
33
34
|
overflow: 'auto'
|
|
34
35
|
});
|
|
35
36
|
var DefaultPopupComponent = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
package/dist/cjs/popup.js
CHANGED
|
@@ -8,6 +8,7 @@ exports.default = exports.Popup = void 0;
|
|
|
8
8
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
9
9
|
var _react = require("react");
|
|
10
10
|
var _react2 = require("@emotion/react");
|
|
11
|
+
var _layering = require("@atlaskit/layering");
|
|
11
12
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
12
13
|
var _popper = require("@atlaskit/popper");
|
|
13
14
|
var _portal = _interopRequireDefault(require("@atlaskit/portal"));
|
|
@@ -46,7 +47,7 @@ var Popup = /*#__PURE__*/(0, _react.memo)(function (_ref) {
|
|
|
46
47
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
47
48
|
triggerRef = _useState2[0],
|
|
48
49
|
setTriggerRef = _useState2[1];
|
|
49
|
-
var renderPopperWrapper = (0, _react2.jsx)(_popperWrapper.default, {
|
|
50
|
+
var renderPopperWrapper = (0, _react2.jsx)(_layering.UNSAFE_LAYERING, null, (0, _react2.jsx)(_popperWrapper.default, {
|
|
50
51
|
content: content,
|
|
51
52
|
isOpen: isOpen,
|
|
52
53
|
placement: placement,
|
|
@@ -62,7 +63,7 @@ var Popup = /*#__PURE__*/(0, _react.memo)(function (_ref) {
|
|
|
62
63
|
autoFocus: autoFocus,
|
|
63
64
|
shouldUseCaptureOnOutsideClick: shouldUseCaptureOnOutsideClick,
|
|
64
65
|
triggerRef: triggerRef
|
|
65
|
-
});
|
|
66
|
+
}));
|
|
66
67
|
return (0, _react2.jsx)(_popper.Manager, null, (0, _react2.jsx)(_popper.Reference, null, function (_ref2) {
|
|
67
68
|
var _ref3 = _ref2.ref;
|
|
68
69
|
return trigger({
|
|
@@ -8,12 +8,15 @@ exports.useCloseManager = void 0;
|
|
|
8
8
|
var _react = require("react");
|
|
9
9
|
var _bindEventListener = require("bind-event-listener");
|
|
10
10
|
var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
|
|
11
|
+
var _layering = require("@atlaskit/layering");
|
|
11
12
|
var useCloseManager = function useCloseManager(_ref) {
|
|
12
13
|
var isOpen = _ref.isOpen,
|
|
13
14
|
onClose = _ref.onClose,
|
|
14
15
|
popupRef = _ref.popupRef,
|
|
15
16
|
triggerRef = _ref.triggerRef,
|
|
16
17
|
capture = _ref.shouldUseCaptureOnOutsideClick;
|
|
18
|
+
var _UNSAFE_useLayering = (0, _layering.UNSAFE_useLayering)(),
|
|
19
|
+
isLayerDisabled = _UNSAFE_useLayering.isLayerDisabled;
|
|
17
20
|
(0, _react.useEffect)(function () {
|
|
18
21
|
if (!isOpen || !popupRef) {
|
|
19
22
|
return _noop.default;
|
|
@@ -44,6 +47,9 @@ var useCloseManager = function useCloseManager(_ref) {
|
|
|
44
47
|
}
|
|
45
48
|
};
|
|
46
49
|
var onKeyDown = function onKeyDown(event) {
|
|
50
|
+
if (isLayerDisabled()) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
47
53
|
var key = event.key;
|
|
48
54
|
if (key === 'Escape' || key === 'Esc') {
|
|
49
55
|
closePopup(event);
|
|
@@ -60,6 +66,6 @@ var useCloseManager = function useCloseManager(_ref) {
|
|
|
60
66
|
listener: onKeyDown
|
|
61
67
|
}]);
|
|
62
68
|
return unbind;
|
|
63
|
-
}, [isOpen, onClose, popupRef, triggerRef, capture]);
|
|
69
|
+
}, [isOpen, onClose, popupRef, triggerRef, capture, isLayerDisabled]);
|
|
64
70
|
};
|
|
65
71
|
exports.useCloseManager = useCloseManager;
|
|
@@ -6,6 +6,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
|
|
|
6
6
|
import { Popper } from '@atlaskit/popper';
|
|
7
7
|
import { N0, N50A, N60A } from '@atlaskit/theme/colors';
|
|
8
8
|
import { layers } from '@atlaskit/theme/constants';
|
|
9
|
+
import { CURRENT_SURFACE_CSS_VAR } from '@atlaskit/tokens';
|
|
9
10
|
import { RepositionOnUpdate } from './reposition-on-update';
|
|
10
11
|
import { useCloseManager } from './use-close-manager';
|
|
11
12
|
import { useFocusManager } from './use-focus-manager';
|
|
@@ -17,6 +18,7 @@ const popupStyles = css({
|
|
|
17
18
|
backgroundColor: `var(--ds-surface-overlay, ${N0})`,
|
|
18
19
|
borderRadius: "var(--ds-border-radius, 3px)",
|
|
19
20
|
boxShadow: `var(--ds-shadow-overlay, ${`0 4px 8px -2px ${N50A}, 0 0 1px ${N60A}`})`,
|
|
21
|
+
[CURRENT_SURFACE_CSS_VAR]: `var(--ds-surface-overlay, ${N0})`,
|
|
20
22
|
':focus': {
|
|
21
23
|
outline: 'none'
|
|
22
24
|
}
|
package/dist/es2019/popup.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
/** @jsx jsx */
|
|
3
3
|
import { memo, useState } from 'react';
|
|
4
4
|
import { jsx } from '@emotion/react';
|
|
5
|
+
import { UNSAFE_LAYERING } from '@atlaskit/layering';
|
|
5
6
|
import { getBooleanFF } from '@atlaskit/platform-feature-flags';
|
|
6
7
|
import { Manager, Reference } from '@atlaskit/popper';
|
|
7
8
|
import Portal from '@atlaskit/portal';
|
|
@@ -28,7 +29,7 @@ export const Popup = /*#__PURE__*/memo(({
|
|
|
28
29
|
shouldRenderToParent = false
|
|
29
30
|
}) => {
|
|
30
31
|
const [triggerRef, setTriggerRef] = useState(null);
|
|
31
|
-
const renderPopperWrapper = jsx(PopperWrapper, {
|
|
32
|
+
const renderPopperWrapper = jsx(UNSAFE_LAYERING, null, jsx(PopperWrapper, {
|
|
32
33
|
content: content,
|
|
33
34
|
isOpen: isOpen,
|
|
34
35
|
placement: placement,
|
|
@@ -44,7 +45,7 @@ export const Popup = /*#__PURE__*/memo(({
|
|
|
44
45
|
autoFocus: autoFocus,
|
|
45
46
|
shouldUseCaptureOnOutsideClick: shouldUseCaptureOnOutsideClick,
|
|
46
47
|
triggerRef: triggerRef
|
|
47
|
-
});
|
|
48
|
+
}));
|
|
48
49
|
return jsx(Manager, null, jsx(Reference, null, ({
|
|
49
50
|
ref
|
|
50
51
|
}) => {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { useEffect } from 'react';
|
|
2
2
|
import { bindAll } from 'bind-event-listener';
|
|
3
3
|
import noop from '@atlaskit/ds-lib/noop';
|
|
4
|
+
import { UNSAFE_useLayering } from '@atlaskit/layering';
|
|
4
5
|
export const useCloseManager = ({
|
|
5
6
|
isOpen,
|
|
6
7
|
onClose,
|
|
@@ -8,6 +9,9 @@ export const useCloseManager = ({
|
|
|
8
9
|
triggerRef,
|
|
9
10
|
shouldUseCaptureOnOutsideClick: capture
|
|
10
11
|
}) => {
|
|
12
|
+
const {
|
|
13
|
+
isLayerDisabled
|
|
14
|
+
} = UNSAFE_useLayering();
|
|
11
15
|
useEffect(() => {
|
|
12
16
|
if (!isOpen || !popupRef) {
|
|
13
17
|
return noop;
|
|
@@ -40,6 +44,9 @@ export const useCloseManager = ({
|
|
|
40
44
|
}
|
|
41
45
|
};
|
|
42
46
|
const onKeyDown = event => {
|
|
47
|
+
if (isLayerDisabled()) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
43
50
|
const {
|
|
44
51
|
key
|
|
45
52
|
} = event;
|
|
@@ -58,5 +65,5 @@ export const useCloseManager = ({
|
|
|
58
65
|
listener: onKeyDown
|
|
59
66
|
}]);
|
|
60
67
|
return unbind;
|
|
61
|
-
}, [isOpen, onClose, popupRef, triggerRef, capture]);
|
|
68
|
+
}, [isOpen, onClose, popupRef, triggerRef, capture, isLayerDisabled]);
|
|
62
69
|
};
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
2
|
import _extends from "@babel/runtime/helpers/extends";
|
|
3
|
+
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
4
|
+
var _css;
|
|
3
5
|
/** @jsx jsx */
|
|
4
6
|
import { forwardRef, useMemo, useState } from 'react';
|
|
5
7
|
import { css, jsx } from '@emotion/react';
|
|
@@ -7,21 +9,21 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
|
|
|
7
9
|
import { Popper } from '@atlaskit/popper';
|
|
8
10
|
import { N0, N50A, N60A } from '@atlaskit/theme/colors';
|
|
9
11
|
import { layers } from '@atlaskit/theme/constants';
|
|
12
|
+
import { CURRENT_SURFACE_CSS_VAR } from '@atlaskit/tokens';
|
|
10
13
|
import { RepositionOnUpdate } from './reposition-on-update';
|
|
11
14
|
import { useCloseManager } from './use-close-manager';
|
|
12
15
|
import { useFocusManager } from './use-focus-manager';
|
|
13
|
-
var popupStyles = css({
|
|
16
|
+
var popupStyles = css((_css = {
|
|
14
17
|
display: 'block',
|
|
15
18
|
boxSizing: 'border-box',
|
|
16
19
|
zIndex: layers.layer(),
|
|
17
20
|
flex: '1 1 auto',
|
|
18
21
|
backgroundColor: "var(--ds-surface-overlay, ".concat(N0, ")"),
|
|
19
22
|
borderRadius: "var(--ds-border-radius, 3px)",
|
|
20
|
-
boxShadow: "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(N50A, ", 0 0 1px ").concat(N60A), ")")
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}, !getBooleanFF('platform.design-system-team.render-popup-in-parent_f73ij') && {
|
|
23
|
+
boxShadow: "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(N50A, ", 0 0 1px ").concat(N60A), ")")
|
|
24
|
+
}, _defineProperty(_css, CURRENT_SURFACE_CSS_VAR, "var(--ds-surface-overlay, ".concat(N0, ")")), _defineProperty(_css, ':focus', {
|
|
25
|
+
outline: 'none'
|
|
26
|
+
}), _css), !getBooleanFF('platform.design-system-team.render-popup-in-parent_f73ij') && {
|
|
25
27
|
overflow: 'auto'
|
|
26
28
|
});
|
|
27
29
|
var DefaultPopupComponent = /*#__PURE__*/forwardRef(function (props, ref) {
|
package/dist/esm/popup.js
CHANGED
|
@@ -3,6 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
|
3
3
|
/** @jsx jsx */
|
|
4
4
|
import { memo, useState } from 'react';
|
|
5
5
|
import { jsx } from '@emotion/react';
|
|
6
|
+
import { UNSAFE_LAYERING } from '@atlaskit/layering';
|
|
6
7
|
import { getBooleanFF } from '@atlaskit/platform-feature-flags';
|
|
7
8
|
import { Manager, Reference } from '@atlaskit/popper';
|
|
8
9
|
import Portal from '@atlaskit/portal';
|
|
@@ -38,7 +39,7 @@ export var Popup = /*#__PURE__*/memo(function (_ref) {
|
|
|
38
39
|
_useState2 = _slicedToArray(_useState, 2),
|
|
39
40
|
triggerRef = _useState2[0],
|
|
40
41
|
setTriggerRef = _useState2[1];
|
|
41
|
-
var renderPopperWrapper = jsx(PopperWrapper, {
|
|
42
|
+
var renderPopperWrapper = jsx(UNSAFE_LAYERING, null, jsx(PopperWrapper, {
|
|
42
43
|
content: content,
|
|
43
44
|
isOpen: isOpen,
|
|
44
45
|
placement: placement,
|
|
@@ -54,7 +55,7 @@ export var Popup = /*#__PURE__*/memo(function (_ref) {
|
|
|
54
55
|
autoFocus: autoFocus,
|
|
55
56
|
shouldUseCaptureOnOutsideClick: shouldUseCaptureOnOutsideClick,
|
|
56
57
|
triggerRef: triggerRef
|
|
57
|
-
});
|
|
58
|
+
}));
|
|
58
59
|
return jsx(Manager, null, jsx(Reference, null, function (_ref2) {
|
|
59
60
|
var _ref3 = _ref2.ref;
|
|
60
61
|
return trigger({
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import { useEffect } from 'react';
|
|
2
2
|
import { bindAll } from 'bind-event-listener';
|
|
3
3
|
import noop from '@atlaskit/ds-lib/noop';
|
|
4
|
+
import { UNSAFE_useLayering } from '@atlaskit/layering';
|
|
4
5
|
export var useCloseManager = function useCloseManager(_ref) {
|
|
5
6
|
var isOpen = _ref.isOpen,
|
|
6
7
|
onClose = _ref.onClose,
|
|
7
8
|
popupRef = _ref.popupRef,
|
|
8
9
|
triggerRef = _ref.triggerRef,
|
|
9
10
|
capture = _ref.shouldUseCaptureOnOutsideClick;
|
|
11
|
+
var _UNSAFE_useLayering = UNSAFE_useLayering(),
|
|
12
|
+
isLayerDisabled = _UNSAFE_useLayering.isLayerDisabled;
|
|
10
13
|
useEffect(function () {
|
|
11
14
|
if (!isOpen || !popupRef) {
|
|
12
15
|
return noop;
|
|
@@ -37,6 +40,9 @@ export var useCloseManager = function useCloseManager(_ref) {
|
|
|
37
40
|
}
|
|
38
41
|
};
|
|
39
42
|
var onKeyDown = function onKeyDown(event) {
|
|
43
|
+
if (isLayerDisabled()) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
40
46
|
var key = event.key;
|
|
41
47
|
if (key === 'Escape' || key === 'Esc') {
|
|
42
48
|
closePopup(event);
|
|
@@ -53,5 +59,5 @@ export var useCloseManager = function useCloseManager(_ref) {
|
|
|
53
59
|
listener: onKeyDown
|
|
54
60
|
}]);
|
|
55
61
|
return unbind;
|
|
56
|
-
}, [isOpen, onClose, popupRef, triggerRef, capture]);
|
|
62
|
+
}, [isOpen, onClose, popupRef, triggerRef, capture, isLayerDisabled]);
|
|
57
63
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/popup",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.10.0",
|
|
4
4
|
"description": "A popup displays brief content in an overlay.",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -36,11 +36,12 @@
|
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@atlaskit/ds-lib": "^2.2.0",
|
|
39
|
+
"@atlaskit/layering": "^0.2.0",
|
|
39
40
|
"@atlaskit/platform-feature-flags": "^0.2.0",
|
|
40
41
|
"@atlaskit/popper": "^5.5.0",
|
|
41
42
|
"@atlaskit/portal": "^4.3.0",
|
|
42
|
-
"@atlaskit/theme": "^12.
|
|
43
|
-
"@atlaskit/tokens": "^1.
|
|
43
|
+
"@atlaskit/theme": "^12.6.0",
|
|
44
|
+
"@atlaskit/tokens": "^1.25.0",
|
|
44
45
|
"@babel/runtime": "^7.0.0",
|
|
45
46
|
"@emotion/react": "^11.7.1",
|
|
46
47
|
"bind-event-listener": "^2.1.1",
|
|
@@ -52,7 +53,8 @@
|
|
|
52
53
|
},
|
|
53
54
|
"devDependencies": {
|
|
54
55
|
"@af/accessibility-testing": "*",
|
|
55
|
-
"@
|
|
56
|
+
"@af/visual-regression": "*",
|
|
57
|
+
"@atlaskit/button": "^16.10.0",
|
|
56
58
|
"@atlaskit/icon": "^21.12.0",
|
|
57
59
|
"@atlaskit/ssr": "*",
|
|
58
60
|
"@atlaskit/visual-regression": "*",
|
package/dist/cjs/version.json
DELETED
package/dist/es2019/version.json
DELETED