@primer/view-components 0.13.0-rc.07828c4f → 0.13.0-rc.46b46cd7

package/app/components/primer/alpha/action_bar_element.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _ActionBarElement_instances, _ActionBarElement_initialBarWidth, _ActionBarElement_previousBarWidth, _ActionBarElement_focusZoneAbortController, _ActionBarElement_isVisible, _ActionBarElement_itemGap, _ActionBarElement_availableSpace, _ActionBarElement_menuSpace, _ActionBarElement_shrink, _ActionBarElement_grow, _ActionBarElement_showItem, _ActionBarElement_hideItem, _ActionBarElement_menuItems_get;
+var _ActionBarElement_instances, _ActionBarElement_initialBarWidth, _ActionBarElement_previousBarWidth, _ActionBarElement_focusZoneAbortController, _ActionBarElement_itemGap, _ActionBarElement_availableSpace, _ActionBarElement_menuSpace, _ActionBarElement_shrink, _ActionBarElement_grow, _ActionBarElement_showItem, _ActionBarElement_hideItem, _ActionBarElement_menuItems_get;
 import { controller, targets, target } from '@github/catalyst';
 import { focusZone, FocusKeys } from '@primer/behaviors';
 const instersectionObserver = new IntersectionObserver(entries => {
@@ -94,17 +94,12 @@ let ActionBarElement = class ActionBarElement extends HTMLElement {
             bindKeys: FocusKeys.ArrowHorizontal | FocusKeys.HomeAndEnd,
             focusOutBehavior: 'wrap',
             focusableElementFilter: element => {
-                return __classPrivateFieldGet(this, _ActionBarElement_instances, "m", _ActionBarElement_isVisible).call(this, element);
+                return !element.closest('.ActionBar-item[hidden]') && !element.closest('li.ActionListItem');
             }
         }), "f");
     }
 };
-_ActionBarElement_initialBarWidth = new WeakMap(), _ActionBarElement_previousBarWidth = new WeakMap(), _ActionBarElement_focusZoneAbortController = new WeakMap(), _ActionBarElement_instances = new WeakSet(), _ActionBarElement_isVisible = function _ActionBarElement_isVisible(element) {
-    // Safari doesn't support `checkVisibility` yet.
-    if (typeof element.checkVisibility === 'function')
-        return element.checkVisibility();
-    return Boolean(element.offsetParent || element.offsetWidth || element.offsetHeight);
-}, _ActionBarElement_itemGap = function _ActionBarElement_itemGap() {
+_ActionBarElement_initialBarWidth = new WeakMap(), _ActionBarElement_previousBarWidth = new WeakMap(), _ActionBarElement_focusZoneAbortController = new WeakMap(), _ActionBarElement_instances = new WeakSet(), _ActionBarElement_itemGap = function _ActionBarElement_itemGap() {
     var _a;
     return parseInt((_a = window.getComputedStyle(this.itemContainer)) === null || _a === void 0 ? void 0 : _a.columnGap, 10) || 0;
 }, _ActionBarElement_availableSpace = function _ActionBarElement_availableSpace() {

package/app/components/primer/alpha/action_menu/action_menu_element.js

@@ -109,7 +109,7 @@ let ActionMenuElement = class ActionMenuElement extends HTMLElement {
         __classPrivateFieldGet(this, _ActionMenuElement_abortController, "f").abort();
     }
     handleEvent(event) {
-        var _a;
+        var _a, _b, _c;
         const targetIsInvoker = (_a = this.invokerElement) === null || _a === void 0 ? void 0 : _a.contains(event.target);
         const eventIsActivation = __classPrivateFieldGet(this, _ActionMenuElement_instances, "m", _ActionMenuElement_isActivation).call(this, event);
         if (targetIsInvoker && event.type === 'mousedown') {
@@ -127,6 +127,10 @@ let ActionMenuElement = class ActionMenuElement extends HTMLElement {
             __classPrivateFieldSet(this, _ActionMenuElement_invokerBeingClicked, false, "f");
             return;
         }
+        // Ignore events within dialogs within menus
+        if (((_b = event.target) === null || _b === void 0 ? void 0 : _b.closest('dialog')) || ((_c = event.target) === null || _c === void 0 ? void 0 : _c.closest('modal-dialog'))) {
+            return;
+        }
         if (event.type === 'focusout') {
             if (__classPrivateFieldGet(this, _ActionMenuElement_invokerBeingClicked, "f"))
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/view-components",
-  "version": "0.13.0-rc.07828c4f",
+  "version": "0.13.0-rc.46b46cd7",
   "description": "ViewComponents for the Primer Design System",
   "main": "app/assets/javascripts/primer_view_components.js",
   "module": "app/components/primer/primer.js",