track length in array helpers, fix mobx external source

solidjs · Jul 24, 2024 · 3fc015c · 3fc015c
1 parent 424a31a
commit 3fc015c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.changeset/eighty-grapes-sell.md b/.changeset/eighty-grapes-sell.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+track length in array helpers, fix mobx external source
diff --git a/packages/solid/src/reactive/array.ts b/packages/solid/src/reactive/array.ts
@@ -59,12 +59,12 @@ export function mapArray<T, U>(
   onCleanup(() => dispose(disposers));
   return () => {
     let newItems = list() || [],
+      newLen = newItems.length,
       i: number,
       j: number;
     (newItems as any)[$TRACK]; // top level tracking
     return untrack(() => {
-      let newLen = newItems.length,
-        newIndices: Map<T | typeof FALLBACK, number>,
+      let newIndices: Map<T | typeof FALLBACK, number>,
         newIndicesNext: number[],
         temp: U[],
         tempdisposers: (() => void)[],
@@ -196,10 +196,11 @@ export function indexArray<T, U>(
 
   onCleanup(() => dispose(disposers));
   return () => {
-    const newItems = list() || [];
+    const newItems = list() || [],
+      newLen = newItems.length;
     (newItems as any)[$TRACK]; // top level tracking
     return untrack(() => {
-      if (newItems.length === 0) {
+      if (newLen === 0) {
         if (len !== 0) {
           dispose(disposers);
           disposers = [];
@@ -226,7 +227,7 @@ export function indexArray<T, U>(
         len = 0;
       }
 
-      for (i = 0; i < newItems.length; i++) {
+      for (i = 0; i < newLen; i++) {
         if (i < items.length && items[i] !== newItems[i]) {
           signals[i](() => newItems[i]);
         } else if (i >= items.length) {
@@ -236,7 +237,7 @@ export function indexArray<T, U>(
       for (; i < items.length; i++) {
         disposers[i]();
       }
-      len = signals.length = disposers.length = newItems.length;
+      len = signals.length = disposers.length = newLen;
       items = newItems.slice(0);
       return (mapped = mapped.slice(0, len));
     });