@instructure/ui-a11y-utils 11.7.9-snapshot-0 → 11.7.9-snapshot-1

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [11.7.9-snapshot-0](https://github.com/instructure/instructure-ui/compare/v11.7.8...v11.7.9-snapshot-0) (2026-10-05)
+## [11.7.9-snapshot-1](https://github.com/instructure/instructure-ui/compare/v11.7.8...v11.7.9-snapshot-1) (2026-10-06)
 
 **Note:** Version bump only for package @instructure/ui-a11y-utils
 

package/lib/FocusRegion.js

@@ -6,11 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.FocusRegion = void 0;
 var _keycode = _interopRequireDefault(require("keycode"));
-var _contains = require("@instructure/ui-dom-utils/lib/contains.js");
-var _addEventListener = require("@instructure/ui-dom-utils/lib/addEventListener.js");
-var _ownerDocument = require("@instructure/ui-dom-utils/lib/ownerDocument.js");
-var _findTabbable = require("@instructure/ui-dom-utils/lib/findTabbable.js");
-var _canUseDOM = require("@instructure/ui-dom-utils/lib/canUseDOM.js");
+var _uiDomUtils = require("@instructure/ui-dom-utils");
 var _uid = require("@instructure/uid");
 var _console = require("@instructure/console");
 var _ScreenReaderFocusRegion = require("./ScreenReaderFocusRegion.js");
@@ -97,7 +93,7 @@ class FocusRegion {
   };
   captureDocumentMousedown = event => {
     this._documentClickTarget = event.target;
-    this._contextContainsTarget = (0, _contains.contains)(this._contextElement, this._documentClickTarget);
+    this._contextContainsTarget = (0, _uiDomUtils.contains)(this._contextElement, this._documentClickTarget);
     // Preemptively remove aria-hidden before focus moves to the clicked element
     // outside the region, preventing the "aria-hidden on focused ancestor" warning.
     if (!this._contextContainsTarget && this._options.shouldCloseOnDocumentClick) {
@@ -112,12 +108,12 @@ class FocusRegion {
     // if event.detail is 0 then this is a keyboard and not a mouse press
     !this._contextContainsTarget &&
     //this prevents clicking on Tooltip from closing the parent dialog
-    !(_canUseDOM.canUseDOM && this._documentClickTarget instanceof HTMLElement && this._documentClickTarget.closest('[role="tooltip"]'))) {
+    !(_uiDomUtils.canUseDOM && this._documentClickTarget instanceof HTMLElement && this._documentClickTarget.closest('[role="tooltip"]'))) {
       this.handleDismiss(event, true);
     }
   };
   handleFrameClick = (event, frame) => {
-    if (!(0, _contains.contains)(this._contextElement, frame)) {
+    if (!(0, _uiDomUtils.contains)(this._contextElement, frame)) {
       // dismiss if frame is not within the region
       this.handleDismiss(event, true);
     }
@@ -127,7 +123,7 @@ class FocusRegion {
       // If a dialog contains an <input type="file"/> element and the user opens the file picker and closes it with the
       // escape key then Firefox passes through that event which could close the parent dialog. This code prevents that
       // from happening (listening for a `cancel` event doesn't seem to work in firefox)
-      const activeElement = (0, _ownerDocument.ownerDocument)(this._contextElement)?.activeElement;
+      const activeElement = (0, _uiDomUtils.ownerDocument)(this._contextElement)?.activeElement;
       const fileInputFocused = activeElement?.tagName === 'INPUT' && activeElement.type === 'file';
       if (fileInputFocused) {
         ;
@@ -151,7 +147,7 @@ class FocusRegion {
     return this._active;
   }
   get keyboardFocusable() {
-    return ((0, _findTabbable.findTabbable)(this._contextElement) || []).length > 0;
+    return ((0, _uiDomUtils.findTabbable)(this._contextElement) || []).length > 0;
   }
 
   /**
@@ -160,19 +156,19 @@ class FocusRegion {
    * @param shouldCloseOnEscape Should the region be closed if ESC is pressed?
    */
   addOrRemoveListeners(shouldCloseOnDocumentClick, shouldCloseOnEscape) {
-    const doc = (0, _ownerDocument.ownerDocument)(this._contextElement);
+    const doc = (0, _uiDomUtils.ownerDocument)(this._contextElement);
     if (shouldCloseOnDocumentClick) {
       if (!this._mouseDownListener) {
-        this._mouseDownListener = (0, _addEventListener.addEventListener)(doc, 'mousedown', this.captureDocumentMousedown);
+        this._mouseDownListener = (0, _uiDomUtils.addEventListener)(doc, 'mousedown', this.captureDocumentMousedown);
       }
       if (!this._clickListener) {
-        this._clickListener = (0, _addEventListener.addEventListener)(doc, 'click', this.handleDocumentClick);
+        this._clickListener = (0, _uiDomUtils.addEventListener)(doc, 'click', this.handleDocumentClick);
       }
       Array.from(doc.getElementsByTagName('iframe')).forEach(el => {
         // listen for mouseup events on any iframes in the document
         const frameDoc = el.contentDocument;
         if (frameDoc && !this._mouseUpListener) {
-          this._mouseUpListener = (0, _addEventListener.addEventListener)(frameDoc, 'mouseup', event => {
+          this._mouseUpListener = (0, _uiDomUtils.addEventListener)(frameDoc, 'mouseup', event => {
             this.handleFrameClick(event, el);
           });
         }
@@ -191,7 +187,7 @@ class FocusRegion {
         //because listeners in the capturing phase are called before other event listeners (like that of the Modal's Escape listener)
         //so a Modal with a Tooltip will not get closed when closing the Tooltip with Escape
         const useCapture = this._options.isTooltip;
-        this._keyUpListener = (0, _addEventListener.addEventListener)(doc, 'keyup', this.handleKeyUp, useCapture);
+        this._keyUpListener = (0, _uiDomUtils.addEventListener)(doc, 'keyup', this.handleKeyUp, useCapture);
       }
     } else {
       this._keyUpListener?.remove();

package/lib/KeyboardFocusRegion.js

@@ -5,15 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.KeyboardFocusRegion = void 0;
-var _findDOMNode = require("@instructure/ui-dom-utils/lib/findDOMNode.js");
-var _findTabbable = require("@instructure/ui-dom-utils/lib/findTabbable.js");
-var _findFocusable = require("@instructure/ui-dom-utils/lib/findFocusable.js");
-var _ownerWindow = require("@instructure/ui-dom-utils/lib/ownerWindow.js");
-var _getActiveElement = require("@instructure/ui-dom-utils/lib/getActiveElement.js");
-var _addEventListener = require("@instructure/ui-dom-utils/lib/addEventListener.js");
-var _ownerDocument = require("@instructure/ui-dom-utils/lib/ownerDocument.js");
-var _containsActiveElement = require("@instructure/ui-dom-utils/lib/containsActiveElement.js");
-var _requestAnimationFrame = require("@instructure/ui-dom-utils/lib/requestAnimationFrame.js");
+var _uiDomUtils = require("@instructure/ui-dom-utils");
 var _console = require("@instructure/console");
 var _keycode = _interopRequireDefault(require("keycode"));
 var _scopeTab = require("./scopeTab.js");
@@ -62,18 +54,18 @@ class KeyboardFocusRegion {
   _wasDocumentClick;
   _contextElement;
   constructor(element, options) {
-    this._contextElement = (0, _findDOMNode.findDOMNode)(element);
+    this._contextElement = (0, _uiDomUtils.findDOMNode)(element);
     this._options = options || {
       shouldContainFocus: true,
       shouldReturnFocus: true,
       defaultFocusElement: null
     };
     if (this._options.shouldReturnFocus) {
-      this._focusLaterElement = (0, _getActiveElement.getActiveElement)(this.doc);
+      this._focusLaterElement = (0, _uiDomUtils.getActiveElement)(this.doc);
     }
   }
   get focused() {
-    return (0, _containsActiveElement.containsActiveElement)(this._contextElement);
+    return (0, _uiDomUtils.containsActiveElement)(this._contextElement);
   }
   get shouldContainFocus() {
     const {
@@ -82,10 +74,10 @@ class KeyboardFocusRegion {
     return shouldContainFocus === true || Array.isArray(shouldContainFocus) && shouldContainFocus.includes('keyboard');
   }
   get focusable() {
-    return (0, _findFocusable.findFocusable)(this._contextElement, () => true, true) || [];
+    return (0, _uiDomUtils.findFocusable)(this._contextElement, () => true, true) || [];
   }
   get tabbable() {
-    return (0, _findTabbable.findTabbable)(this._contextElement) || [];
+    return (0, _uiDomUtils.findTabbable)(this._contextElement) || [];
   }
   get firstTabbable() {
     return this.tabbable[0];
@@ -100,16 +92,16 @@ class KeyboardFocusRegion {
     return this.focusable.pop();
   }
   get doc() {
-    return (0, _ownerDocument.ownerDocument)(this._contextElement);
+    return (0, _uiDomUtils.ownerDocument)(this._contextElement);
   }
   get win() {
-    return (0, _ownerWindow.ownerWindow)(this._contextElement);
+    return (0, _uiDomUtils.ownerWindow)(this._contextElement);
   }
   get defaultFocusElement() {
     const {
       defaultFocusElement
     } = this._options;
-    const element = (0, _findDOMNode.findDOMNode)(typeof defaultFocusElement === 'function' ? defaultFocusElement() : defaultFocusElement);
+    const element = (0, _uiDomUtils.findDOMNode)(typeof defaultFocusElement === 'function' ? defaultFocusElement() : defaultFocusElement);
     if (element && this._contextElement && this._contextElement.contains(element)) {
       return element;
     }
@@ -122,7 +114,7 @@ class KeyboardFocusRegion {
     return null;
   }
   updateElement(element) {
-    this._contextElement = (0, _findDOMNode.findDOMNode)(element);
+    this._contextElement = (0, _uiDomUtils.findDOMNode)(element);
   }
   focusDefaultElement() {
     if (this.defaultFocusElement) {
@@ -136,7 +128,7 @@ class KeyboardFocusRegion {
     } else {
       if (this.shouldContainFocus) {
         // Blur the active element to place focus on the document body
-        (0, _getActiveElement.getActiveElement)(this.doc) && (0, _getActiveElement.getActiveElement)(this.doc).blur();
+        (0, _uiDomUtils.getActiveElement)(this.doc) && (0, _uiDomUtils.getActiveElement)(this.doc).blur();
         (0, _console.logError)(true, `
           [KeyboardFocusRegion] No \`defaultFocusElement\` was provided and
           \`shouldContainFocus\` was set to \`true\` or \`keyboard\`. Focus has
@@ -161,7 +153,7 @@ class KeyboardFocusRegion {
     if (!isHiddenOutside) {
       focusElement.focus();
     } else {
-      this._raf.push((0, _requestAnimationFrame.requestAnimationFrame)(() => {
+      this._raf.push((0, _uiDomUtils.requestAnimationFrame)(() => {
         this.tryFocusOnPositionedElement(positionContainer, focusElement, tries - 1);
       }));
     }
@@ -170,7 +162,7 @@ class KeyboardFocusRegion {
     if (this.focused) {
       return;
     }
-    this._raf.push((0, _requestAnimationFrame.requestAnimationFrame)(() => {
+    this._raf.push((0, _uiDomUtils.requestAnimationFrame)(() => {
       this.focusDefaultElement();
     }));
   }
@@ -214,8 +206,8 @@ class KeyboardFocusRegion {
       // the element outside of a setTimeout. Side-effect of this implementation
       // is that the document.body gets focus, and then we focus our element right
       // after, seems fine.
-      this._raf.push((0, _requestAnimationFrame.requestAnimationFrame)(() => {
-        if ((0, _containsActiveElement.containsActiveElement)(this._contextElement)) {
+      this._raf.push((0, _uiDomUtils.requestAnimationFrame)(() => {
+        if ((0, _uiDomUtils.containsActiveElement)(this._contextElement)) {
           return;
         }
         this.focusDefaultElement();
@@ -240,14 +232,14 @@ class KeyboardFocusRegion {
     if (!this._active) {
       if (defaultFocusElement || shouldContainFocus) {
         if (shouldContainFocus) {
-          this._listeners.push((0, _addEventListener.addEventListener)(this.doc, 'keydown', this.handleKeyDown));
+          this._listeners.push((0, _uiDomUtils.addEventListener)(this.doc, 'keydown', this.handleKeyDown));
         } else {
-          this._listeners.push((0, _addEventListener.addEventListener)(this.firstTabbable || defaultFocusElement, 'keydown', this.handleFirstTabbableKeyDown));
-          this._listeners.push((0, _addEventListener.addEventListener)(this.lastTabbable || defaultFocusElement, 'keydown', this.handleLastTabbableKeyDown));
+          this._listeners.push((0, _uiDomUtils.addEventListener)(this.firstTabbable || defaultFocusElement, 'keydown', this.handleFirstTabbableKeyDown));
+          this._listeners.push((0, _uiDomUtils.addEventListener)(this.lastTabbable || defaultFocusElement, 'keydown', this.handleLastTabbableKeyDown));
         }
-        this._listeners.push((0, _addEventListener.addEventListener)(this.doc, 'click', this.handleClick, true));
-        this._listeners.push((0, _addEventListener.addEventListener)(this.win, 'blur', this.handleWindowBlur, false));
-        this._listeners.push((0, _addEventListener.addEventListener)(this.doc, 'focus', this.handleFocus, true));
+        this._listeners.push((0, _uiDomUtils.addEventListener)(this.doc, 'click', this.handleClick, true));
+        this._listeners.push((0, _uiDomUtils.addEventListener)(this.win, 'blur', this.handleWindowBlur, false));
+        this._listeners.push((0, _uiDomUtils.addEventListener)(this.doc, 'focus', this.handleFocus, true));
         this._active = true;
       }
     }

package/lib/hasVisibleChildren.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.hasVisibleChildren = hasVisibleChildren;
 var _react = require("react");
-var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
-var _ScreenReaderContent = require("@instructure/ui-a11y-content/lib/ScreenReaderContent");
+var _uiReactUtils = require("@instructure/ui-react-utils");
+var _uiA11yContent = require("@instructure/ui-a11y-content");
 /*
  * The MIT License (MIT)
  *
@@ -44,7 +44,7 @@ var _ScreenReaderContent = require("@instructure/ui-a11y-content/lib/ScreenReade
 function hasVisibleChildren(children) {
   let visible = false;
   _react.Children.forEach(children, child => {
-    if (child && !(0, _matchComponentTypes.matchComponentTypes)(child, [_ScreenReaderContent.ScreenReaderContent])) {
+    if (child && !(0, _uiReactUtils.matchComponentTypes)(child, [_uiA11yContent.ScreenReaderContent])) {
       visible = true;
     }
   });

package/lib/scopeTab.js

@@ -5,10 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.scopeTab = scopeTab;
-var _findDOMNode = require("@instructure/ui-dom-utils/lib/findDOMNode.js");
-var _findTabbable = require("@instructure/ui-dom-utils/lib/findTabbable.js");
-var _isActiveElement = require("@instructure/ui-dom-utils/lib/isActiveElement.js");
-var _containsActiveElement = require("@instructure/ui-dom-utils/lib/containsActiveElement.js");
+var _uiDomUtils = require("@instructure/ui-dom-utils");
 /*
  * The MIT License (MIT)
  *
@@ -46,8 +43,8 @@ var _containsActiveElement = require("@instructure/ui-dom-utils/lib/containsActi
  * @param onLeavingFinalTabbable function executed when leaving final tabbable instead of the default behavior
  */
 function scopeTab(element, event, onLeavingFinalTabbable) {
-  const node = (0, _findDOMNode.findDOMNode)(element);
-  const tabbable = (0, _findTabbable.findTabbable)(node);
+  const node = (0, _uiDomUtils.findDOMNode)(element);
+  const tabbable = (0, _uiDomUtils.findTabbable)(node);
   if (!tabbable.length) {
     event.preventDefault();
     return;
@@ -58,11 +55,11 @@ function scopeTab(element, event, onLeavingFinalTabbable) {
   // when its focused and tab is pressed, leaving one element
   // (the menu container) in the tabbable array, which is not the currently
   // active element
-  tabbable.length < 2 || (0, _isActiveElement.isActiveElement)(finalTabbable) ||
+  tabbable.length < 2 || (0, _uiDomUtils.isActiveElement)(finalTabbable) ||
   // handle immediate shift+tab after opening with mouse
-  (0, _isActiveElement.isActiveElement)(node) ||
+  (0, _uiDomUtils.isActiveElement)(node) ||
   // already left final tabbable
-  !(0, _containsActiveElement.containsActiveElement)(element);
+  !(0, _uiDomUtils.containsActiveElement)(element);
   if (!leavingFinalTabbable) return;
   if (typeof onLeavingFinalTabbable === 'function') {
     onLeavingFinalTabbable();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-a11y-utils",
-  "version": "11.7.9-snapshot-0",
+  "version": "11.7.9-snapshot-1",
   "description": "A collection of utilities for managing focus and screen reader behavior",
   "author": "Instructure, Inc. Engineering and Product Design",
   "module": "./es/index.js",
@@ -16,17 +16,17 @@
   "dependencies": {
     "@babel/runtime": "^7.29.7",
     "keycode": "^2",
-    "@instructure/console": "11.7.9-snapshot-0",
-    "@instructure/shared-types": "11.7.9-snapshot-0",
-    "@instructure/ui-a11y-content": "11.7.9-snapshot-0",
-    "@instructure/ui-react-utils": "11.7.9-snapshot-0",
-    "@instructure/ui-dom-utils": "11.7.9-snapshot-0",
-    "@instructure/uid": "11.7.9-snapshot-0"
+    "@instructure/ui-a11y-content": "11.7.9-snapshot-1",
+    "@instructure/console": "11.7.9-snapshot-1",
+    "@instructure/shared-types": "11.7.9-snapshot-1",
+    "@instructure/ui-dom-utils": "11.7.9-snapshot-1",
+    "@instructure/ui-react-utils": "11.7.9-snapshot-1",
+    "@instructure/uid": "11.7.9-snapshot-1"
   },
   "devDependencies": {
     "vitest": "^5.0.0",
-    "@instructure/ui-babel-preset": "11.7.9-snapshot-0",
-    "@instructure/ui-color-utils": "11.7.9-snapshot-0"
+    "@instructure/ui-babel-preset": "11.7.9-snapshot-1",
+    "@instructure/ui-color-utils": "11.7.9-snapshot-1"
   },
   "peerDependencies": {
     "react": ">=18 <=19"