@reckona/mreact-compat 0.0.163 → 0.0.165

package/dist/hooks.js

@@ -25,6 +25,7 @@ let currentEventPriority = "default";
 let eventRerenderScheduled = false;
 let automaticRerenderScheduled = false;
 let effectFlushRerenderDepth = 0;
+let hostCommitRerenderDepth = 0;
 let strictMemoOwnerId = 0;
 const strictMemoObjectOwnerIds = new WeakMap();
 const queuedTransitionRerenders = new Map();
@@ -144,8 +145,6 @@ export function createRootRuntime(rerender, options = {}) {
             hookRenderState.currentInstance = undefined;
             if (committed) {
                 flushProfilerCommits(this, profilerCommits);
-                flushHostCommitRerenders();
-                this.externalStoreUpdate = false;
             }
         },
         flushEffects() {
@@ -168,7 +167,9 @@ export function createRootRuntime(rerender, options = {}) {
                 this.effectFlushPhase = undefined;
                 this.profilerFlushDepth -= 1;
                 if (this.profilerFlushDepth === 0) {
+                    flushHostCommitRerenders();
                     flushEffectFlushRerenders();
+                    this.externalStoreUpdate = false;
                 }
             }
         },
@@ -537,6 +538,14 @@ function clearReactiveTextBinding(node) {
     previous.subscribers.delete(node);
     reactiveTextBindingsByNode.delete(node);
 }
+function clearReactiveTextBindingSubscribers(binding) {
+    for (const node of binding.subscribers) {
+        if (reactiveTextBindingsByNode.get(node) === binding) {
+            reactiveTextBindingsByNode.delete(node);
+        }
+    }
+    binding.subscribers.clear();
+}
 function getStateTextBinding(slot) {
     slot.textBinding ??= {
         value: slot.value,
@@ -871,13 +880,25 @@ export function useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot)
             }
             const nextSnapshot = getSnapshot();
             if (!Object.is(slot.value, nextSnapshot)) {
+                if (hookRenderState.hostCommitDepth > 0 && !Object.hasOwn(slot, "hostCommitValue")) {
+                    slot.hostCommitValue = slot.value;
+                }
                 slot.value = nextSnapshot;
-                instance.dirty = true;
                 runtime.externalStoreUpdate = true;
+                if (hookRenderState.hostCommitDepth > 0) {
+                    updateHostCommitDirtyState(instance);
+                    hookRenderState.queuedHostCommitRerenders.add(runtime);
+                    return;
+                }
+                instance.dirty = true;
                 if (runtime.profilerFlushDepth > 0) {
                     hookRenderState.queuedEffectFlushRerenders.add(runtime);
                     return;
                 }
+                if (eventBatchDepth > 0) {
+                    queueEventRerender(runtime);
+                    return;
+                }
                 runtime.rerender("sync");
             }
         };
@@ -1059,7 +1080,7 @@ export function startTransition(scope) {
     runTransitionScope(scope, context);
 }
 /** Runs a callback while updates are batched at the requested event priority. */
-export function runWithEventPriority(priority, callback) {
+export function runWithEventPriority(priority, callback, deferFlush) {
     const previousPriority = currentEventPriority;
     currentEventPriority = priority;
     eventBatchDepth += 1;
@@ -1070,7 +1091,15 @@ export function runWithEventPriority(priority, callback) {
         eventBatchDepth -= 1;
         currentEventPriority = previousPriority;
         if (eventBatchDepth === 0) {
-            flushEventRerendersForPriority(priority);
+            const flush = () => {
+                flushEventRerendersForPriority(priority);
+            };
+            if (deferFlush === undefined) {
+                flush();
+            }
+            else {
+                deferFlush(flush);
+            }
         }
     }
 }
@@ -1401,18 +1430,28 @@ function scheduleInstanceUpdate(runtime, instance, options = {}) {
     scheduleRuntimeRerender(runtime, options);
 }
 function flushHostCommitRerenders() {
-    if (hookRenderState.hostCommitDepth > 0 ||
+    if (hostCommitRerenderDepth > 0 ||
+        hookRenderState.hostCommitDepth > 0 ||
         hookRenderState.queuedHostCommitRerenders.size === 0) {
         return;
     }
-    const runtimes = [...hookRenderState.queuedHostCommitRerenders];
-    hookRenderState.queuedHostCommitRerenders.clear();
-    for (const runtime of runtimes) {
-        const hasDirtyInstance = Array.from(runtime.instances.values()).some((instance) => instance.dirty);
-        clearHostCommitStateBaselines(runtime);
-        if (hasDirtyInstance) {
-            runtime.rerender("sync");
+    hostCommitRerenderDepth += 1;
+    try {
+        for (let attempt = 0; attempt < 3 && hookRenderState.queuedHostCommitRerenders.size > 0; attempt += 1) {
+            const runtimes = [...hookRenderState.queuedHostCommitRerenders];
+            hookRenderState.queuedHostCommitRerenders.clear();
+            for (const runtime of runtimes) {
+                const hasDirtyInstance = Array.from(runtime.instances.values()).some((instance) => instance.dirty);
+                clearHostCommitStateBaselines(runtime);
+                if (hasDirtyInstance) {
+                    runtime.rerender("sync");
+                }
+            }
         }
+        hookRenderState.queuedHostCommitRerenders.clear();
+    }
+    finally {
+        hostCommitRerenderDepth -= 1;
     }
 }
 function flushEffectFlushRerenders() {
@@ -1439,14 +1478,14 @@ function flushEffectFlushRerenders() {
     }
 }
 function updateHostCommitDirtyState(instance) {
-    instance.dirty = instance.hooks.some((slot) => slot.kind === "state" &&
+    instance.dirty = instance.hooks.some((slot) => (slot.kind === "state" || slot.kind === "store") &&
         Object.hasOwn(slot, "hostCommitValue") &&
         !Object.is(slot.hostCommitValue, slot.value));
 }
 function clearHostCommitStateBaselines(runtime) {
     for (const instance of runtime.instances.values()) {
         for (const slot of instance.hooks) {
-            if (slot.kind === "state") {
+            if (slot.kind === "state" || slot.kind === "store") {
                 delete slot.hostCommitValue;
             }
         }
@@ -1558,6 +1597,9 @@ function cleanupInstance(instance) {
             slot.cleanup?.();
             delete slot.cleanup;
         }
+        else if (slot?.kind === "state" && slot.textBinding !== undefined) {
+            clearReactiveTextBindingSubscribers(slot.textBinding);
+        }
     }
 }
 function requireRuntime() {