@atlaskit/popup 4.7.1 → 4.8.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.
Files changed (10) hide show
  1. package/CHANGELOG.md +11 -0
  2. package/dist/cjs/compositional/popup.js +3 -6
  3. package/dist/cjs/use-get-memoized-merged-trigger-ref-new.js +2 -2
  4. package/dist/es2019/compositional/popup.js +3 -6
  5. package/dist/es2019/use-get-memoized-merged-trigger-ref-new.js +2 -2
  6. package/dist/esm/compositional/popup.js +3 -6
  7. package/dist/esm/use-get-memoized-merged-trigger-ref-new.js +2 -2
  8. package/dist/types/use-get-memoized-merged-trigger-ref-new.d.ts +2 -2
  9. package/dist/types-ts4.5/use-get-memoized-merged-trigger-ref-new.d.ts +2 -2
  10. package/package.json +3 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,16 @@
1
1
  # @atlaskit/popup
2
2
 
3
+ ## 4.8.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`51e544e9024d4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/51e544e9024d4) -
8
+ Fixes a bug with compositional popups where focus was not being returned to the trigger when the
9
+ popup is closed. This was occurring in React 18 Strict Mode.
10
+
11
+ This change was previously behind the feature gate `platform-dst-popup-compositional-trigger-ref`,
12
+ which has now been removed.
13
+
3
14
  ## 4.7.1
4
15
 
5
16
  ### Patch Changes
package/dist/cjs/compositional/popup.js CHANGED
@@ -13,12 +13,10 @@ var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
13
13
  var _useId = require("@atlaskit/ds-lib/use-id");
14
14
  var _layering = require("@atlaskit/layering");
15
15
  var _openLayerObserver = require("@atlaskit/layering/experimental/open-layer-observer");
16
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
17
16
  var _popper = require("@atlaskit/popper");
18
17
  var _portal = _interopRequireDefault(require("@atlaskit/portal"));
19
18
  var _popperWrapper = _interopRequireDefault(require("../popper-wrapper"));
20
19
  var _useAppearance = require("../use-appearance");
21
- var _useGetMemoizedMergedTriggerRef = require("../use-get-memoized-merged-trigger-ref");
22
20
  var _useGetMemoizedMergedTriggerRefNew = require("../use-get-memoized-merged-trigger-ref-new");
23
21
  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); }
24
22
  var IsOpenContext = /*#__PURE__*/(0, _react.createContext)(false);
