@atlaskit/popup 1.8.1 → 1.8.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/popup
 
+## 1.8.3
+
+### Patch Changes
+
+- [`4ae083a7e66`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4ae083a7e66) - Use `@af/accessibility-testing` for default jest-axe config and jest-axe import in accessibility testing.
+
+## 1.8.2
+
+### Patch Changes
+
+- [`472a62ce219`](https://bitbucket.org/atlassian/atlassian-frontend/commits/472a62ce219) - [ux] Fixes `autoFocus` functionality on upgrade of focus-trap to v7.
+
 ## 1.8.1
 
 ### Patch Changes

package/dist/cjs/popper-wrapper.js

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

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

@@ -12,23 +12,32 @@ 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;
+    initialFocusRef = _ref.initialFocusRef,
+    autoFocus = _ref.autoFocus;
   (0, _react.useEffect)(function () {
     if (!popupRef) {
       return _noop.default;
     }
-    var trapConfig = {
-      clickOutsideDeactivates: true,
-      escapeDeactivates: true,
-      initialFocus: initialFocusRef || popupRef,
-      fallbackFocus: popupRef,
-      returnFocusOnDeactivate: true
-    };
     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 {
-      focusTrap = (0, _focusTrapV.default)(popupRef, trapConfig);
+      var _trapConfig = {
+        clickOutsideDeactivates: true,
+        escapeDeactivates: true,
+        initialFocus: initialFocusRef || popupRef,
+        fallbackFocus: popupRef,
+        returnFocusOnDeactivate: true
+      };
+      focusTrap = (0, _focusTrapV.default)(popupRef, _trapConfig);
     }
 
     // wait for the popup to reposition itself before we focus
@@ -43,6 +52,6 @@ var useFocusManager = function useFocusManager(_ref) {
       }
       focusTrap.deactivate();
     };
-  }, [popupRef, initialFocusRef]);
+  }, [popupRef, initialFocusRef, autoFocus]);
 };
 exports.useFocusManager = useFocusManager;

package/dist/cjs/version.json

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

package/dist/es2019/popper-wrapper.js

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

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

@@ -5,23 +5,32 @@ import noop from '@atlaskit/ds-lib/noop';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export const useFocusManager = ({
   popupRef,
-  initialFocusRef
+  initialFocusRef,
+  autoFocus
 }) => {
   useEffect(() => {
     if (!popupRef) {
       return noop;
     }
-    const trapConfig = {
-      clickOutsideDeactivates: true,
-      escapeDeactivates: true,
-      initialFocus: initialFocusRef || popupRef,
-      fallbackFocus: popupRef,
-      returnFocusOnDeactivate: true
-    };
     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);
     }
 
@@ -37,5 +46,5 @@ export const useFocusManager = ({
       }
       focusTrap.deactivate();
     };
-  }, [popupRef, initialFocusRef]);
+  }, [popupRef, initialFocusRef, autoFocus]);
 };

package/dist/es2019/version.json

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

package/dist/esm/popper-wrapper.js

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

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

@@ -5,23 +5,32 @@ 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;
+    initialFocusRef = _ref.initialFocusRef,
+    autoFocus = _ref.autoFocus;
   useEffect(function () {
     if (!popupRef) {
       return noop;
     }
-    var trapConfig = {
-      clickOutsideDeactivates: true,
-      escapeDeactivates: true,
-      initialFocus: initialFocusRef || popupRef,
-      fallbackFocus: popupRef,
-      returnFocusOnDeactivate: true
-    };
     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 {
-      focusTrap = createFocusTrapV2(popupRef, trapConfig);
+      var _trapConfig = {
+        clickOutsideDeactivates: true,
+        escapeDeactivates: true,
+        initialFocus: initialFocusRef || popupRef,
+        fallbackFocus: popupRef,
+        returnFocusOnDeactivate: true
+      };
+      focusTrap = createFocusTrapV2(popupRef, _trapConfig);
     }
 
     // wait for the popup to reposition itself before we focus
@@ -36,5 +45,5 @@ export var useFocusManager = function useFocusManager(_ref) {
       }
       focusTrap.deactivate();
     };
-  }, [popupRef, initialFocusRef]);
+  }, [popupRef, initialFocusRef, autoFocus]);
 };

package/dist/esm/version.json

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

package/dist/types/types.d.ts

@@ -164,6 +164,7 @@ 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, }: FocusManagerHook) => void;
+export declare const useFocusManager: ({ popupRef, initialFocusRef, autoFocus, }: FocusManagerHook) => void;

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

@@ -167,6 +167,7 @@ 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, }: FocusManagerHook) => void;
+export declare const useFocusManager: ({ popupRef, initialFocusRef, autoFocus, }: FocusManagerHook) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/popup",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "A popup displays brief content in an overlay.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -52,16 +52,10 @@
     "react-dom": "^16.8.0"
   },
   "devDependencies": {
+    "@af/accessibility-testing": "*",
     "@atlaskit/button": "^16.8.0",
-    "@atlaskit/docs": "*",
     "@atlaskit/icon": "^21.12.0",
-    "@atlaskit/menu": "^1.9.0",
-    "@atlaskit/radio": "^5.6.0",
-    "@atlaskit/section-message": "^6.4.0",
-    "@atlaskit/select": "^16.5.0",
     "@atlaskit/ssr": "*",
-    "@atlaskit/textfield": "^5.5.0",
-    "@atlaskit/toggle": "^12.6.0",
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
@@ -69,7 +63,6 @@
     "@testing-library/dom": "^8.17.1",
     "@testing-library/react": "^12.1.5",
     "ast-types": "^0.13.3",
-    "jest-axe": "^4.0.0",
     "jscodeshift": "^0.13.0",
     "raf-stub": "^2.0.1",
     "react-dom": "^16.8.0",

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

@@ -1,81 +0,0 @@
-## 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)
-
-```