@primer/view-components 0.49.0-rc.caee4ac3 → 0.49.0-rc.d8a5a699

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

@@ -9,7 +9,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _ToolTipElement_instances, _ToolTipElement_abortController, _ToolTipElement_align, _ToolTipElement_side, _ToolTipElement_allowUpdatePosition, _ToolTipElement_showReason, _ToolTipElement_update, _ToolTipElement_updateControl, _ToolTipElement_updateControlReference, _ToolTipElement_updateDirection, _ToolTipElement_updatePosition;
+var _ToolTipElement_instances, _ToolTipElement_abortController, _ToolTipElement_align, _ToolTipElement_side, _ToolTipElement_allowUpdatePosition, _ToolTipElement_showReason, _ToolTipElement_isControlsPopoverOpen, _ToolTipElement_update, _ToolTipElement_updateControl, _ToolTipElement_updateControlReference, _ToolTipElement_updateDirection, _ToolTipElement_updatePosition;
 import '@oddbird/popover-polyfill';
 import { getAnchoredPosition } from '@primer/behaviors';
 const isPopoverOpen = (() => {
@@ -78,6 +78,7 @@ class ToolTipElement extends HTMLElement {
         _ToolTipElement_side.set(this, 'outside-bottom');
         _ToolTipElement_allowUpdatePosition.set(this, false);
         _ToolTipElement_showReason.set(this, 'mouse');
+        _ToolTipElement_isControlsPopoverOpen.set(this, false);
     }
     styles() {
         return `
@@ -244,18 +245,24 @@ class ToolTipElement extends HTMLElement {
         if (!this.control)
             return;
         const showing = isPopoverOpen(this);
+        // Track when the control's popover (e.g an ActionMenu) is opened/closed
+        if (event.type === 'beforetoggle' && event.currentTarget !== this) {
+            __classPrivateFieldSet(this, _ToolTipElement_isControlsPopoverOpen, event.newState === 'open', "f");
+        }
         // Ensures that tooltip stays open when hovering between tooltip and element
         // WCAG Success Criterion 1.4.13 Hoverable
-        const shouldShow = event.type === 'mouseenter' ||
+        const shouldShow = (event.type === 'mouseenter' ||
             // Only show tooltip on focus if running in headless browser (for tests) or if focus ring
             // is visible (i.e. if user is using keyboard navigation)
-            (event.type === 'focus' && (navigator.webdriver || this.control.matches(':focus-visible')));
+            (event.type === 'focus' && (navigator.webdriver || this.control.matches(':focus-visible')))) &&
+            // Don't show tooltip if the control's popover is open (e.g. an ActionMenu)
+            !__classPrivateFieldGet(this, _ToolTipElement_isControlsPopoverOpen, "f");
         const isMouseLeaveFromButton = event.type === 'mouseleave' &&
             event.relatedTarget !== this.control &&
             event.relatedTarget !== this;
         const isEscapeKeydown = event.type === 'keydown' && event.key === 'Escape';
         const isMouseDownOnButton = event.type === 'mousedown' && event.currentTarget === this.control;
-        const isOpeningOtherPopover = event.type === 'beforetoggle' && event.currentTarget !== this;
+        const isOpeningOtherPopover = event.type === 'beforetoggle' && event.currentTarget !== this && event.newState === 'open';
         const shouldHide = isMouseLeaveFromButton || isEscapeKeydown || isMouseDownOnButton || isOpeningOtherPopover;
         if (showing && isEscapeKeydown) {
             /* eslint-disable-next-line no-restricted-syntax */
@@ -288,7 +295,7 @@ class ToolTipElement extends HTMLElement {
         }
     }
 }
-_ToolTipElement_abortController = new WeakMap(), _ToolTipElement_align = new WeakMap(), _ToolTipElement_side = new WeakMap(), _ToolTipElement_allowUpdatePosition = new WeakMap(), _ToolTipElement_showReason = new WeakMap(), _ToolTipElement_instances = new WeakSet(), _ToolTipElement_update = function _ToolTipElement_update(isOpen) {
+_ToolTipElement_abortController = new WeakMap(), _ToolTipElement_align = new WeakMap(), _ToolTipElement_side = new WeakMap(), _ToolTipElement_allowUpdatePosition = new WeakMap(), _ToolTipElement_showReason = new WeakMap(), _ToolTipElement_isControlsPopoverOpen = new WeakMap(), _ToolTipElement_instances = new WeakSet(), _ToolTipElement_update = function _ToolTipElement_update(isOpen) {
     if (isOpen) {
         openTooltips.add(this);
         this.classList.remove(TOOLTIP_SR_ONLY_CLASS);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/view-components",
-  "version": "0.49.0-rc.caee4ac3",
+  "version": "0.49.0-rc.d8a5a699",
   "description": "ViewComponents for the Primer Design System",
   "main": "app/assets/javascripts/primer_view_components.js",
   "module": "app/components/primer/primer.js",
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.24.1",
-    "@github/axe-github": "^0.7.0",
+    "@github/axe-github": "^0.8.1",
     "@github/browserslist-config": "^1.0.0",
     "@github/markdownlint-github": "^0.8.0",
     "@github/prettier-config": "0.0.6",
@@ -92,7 +92,7 @@
     "stylelint-actions-formatters": "^16.3.1",
     "tslib": "^2.4.0",
     "typescript": "^5.2.2",
-    "vite": "^6.2.5",
+    "vite": "^7.3.0",
     "vite-plugin-ruby": "^5.1.0"
   },
   "prettier": "@github/prettier-config",