@pingux/astro 2.147.0 → 2.147.1-alpha.1

package/lib/cjs/components/GridList/GridList.d.ts

@@ -1,17 +1,4 @@
-import React, { Key } from 'react';
-import { Collection } from 'react-stately';
-import type { Node } from '@react-types/shared';
-type GridListProps = {
-    containerProps: object;
-    rowProps: object;
-    cellProps: object;
-    children?: React.ReactNode;
-    isReorderable?: boolean;
-    items: Iterable<object>;
-    keyboardNavigationBehavior?: 'arrow' | 'tab';
-    onAction?: (key: Key) => void;
-    onSelectionChange?: (keys: Selection) => void;
-    collection: Collection<Node<object>>;
-};
+import React from 'react';
+import { GridListProps } from '../../types/gridList';
 declare const GridList: (props: GridListProps) => React.JSX.Element;
 export default GridList;

package/lib/cjs/components/GridList/GridList.stories.d.ts

@@ -1,18 +1,7 @@
 import React from 'react';
 declare const _default: {
     title: string;
-    component: (props: {
-        containerProps: object;
-        rowProps: object;
-        cellProps: object;
-        children?: React.ReactNode;
-        isReorderable?: boolean | undefined;
-        items: Iterable<object>;
-        keyboardNavigationBehavior?: "tab" | "arrow" | undefined;
-        onAction?: ((key: React.Key) => void) | undefined;
-        onSelectionChange?: ((keys: Selection) => void) | undefined;
-        collection: import("react-stately").Collection<import("@react-types/shared").Node<object>>;
-    }) => React.JSX.Element;
+    component: (props: import("../../types/gridList").GridListProps) => React.JSX.Element;
     argTypes: {
         isReorderable: {
             description: string;

package/lib/cjs/components/ImageUploadField/ImageUploadField.test.js

@@ -366,7 +366,9 @@ test('should show the menu if label clicked when preview image exists', /*#__PUR
         // Click on the image preview button
         imageUploadLabel = _testWrapper.screen.getByText(testLabel);
         _react2.fireEvent.click(imageUploadLabel);
-        expect(_testWrapper.screen.getAllByRole('button')[0]).toHaveAttribute('aria-expanded', 'true');
+        expect(_testWrapper.screen.getAllByRole('button', {
+          hidden: true
+        })[0]).toHaveAttribute('aria-expanded', 'true');
         expect(_testWrapper.screen.getByRole('menu')).toBeInTheDocument();
         expect(_testWrapper.screen.getByText('Upload New Image')).toBeInTheDocument();
         expect(_testWrapper.screen.getByText('Remove Image')).toBeInTheDocument();

package/lib/cjs/components/Modal/Modal.stories.d.ts

@@ -5,3 +5,4 @@ export default _default;
 export declare const Default: StoryFn<ModalProps>;
 export declare const LargeContent: StoryFn<ModalProps>;
 export declare const WithInputField: StoryFn<ModalProps>;
+export declare const WithPopoverMenu: StoryFn<ModalProps>;

package/lib/cjs/components/Modal/Modal.stories.js

@@ -8,7 +8,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.WithInputField = exports.LargeContent = exports.Default = void 0;
+exports["default"] = exports.WithPopoverMenu = exports.WithInputField = exports.LargeContent = exports.Default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
@@ -248,6 +248,32 @@ var WithInputField = function WithInputField() {
   }, "Cancel")))));
 };
 exports.WithInputField = WithInputField;
+var WithPopoverMenu = function WithPopoverMenu() {
+  var state = (0, _hooks.useModalState)();
+  return (0, _react2.jsx)(_index.OverlayProvider, null, (0, _react2.jsx)(_index.Button, {
+    onPress: state.open,
+    "aria-label": "Open modal"
+  }, "Open Modal"), state.isOpen && (0, _react2.jsx)(_index.Modal, {
+    isOpen: state.isOpen,
+    onClose: state.close
+  }, (0, _react2.jsx)(_index.Box, {
+    gap: "lg"
+  }, (0, _react2.jsx)(_index.Text, null, "Lorem ipsum dolor sit amet consectetur"), (0, _react2.jsx)(_index.PopoverMenu, null, (0, _react2.jsx)(_index.Button, null, "Click me"), (0, _react2.jsx)(_index.Menu, {
+    onAction: function onAction() {
+      return console.log('on action');
+    }
+  }, (0, _react2.jsx)(_index.Item, {
+    key: "edit"
+  }, "Edit"), (0, _react2.jsx)(_index.Item, {
+    key: "duplicate"
+  }, "Duplicate"), (0, _react2.jsx)(_index.Item, {
+    key: "delete",
+    textValue: "delete"
+  }, (0, _react2.jsx)(_index.Text, {
+    color: "critical.bright"
+  }, "Delete")))))));
+};
+exports.WithPopoverMenu = WithPopoverMenu;
 WithInputField.parameters = {
   a11y: {
     config: {

package/lib/cjs/components/Modal/tests/Modal.unit.test.js

@@ -1,13 +1,24 @@
 "use strict";
 
+var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
+var _Object$create = require("@babel/runtime-corejs3/core-js-stable/object/create");
+var _Object$getPrototypeOf = require("@babel/runtime-corejs3/core-js-stable/object/get-prototype-of");
+var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
+var _Object$setPrototypeOf = require("@babel/runtime-corejs3/core-js-stable/object/set-prototype-of");
+var _Promise = require("@babel/runtime-corejs3/core-js-stable/promise");
+var _reverseInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/reverse");
+var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
 var _react = _interopRequireDefault(require("react"));
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 var _index = require("../../../index");
 var _testWrapper = require("../../../utils/testUtils/testWrapper");
 var _universalComponentTest = require("../../../utils/testUtils/universalComponentTest");
 var _react2 = require("@emotion/react");
-// For testing the modal alone
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = _Object$defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof _Symbol ? _Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return _Object$defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = _Object$create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = _Object$getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = _Object$create(IteratorPrototype); function defineIteratorMethods(prototype) { var _context2; _forEachInstanceProperty(_context2 = ["next", "throw", "return"]).call(_context2, function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], _forEachInstanceProperty(tryLocsList).call(tryLocsList, pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return _Object$setPrototypeOf ? _Object$setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = _Object$create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = _Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return _reverseInstanceProperty(keys).call(keys), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { var _context3; if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, _forEachInstanceProperty(_context3 = this.tryEntries).call(_context3, resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+_sliceInstanceProperty(name).call(name, 1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; } // For testing the modal alone
 var getComponent = function getComponent() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return (0, _testWrapper.render)((0, _react2.jsx)(_index.OverlayProvider, null, (0, _react2.jsx)(_index.Modal, props)));
@@ -28,6 +39,24 @@ var getModalWithRadioFieldGroup = function getModalWithRadioFieldGroup() {
     "data-testid": "option2"
   })))));
 };
+var buttonText = 'Click me';
+var onAction = jest.fn();
+var option1 = 'option1';
+var getModalWithPopoverMenu = function getModalWithPopoverMenu() {
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return (0, _testWrapper.render)((0, _react2.jsx)(_index.OverlayProvider, null, (0, _react2.jsx)(_index.Modal, props, (0, _react2.jsx)(_index.PopoverMenu, null, (0, _react2.jsx)(_index.Button, null, buttonText), (0, _react2.jsx)(_index.Menu, {
+    onAction: onAction
+  }, (0, _react2.jsx)(_index.Item, {
+    key: "edit"
+  }, option1), (0, _react2.jsx)(_index.Item, {
+    key: "duplicate"
+  }, "Duplicate"), (0, _react2.jsx)(_index.Item, {
+    key: "delete",
+    textValue: "delete"
+  }, (0, _react2.jsx)(_index.Text, {
+    color: "critical.bright"
+  }, "Delete")))))));
+};
 
 // **********
 // Unit tests
@@ -252,4 +281,24 @@ test('should not show focus ring (is-focused class) on radio buttons when clicke
   expect(radioB).toBeChecked();
   expect(labelA).not.toHaveClass('is-focused');
   expect(labelB).not.toHaveClass('is-focused');
-});
+});
+test('popover menu onAction is called when menu is inside modal', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var button, option1Text;
+  return _regeneratorRuntime().wrap(function _callee$(_context) {
+    while (1) switch (_context.prev = _context.next) {
+      case 0:
+        getModalWithPopoverMenu();
+        button = _testWrapper.screen.getByText(buttonText);
+        _userEvent["default"].click(button);
+        _context.next = 5;
+        return _testWrapper.screen.findByText(option1);
+      case 5:
+        option1Text = _context.sent;
+        _userEvent["default"].click(option1Text);
+        expect(onAction).toHaveBeenCalled();
+      case 8:
+      case "end":
+        return _context.stop();
+    }
+  }, _callee);
+})));

package/lib/cjs/components/Popover/Popover.d.ts

@@ -1,14 +1,4 @@
 import * as React from 'react';
-import type { OverlayTriggerState } from 'react-stately';
-import type { AriaPopoverProps } from '@react-aria/overlays';
-export interface PopoverProps extends Omit<AriaPopoverProps, 'popoverRef'> {
-    children?: React.ReactNode;
-    state: OverlayTriggerState;
-    className?: string;
-    popoverRef?: React.RefObject<HTMLDivElement>;
-    style?: React.CSSProperties;
-    width?: string | number;
-    'data-testid'?: string;
-}
+import { PopoverProps } from '../../types';
 declare const Popover: (props: PopoverProps) => React.JSX.Element | null;
 export default Popover;

package/lib/cjs/components/Popover/Popover.js

@@ -22,23 +22,29 @@ var React = _interopRequireWildcard(require("react"));
 var _overlays = require("@react-aria/overlays");
 var _hooks = require("../../hooks");
 var _Box = _interopRequireDefault(require("../Box"));
+var _PopoverContainer = require("../PopoverContainer");
 var _react2 = require("@emotion/react");
-var _excluded = ["popoverRef", "state", "children", "className", "isNonModal", "width"];
+var _excluded = ["arrowProps", "arrowCrossOffset", "direction", "popoverRef", "state", "children", "className", "isNonModal", "hasNoArrow", "width"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Popover = function Popover(props) {
   var ref = React.useRef(null);
-  var _props$popoverRef = props.popoverRef,
+  var arrowProps = props.arrowProps,
+    arrowCrossOffset = props.arrowCrossOffset,
+    direction = props.direction,
+    _props$popoverRef = props.popoverRef,
     popoverRef = _props$popoverRef === void 0 ? ref : _props$popoverRef,
     state = props.state,
     children = props.children,
     className = props.className,
     isNonModal = props.isNonModal,
+    hasNoArrow = props.hasNoArrow,
     width = props.width,
     others = (0, _objectWithoutProperties2["default"])(props, _excluded);
   var _usePopover = (0, _overlays.usePopover)(_objectSpread(_objectSpread({}, props), {}, {
+      offset: 5,
       popoverRef: popoverRef
     }), state),
     popoverProps = _usePopover.popoverProps,
@@ -57,9 +63,10 @@ var Popover = function Popover(props) {
     className: classNames,
     role: "presentation",
     width: width
-  }, popoverProps, others), !isNonModal && (0, _react2.jsx)(_overlays.DismissButton, {
-    onDismiss: state.close
-  }), children, (0, _react2.jsx)(_overlays.DismissButton, {
+  }, popoverProps, others), children, hasNoArrow ? null : (0, _react2.jsx)(_PopoverContainer.PopoverArrow, (0, _extends2["default"])({}, arrowProps, {
+    arrowCrossOffset: arrowCrossOffset,
+    direction: direction
+  })), (0, _react2.jsx)(_overlays.DismissButton, {
     onDismiss: state.close
   })));
 };

package/lib/cjs/components/PopoverMenu/PopoverMenu.js

@@ -24,8 +24,7 @@ var _reactAria = require("react-aria");
 var _reactStately = require("react-stately");
 var _interactions = require("@react-aria/interactions");
 var _MenuContext = require("../../context/MenuContext");
-var _hooks = require("../../hooks");
-var _PopoverContainer = _interopRequireDefault(require("../PopoverContainer"));
+var _Popover = _interopRequireDefault(require("../Popover/Popover"));
 var _react2 = require("@emotion/react");
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -33,7 +32,6 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var PopoverMenu = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _context;
-  var menuPopoverRef = (0, _hooks.useLocalOrForwardRef)(ref);
   var triggerRef = (0, _react.useRef)(null);
   var menuRef = (0, _react.useRef)(null);
   var children = props.children,
@@ -57,20 +55,6 @@ var PopoverMenu = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _useMenuTrigger = (0, _reactAria.useMenuTrigger)({}, state, triggerRef),
     menuTriggerProps = _useMenuTrigger.menuTriggerProps,
     menuProps = _useMenuTrigger.menuProps;
-  var _useOverlayPosition = (0, _reactAria.useOverlayPosition)({
-      targetRef: triggerRef,
-      overlayRef: menuPopoverRef,
-      scrollRef: menuRef,
-      offset: 5,
-      placement: (0, _concat["default"])(_context = "".concat(direction, " ")).call(_context, align),
-      // Our API preference is for default false so we invert this since it should be default true
-      shouldFlip: !isNotFlippable,
-      isOpen: state.isOpen,
-      onClose: state.close,
-      shouldUpdatePosition: true
-    }),
-    positionProps = _useOverlayPosition.overlayProps,
-    placement = _useOverlayPosition.placement;
 
   /* eslint-disable react/jsx-no-constructed-context-values */
   var menuContext = _objectSpread(_objectSpread({}, menuProps), {}, {
@@ -88,22 +72,23 @@ var PopoverMenu = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }), menu, (0, _react2.jsx)(_reactAria.DismissButton, {
     onDismiss: state.close
   }));
+  var placement = (0, _concat["default"])(_context = "".concat(direction, " ")).call(_context, align);
   return (0, _react2.jsx)(_react["default"].Fragment, null, (0, _react2.jsx)(_interactions.PressResponder, (0, _extends2["default"])({}, menuTriggerProps, {
     ref: triggerRef,
     isPressed: state.isOpen
   }), menuTrigger), (0, _react2.jsx)(_MenuContext.MenuContext.Provider, {
     value: menuContext
-  }, (0, _react2.jsx)(_PopoverContainer["default"], (0, _extends2["default"])({
-    isOpen: state.isOpen,
-    ref: menuPopoverRef,
+  }, (0, _react2.jsx)(_reactAria.OverlayContainer, null, (0, _react2.jsx)(_Popover["default"], (0, _extends2["default"])({
     placement: placement,
-    onClose: state.close,
-    hasNoArrow: hasNoArrow,
-    isDismissable: true,
-    isNonModal: true
-  }, positionProps, menuProps, {
-    role: "dialog"
-  }), contents)));
+    hasNoArrow: hasNoArrow
+  }, menuProps, {
+    "data-popover-placement": direction,
+    "data-testid": "popover-container",
+    role: "presentation",
+    triggerRef: triggerRef,
+    state: state,
+    direction: direction
+  }), contents))));
 });
 PopoverMenu.defaultProps = {
   align: 'middle',

package/lib/cjs/hooks/useOverlappingMenuHoverState/useOverlappingMenuHoverState.test.js

@@ -67,7 +67,9 @@ describe('useOverlappingMenuHoverState', function () {
             case 0:
               getComponent();
               _context.next = 3;
-              return _userEvent["default"].hover(_react2.screen.getByRole('listitem'));
+              return _userEvent["default"].hover(_react2.screen.getByRole('listitem', {
+                hidden: true
+              }));
             case 3:
               _react2.screen.getByText(IS_HOVERED);
             case 4:
@@ -106,7 +108,9 @@ describe('useOverlappingMenuHoverState', function () {
               return _userEvent["default"].click(_react2.screen.getByRole('button'));
             case 3:
               _context3.next = 5;
-              return _userEvent["default"].unhover(_react2.screen.getByRole('listitem'));
+              return _userEvent["default"].unhover(_react2.screen.getByRole('listitem', {
+                hidden: true
+              }));
             case 5:
               expect(_react2.screen.queryByText(IS_HOVERED)).not.toBeInTheDocument();
             case 6:
@@ -151,7 +155,9 @@ describe('useOverlappingMenuHoverState', function () {
               return _userEvent["default"].hover(_react2.screen.getByRole('menu'));
             case 5:
               _context5.next = 7;
-              return _userEvent["default"].hover(_react2.screen.getByRole('listitem'));
+              return _userEvent["default"].hover(_react2.screen.getByRole('listitem', {
+                hidden: true
+              }));
             case 7:
               _react2.screen.getByText(IS_HOVERED);
             case 8:
@@ -197,10 +203,14 @@ describe('useOverlappingMenuHoverState', function () {
               return _userEvent["default"].hover(_react2.screen.getByRole('menu'));
             case 5:
               _context7.next = 7;
-              return _userEvent["default"].hover(_react2.screen.getByRole('listitem'));
+              return _userEvent["default"].hover(_react2.screen.getByRole('listitem', {
+                hidden: true
+              }));
             case 7:
               _context7.next = 9;
-              return _userEvent["default"].unhover(_react2.screen.getByRole('listitem'));
+              return _userEvent["default"].unhover(_react2.screen.getByRole('listitem', {
+                hidden: true
+              }));
             case 9:
               expect(_react2.screen.queryByText(IS_HOVERED)).not.toBeInTheDocument();
             case 10:

package/lib/cjs/types/gridList.d.ts

@@ -3,8 +3,17 @@ import { Collection, DisabledBehavior, ListState, SelectionBehavior } from 'reac
 import { DraggableCollectionState, DroppableCollectionState } from '@react-stately/dnd';
 import type { FocusStrategy, KeyboardDelegate, Node } from '@react-types/shared';
 import { DraggableCollectionStateOptions, DroppableCollectionOptions, DroppableCollectionStateOptions } from './dnd';
-export interface GridListProps extends SharedGridProps {
+export interface GridListProps {
     isReorderable?: boolean;
+    rowProps?: object;
+    cellProps?: object;
+    containerProps?: object;
+    items: Iterable<object>;
+    children?: React.ReactNode;
+    keyboardNavigationBehavior?: 'arrow' | 'tab';
+    onAction?: (key: Key) => void;
+    onSelectionChange?: (keys: Selection) => void;
+    collection?: Collection<Node<object>>;
 }
 export type GridListRowProps = SharedGridListItemProps;
 export interface GridRowProps {
@@ -20,9 +29,6 @@ interface SharedGridListItemProps {
     item: Node<object>;
     state: ListState<object>;
 }
-interface SharedGridProps {
-    isReorderable?: boolean;
-}
 export interface UseGridListItemProps extends SharedGridListItemProps {
     cellRef: React.Ref<HTMLDivElement>;
     ref: RefObject<HTMLElement>;
@@ -31,7 +37,7 @@ export interface UseGridListProps extends ReorderableProps {
     shouldAllowDuplicateSelectionEvents?: boolean;
     hasAutoFocus?: boolean | FocusStrategy;
     children?: React.ReactNode;
-    collection: Collection<Node<object>>;
+    collection?: Collection<Node<object>>;
     defaultSelectedKeys?: Iterable<Key> | 'all';
     disabledBehavior?: DisabledBehavior;
     disabledKeys?: Iterable<Key>;

package/lib/cjs/types/popoverContainer.d.ts

@@ -1,3 +1,6 @@
+/// <reference types="react" />
+import type { OverlayTriggerState } from 'react-stately';
+import type { AriaPopoverProps } from '@react-aria/overlays';
 import { TestingAttributes } from './shared/test';
 import { DOMAttributes, Modify, StyleProps } from './shared';
 type PopoverPlacement = 'top' | 'right' | 'bottom' | 'left';
@@ -22,4 +25,19 @@ export interface PopoverContainerProps extends StylePropsExtended, DOMAttributes
 export interface PopoverWrapperProps extends PopoverContainerProps {
     isOpen?: boolean;
 }
+export interface PopoverProps extends Omit<AriaPopoverProps, 'popoverRef'> {
+    children?: React.ReactNode;
+    state: OverlayTriggerState;
+    direction?: PopoverPlacement;
+    className?: string;
+    popoverRef?: React.RefObject<HTMLDivElement>;
+    style?: React.CSSProperties;
+    width?: string | number;
+    'data-testid'?: string;
+    hasNoArrow?: boolean;
+    arrowProps?: PopoverArrowProps;
+    arrowCrossOffset?: string;
+    isDismissable?: boolean;
+    role?: string;
+}
 export {};

package/lib/cjs/utils/testUtils/universalFormSubmitTest.js

@@ -356,6 +356,7 @@ var universalFieldComponentTests = function universalFieldComponentTests(_ref3)
               }
             });
             _react2.fireEvent.submit(_react2.screen.getByRole('form', {
+              hidden: true,
               name: /test form 2/i
             }));
             expect(handleFormSubmit).toHaveBeenCalledWith({
@@ -376,6 +377,7 @@ var universalFieldComponentTests = function universalFieldComponentTests(_ref3)
               }
             });
             _react2.fireEvent.submit(_react2.screen.getByRole('form', {
+              hidden: true,
               name: /test form 2/i
             }));
             expect(handleFormSubmit).toHaveBeenCalledWith({
@@ -426,6 +428,7 @@ var universalFieldComponentTests = function universalFieldComponentTests(_ref3)
               });
             }
             _react2.fireEvent.submit(_react2.screen.getByRole('form', {
+              hidden: true,
               name: /test form 2/i
             }));
             expect(handleFormSubmit).toHaveBeenCalledWith({

package/lib/components/ImageUploadField/ImageUploadField.test.js

@@ -363,7 +363,9 @@ test('should show the menu if label clicked when preview image exists', /*#__PUR
         // Click on the image preview button
         imageUploadLabel = screen.getByText(testLabel);
         fireEvent.click(imageUploadLabel);
-        expect(screen.getAllByRole('button')[0]).toHaveAttribute('aria-expanded', 'true');
+        expect(screen.getAllByRole('button', {
+          hidden: true
+        })[0]).toHaveAttribute('aria-expanded', 'true');
         expect(screen.getByRole('menu')).toBeInTheDocument();
         expect(screen.getByText('Upload New Image')).toBeInTheDocument();
         expect(screen.getByText('Remove Image')).toBeInTheDocument();

package/lib/components/Modal/Modal.stories.js

@@ -4,7 +4,7 @@ import React, { useState } from 'react';
 import { withDesign } from 'storybook-addon-designs';
 import DocsLayout from '../../../.storybook/storybookDocsLayout';
 import { useModalState } from '../../hooks';
-import { Box, Button, Item, Modal, OverlayProvider, RadioField, RadioGroupField, SearchField, SelectField, Text } from '../../index';
+import { Box, Button, Item, Menu, Modal, OverlayProvider, PopoverMenu, RadioField, RadioGroupField, SearchField, SelectField, Text } from '../../index';
 import { FIGMA_LINKS } from '../../utils/designUtils/figmaLinks';
 import { modalSizes } from '../../utils/devUtils/constants/modalSizes';
 import ModalReadme from './Modal.mdx';
@@ -231,6 +231,31 @@ export var WithInputField = function WithInputField() {
     "aria-label": "Cancel"
   }, "Cancel")))));
 };
+export var WithPopoverMenu = function WithPopoverMenu() {
+  var state = useModalState();
+  return ___EmotionJSX(OverlayProvider, null, ___EmotionJSX(Button, {
+    onPress: state.open,
+    "aria-label": "Open modal"
+  }, "Open Modal"), state.isOpen && ___EmotionJSX(Modal, {
+    isOpen: state.isOpen,
+    onClose: state.close
+  }, ___EmotionJSX(Box, {
+    gap: "lg"
+  }, ___EmotionJSX(Text, null, "Lorem ipsum dolor sit amet consectetur"), ___EmotionJSX(PopoverMenu, null, ___EmotionJSX(Button, null, "Click me"), ___EmotionJSX(Menu, {
+    onAction: function onAction() {
+      return console.log('on action');
+    }
+  }, ___EmotionJSX(Item, {
+    key: "edit"
+  }, "Edit"), ___EmotionJSX(Item, {
+    key: "duplicate"
+  }, "Duplicate"), ___EmotionJSX(Item, {
+    key: "delete",
+    textValue: "delete"
+  }, ___EmotionJSX(Text, {
+    color: "critical.bright"
+  }, "Delete")))))));
+};
 WithInputField.parameters = {
   a11y: {
     config: {

package/lib/components/Modal/tests/Modal.unit.test.js

@@ -1,6 +1,18 @@
+import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
+import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
+import _Object$create from "@babel/runtime-corejs3/core-js-stable/object/create";
+import _Object$getPrototypeOf from "@babel/runtime-corejs3/core-js-stable/object/get-prototype-of";
+import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
+import _Object$setPrototypeOf from "@babel/runtime-corejs3/core-js-stable/object/set-prototype-of";
+import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
+import _reverseInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/reverse";
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
+import _typeof from "@babel/runtime-corejs3/helpers/esm/typeof";
+import _asyncToGenerator from "@babel/runtime-corejs3/helpers/esm/asyncToGenerator";
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = _Object$defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof _Symbol ? _Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return _Object$defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = _Object$create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = _Object$getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = _Object$create(IteratorPrototype); function defineIteratorMethods(prototype) { var _context2; _forEachInstanceProperty(_context2 = ["next", "throw", "return"]).call(_context2, function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], _forEachInstanceProperty(tryLocsList).call(tryLocsList, pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return _Object$setPrototypeOf ? _Object$setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = _Object$create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = _Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return _reverseInstanceProperty(keys).call(keys), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { var _context3; if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, _forEachInstanceProperty(_context3 = this.tryEntries).call(_context3, resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+_sliceInstanceProperty(name).call(name, 1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 import React from 'react';
 import userEvent from '@testing-library/user-event';
-import { Modal, OverlayProvider, RadioField, RadioGroupField } from '../../../index';
+import { Button, Item, Menu, Modal, OverlayProvider, PopoverMenu, RadioField, RadioGroupField, Text } from '../../../index';
 import { render, screen } from '../../../utils/testUtils/testWrapper';
 import { universalComponentTests } from '../../../utils/testUtils/universalComponentTest';
 
@@ -26,6 +38,24 @@ var getModalWithRadioFieldGroup = function getModalWithRadioFieldGroup() {
     "data-testid": "option2"
   })))));
 };
+var buttonText = 'Click me';
+var onAction = jest.fn();
+var option1 = 'option1';
+var getModalWithPopoverMenu = function getModalWithPopoverMenu() {
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return render(___EmotionJSX(OverlayProvider, null, ___EmotionJSX(Modal, props, ___EmotionJSX(PopoverMenu, null, ___EmotionJSX(Button, null, buttonText), ___EmotionJSX(Menu, {
+    onAction: onAction
+  }, ___EmotionJSX(Item, {
+    key: "edit"
+  }, option1), ___EmotionJSX(Item, {
+    key: "duplicate"
+  }, "Duplicate"), ___EmotionJSX(Item, {
+    key: "delete",
+    textValue: "delete"
+  }, ___EmotionJSX(Text, {
+    color: "critical.bright"
+  }, "Delete")))))));
+};
 
 // **********
 // Unit tests
@@ -250,4 +280,24 @@ test('should not show focus ring (is-focused class) on radio buttons when clicke
   expect(radioB).toBeChecked();
   expect(labelA).not.toHaveClass('is-focused');
   expect(labelB).not.toHaveClass('is-focused');
-});
+});
+test('popover menu onAction is called when menu is inside modal', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var button, option1Text;
+  return _regeneratorRuntime().wrap(function _callee$(_context) {
+    while (1) switch (_context.prev = _context.next) {
+      case 0:
+        getModalWithPopoverMenu();
+        button = screen.getByText(buttonText);
+        userEvent.click(button);
+        _context.next = 5;
+        return screen.findByText(option1);
+      case 5:
+        option1Text = _context.sent;
+        userEvent.click(option1Text);
+        expect(onAction).toHaveBeenCalled();
+      case 8:
+      case "end":
+        return _context.stop();
+    }
+  }, _callee);
+})));

package/lib/components/Popover/Popover.js

@@ -9,25 +9,31 @@ import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-var _excluded = ["popoverRef", "state", "children", "className", "isNonModal", "width"];
+var _excluded = ["arrowProps", "arrowCrossOffset", "direction", "popoverRef", "state", "children", "className", "isNonModal", "hasNoArrow", "width"];
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 import * as React from 'react';
 import { DismissButton, Overlay, usePopover } from '@react-aria/overlays';
 import { useStatusClasses } from '../../hooks';
 import Box from '../Box';
+import { PopoverArrow } from '../PopoverContainer';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var Popover = function Popover(props) {
   var ref = React.useRef(null);
-  var _props$popoverRef = props.popoverRef,
+  var arrowProps = props.arrowProps,
+    arrowCrossOffset = props.arrowCrossOffset,
+    direction = props.direction,
+    _props$popoverRef = props.popoverRef,
     popoverRef = _props$popoverRef === void 0 ? ref : _props$popoverRef,
     state = props.state,
     children = props.children,
     className = props.className,
     isNonModal = props.isNonModal,
+    hasNoArrow = props.hasNoArrow,
     width = props.width,
     others = _objectWithoutProperties(props, _excluded);
   var _usePopover = usePopover(_objectSpread(_objectSpread({}, props), {}, {
+      offset: 5,
       popoverRef: popoverRef
     }), state),
     popoverProps = _usePopover.popoverProps,
@@ -46,9 +52,10 @@ var Popover = function Popover(props) {
     className: classNames,
     role: "presentation",
     width: width
-  }, popoverProps, others), !isNonModal && ___EmotionJSX(DismissButton, {
-    onDismiss: state.close
-  }), children, ___EmotionJSX(DismissButton, {
+  }, popoverProps, others), children, hasNoArrow ? null : ___EmotionJSX(PopoverArrow, _extends({}, arrowProps, {
+    arrowCrossOffset: arrowCrossOffset,
+    direction: direction
+  })), ___EmotionJSX(DismissButton, {
     onDismiss: state.close
   })));
 };

package/lib/components/PopoverMenu/PopoverMenu.js

@@ -13,16 +13,14 @@ import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 import React, { forwardRef, useRef } from 'react';
-import { DismissButton, FocusScope, useMenuTrigger, useOverlayPosition } from 'react-aria';
+import { DismissButton, FocusScope, OverlayContainer, useMenuTrigger } from 'react-aria';
 import { useMenuTriggerState } from 'react-stately';
 import { PressResponder } from '@react-aria/interactions';
 import { MenuContext } from '../../context/MenuContext';
-import { useLocalOrForwardRef } from '../../hooks';
-import PopoverContainer from '../PopoverContainer';
+import Popover from '../Popover/Popover';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var PopoverMenu = /*#__PURE__*/forwardRef(function (props, ref) {
   var _context;
-  var menuPopoverRef = useLocalOrForwardRef(ref);
   var triggerRef = useRef(null);
   var menuRef = useRef(null);
   var children = props.children,
@@ -46,20 +44,6 @@ var PopoverMenu = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useMenuTrigger = useMenuTrigger({}, state, triggerRef),
     menuTriggerProps = _useMenuTrigger.menuTriggerProps,
     menuProps = _useMenuTrigger.menuProps;
-  var _useOverlayPosition = useOverlayPosition({
-      targetRef: triggerRef,
-      overlayRef: menuPopoverRef,
-      scrollRef: menuRef,
-      offset: 5,
-      placement: _concatInstanceProperty(_context = "".concat(direction, " ")).call(_context, align),
-      // Our API preference is for default false so we invert this since it should be default true
-      shouldFlip: !isNotFlippable,
-      isOpen: state.isOpen,
-      onClose: state.close,
-      shouldUpdatePosition: true
-    }),
-    positionProps = _useOverlayPosition.overlayProps,
-    placement = _useOverlayPosition.placement;
 
   /* eslint-disable react/jsx-no-constructed-context-values */
   var menuContext = _objectSpread(_objectSpread({}, menuProps), {}, {
@@ -77,22 +61,23 @@ var PopoverMenu = /*#__PURE__*/forwardRef(function (props, ref) {
   }), menu, ___EmotionJSX(DismissButton, {
     onDismiss: state.close
   }));
+  var placement = _concatInstanceProperty(_context = "".concat(direction, " ")).call(_context, align);
   return ___EmotionJSX(React.Fragment, null, ___EmotionJSX(PressResponder, _extends({}, menuTriggerProps, {
     ref: triggerRef,
     isPressed: state.isOpen
   }), menuTrigger), ___EmotionJSX(MenuContext.Provider, {
     value: menuContext
-  }, ___EmotionJSX(PopoverContainer, _extends({
-    isOpen: state.isOpen,
-    ref: menuPopoverRef,
+  }, ___EmotionJSX(OverlayContainer, null, ___EmotionJSX(Popover, _extends({
     placement: placement,
-    onClose: state.close,
-    hasNoArrow: hasNoArrow,
-    isDismissable: true,
-    isNonModal: true
-  }, positionProps, menuProps, {
-    role: "dialog"
-  }), contents)));
+    hasNoArrow: hasNoArrow
+  }, menuProps, {
+    "data-popover-placement": direction,
+    "data-testid": "popover-container",
+    role: "presentation",
+    triggerRef: triggerRef,
+    state: state,
+    direction: direction
+  }), contents))));
 });
 PopoverMenu.defaultProps = {
   align: 'middle',

package/lib/hooks/useOverlappingMenuHoverState/useOverlappingMenuHoverState.test.js

@@ -60,7 +60,9 @@ describe('useOverlappingMenuHoverState', function () {
             case 0:
               getComponent();
               _context.next = 3;
-              return userEvent.hover(screen.getByRole('listitem'));
+              return userEvent.hover(screen.getByRole('listitem', {
+                hidden: true
+              }));
             case 3:
               screen.getByText(IS_HOVERED);
             case 4:
@@ -99,7 +101,9 @@ describe('useOverlappingMenuHoverState', function () {
               return userEvent.click(screen.getByRole('button'));
             case 3:
               _context3.next = 5;
-              return userEvent.unhover(screen.getByRole('listitem'));
+              return userEvent.unhover(screen.getByRole('listitem', {
+                hidden: true
+              }));
             case 5:
               expect(screen.queryByText(IS_HOVERED)).not.toBeInTheDocument();
             case 6:
@@ -144,7 +148,9 @@ describe('useOverlappingMenuHoverState', function () {
               return userEvent.hover(screen.getByRole('menu'));
             case 5:
               _context5.next = 7;
-              return userEvent.hover(screen.getByRole('listitem'));
+              return userEvent.hover(screen.getByRole('listitem', {
+                hidden: true
+              }));
             case 7:
               screen.getByText(IS_HOVERED);
             case 8:
@@ -190,10 +196,14 @@ describe('useOverlappingMenuHoverState', function () {
               return userEvent.hover(screen.getByRole('menu'));
             case 5:
               _context7.next = 7;
-              return userEvent.hover(screen.getByRole('listitem'));
+              return userEvent.hover(screen.getByRole('listitem', {
+                hidden: true
+              }));
             case 7:
               _context7.next = 9;
-              return userEvent.unhover(screen.getByRole('listitem'));
+              return userEvent.unhover(screen.getByRole('listitem', {
+                hidden: true
+              }));
             case 9:
               expect(screen.queryByText(IS_HOVERED)).not.toBeInTheDocument();
             case 10:

package/lib/utils/testUtils/universalFormSubmitTest.js

@@ -345,6 +345,7 @@ export var universalFieldComponentTests = function universalFieldComponentTests(
               }
             });
             fireEvent.submit(screen.getByRole('form', {
+              hidden: true,
               name: /test form 2/i
             }));
             expect(handleFormSubmit).toHaveBeenCalledWith({
@@ -365,6 +366,7 @@ export var universalFieldComponentTests = function universalFieldComponentTests(
               }
             });
             fireEvent.submit(screen.getByRole('form', {
+              hidden: true,
               name: /test form 2/i
             }));
             expect(handleFormSubmit).toHaveBeenCalledWith({
@@ -415,6 +417,7 @@ export var universalFieldComponentTests = function universalFieldComponentTests(
               });
             }
             fireEvent.submit(screen.getByRole('form', {
+              hidden: true,
               name: /test form 2/i
             }));
             expect(handleFormSubmit).toHaveBeenCalledWith({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pingux/astro",
-  "version": "2.147.0",
+  "version": "2.147.1-alpha.1",
   "description": "React component library for Ping Identity's design system",
   "repository": {
     "type": "git",