@atlaskit/popup 1.11.2 → 1.11.3

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 (6) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/dist/cjs/use-focus-manager.js +10 -31
  3. package/dist/es2019/use-focus-manager.js +10 -31
  4. package/dist/esm/use-focus-manager.js +10 -31
  5. package/package.json +4 -7
  6. package/tmp/api-report-tmp.d.ts +0 -82
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @atlaskit/popup
2
2
 
3
+ ## 1.11.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [#42594](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42594) [`07781d6d786`](https://bitbucket.org/atlassian/atlassian-frontend/commits/07781d6d786) - Removes feature flag implemented in 1.11.0. Does not implement proposed functionality behind the feature flag.
8
+
3
9
  ## 1.11.2
4
10
 
5
11
  ### Patch Changes
package/dist/cjs/use-focus-manager.js CHANGED
@@ -8,7 +8,6 @@ exports.useFocusManager = void 0;
8
8
  var _react = require("react");
9
9
  var _focusTrap = _interopRequireDefault(require("focus-trap"));
10
10
  var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
11
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
12
11
  var useFocusManager = exports.useFocusManager = function useFocusManager(_ref) {
13
12
  var initialFocusRef = _ref.initialFocusRef,
14
13
  popupRef = _ref.popupRef;
@@ -16,47 +15,27 @@ var useFocusManager = exports.useFocusManager = function useFocusManager(_ref) {
16
15
  if (!popupRef) {
17
16
  return _noop.default;
18
17
  }
19
- var previouslyFocusedElement;
20
- var focusTrap;
21
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.remove-focus-trap-from-popup_3q7sk')) {
22
- previouslyFocusedElement = document.activeElement;
23
- } else {
24
- var trapConfig = {
25
- clickOutsideDeactivates: true,
26
- escapeDeactivates: true,
27
- initialFocus: initialFocusRef || popupRef,
28
- fallbackFocus: popupRef,
29
- returnFocusOnDeactivate: true
30
- };
31
- focusTrap = (0, _focusTrap.default)(popupRef, trapConfig);
32
- }
18
+ var trapConfig = {
19
+ clickOutsideDeactivates: true,
20
+ escapeDeactivates: true,
21
+ initialFocus: initialFocusRef || popupRef,
22
+ fallbackFocus: popupRef,
23
+ returnFocusOnDeactivate: true
24
+ };
25
+ var focusTrap = (0, _focusTrap.default)(popupRef, trapConfig);
33
26
  var frameId = null;
34
27
 
35
28
  // wait for the popup to reposition itself before we focus
36
29
  frameId = requestAnimationFrame(function () {
37
30
  frameId = null;
38
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.remove-focus-trap-from-popup_3q7sk')) {
39
- if (initialFocusRef && initialFocusRef.focus) {
40
- initialFocusRef.focus();
41
- } else {
42
- popupRef.focus();
43
- }
44
- } else {
45
- focusTrap.activate();
46
- }
31
+ focusTrap.activate();
47
32
  });
48
33
  return function () {
49
34
  if (frameId != null) {
50
35
  cancelAnimationFrame(frameId);
51
36
  frameId = null;
52
37
  }
53
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.remove-focus-trap-from-popup_3q7sk')) {
54
- if (previouslyFocusedElement && previouslyFocusedElement.focus) {
55
- previouslyFocusedElement.focus();
56
- }
57
- } else {
58
- focusTrap.deactivate();
59
- }
38
+ focusTrap.deactivate();
60
39
  };
61
40
  }, [popupRef, initialFocusRef]);
62
41
  };
package/dist/es2019/use-focus-manager.js CHANGED
@@ -1,7 +1,6 @@
1
1
  import { useEffect } from 'react';
2
2
  import createFocusTrap from 'focus-trap';
3
3
  import noop from '@atlaskit/ds-lib/noop';
