@farm.js/react 0.1.0-beta.10 → 0.1.0-beta.11

package/dist/compiler-runtime.mjs

@@ -3375,7 +3375,6 @@ function createHostConditionalBlockComponent(owner) {
       for (const unsubscribe of this.fallbackUnsubscribers) unsubscribe();
       this.fallbackUnsubscribers = [];
       this.instance?.scope?.cleanup();
-      this.root = null;
       this.activeBranch = null;
       this.instance = null;
     }
@@ -3647,7 +3646,6 @@ function createConditionalRangesBlockComponent(owner) {
       for (const unsubscribe of this.fallbackUnsubscribers) unsubscribe();
       this.fallbackUnsubscribers = [];
       for (const instance of this.rangeInstances) instance?.host.scope?.cleanup();
-      this.root = null;
       this.rangeInstances = [];
       this.staticSegments = [];
       this.staticValues.length = 0;
@@ -4489,15 +4487,15 @@ function reconcileCompilerKeyedArrayBatchInsert(props, dirtyState, collectionTok
       return void 0;
     }
   }
-  const knownKeys = new Set(instances.keys());
+  const incomingKeys = /* @__PURE__ */ new Set();
   const incoming = [];
   try {
     for (let offset = 0; offset < insertCount; offset += 1) {
       const index = update.position + offset;
       const item = finalValue[index];
       const key = keyedRowIdentity(props.rowKey(item, index));
-      if (knownKeys.has(key)) return void 0;
-      knownKeys.add(key);
+      if (instances.has(key) || incomingKeys.has(key)) return void 0;
+      incomingKeys.add(key);
       const descriptor = props.create(item, index);
       incoming.push({
         key,
@@ -4650,9 +4648,9 @@ function reconcileCompilerKeyedArrayWindowReplace(props, dirtyState, collectionT
       const preparedIncomingKeys = /* @__PURE__ */ new Set();
       const preparedWindows = [];
       const nextInstances = [];
-      for (const window of windows) {
-        if (window[0] < sourceCursor) return void 0;
-        while (sourceCursor < window[0]) {
+      for (const window2 of windows) {
+        if (window2[0] < sourceCursor) return void 0;
+        while (sourceCursor < window2[0]) {
           const instance = previousInstances[sourceCursor];
           if (!instance || instance.index !== sourceCursor || !Object.is(instance.item, finalValue[resultCursor])) {
             return void 0;
@@ -4665,24 +4663,24 @@ function reconcileCompilerKeyedArrayWindowReplace(props, dirtyState, collectionT
           props,
           finalValue,
           resultCursor,
-          window[3]
+          window2[3]
         );
         if (!incoming2) return void 0;
-        window[1] = resultCursor;
+        window2[1] = resultCursor;
         const prepared3 = prepareCompilerKeyedArrayWindow(
           props,
           instances,
           previousInstances,
           root,
-          window,
+          window2,
           incoming2,
           preparedIncomingKeys
         );
         if (!prepared3) return void 0;
         preparedWindows.push(prepared3);
         nextInstances.push(...prepared3[4]);
-        sourceCursor += window[2];
-        resultCursor += window[3];
+        sourceCursor += window2[2];
+        resultCursor += window2[3];
       }
       while (sourceCursor < previousInstances.length) {
         const instance = previousInstances[sourceCursor];
@@ -4702,30 +4700,32 @@ function reconcileCompilerKeyedArrayWindowReplace(props, dirtyState, collectionT
       }
       return keyedRowInstancesByKey(nextInstances);
     }
-    const touchedIndices = /* @__PURE__ */ new Set();
-    for (const update2 of updates) {
-      for (let index = update2.position; index < update2.position + update2.removedCount; index += 1) {
-        touchedIndices.add(index);
-      }
-    }
+    updates.sort((left, right) => right.position - left.position);
+    let window = updates.pop();
+    const touchedInstances = [];
     for (let index = 0; index < previousInstances.length; index += 1) {
+      while (window && index >= window.position + window.removedCount) {
+        window = updates.pop();
+      }
       const instance = previousInstances[index];
-      const touched = touchedIndices.has(index);
-      if (!instance || instance.index !== index || (touched ? instance.element.parentNode !== root : !Object.is(instance.item, finalValue[index]))) {
+      if (!instance || instance.index !== index) return void 0;
+      if (window && index >= window.position) {
+        if (instance.element.parentNode !== root) return void 0;
+        touchedInstances.push(instance);
+      } else if (!Object.is(instance.item, finalValue[index])) {
         return void 0;
       }
     }
-    const knownKeys = new Set(instances.keys());
     const incomingKeys2 = /* @__PURE__ */ new Set();
     let replacesRows = false;
     const prepared2 = [];
     try {
-      for (const index of [...touchedIndices].sort((left, right) => left - right)) {
-        const instance = previousInstances[index];
+      for (const instance of touchedInstances) {
+        const index = instance.index;
         const item = finalValue[index];
         const key = keyedRowIdentity(props.rowKey(item, index));
         if (key !== instance.key) {
-          if (knownKeys.has(key) || incomingKeys2.has(key)) return void 0;
+          if (instances.has(key) || incomingKeys2.has(key)) return void 0;
           incomingKeys2.add(key);
           replacesRows = true;
           const descriptor = props.create(item, index);
@@ -5549,11 +5549,13 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
             this.hasReactOwnedRows()
           );
           if (positionedInstances) {
-            this.instances = new Map(positionedInstances);
-            this.rebuildElementIndex(this.instances);
-            const keys = [...this.instances.keys()];
-            this.pruneEventHandlers(keys);
-            this.pruneConditionalListeners(keys);
+            if (positionedInstances !== this.instances) {
+              this.instances = new Map(positionedInstances);
+              this.rebuildElementIndex(this.instances);
+              const keys = [...this.instances.keys()];
+              this.pruneEventHandlers(keys);
+              this.pruneConditionalListeners(keys);
+            }
             this.commitCurrentCollection(dirtyState);
             afterCommit?.();
             return;
@@ -5568,9 +5570,9 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
           );
           if (reorderedInstances) {
             const removedRows = reorderedInstances.size < this.instances.size;
-            this.instances = new Map(reorderedInstances);
-            this.rebuildElementIndex(this.instances);
+            this.instances = reorderedInstances;
             if (removedRows) {
+              this.rebuildElementIndex(this.instances);
               const keys = [...this.instances.keys()];
               this.pruneEventHandlers(keys);
               this.pruneConditionalListeners(keys);
@@ -6297,7 +6299,6 @@ function createKeyedRowsBlockComponent(owner, options = {}) {
     componentWillUnmount() {
       this.mounted = false;
       this.unsubscribe?.();
-      this.root = null;
       this.cleanupHostScopes();
       this.instances.clear();
       this.identityTargets.clear();
@@ -6531,7 +6532,6 @@ function createKeyedRangesBlockComponent(owner) {
     componentWillUnmount() {
       this.mounted = false;
       this.unsubscribe?.();
-      this.root = null;
       this.rangeInstances = [];
       this.staticSegments = [];
       this.staticValues.length = 0;
@@ -6656,7 +6656,6 @@ function createMixedRangesBlockComponent(owner) {
       this.controller?.cleanup();
       this.controller = null;
       this.clearFallbackSubscriptions();
-      this.root = null;
     }
     render() {
       const container = this.currentProps.render();
@@ -7770,13 +7769,11 @@ function createCompiledComponentWithFeatures(definition, runtimeFeatures) {
     }
     componentWillUnmount() {
       this.mounted = false;
-      this.root = null;
       this.dirtyState.clear();
       this.inputSelection = null;
       this.blockRefreshListeners.clear();
       this.blockRoots.clear();
       this.blockRootElements.clear();
-      this.bindingTargets.clear();
       this.bindingTargetRefs.clear();
       this.indexedDefinition = null;
       this.staticBindingsByDependency = [];