npm - @primer/behaviors - Versions diffs - 1.9.2-rc.45ff0ed → 1.10.0-rc.8ac56be - Mend

@primer/behaviors 1.9.2-rc.45ff0ed → 1.10.0-rc.8ac56be

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/cjs/focus-zone.js CHANGED Viewed

@@ -214,10 +214,25 @@ function focusZone(container, settings) {
             element.setAttribute('tabindex', '-1');
         }
         const shouldFocusPrepended = focusPrependedElements && insertionIndex === 0 && !wasDirectlyActivated;
-        if (!preventInitialFocus && (!currentFocusedElement || shouldFocusPrepended)) {
+        if (!preventInitialFocus && shouldFocusPrepended) {
+            reinitializeWithFreshElements();
+        }
+        else if (!preventInitialFocus && !currentFocusedElement) {
             updateFocusedElement(getFirstFocusableElement());
         }
     }
+    function reinitializeWithFreshElements() {
+        const freshElements = [...iterateFocusableElements.iterateFocusableElements(container, iterateFocusableElementsOptions)];
+        focusableElements.clear();
+        focusableElements.insertAt(0, ...freshElements);
+        for (const element of freshElements) {
+            if (!savedTabIndex.has(element)) {
+                savedTabIndex.set(element, element.getAttribute('tabindex'));
+            }
+            element.setAttribute('tabindex', '-1');
+        }
+        updateFocusedElement(getFirstFocusableElement());
+    }
     function findInsertionIndex(elementsToInsert) {
         const firstElementToInsert = elementsToInsert[0];
         if (focusableElements.size === 0)
@@ -318,7 +333,12 @@ function focusZone(container, settings) {
                 }
             }
             if (toAdd.length > 0) {
-                beginFocusManagement(...toAdd);
+                if (focusPrependedElements) {
+                    reinitializeWithFreshElements();
+                }
+                else {
+                    beginFocusManagement(...toAdd);
+                }
             }
         }
         if (attributeAdditions.size > 0) {

package/dist/esm/focus-zone.mjs CHANGED Viewed

@@ -212,10 +212,25 @@ function focusZone(container, settings) {
             element.setAttribute('tabindex', '-1');
         }
         const shouldFocusPrepended = focusPrependedElements && insertionIndex === 0 && !wasDirectlyActivated;
-        if (!preventInitialFocus && (!currentFocusedElement || shouldFocusPrepended)) {
+        if (!preventInitialFocus && shouldFocusPrepended) {
+            reinitializeWithFreshElements();
+        }
+        else if (!preventInitialFocus && !currentFocusedElement) {
             updateFocusedElement(getFirstFocusableElement());
         }
     }
+    function reinitializeWithFreshElements() {
+        const freshElements = [...iterateFocusableElements(container, iterateFocusableElementsOptions)];
+        focusableElements.clear();
+        focusableElements.insertAt(0, ...freshElements);
+        for (const element of freshElements) {
+            if (!savedTabIndex.has(element)) {
+                savedTabIndex.set(element, element.getAttribute('tabindex'));
+            }
+            element.setAttribute('tabindex', '-1');
+        }
+        updateFocusedElement(getFirstFocusableElement());
+    }
     function findInsertionIndex(elementsToInsert) {
         const firstElementToInsert = elementsToInsert[0];
         if (focusableElements.size === 0)
@@ -316,7 +331,12 @@ function focusZone(container, settings) {
                 }
             }
             if (toAdd.length > 0) {
-                beginFocusManagement(...toAdd);
+                if (focusPrependedElements) {
+                    reinitializeWithFreshElements();
+                }
+                else {
+                    beginFocusManagement(...toAdd);
+                }
             }
         }
         if (attributeAdditions.size > 0) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@primer/behaviors",
-  "version": "1.9.2-rc.45ff0ed",
+  "version": "1.10.0-rc.8ac56be",
   "description": "Shared behaviors for JavaScript components",
   "type": "commonjs",
   "main": "dist/cjs/index.js",