4
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
5
4
  export const useFocusManager = ({
6
5
  initialFocusRef,
7
6
  popupRef
@@ -10,47 +9,27 @@ export const useFocusManager = ({
10
9
  if (!popupRef) {
11
10
  return noop;
12
11
  }
13
- let previouslyFocusedElement;
14
- let focusTrap;
15
- if (getBooleanFF('platform.design-system-team.remove-focus-trap-from-popup_3q7sk')) {
16
- previouslyFocusedElement = document.activeElement;
17
- } else {
18
- const trapConfig = {
19
- clickOutsideDeactivates: true,
20
- escapeDeactivates: true,
21
- initialFocus: initialFocusRef || popupRef,
22
- fallbackFocus: popupRef,
23
- returnFocusOnDeactivate: true
24
- };
25
- focusTrap = createFocusTrap(popupRef, trapConfig);
26
- }
12
+ const trapConfig = {
13
+ clickOutsideDeactivates: true,
14
+ escapeDeactivates: true,
15
+ initialFocus: initialFocusRef || popupRef,
16
+ fallbackFocus: popupRef,
17
+ returnFocusOnDeactivate: true
18
+ };
19
+ const focusTrap = createFocusTrap(popupRef, trapConfig);
27
20
  let frameId = null;
28
21
 
29
22
  // wait for the popup to reposition itself before we focus
30
23
  frameId = requestAnimationFrame(() => {
31
24
  frameId = null;
32
- if (getBooleanFF('platform.design-system-team.remove-focus-trap-from-popup_3q7sk')) {
33
- if (initialFocusRef && initialFocusRef.focus) {
34
- initialFocusRef.focus();
35
- } else {
36
- popupRef.focus();
37
- }
38
- } else {
39
- focusTrap.activate();
40
- }
25
+ focusTrap.activate();
41
26
  });
42
27
  return () => {
43
28
  if (frameId != null) {
44
29
  cancelAnimationFrame(frameId);
45
30
  frameId = null;
46
31
  }
47
- if (getBooleanFF('platform.design-system-team.remove-focus-trap-from-popup_3q7sk')) {
48
- if (previouslyFocusedElement && previouslyFocusedElement.focus) {
49
- previouslyFocusedElement.focus();
50
- }
51
- } else {
52
- focusTrap.deactivate();
53
- }
32
+ focusTrap.deactivate();
54
33
  };
55
34
  }, [popupRef, initialFocusRef]);
56
35
  };
package/dist/esm/use-focus-manager.js CHANGED
@@ -1,7 +1,6 @@
1
1
  import { useEffect } from 'react';
2
2
  import createFocusTrap from 'focus-trap';
3
3
  import noop from '@atlaskit/ds-lib/noop';
4
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
5
4
  export var useFocusManager = function useFocusManager(_ref) {
6
5
  var initialFocusRef = _ref.initialFocusRef,
7
6
  popupRef = _ref.popupRef;
@@ -9,47 +8,27 @@ export var useFocusManager = function useFocusManager(_ref) {
9
8
  if (!popupRef) {
10
9
  return noop;
11
10
  }
12
- var previouslyFocusedElement;
13
- var focusTrap;
14
- if (getBooleanFF('platform.design-system-team.remove-focus-trap-from-popup_3q7sk')) {
15
- previouslyFocusedElement = document.activeElement;
16
- } else {
17
- var trapConfig = {
18
- clickOutsideDeactivates: true,
19
- escapeDeactivates: true,
20
- initialFocus: initialFocusRef || popupRef,
21
- fallbackFocus: popupRef,
22
- returnFocusOnDeactivate: true
23
- };
24
- focusTrap = createFocusTrap(popupRef, trapConfig);
25
- }
11
+ var trapConfig = {
12
+ clickOutsideDeactivates: true,
13
+ escapeDeactivates: true,
14
+ initialFocus: initialFocusRef || popupRef,
15
+ fallbackFocus: popupRef,
16
+ returnFocusOnDeactivate: true
17
+ };
18
+ var focusTrap = createFocusTrap(popupRef, trapConfig);
26
19
  var frameId = null;
27
20
 
28
21
  // wait for the popup to reposition itself before we focus
29
22
  frameId = requestAnimationFrame(function () {
30
23
  frameId = null;
31
- if (getBooleanFF('platform.design-system-team.remove-focus-trap-from-popup_3q7sk')) {
32
- if (initialFocusRef && initialFocusRef.focus) {
33
- initialFocusRef.focus();
34
- } else {
35
- popupRef.focus();
36
- }
37
- } else {
38
- focusTrap.activate();
39
- }
24
+ focusTrap.activate();
40
25
  });
41
26
  return function () {
42
27
  if (frameId != null) {
43
28
  cancelAnimationFrame(frameId);
44
29
  frameId = null;
45
30
  }
46
- if (getBooleanFF('platform.design-system-team.remove-focus-trap-from-popup_3q7sk')) {
47
- if (previouslyFocusedElement && previouslyFocusedElement.focus) {
48
- previouslyFocusedElement.focus();
49
- }
50
- } else {
51
- focusTrap.deactivate();
52
- }
31
+ focusTrap.deactivate();
53
32
  };
54
33
  }, [popupRef, initialFocusRef]);
55
34
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/popup",
3
- "version": "1.11.2",
3
+ "version": "1.11.3",
4
4
  "description": "A popup displays brief content in an overlay.",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -39,9 +39,9 @@
39
39
  "@atlaskit/layering": "^0.2.0",
40
40
  "@atlaskit/platform-feature-flags": "^0.2.0",
41
41
  "@atlaskit/popper": "^5.5.0",
42
- "@atlaskit/portal": "^4.3.0",
42
+ "@atlaskit/portal": "^4.4.0",
43
43
  "@atlaskit/theme": "^12.6.0",
44
- "@atlaskit/tokens": "^1.27.0",
44
+ "@atlaskit/tokens": "^1.28.0",
45
45
  "@babel/runtime": "^7.0.0",
46
46
  "@emotion/react": "^11.7.1",
47
47
  "bind-event-listener": "^2.1.1",
@@ -54,7 +54,7 @@
54
54
  "devDependencies": {
55
55
  "@af/accessibility-testing": "*",
56
56
  "@af/visual-regression": "*",
57
- "@atlaskit/button": "^16.10.0",
57
+ "@atlaskit/button": "^16.13.0",
58
58
  "@atlaskit/icon": "^21.12.0",
59
59
  "@atlaskit/ssr": "*",
60
60
  "@atlaskit/visual-regression": "*",
@@ -98,9 +98,6 @@
98
98
  "platform-feature-flags": {
99
99
  "platform.design-system-team.layering_popup_1cnzt": {
100
100
  "type": "boolean"
101
- },
102
- "platform.design-system-team.remove-focus-trap-from-popup_3q7sk": {
103
- "type": "boolean"
104
101
  }
105
102
  },
106
103
  "homepage": "https://atlassian.design/components/popup/",
package/tmp/api-report-tmp.d.ts DELETED
@@ -1,82 +0,0 @@
1
- ## API Report File for "@atlaskit/popup"
2
-
3
- > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
4
-
5
- ```ts
6
-
7
- import { ComponentType } from 'react';
8
- import { CSSProperties } from 'react';
9
- import { Dispatch } from 'react';
10
- import { FC } from 'react';
11
- import { Placement } from '@atlaskit/popper';
12
- import { PopperChildrenProps } from '@atlaskit/popper';
13
- import { default as React_2 } from 'react';
14
- import { ReactNode } from 'react';
15
- import { Ref } from 'react';
16
- import { SetStateAction } from 'react';
17
-
18
- // @public (undocumented)
19
- interface BaseProps {
20
- autoFocus?: boolean;
21
- boundary?: 'clippingParents' | HTMLElement;
22
- content: (props: ContentProps) => React_2.ReactNode;
23
- fallbackPlacements?: Placement[];
24
- id?: string;
25
- isOpen: boolean;
26
- offset?: [number, number];
27
- onClose?(event: Event | React_2.KeyboardEvent | React_2.MouseEvent): void;
28
- placement?: Placement;
29
- popupComponent?: ComponentType<PopupComponentProps>;
30
- rootBoundary?: 'document' | 'viewport';
31
- shouldFlip?: boolean;
32
- shouldRenderToParent?: boolean;
33
- shouldUseCaptureOnOutsideClick?: boolean;
34
- testId?: string;
35
- }
36
-
37
- // @public (undocumented)
38
- export interface ContentProps {
39
- isOpen: boolean;
40
- onClose?: BaseProps['onClose'];
41
- setInitialFocusRef: Dispatch<SetStateAction<HTMLElement | null>>;
42
- update: PopperChildrenProps['update'];
43
- }
44
-
45
- // @public (undocumented)
46
- const Popup: FC<PopupProps>;
47
- export { Popup }
48
- export default Popup;
49
-
50
- // @public (undocumented)
51
- export interface PopupComponentProps {
52
- 'data-placement': Placement;
53
- 'data-testid'?: string;
54
- children: ReactNode;
55
- id?: string;
56
- ref: Ref<HTMLDivElement>;
57
- shouldRenderToParent?: boolean;
58
- style: CSSProperties;
59
- tabIndex: number | undefined;
60
- }
61
-
62
- // @public (undocumented)
63
- export interface PopupProps extends BaseProps {
64
- trigger: (props: TriggerProps) => React_2.ReactNode;
65
- zIndex?: number;
66
- }
67
-
68
- // @public (undocumented)
69
- export interface TriggerProps {
70
- // (undocumented)
71
- 'aria-controls'?: string;
72
- // (undocumented)
73
- 'aria-expanded': boolean;
74
- // (undocumented)
75
- 'aria-haspopup': boolean;
76
- // (undocumented)
77
- ref: Ref<any>;
78
- }
79
-
80
- // (No @packageDocumentation comment for this package)
81
-
82
- ```