@farm.js/react 0.1.0-beta.15 → 0.1.0-beta.17

package/dist/compiler-runtime.cjs

@@ -2332,17 +2332,15 @@ function applyPreparedKeyedRowBindingUpdates(props, instance, updates) {
   }
 }
 function prepareKeyedRowBindingSetUpdates(props, instances, rows) {
-  const preparedInstances = [];
   const preparedUpdates = [];
   for (let index = 0; index < rows.items.length; index += 1) {
     const instance = instances.get(rows.keys[index]);
     if (!instance) return void 0;
     const updates = prepareKeyedRowBindingUpdates(props, instance, rows.items[index], index);
     if (!updates) return void 0;
-    preparedInstances.push(instance);
     preparedUpdates.push(updates);
   }
-  return [preparedInstances, preparedUpdates];
+  return preparedUpdates;
 }
 function keyedRowConditionalSnapshot(conditional, item, index) {
   const test = conditional.test(item, index);
@@ -6393,7 +6391,7 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
       const conditionalChanges = [];
       for (index = 0; index < rows.items.length; index += 1) {
         const key = rows.keys[index];
-        const existing = preparedBindings?.[0][index] || this.instances.get(key);
+        const existing = this.instances.get(key);
         if (!existing) return false;
         if (this.currentProps.hostBlocks) {
           const descriptor = this.currentProps.create(rows.items[index], index);
@@ -6402,7 +6400,7 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
             return true;
           }
         }
-        const bindingUpdates = preparedBindings?.[1][index];
+        const bindingUpdates = preparedBindings?.[index];
         if (bindingUpdates) {
           applyPreparedKeyedRowBindingUpdates(this.currentProps, existing, bindingUpdates);
         } else {
@@ -6431,19 +6429,15 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
       this.notifyConditionalChanges(conditionalChanges, afterCommit);
       return true;
     }
-    reconcileSingleRemoval(rows, afterCommit, dirtyState) {
-      if (this.hasReactOwnedRows() || rows.keys.length + 1 !== this.instances.size) return false;
-      const previousKeys = [...this.instances.keys()];
-      let removedIndex = 0;
-      while (removedIndex < rows.keys.length && previousKeys[removedIndex] === rows.keys[removedIndex]) {
-        removedIndex += 1;
-      }
-      for (let index = removedIndex; index < rows.keys.length; index += 1) {
-        if (previousKeys[index + 1] !== rows.keys[index]) return false;
+    reconcileRemovals(rows, afterCommit, dirtyState) {
+      if (this.hasReactOwnedRows() || rows.keys.length >= this.instances.size) return false;
+      const removed = [];
+      let nextIndex = 0;
+      for (const [key, instance] of this.instances) {
+        if (key === rows.keys[nextIndex]) nextIndex += 1;
+        else removed.push(instance);
       }
-      const removedKey = previousKeys[removedIndex];
-      const removed = this.instances.get(removedKey);
-      if (!removed) return false;
+      if (nextIndex !== rows.keys.length) return false;
       const shouldPrepareBindings = rows.items.length > 1 && this.currentProps.bindings.length > 0 && !this.currentProps.hostBlocks;
       const preparedBindings = shouldPrepareBindings ? prepareKeyedRowBindingSetUpdates(this.currentProps, this.instances, rows) : void 0;
       if (shouldPrepareBindings && !preparedBindings) {
@@ -6453,7 +6447,7 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
       const conditionalChanges = [];
       for (let index = 0; index < rows.items.length; index += 1) {
         const key = rows.keys[index];
-        const existing = preparedBindings?.[0][index] || this.instances.get(key);
+        const existing = this.instances.get(key);
         if (!existing) return false;
         if (this.currentProps.hostBlocks) {
           const descriptor = this.currentProps.create(rows.items[index], index);
@@ -6462,7 +6456,7 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
             return true;
           }
         }
-        const bindingUpdates = preparedBindings?.[1][index];
+        const bindingUpdates = preparedBindings?.[index];
         if (bindingUpdates) {
           applyPreparedKeyedRowBindingUpdates(this.currentProps, existing, bindingUpdates);
         } else {
@@ -6487,11 +6481,13 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
         existing.item = rows.items[index];
         existing.index = index;
       }
-      removed.scope?.cleanup();
-      removed.element.remove();
-      this.instances.delete(removedKey);
-      this.eventHandlers.delete(removedKey);
-      this.conditionalListeners.delete(removedKey);
+      for (const instance of removed) {
+        instance.scope?.cleanup();
+        instance.element.remove();
+        this.instances.delete(instance.key);
+        this.eventHandlers.delete(instance.key);
+        this.conditionalListeners.delete(instance.key);
+      }
       this.commitCurrentCollection(dirtyState);
       this.notifyConditionalChanges(conditionalChanges, afterCommit);
       return true;
@@ -6540,9 +6536,14 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
         return;
       }
       if (this.reconcileStableRows(rows, afterCommit, dirtyState)) return;
-      if (this.reconcileSingleRemoval(rows, afterCommit, dirtyState)) return;
+      if (this.reconcileRemovals(rows, afterCommit, dirtyState)) return;
       const nextKeys = new Set(rows.keys);
       const hasSurvivingRows = rows.keys.some((key) => this.instances.has(key));
+      const preparedBindings = nextKeys.size < this.instances.size && this.currentProps.bindings.length > 0 && !this.currentProps.hostBlocks && rows.keys.every((key) => this.instances.has(key)) ? prepareKeyedRowBindingSetUpdates(this.currentProps, this.instances, rows) : null;
+      if (preparedBindings === void 0) {
+        this.activateFallback(afterCommit);
+        return;
+      }
       const oldIndices = /* @__PURE__ */ new Map();
       if (hasSurvivingRows) {
         [...this.instances].forEach(([key], index) => oldIndices.set(key, index));
@@ -6567,7 +6568,15 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
               return;
             }
           }
-          applyKeyedRowBindings(this.currentProps, existing, rows.items[index], index);
+          if (preparedBindings) {
+            applyPreparedKeyedRowBindingUpdates(
+              this.currentProps,
+              existing,
+              preparedBindings[index]
+            );
+          } else {
+            applyKeyedRowBindings(this.currentProps, existing, rows.items[index], index);
+          }
           const conditionalValues = this.readConditionalValues(
             this.currentProps,
             rows.items[index],