@primer/behaviors 0.0.0-202292020482 → 0.0.0-20230925220411

package/dist/cjs/anchored-position.js

@@ -26,6 +26,8 @@ function getAnchoredPosition(floatingElement, anchorElement, settings = {}) {
 }
 exports.getAnchoredPosition = getAnchoredPosition;
 function getPositionedParent(element) {
+    if (isOnTopLayer(element))
+        return document.body;
     let parentNode = element.parentNode;
     while (parentNode !== null) {
         if (parentNode instanceof HTMLElement && getComputedStyle(parentNode).position !== 'static') {
@@ -35,6 +37,21 @@ function getPositionedParent(element) {
     }
     return document.body;
 }
+function isOnTopLayer(element) {
+    var _a;
+    if (element.tagName === 'DIALOG') {
+        return true;
+    }
+    try {
+        if (element.matches(':popover-open') && /native code/.test((_a = document.body.showPopover) === null || _a === void 0 ? void 0 : _a.toString())) {
+            return true;
+        }
+    }
+    catch (_b) {
+        return false;
+    }
+    return false;
+}
 function getClippingRect(element) {
     let parentNode = element;
     while (parentNode !== null) {

package/dist/cjs/focus-zone.d.ts

@@ -1,5 +1,5 @@
 export declare type Direction = 'previous' | 'next' | 'start' | 'end';
-export declare type FocusMovementKeys = 'ArrowLeft' | 'ArrowDown' | 'ArrowUp' | 'ArrowRight' | 'h' | 'j' | 'k' | 'l' | 'a' | 's' | 'w' | 'd' | 'Tab' | 'Home' | 'End' | 'PageUp' | 'PageDown';
+export declare type FocusMovementKeys = 'ArrowLeft' | 'ArrowDown' | 'ArrowUp' | 'ArrowRight' | 'h' | 'j' | 'k' | 'l' | 'a' | 's' | 'w' | 'd' | 'Tab' | 'Home' | 'End' | 'PageUp' | 'PageDown' | 'Backspace';
 export declare enum FocusKeys {
     ArrowHorizontal = 1,
     ArrowVertical = 2,
@@ -10,6 +10,7 @@ export declare enum FocusKeys {
     WS = 32,
     AD = 64,
     Tab = 128,
+    Backspace = 512,
     ArrowAll = 3,
     HJKL = 12,
     WASD = 96,

package/dist/cjs/focus-zone.js

@@ -17,6 +17,7 @@ var FocusKeys;
     FocusKeys[FocusKeys["WS"] = 32] = "WS";
     FocusKeys[FocusKeys["AD"] = 64] = "AD";
     FocusKeys[FocusKeys["Tab"] = 128] = "Tab";
+    FocusKeys[FocusKeys["Backspace"] = 512] = "Backspace";
     FocusKeys[FocusKeys["ArrowAll"] = 3] = "ArrowAll";
     FocusKeys[FocusKeys["HJKL"] = 12] = "HJKL";
     FocusKeys[FocusKeys["WASD"] = 96] = "WASD";
@@ -39,7 +40,8 @@ const KEY_TO_BIT = {
     Home: FocusKeys.HomeAndEnd,
     End: FocusKeys.HomeAndEnd,
     PageUp: FocusKeys.PageUpDown,
-    PageDown: FocusKeys.PageUpDown
+    PageDown: FocusKeys.PageUpDown,
+    Backspace: FocusKeys.Backspace
 };
 const KEY_TO_DIRECTION = {
     ArrowLeft: 'previous',
@@ -58,7 +60,8 @@ const KEY_TO_DIRECTION = {
     Home: 'start',
     End: 'end',
     PageUp: 'start',
-    PageDown: 'end'
+    PageDown: 'end',
+    Backspace: 'previous'
 };
 function getDirection(keyboardEvent) {
     const direction = KEY_TO_DIRECTION[keyboardEvent.key];
@@ -187,8 +190,7 @@ function focusZone(container, settings) {
         if (filteredElements.length === 0) {
             return;
         }
-        const insertIndex = focusableElements.findIndex(e => (e.compareDocumentPosition(filteredElements[0]) & Node.DOCUMENT_POSITION_PRECEDING) > 0);
-        focusableElements.splice(insertIndex === -1 ? focusableElements.length : insertIndex, 0, ...filteredElements);
+        focusableElements.splice(findInsertionIndex(filteredElements), 0, ...filteredElements);
         for (const element of filteredElements) {
             if (!savedTabIndex.has(element)) {
                 savedTabIndex.set(element, element.getAttribute('tabindex'));
@@ -199,6 +201,27 @@ function focusZone(container, settings) {
             updateFocusedElement(getFirstFocusableElement());
         }
     }
+    function findInsertionIndex(elementsToInsert) {
+        const firstElementToInsert = elementsToInsert[0];
+        if (focusableElements.length === 0)
+            return 0;
+        let iMin = 0;
+        let iMax = focusableElements.length - 1;
+        while (iMin <= iMax) {
+            const i = Math.floor((iMin + iMax) / 2);
+            const element = focusableElements[i];
+            if (followsInDocument(firstElementToInsert, element)) {
+                iMax = i - 1;
+            }
+            else {
+                iMin = i + 1;
+            }
+        }
+        return iMin;
+    }
+    function followsInDocument(first, second) {
+        return (second.compareDocumentPosition(first) & Node.DOCUMENT_POSITION_PRECEDING) > 0;
+    }
     function endFocusManagement(...elements) {
         for (const element of elements) {
             const focusableElementIndex = focusableElements.indexOf(element);
@@ -222,7 +245,8 @@ function focusZone(container, settings) {
         }
     }
     beginFocusManagement(...(0, iterate_focusable_elements_js_1.iterateFocusableElements)(container));
-    updateFocusedElement(getFirstFocusableElement());
+    const initialElement = typeof focusInStrategy === 'function' ? focusInStrategy(document.body) : getFirstFocusableElement();
+    updateFocusedElement(initialElement);
     const observer = new MutationObserver(mutations => {
         for (const mutation of mutations) {
             for (const removedNode of mutation.removedNodes) {

package/dist/esm/anchored-position.js

@@ -22,6 +22,8 @@ export function getAnchoredPosition(floatingElement, anchorElement, settings = {
     return pureCalculateAnchoredPosition(clippingRect, relativeRect, floatingElement.getBoundingClientRect(), anchorElement instanceof Element ? anchorElement.getBoundingClientRect() : anchorElement, getDefaultSettings(settings));
 }
 function getPositionedParent(element) {
+    if (isOnTopLayer(element))
+        return document.body;
     let parentNode = element.parentNode;
     while (parentNode !== null) {
         if (parentNode instanceof HTMLElement && getComputedStyle(parentNode).position !== 'static') {
@@ -31,6 +33,21 @@ function getPositionedParent(element) {
     }
     return document.body;
 }
+function isOnTopLayer(element) {
+    var _a;
+    if (element.tagName === 'DIALOG') {
+        return true;
+    }
+    try {
+        if (element.matches(':popover-open') && /native code/.test((_a = document.body.showPopover) === null || _a === void 0 ? void 0 : _a.toString())) {
+            return true;
+        }
+    }
+    catch (_b) {
+        return false;
+    }
+    return false;
+}
 function getClippingRect(element) {
     let parentNode = element;
     while (parentNode !== null) {

package/dist/esm/focus-zone.d.ts

@@ -1,5 +1,5 @@
 export declare type Direction = 'previous' | 'next' | 'start' | 'end';
-export declare type FocusMovementKeys = 'ArrowLeft' | 'ArrowDown' | 'ArrowUp' | 'ArrowRight' | 'h' | 'j' | 'k' | 'l' | 'a' | 's' | 'w' | 'd' | 'Tab' | 'Home' | 'End' | 'PageUp' | 'PageDown';
+export declare type FocusMovementKeys = 'ArrowLeft' | 'ArrowDown' | 'ArrowUp' | 'ArrowRight' | 'h' | 'j' | 'k' | 'l' | 'a' | 's' | 'w' | 'd' | 'Tab' | 'Home' | 'End' | 'PageUp' | 'PageDown' | 'Backspace';
 export declare enum FocusKeys {
     ArrowHorizontal = 1,
     ArrowVertical = 2,
@@ -10,6 +10,7 @@ export declare enum FocusKeys {
     WS = 32,
     AD = 64,
     Tab = 128,
+    Backspace = 512,
     ArrowAll = 3,
     HJKL = 12,
     WASD = 96,

package/dist/esm/focus-zone.js

@@ -14,6 +14,7 @@ export var FocusKeys;
     FocusKeys[FocusKeys["WS"] = 32] = "WS";
     FocusKeys[FocusKeys["AD"] = 64] = "AD";
     FocusKeys[FocusKeys["Tab"] = 128] = "Tab";
+    FocusKeys[FocusKeys["Backspace"] = 512] = "Backspace";
     FocusKeys[FocusKeys["ArrowAll"] = 3] = "ArrowAll";
     FocusKeys[FocusKeys["HJKL"] = 12] = "HJKL";
     FocusKeys[FocusKeys["WASD"] = 96] = "WASD";
@@ -36,7 +37,8 @@ const KEY_TO_BIT = {
     Home: FocusKeys.HomeAndEnd,
     End: FocusKeys.HomeAndEnd,
     PageUp: FocusKeys.PageUpDown,
-    PageDown: FocusKeys.PageUpDown
+    PageDown: FocusKeys.PageUpDown,
+    Backspace: FocusKeys.Backspace
 };
 const KEY_TO_DIRECTION = {
     ArrowLeft: 'previous',
@@ -55,7 +57,8 @@ const KEY_TO_DIRECTION = {
     Home: 'start',
     End: 'end',
     PageUp: 'start',
-    PageDown: 'end'
+    PageDown: 'end',
+    Backspace: 'previous'
 };
 function getDirection(keyboardEvent) {
     const direction = KEY_TO_DIRECTION[keyboardEvent.key];
@@ -184,8 +187,7 @@ export function focusZone(container, settings) {
         if (filteredElements.length === 0) {
             return;
         }
-        const insertIndex = focusableElements.findIndex(e => (e.compareDocumentPosition(filteredElements[0]) & Node.DOCUMENT_POSITION_PRECEDING) > 0);
-        focusableElements.splice(insertIndex === -1 ? focusableElements.length : insertIndex, 0, ...filteredElements);
+        focusableElements.splice(findInsertionIndex(filteredElements), 0, ...filteredElements);
         for (const element of filteredElements) {
             if (!savedTabIndex.has(element)) {
                 savedTabIndex.set(element, element.getAttribute('tabindex'));
@@ -196,6 +198,27 @@ export function focusZone(container, settings) {
             updateFocusedElement(getFirstFocusableElement());
         }
     }
+    function findInsertionIndex(elementsToInsert) {
+        const firstElementToInsert = elementsToInsert[0];
+        if (focusableElements.length === 0)
+            return 0;
+        let iMin = 0;
+        let iMax = focusableElements.length - 1;
+        while (iMin <= iMax) {
+            const i = Math.floor((iMin + iMax) / 2);
+            const element = focusableElements[i];
+            if (followsInDocument(firstElementToInsert, element)) {
+                iMax = i - 1;
+            }
+            else {
+                iMin = i + 1;
+            }
+        }
+        return iMin;
+    }
+    function followsInDocument(first, second) {
+        return (second.compareDocumentPosition(first) & Node.DOCUMENT_POSITION_PRECEDING) > 0;
+    }
     function endFocusManagement(...elements) {
         for (const element of elements) {
             const focusableElementIndex = focusableElements.indexOf(element);
@@ -219,7 +242,8 @@ export function focusZone(container, settings) {
         }
     }
     beginFocusManagement(...iterateFocusableElements(container));
-    updateFocusedElement(getFirstFocusableElement());
+    const initialElement = typeof focusInStrategy === 'function' ? focusInStrategy(document.body) : getFirstFocusableElement();
+    updateFocusedElement(initialElement);
     const observer = new MutationObserver(mutations => {
         for (const mutation of mutations) {
             for (const removedNode of mutation.removedNodes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/behaviors",
-  "version": "0.0.0-202292020482",
+  "version": "0.0.0-20230925220411",
   "description": "Shared behaviors for JavaScript components",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -30,17 +30,17 @@
     "dist/cjs/focus-trap.js"
   ],
   "scripts": {
-    "lint": "eslint src/",
-    "test": "npm run jest && npm run lint",
-    "test:watch": "jest --watch",
-    "jest": "jest",
     "clean": "rm -rf dist",
-    "prebuild": "npm run clean",
     "build": "npm run build:esm && npm run build:cjs",
     "build:esm": "tsc",
     "build:cjs": "tsc --module commonjs --outDir dist/cjs",
+    "lint": "eslint src/",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "prebuild": "npm run clean",
+    "release": "npm run build && changeset publish",
     "size-limit": "npm run build && size-limit",
-    "release": "npm run build && changeset publish"
+    "type-check": "tsc --noEmit"
   },
   "repository": {
     "type": "git",
@@ -69,12 +69,12 @@
     "@changesets/changelog-github": "^0.4.2",
     "@changesets/cli": "^2.18.1",
     "@github/prettier-config": "0.0.4",
-    "@size-limit/preset-small-lib": "^7.0.3",
+    "@size-limit/preset-small-lib": "^8.2.4",
     "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^13.5.0",
     "@types/jest": "^27.0.3",
     "@types/react": "^17.0.37",
-    "esbuild": "^0.14.1",
+    "esbuild": "^0.15.16",
     "esbuild-jest": "^0.5.0",
     "eslint": "^8.3.0",
     "eslint-plugin-github": "^4.3.5",
@@ -82,7 +82,7 @@
     "prettier": "^2.5.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "size-limit": "^7.0.3",
+    "size-limit": "^8.2.4",
     "typescript": "^4.5.2"
   }
 }