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

package/dist/compiler-runtime.cjs

@@ -2308,16 +2308,21 @@ function commitKeyedRowBinding(binding, instance, bindingIndex, value, target) {
     updateAttribute(target, binding.name, value);
   }
 }
+function prepareKeyedRowBindingUpdate(props, instance, item, index, bindingIndex) {
+  const binding = props.bindings[bindingIndex];
+  const rawValue = binding.read(item, index);
+  const value = normalizedKeyedRowBindingValue(binding, rawValue);
+  if (Object.is(instance.values[bindingIndex], value)) return null;
+  const target = findCompilerHostTarget(instance.element, binding.path);
+  if (!target || binding.kind !== "text" && !binding.name) return void 0;
+  return [bindingIndex, target, value];
+}
 function prepareKeyedRowBindingUpdates(props, instance, item, index) {
   const updates = [];
   for (let bindingIndex = 0; bindingIndex < props.bindings.length; bindingIndex += 1) {
-    const binding = props.bindings[bindingIndex];
-    const rawValue = binding.read(item, index);
-    const value = normalizedKeyedRowBindingValue(binding, rawValue);
-    if (Object.is(instance.values[bindingIndex], value)) continue;
-    const target = findCompilerHostTarget(instance.element, binding.path);
-    if (!target || binding.kind !== "text" && !binding.name) return void 0;
-    updates.push([bindingIndex, target, value]);
+    const update = prepareKeyedRowBindingUpdate(props, instance, item, index, bindingIndex);
+    if (update === void 0) return void 0;
+    if (update) updates.push(update);
   }
   return updates;
 }
@@ -2326,6 +2331,19 @@ function applyPreparedKeyedRowBindingUpdates(props, instance, updates) {
     commitKeyedRowBinding(props.bindings[bindingIndex], instance, bindingIndex, value, target);
   }
 }
+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];
+}
 function keyedRowConditionalSnapshot(conditional, item, index) {
   const test = conditional.test(item, index);
   if (conditional.logical && !test) {
@@ -6258,6 +6276,7 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
           nextMapLookupTargets.set(bindingIndex, snapshot);
         }
       }
