@primer/behaviors 0.0.0-202342222036 → 0.0.0-2023818155639

package/dist/cjs/anchored-position.js

@@ -26,8 +26,6 @@ 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') {
@@ -37,21 +35,6 @@ 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' | 'Backspace';
+export declare type FocusMovementKeys = 'ArrowLeft' | 'ArrowDown' | 'ArrowUp' | 'ArrowRight' | 'h' | 'j' | 'k' | 'l' | 'a' | 's' | 'w' | 'd' | 'Tab' | 'Home' | 'End' | 'PageUp' | 'PageDown';
 export declare enum FocusKeys {
     ArrowHorizontal = 1,
     ArrowVertical = 2,
@@ -10,7 +10,6 @@ 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,7 +17,6 @@ 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";
@@ -40,8 +39,7 @@ const KEY_TO_BIT = {
     Home: FocusKeys.HomeAndEnd,
     End: FocusKeys.HomeAndEnd,
     PageUp: FocusKeys.PageUpDown,
-    PageDown: FocusKeys.PageUpDown,
-    Backspace: FocusKeys.Backspace
+    PageDown: FocusKeys.PageUpDown
 };
 const KEY_TO_DIRECTION = {
     ArrowLeft: 'previous',
@@ -60,8 +58,7 @@ const KEY_TO_DIRECTION = {
     Home: 'start',
     End: 'end',
     PageUp: 'start',
-    PageDown: 'end',
-    Backspace: 'previous'
+    PageDown: 'end'
 };
 function getDirection(keyboardEvent) {
     const direction = KEY_TO_DIRECTION[keyboardEvent.key];
@@ -190,7 +187,8 @@ function focusZone(container, settings) {
         if (filteredElements.length === 0) {
             return;
         }
-        focusableElements.splice(findInsertionIndex(filteredElements), 0, ...filteredElements);
+        const insertIndex = focusableElements.findIndex(e => (e.compareDocumentPosition(filteredElements[0]) & Node.DOCUMENT_POSITION_PRECEDING) > 0);
+        focusableElements.splice(insertIndex === -1 ? focusableElements.length : insertIndex, 0, ...filteredElements);
         for (const element of filteredElements) {
             if (!savedTabIndex.has(element)) {
                 savedTabIndex.set(element, element.getAttribute('tabindex'));
@@ -201,27 +199,6 @@ 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);
@@ -245,8 +222,7 @@ function focusZone(container, settings) {
         }
     }
     beginFocusManagement(...(0, iterate_focusable_elements_js_1.iterateFocusableElements)(container));
-    const initialElement = typeof focusInStrategy === 'function' ? focusInStrategy(document.body) : getFirstFocusableElement();
-    updateFocusedElement(initialElement);
+    updateFocusedElement(getFirstFocusableElement());
     const observer = new MutationObserver(mutations => {
         for (const mutation of mutations) {
             for (const removedNode of mutation.removedNodes) {

package/dist/esm/anchored-position.js

@@ -22,8 +22,6 @@ 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') {
@@ -33,21 +31,6 @@ 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' | 'Backspace';
+export declare type FocusMovementKeys = 'ArrowLeft' | 'ArrowDown' | 'ArrowUp' | 'ArrowRight' | 'h' | 'j' | 'k' | 'l' | 'a' | 's' | 'w' | 'd' | 'Tab' | 'Home' | 'End' | 'PageUp' | 'PageDown';
 export declare enum FocusKeys {
     ArrowHorizontal = 1,
     ArrowVertical = 2,
@@ -10,7 +10,6 @@ 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,7 +14,6 @@ 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";
@@ -37,8 +36,7 @@ const KEY_TO_BIT = {
     Home: FocusKeys.HomeAndEnd,
     End: FocusKeys.HomeAndEnd,
     PageUp: FocusKeys.PageUpDown,
-    PageDown: FocusKeys.PageUpDown,
-    Backspace: FocusKeys.Backspace
+    PageDown: FocusKeys.PageUpDown
 };
 const KEY_TO_DIRECTION = {
     ArrowLeft: 'previous',
@@ -57,8 +55,7 @@ const KEY_TO_DIRECTION = {
     Home: 'start',
     End: 'end',
     PageUp: 'start',
-    PageDown: 'end',
-    Backspace: 'previous'
+    PageDown: 'end'
 };
 function getDirection(keyboardEvent) {
     const direction = KEY_TO_DIRECTION[keyboardEvent.key];
@@ -187,7 +184,8 @@ export function focusZone(container, settings) {
         if (filteredElements.length === 0) {
             return;
         }
-        focusableElements.splice(findInsertionIndex(filteredElements), 0, ...filteredElements);
+        const insertIndex = focusableElements.findIndex(e => (e.compareDocumentPosition(filteredElements[0]) & Node.DOCUMENT_POSITION_PRECEDING) > 0);
+        focusableElements.splice(insertIndex === -1 ? focusableElements.length : insertIndex, 0, ...filteredElements);
         for (const element of filteredElements) {
             if (!savedTabIndex.has(element)) {
                 savedTabIndex.set(element, element.getAttribute('tabindex'));
@@ -198,27 +196,6 @@ 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);
@@ -242,8 +219,7 @@ export function focusZone(container, settings) {
         }
     }
     beginFocusManagement(...iterateFocusableElements(container));
-    const initialElement = typeof focusInStrategy === 'function' ? focusInStrategy(document.body) : getFirstFocusableElement();
-    updateFocusedElement(initialElement);
+    updateFocusedElement(getFirstFocusableElement());
     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-202342222036",
+  "version": "0.0.0-2023818155639",
   "description": "Shared behaviors for JavaScript components",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -74,7 +74,7 @@
     "@testing-library/user-event": "^13.5.0",
     "@types/jest": "^27.0.3",
     "@types/react": "^17.0.37",
-    "esbuild": "^0.15.16",
+    "esbuild": "^0.14.1",
     "esbuild-jest": "^0.5.0",
     "eslint": "^8.3.0",
     "eslint-plugin-github": "^4.3.5",