♻️ Uses Map

alpinejs · Sep 30, 2024 · 985ce1c · 985ce1c
1 parent 0f9e12e
commit 985ce1c
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/packages/alpinejs/src/directives/x-for.js b/packages/alpinejs/src/directives/x-for.js
@@ -62,35 +62,36 @@ function loop(templateEl, iteratorNames, evaluateItems, evaluateKey) {
         const oldLookup = templateEl._x_lookup
         const lookup = new Map()
         templateEl._x_lookup = lookup
-        const scopeEntries = []
+
         const hasStringKeys = isObject(items)
-        Object.entries(items).forEach(([index, item]) => {
+        const scopeEntries = Object.entries(items).map(([index, item]) => {
             if (!hasStringKeys) index = parseInt(index)
             const scope = getIterationScopeVariables(
                 iteratorNames,
                 item,
                 index,
                 items
             )
-
+            let key;
             evaluateKey(
-                key => {
-                    if (typeof key === 'object')
+                innerKey => {
+                    if (typeof innerKey === 'object')
                         warn(
                             'x-for key cannot be an object, it must be a string or an integer',
                             templateEl
                         )
 
-                    if (oldLookup.has(key)) {
-                        lookup.set(key, oldLookup.get(key))
-                        oldLookup.delete(key)
+                    if (oldLookup.has(innerKey)) {
+                        lookup.set(innerKey, oldLookup.get(innerKey))
+                        oldLookup.delete(innerKey)
                     }
-                    scopeEntries.push([key, scope])
+                    key = innerKey
                 },
                 {
                     scope: { index, ...scope },
                 }
             )
+            return [key, scope];
         })
 
         mutateDom(() => {