+      let preparedBindingUpdates;
       for (const bindingIndex of affectedBindingIndices) {
         const binding = this.currentProps.bindings[bindingIndex];
         const identityTarget = binding.identityTarget;
@@ -6278,52 +6297,32 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
         const canTargetMapLookup = Boolean(
           mapLookupTarget && binding.dependencies?.length === 1 && binding.dependencies[0] === mapLookupTarget.dependency && dirtyState.has(mapLookupTarget.dependency) && previousMapLookupTarget?.eligible && nextMapLookupTarget?.eligible
         );
+        let selectedKeys;
+        let selectedCount;
         if (canTargetMapLookup && previousMapLookupTarget && nextMapLookupTarget) {
           const keys = keyedMapLookupChangedKeys(previousMapLookupTarget, nextMapLookupTarget);
-          for (const key of keys) {
-            const instance = this.instances.get(key);
-            if (instance) {
-              applyKeyedRowBinding(
-                this.currentProps,
-                instance,
-                instance.item,
-                instance.index,
-                bindingIndex
-              );
-            }
-          }
+          selectedKeys = keys;
+          selectedCount = keys.size;
         } else if (canTargetMembership && previousMembershipTarget && nextMembershipTarget) {
           const keys = keyedMembershipChangedKeys(previousMembershipTarget, nextMembershipTarget);
-          for (const key of keys) {
-            const instance = this.instances.get(key);
-            if (instance) {
-              applyKeyedRowBinding(
-                this.currentProps,
-                instance,
-                instance.item,
-                instance.index,
-                bindingIndex
-              );
-            }
-          }
+          selectedKeys = keys;
+          selectedCount = keys.size;
         } else if (canTargetIdentity && previousIdentityTarget && nextIdentityTarget) {
           const keys = /* @__PURE__ */ new Set();
           if (previousIdentityTarget.key !== void 0) keys.add(previousIdentityTarget.key);
           if (nextIdentityTarget.key !== void 0) keys.add(nextIdentityTarget.key);
-          for (const key of keys) {
-            const instance = this.instances.get(key);
-            if (instance) {
-              applyKeyedRowBinding(
-                this.currentProps,
-                instance,
-                instance.item,
-                instance.index,
-                bindingIndex
-              );
-            }
-          }
+          selectedKeys = keys;
+          selectedCount = keys.size;
         } else {
-          for (const instance of this.instances.values()) {
+          selectedKeys = this.instances.keys();
+          selectedCount = this.instances.size;
+        }
+        const prepare = affectedBindingIndices.length > 1 || selectedCount > 1;
+        if (prepare) preparedBindingUpdates || (preparedBindingUpdates = []);
+        for (const key of selectedKeys) {
+          const instance = this.instances.get(key);
+          if (!instance) continue;
+          if (!prepare) {
             applyKeyedRowBinding(
               this.currentProps,
               instance,
@@ -6331,8 +6330,37 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
               instance.index,
               bindingIndex
             );
+            continue;
           }
+          const update = prepareKeyedRowBindingUpdate(
+            this.currentProps,
+            instance,
+            instance.item,
+            instance.index,
+            bindingIndex
+          );
+          if (update === void 0) {
+            this.activateFallback(afterCommit);
+            return true;
+          }
+          if (update) preparedBindingUpdates.push([instance, update]);
         }
+      }
+      if (preparedBindingUpdates) {
+        for (const [instance, [bindingIndex, target, value]] of preparedBindingUpdates) {
+          commitKeyedRowBinding(
+            this.currentProps.bindings[bindingIndex],
+            instance,
+            bindingIndex,
+            value,
+            target
+          );
+        }
+      }
+      for (const bindingIndex of affectedBindingIndices) {
+        const nextIdentityTarget = nextIdentityTargets.get(bindingIndex);
+        const nextMembershipTarget = nextMembershipTargets.get(bindingIndex);
+        const nextMapLookupTarget = nextMapLookupTargets.get(bindingIndex);
         if (nextIdentityTarget) this.identityTargets.set(bindingIndex, nextIdentityTarget);
         else this.identityTargets.delete(bindingIndex);
         if (nextMembershipTarget) {
@@ -6356,10 +6384,16 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
         if (rows.keys[index] !== key) return false;
         index += 1;
       }
+      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) {
+        this.activateFallback(afterCommit);
+        return true;
+      }
       const conditionalChanges = [];
       for (index = 0; index < rows.items.length; index += 1) {
         const key = rows.keys[index];
-        const existing = this.instances.get(key);
+        const existing = preparedBindings?.[0][index] || this.instances.get(key);
         if (!existing) return false;
         if (this.currentProps.hostBlocks) {
           const descriptor = this.currentProps.create(rows.items[index], index);
@@ -6368,7 +6402,12 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
             return true;
           }
         }
-        applyKeyedRowBindings(this.currentProps, existing, rows.items[index], index);
+        const bindingUpdates = preparedBindings?.[1][index];
+        if (bindingUpdates) {
+          applyPreparedKeyedRowBindingUpdates(this.currentProps, existing, bindingUpdates);
+        } else {
+          applyKeyedRowBindings(this.currentProps, existing, rows.items[index], index);
+        }
         const conditionalValues = this.readConditionalValues(
           this.currentProps,
           rows.items[index],
@@ -6405,10 +6444,16 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
       const removedKey = previousKeys[removedIndex];
       const removed = this.instances.get(removedKey);
       if (!removed) 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) {
+        this.activateFallback(afterCommit);
+        return true;
+      }
       const conditionalChanges = [];
       for (let index = 0; index < rows.items.length; index += 1) {
         const key = rows.keys[index];
-        const existing = this.instances.get(key);
+        const existing = preparedBindings?.[0][index] || this.instances.get(key);
         if (!existing) return false;
         if (this.currentProps.hostBlocks) {
           const descriptor = this.currentProps.create(rows.items[index], index);
@@ -6417,7 +6462,12 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
             return true;
           }
         }
-        applyKeyedRowBindings(this.currentProps, existing, rows.items[index], index);
+        const bindingUpdates = preparedBindings?.[1][index];
+        if (bindingUpdates) {
+          applyPreparedKeyedRowBindingUpdates(this.currentProps, existing, bindingUpdates);
+        } else {
+          applyKeyedRowBindings(this.currentProps, existing, rows.items[index], index);
+        }
         const conditionalValues = this.readConditionalValues(
           this.currentProps,
           rows.items[index],