@atlaskit/popup 1.8.3 → 1.9.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/popup
 
+## 1.9.1
+
+### Patch Changes
+
+- [`6a0a3c059ba`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6a0a3c059ba) - Remove unused argument from internal focus management function.
+
+## 1.9.0
+
+### Minor Changes
+
+- [`3920dcfd848`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3920dcfd848) - This removes the feature flag made for upgrading the `focus-trap` dependency and keeps `focus-trap` at it's original version.
+
 ## 1.8.3
 
 ### Patch Changes

package/dist/cjs/popper-wrapper.js

@@ -66,8 +66,7 @@ function PopperWrapper(_ref) {
     setInitialFocusRef = _useState4[1];
   (0, _useFocusManager.useFocusManager)({
     initialFocusRef: initialFocusRef,
-    popupRef: popupRef,
-    autoFocus: autoFocus
+    popupRef: popupRef
   });
   (0, _useCloseManager.useCloseManager)({
     isOpen: isOpen,

package/dist/cjs/use-focus-manager.js

@@ -6,39 +6,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useFocusManager = void 0;
 var _react = require("react");
-var _focusTrap = require("focus-trap");
-var _focusTrapV = _interopRequireDefault(require("focus-trap-v2"));
+var _focusTrap = _interopRequireDefault(require("focus-trap"));
 var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var useFocusManager = function useFocusManager(_ref) {
   var popupRef = _ref.popupRef,
-    initialFocusRef = _ref.initialFocusRef,
-    autoFocus = _ref.autoFocus;
+    initialFocusRef = _ref.initialFocusRef;
   (0, _react.useEffect)(function () {
     if (!popupRef) {
       return _noop.default;
     }
-    var focusTrap;
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.focus-trap-upgrade_p2cei')) {
-      var trapConfig = {
-        clickOutsideDeactivates: true,
-        escapeDeactivates: true,
-        // @ts-ignore: The multiple focus-trap packages is causing a type error that does not affect functionality
-        initialFocus: autoFocus ? initialFocusRef || popupRef : false,
-        fallbackFocus: popupRef,
-        returnFocusOnDeactivate: true
-      };
-      focusTrap = (0, _focusTrap.createFocusTrap)(popupRef, trapConfig);
-    } else {
-      var _trapConfig = {
-        clickOutsideDeactivates: true,
-        escapeDeactivates: true,
-        initialFocus: initialFocusRef || popupRef,
-        fallbackFocus: popupRef,
-        returnFocusOnDeactivate: true
-      };
-      focusTrap = (0, _focusTrapV.default)(popupRef, _trapConfig);
-    }
+    var trapConfig = {
+      clickOutsideDeactivates: true,
+      escapeDeactivates: true,
+      initialFocus: initialFocusRef || popupRef,
+      fallbackFocus: popupRef,
+      returnFocusOnDeactivate: true
+    };
+    var focusTrap = (0, _focusTrap.default)(popupRef, trapConfig);
 
     // wait for the popup to reposition itself before we focus
     var frameId = requestAnimationFrame(function () {
@@ -52,6 +36,6 @@ var useFocusManager = function useFocusManager(_ref) {
       }
       focusTrap.deactivate();
     };
-  }, [popupRef, initialFocusRef, autoFocus]);
+  }, [popupRef, initialFocusRef]);
 };
 exports.useFocusManager = useFocusManager;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/popup",
-	"version": "1.8.3",
+	"version": "1.9.1",
 	"sideEffects": false
 }

package/dist/es2019/popper-wrapper.js