@@ -85,15 +83,14 @@ var Popup = exports.Popup = function Popup(_ref) {
85
83
  var PopupTrigger = exports.PopupTrigger = function PopupTrigger(_ref2) {
86
84
  var children = _ref2.children;
87
85
  useEnsureIsInsidePopup();
88
- var isOpen = (0, _react.useContext)(IsOpenContext);
89
86
  var id = (0, _react.useContext)(IdContext);
90
87
  var setTriggerRef = (0, _react.useContext)(SetTriggerRefContext);
91
- var getMergedTriggerRef = (0, _useGetMemoizedMergedTriggerRef.useGetMemoizedMergedTriggerRef)();
92
- var getMergedTriggerRefNew = (0, _useGetMemoizedMergedTriggerRefNew.useGetMemoizedMergedTriggerRefNew)();
88
+ var isOpen = (0, _react.useContext)(IsOpenContext);
89
+ var getMergedTriggerRef = (0, _useGetMemoizedMergedTriggerRefNew.useGetMemoizedMergedTriggerRefNew)();
93
90
  return /*#__PURE__*/_react.default.createElement(_popper.Reference, null, function (_ref3) {
94
91
  var ref = _ref3.ref;
95
92
  return children({
96
- ref: (0, _platformFeatureFlags.fg)('platform-dst-popup-compositional-trigger-ref') ? getMergedTriggerRefNew(ref, setTriggerRef) : getMergedTriggerRef(ref, setTriggerRef, isOpen),
93
+ ref: getMergedTriggerRef(ref, setTriggerRef),
97
94
  'aria-controls': id,
98
95
  'aria-expanded': isOpen,
99
96
  'aria-haspopup': true
package/dist/cjs/use-get-memoized-merged-trigger-ref-new.js CHANGED
@@ -10,8 +10,8 @@ var _react = require("react");
10
10
  var _memoizeOne = _interopRequireDefault(require("memoize-one"));
11
11
  /**
12
12
  * Here setting ref is not dependent on isOpen flag which is failing in React 18 strict mode
13
- * Implemented behind ff `platform-design-system-popup-ref` (for regular popup) and
14
- * `platform-dst-popup-compositional-trigger-ref` (for compositional popup)
13
+ * Used behind ff `platform-design-system-popup-ref` for regular popup.
14
+ * Compositional popup always uses this variant.
15
15
  * @returns Function to set trigger ref
16
16
  */
17
17
  var useGetMemoizedMergedTriggerRefNew = exports.useGetMemoizedMergedTriggerRefNew = function useGetMemoizedMergedTriggerRefNew() {
package/dist/es2019/compositional/popup.js CHANGED
@@ -4,12 +4,10 @@ import noop from '@atlaskit/ds-lib/noop';
4
4
  import { useId } from '@atlaskit/ds-lib/use-id';
5
5
  import { Layering } from '@atlaskit/layering';
6
6
  import { useNotifyOpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
7
- import { fg } from '@atlaskit/platform-feature-flags';
8
7
  import { Manager, Reference } from '@atlaskit/popper';
9
8
  import Portal from '@atlaskit/portal';
10
9
  import PopperWrapper from '../popper-wrapper';
11
10
  import { usePopupAppearance } from '../use-appearance';
12
- import { useGetMemoizedMergedTriggerRef } from '../use-get-memoized-merged-trigger-ref';
13
11
  import { useGetMemoizedMergedTriggerRefNew } from '../use-get-memoized-merged-trigger-ref-new';
14
12
  const IsOpenContext = /*#__PURE__*/createContext(false);
15
13
  const IdContext = /*#__PURE__*/createContext(undefined);
@@ -73,15 +71,14 @@ export const PopupTrigger = ({
73
71
  children
74
72
  }) => {
75
73
  useEnsureIsInsidePopup();
76
- const isOpen = useContext(IsOpenContext);
77
74
  const id = useContext(IdContext);
78
75
  const setTriggerRef = useContext(SetTriggerRefContext);
79
- const getMergedTriggerRef = useGetMemoizedMergedTriggerRef();
80
- const getMergedTriggerRefNew = useGetMemoizedMergedTriggerRefNew();
76
+ const isOpen = useContext(IsOpenContext);
77
+ const getMergedTriggerRef = useGetMemoizedMergedTriggerRefNew();
81
78
  return /*#__PURE__*/React.createElement(Reference, null, ({
82
79
  ref
83
80
  }) => children({
84
- ref: fg('platform-dst-popup-compositional-trigger-ref') ? getMergedTriggerRefNew(ref, setTriggerRef) : getMergedTriggerRef(ref, setTriggerRef, isOpen),
81
+ ref: getMergedTriggerRef(ref, setTriggerRef),
85
82
  'aria-controls': id,
86
83
  'aria-expanded': isOpen,
87
84
  'aria-haspopup': true
package/dist/es2019/use-get-memoized-merged-trigger-ref-new.js CHANGED
@@ -3,8 +3,8 @@ import memoizeOne from 'memoize-one';
3
3
 
4
4
  /**
5
5
  * Here setting ref is not dependent on isOpen flag which is failing in React 18 strict mode
6
- * Implemented behind ff `platform-design-system-popup-ref` (for regular popup) and
7
- * `platform-dst-popup-compositional-trigger-ref` (for compositional popup)
6
+ * Used behind ff `platform-design-system-popup-ref` for regular popup.
7
+ * Compositional popup always uses this variant.
8
8
  * @returns Function to set trigger ref
9
9
  */
10
10
  export const useGetMemoizedMergedTriggerRefNew = () => {
package/dist/esm/compositional/popup.js CHANGED
@@ -5,12 +5,10 @@ import noop from '@atlaskit/ds-lib/noop';
5
5
  import { useId } from '@atlaskit/ds-lib/use-id';
6
6
  import { Layering } from '@atlaskit/layering';
7
7
  import { useNotifyOpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
8
- import { fg } from '@atlaskit/platform-feature-flags';
9
8
  import { Manager, Reference } from '@atlaskit/popper';
10
9
  import Portal from '@atlaskit/portal';
11
10
  import PopperWrapper from '../popper-wrapper';
12
11
  import { usePopupAppearance } from '../use-appearance';
13
- import { useGetMemoizedMergedTriggerRef } from '../use-get-memoized-merged-trigger-ref';
14
12
  import { useGetMemoizedMergedTriggerRefNew } from '../use-get-memoized-merged-trigger-ref-new';
15
13
  var IsOpenContext = /*#__PURE__*/createContext(false);
16
14
  var IdContext = /*#__PURE__*/createContext(undefined);
@@ -76,15 +74,14 @@ export var Popup = function Popup(_ref) {
76
74
  export var PopupTrigger = function PopupTrigger(_ref2) {
77
75
  var children = _ref2.children;
78
76
  useEnsureIsInsidePopup();
79
- var isOpen = useContext(IsOpenContext);
80
77
  var id = useContext(IdContext);
81
78
  var setTriggerRef = useContext(SetTriggerRefContext);
82
- var getMergedTriggerRef = useGetMemoizedMergedTriggerRef();
83
- var getMergedTriggerRefNew = useGetMemoizedMergedTriggerRefNew();
79
+ var isOpen = useContext(IsOpenContext);
80
+ var getMergedTriggerRef = useGetMemoizedMergedTriggerRefNew();
84
81
  return /*#__PURE__*/React.createElement(Reference, null, function (_ref3) {
85
82
  var ref = _ref3.ref;
86
83
  return children({
87
- ref: fg('platform-dst-popup-compositional-trigger-ref') ? getMergedTriggerRefNew(ref, setTriggerRef) : getMergedTriggerRef(ref, setTriggerRef, isOpen),
84
+ ref: getMergedTriggerRef(ref, setTriggerRef),
88
85
  'aria-controls': id,
89
86
  'aria-expanded': isOpen,
90
87
  'aria-haspopup': true
package/dist/esm/use-get-memoized-merged-trigger-ref-new.js CHANGED
@@ -4,8 +4,8 @@ import memoizeOne from 'memoize-one';
4
4
 
5
5
  /**
6
6
  * Here setting ref is not dependent on isOpen flag which is failing in React 18 strict mode
7
- * Implemented behind ff `platform-design-system-popup-ref` (for regular popup) and
8
- * `platform-dst-popup-compositional-trigger-ref` (for compositional popup)
7
+ * Used behind ff `platform-design-system-popup-ref` for regular popup.
8
+ * Compositional popup always uses this variant.
9
9
  * @returns Function to set trigger ref
10
10
  */
11
11
  export var useGetMemoizedMergedTriggerRefNew = function useGetMemoizedMergedTriggerRefNew() {
package/dist/types/use-get-memoized-merged-trigger-ref-new.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  import { type Dispatch, type SetStateAction } from 'react';
2
2
  /**
3
3
  * Here setting ref is not dependent on isOpen flag which is failing in React 18 strict mode
4
- * Implemented behind ff `platform-design-system-popup-ref` (for regular popup) and
5
- * `platform-dst-popup-compositional-trigger-ref` (for compositional popup)
4
+ * Used behind ff `platform-design-system-popup-ref` for regular popup.
5
+ * Compositional popup always uses this variant.
6
6
  * @returns Function to set trigger ref
7
7
  */
8
8
  export declare const useGetMemoizedMergedTriggerRefNew: () => import("memoize-one").MemoizedFn<(ref: React.RefCallback<HTMLElement> | React.MutableRefObject<HTMLElement> | null, setTriggerRef: Dispatch<SetStateAction<HTMLElement | null>>) => (node: HTMLElement | null) => void>;
package/dist/types-ts4.5/use-get-memoized-merged-trigger-ref-new.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  import { type Dispatch, type SetStateAction } from 'react';
2
2
  /**
3
3
  * Here setting ref is not dependent on isOpen flag which is failing in React 18 strict mode
4
- * Implemented behind ff `platform-design-system-popup-ref` (for regular popup) and
5
- * `platform-dst-popup-compositional-trigger-ref` (for compositional popup)
4
+ * Used behind ff `platform-design-system-popup-ref` for regular popup.
5
+ * Compositional popup always uses this variant.
6
6
  * @returns Function to set trigger ref
7
7
  */
8
8
  export declare const useGetMemoizedMergedTriggerRefNew: () => import("memoize-one").MemoizedFn<(ref: React.RefCallback<HTMLElement> | React.MutableRefObject<HTMLElement> | null, setTriggerRef: Dispatch<SetStateAction<HTMLElement | null>>) => (node: HTMLElement | null) => void>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/popup",
3
- "version": "4.7.1",
3
+ "version": "4.8.0",
4
4
  "description": "A popup displays brief content in an overlay.",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -58,9 +58,9 @@
58
58
  "@atlaskit/button": "^23.8.0",
59
59
  "@atlaskit/code": "^17.4.0",
60
60
  "@atlaskit/docs": "^11.2.0",
61
- "@atlaskit/form": "^15.0.0",
61
+ "@atlaskit/form": "^15.1.0",
62
62
  "@atlaskit/heading": "^5.2.0",
63
- "@atlaskit/icon": "^29.2.0",
63
+ "@atlaskit/icon": "^29.3.0",
64
64
  "@atlaskit/link": "^3.2.0",
65
65
  "@atlaskit/modal-dialog": "^14.9.0",
66
66
  "@atlaskit/section-message": "^8.11.0",
@@ -117,9 +117,6 @@
117
117
  "popup-onclose-fix": {
118
118
  "type": "boolean"
119
119
  },
120
- "platform-dst-popup-compositional-trigger-ref": {
121
- "type": "boolean"
122
- },
123
120
  "platform-dst-shape-theme-default": {
124
121
  "type": "boolean"
125
122
  }