@@ -47,8 +47,7 @@ function PopperWrapper({
   const [initialFocusRef, setInitialFocusRef] = useState(null);
   useFocusManager({
     initialFocusRef,
-    popupRef,
-    autoFocus
+    popupRef
   });
   useCloseManager({
     isOpen,

package/dist/es2019/use-focus-manager.js

@@ -1,38 +1,22 @@
 import { useEffect } from 'react';
-import { createFocusTrap } from 'focus-trap';
-import createFocusTrapV2 from 'focus-trap-v2';
+import createFocusTrap from 'focus-trap';
 import noop from '@atlaskit/ds-lib/noop';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export const useFocusManager = ({
   popupRef,
-  initialFocusRef,
-  autoFocus
+  initialFocusRef
 }) => {
   useEffect(() => {
     if (!popupRef) {
       return noop;
     }
-    let focusTrap;
-    if (getBooleanFF('platform.design-system-team.focus-trap-upgrade_p2cei')) {
-      const trapConfig = {
-        clickOutsideDeactivates: true,
-        escapeDeactivates: true,
-        // @ts-ignore: The multiple focus-trap packages is causing a type error that does not affect functionality
-        initialFocus: autoFocus ? initialFocusRef || popupRef : false,
-        fallbackFocus: popupRef,
-        returnFocusOnDeactivate: true
-      };
-      focusTrap = createFocusTrap(popupRef, trapConfig);
-    } else {
-      const trapConfig = {
-        clickOutsideDeactivates: true,
-        escapeDeactivates: true,
-        initialFocus: initialFocusRef || popupRef,
-        fallbackFocus: popupRef,
-        returnFocusOnDeactivate: true
-      };
-      focusTrap = createFocusTrapV2(popupRef, trapConfig);
-    }
+    const trapConfig = {
+      clickOutsideDeactivates: true,
+      escapeDeactivates: true,
+      initialFocus: initialFocusRef || popupRef,
+      fallbackFocus: popupRef,
+      returnFocusOnDeactivate: true
+    };
+    const focusTrap = createFocusTrap(popupRef, trapConfig);
 
     // wait for the popup to reposition itself before we focus
     let frameId = requestAnimationFrame(() => {
@@ -46,5 +30,5 @@ export const useFocusManager = ({
       }
       focusTrap.deactivate();
     };
-  }, [popupRef, initialFocusRef, autoFocus]);
+  }, [popupRef, initialFocusRef]);
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/popup",
-	"version": "1.8.3",
+	"version": "1.9.1",
 	"sideEffects": false
 }

package/dist/esm/popper-wrapper.js

@@ -58,8 +58,7 @@ function PopperWrapper(_ref) {
     setInitialFocusRef = _useState4[1];
   useFocusManager({
     initialFocusRef: initialFocusRef,
-    popupRef: popupRef,
-    autoFocus: autoFocus
+    popupRef: popupRef
   });
   useCloseManager({
     isOpen: isOpen,

package/dist/esm/use-focus-manager.js

@@ -1,37 +1,21 @@
 import { useEffect } from 'react';
-import { createFocusTrap } from 'focus-trap';
-import createFocusTrapV2 from 'focus-trap-v2';
+import createFocusTrap from 'focus-trap';
 import noop from '@atlaskit/ds-lib/noop';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export var useFocusManager = function useFocusManager(_ref) {
   var popupRef = _ref.popupRef,
-    initialFocusRef = _ref.initialFocusRef,
-    autoFocus = _ref.autoFocus;
+    initialFocusRef = _ref.initialFocusRef;
   useEffect(function () {
     if (!popupRef) {
       return noop;
     }
-    var focusTrap;
-    if (getBooleanFF('platform.design-system-team.focus-trap-upgrade_p2cei')) {
-      var trapConfig = {
-        clickOutsideDeactivates: true,
-        escapeDeactivates: true,
-        // @ts-ignore: The multiple focus-trap packages is causing a type error that does not affect functionality
-        initialFocus: autoFocus ? initialFocusRef || popupRef : false,
-        fallbackFocus: popupRef,
-        returnFocusOnDeactivate: true
-      };
-      focusTrap = createFocusTrap(popupRef, trapConfig);
-    } else {
-      var _trapConfig = {
-        clickOutsideDeactivates: true,
-        escapeDeactivates: true,
-        initialFocus: initialFocusRef || popupRef,
-        fallbackFocus: popupRef,
-        returnFocusOnDeactivate: true
-      };
-      focusTrap = createFocusTrapV2(popupRef, _trapConfig);
-    }
+    var trapConfig = {
+      clickOutsideDeactivates: true,
+      escapeDeactivates: true,
+      initialFocus: initialFocusRef || popupRef,
+      fallbackFocus: popupRef,
+      returnFocusOnDeactivate: true
+    };
+    var focusTrap = createFocusTrap(popupRef, trapConfig);
 
     // wait for the popup to reposition itself before we focus
     var frameId = requestAnimationFrame(function () {
@@ -45,5 +29,5 @@ export var useFocusManager = function useFocusManager(_ref) {
       }
       focusTrap.deactivate();
     };
-  }, [popupRef, initialFocusRef, autoFocus]);
+  }, [popupRef, initialFocusRef]);
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/popup",
-	"version": "1.8.3",
+	"version": "1.9.1",
 	"sideEffects": false
 }

package/dist/types/types.d.ts

@@ -85,7 +85,8 @@ interface BaseProps {
     /**
      * Defines a list of placements to try.
      * When no space is available on the preferred placement,
-     * the modifier will test the ones provided in the list, and use the first useful one.
+     * the modifier will test the ones provided in the list, and use the first suitable one.
+     * If no fallback placements are suitable, it reverts back to the original placement.
      */
     fallbackPlacements?: Placement[];
     /**
@@ -164,7 +165,6 @@ export type CloseManagerHook = Pick<PopupProps, 'isOpen' | 'onClose'> & {
 export type FocusManagerHook = {
     popupRef: PopupRef;
     initialFocusRef: HTMLElement | null;
-    autoFocus: boolean;
 };
 export type RepositionOnUpdateProps = {
     update: PopperChildrenProps['update'];

package/dist/types/use-focus-manager.d.ts

@@ -1,2 +1,2 @@
 import { FocusManagerHook } from './types';
-export declare const useFocusManager: ({ popupRef, initialFocusRef, autoFocus, }: FocusManagerHook) => void;
+export declare const useFocusManager: ({ popupRef, initialFocusRef, }: FocusManagerHook) => void;

package/dist/types-ts4.5/types.d.ts

@@ -88,7 +88,8 @@ interface BaseProps {
     /**
      * Defines a list of placements to try.
      * When no space is available on the preferred placement,
-     * the modifier will test the ones provided in the list, and use the first useful one.
+     * the modifier will test the ones provided in the list, and use the first suitable one.
+     * If no fallback placements are suitable, it reverts back to the original placement.
      */
     fallbackPlacements?: Placement[];
     /**
@@ -167,7 +168,6 @@ export type CloseManagerHook = Pick<PopupProps, 'isOpen' | 'onClose'> & {
 export type FocusManagerHook = {
     popupRef: PopupRef;
     initialFocusRef: HTMLElement | null;
-    autoFocus: boolean;
 };
 export type RepositionOnUpdateProps = {
     update: PopperChildrenProps['update'];

package/dist/types-ts4.5/use-focus-manager.d.ts

@@ -1,2 +1,2 @@
 import { FocusManagerHook } from './types';
-export declare const useFocusManager: ({ popupRef, initialFocusRef, autoFocus, }: FocusManagerHook) => void;
+export declare const useFocusManager: ({ popupRef, initialFocusRef, }: FocusManagerHook) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/popup",
-  "version": "1.8.3",
+  "version": "1.9.1",
   "description": "A popup displays brief content in an overlay.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -40,12 +40,11 @@
     "@atlaskit/popper": "^5.5.0",
     "@atlaskit/portal": "^4.3.0",
     "@atlaskit/theme": "^12.5.0",
-    "@atlaskit/tokens": "^1.11.0",
+    "@atlaskit/tokens": "^1.13.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "bind-event-listener": "^2.1.1",
-    "focus-trap": "^7.0.0",
-    "focus-trap-v2": "npm:focus-trap@^2.4.5"
+    "focus-trap": "^2.4.5"
   },
   "peerDependencies": {
     "react": "^16.8.0",
@@ -57,7 +56,6 @@
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/ssr": "*",
     "@atlaskit/visual-regression": "*",
-    "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@atlassian/feature-flags-test-utils": "*",
     "@testing-library/dom": "^8.17.1",
@@ -96,13 +94,10 @@
     }
   },
   "homepage": "https://atlassian.design/components/popup/",
+  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1",
   "platform-feature-flags": {
     "platform.design-system-team.render-popup-in-parent_f73ij": {
       "type": "boolean"
-    },
-    "platform.design-system-team.focus-trap-upgrade_p2cei": {
-      "type": "boolean"
     }
-  },
-  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1"
+  }
 }

package/tmp/api-report-tmp.d.ts

@@ -0,0 +1,81 @@
+## API Report File for "@atlaskit/popup"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { ComponentType } from 'react';
+import { CSSProperties } from 'react';
+import { Dispatch } from 'react';
+import { FC } from 'react';
+import { Placement } from '@atlaskit/popper';
+import { PopperChildrenProps } from '@atlaskit/popper';
+import { default as React_2 } from 'react';
+import { ReactNode } from 'react';
+import { Ref } from 'react';
+import { SetStateAction } from 'react';
+
+// @public (undocumented)
+interface BaseProps {
+    autoFocus?: boolean;
+    boundary?: 'clippingParents' | HTMLElement;
+    content: (props: ContentProps) => React_2.ReactNode;
+    fallbackPlacements?: Placement[];
+    id?: string;
+    isOpen: boolean;
+    offset?: [number, number];
+    onClose?(event: Event | React_2.KeyboardEvent | React_2.MouseEvent): void;
+    placement?: Placement;
+    popupComponent?: ComponentType<PopupComponentProps>;
+    rootBoundary?: 'document' | 'viewport';
+    shouldFlip?: boolean;
+    shouldUseCaptureOnOutsideClick?: boolean;
+    testId?: string;
+}
+
+// @public (undocumented)
+export interface ContentProps {
+    isOpen: boolean;
+    onClose?: BaseProps['onClose'];
+    setInitialFocusRef: Dispatch<SetStateAction<HTMLElement | null>>;
+    update: PopperChildrenProps['update'];
+}
+
+// @public (undocumented)
+const Popup: FC<PopupProps>;
+export { Popup }
+export default Popup;
+
+// @public (undocumented)
+export interface PopupComponentProps {
+    'data-placement': Placement;
+    'data-testid'?: string;
+    children: ReactNode;
+    id?: string;
+    ref: Ref<HTMLDivElement>;
+    style: CSSProperties;
+    tabIndex: number | undefined;
+}
+
+// @public (undocumented)
+export interface PopupProps extends BaseProps {
+    shouldRenderToParent?: boolean;
+    trigger: (props: TriggerProps) => React_2.ReactNode;
+    zIndex?: number;
+}
+
+// @public (undocumented)
+export interface TriggerProps {
+    // (undocumented)
+    'aria-controls'?: string;
+    // (undocumented)
+    'aria-expanded': boolean;
+    // (undocumented)
+    'aria-haspopup': boolean;
+    // (undocumented)
+    ref: Ref<any>;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```