@tanstack/redact 0.0.21 → 0.1.0

package/dist/dom/features/index.js

@@ -1,9 +1,10 @@
-// packages/redact/src/dom/features/index.ts
-import "./portal";
-import "./context";
-import "./suspense";
-import "./memo";
-import "./forward-ref";
-import "./lazy";
-import "./class";
+// src/dom/features/index.ts
+import "./portal/index.js";
+import "./context/index.js";
+import "./suspense/index.js";
+import "./memo/index.js";
+import "./forward-ref/index.js";
+import "./lazy/index.js";
+import "./class/index.js";
+import "./activity/index.js";
 //# sourceMappingURL=index.js.map

package/dist/dom/features/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dom/features/index.ts"],
-  "sourcesContent": ["// Feature wiring. Each import is a side-effect import that triggers the\n// feature module's self-registration with the reconciler (renderer, type\n// matcher, element marker). A vite plugin can swap any entry to './stub'\n// to disable that feature in the emitted bundle.\nimport './portal'\nimport './context'\nimport './suspense'\nimport './memo'\nimport './forward-ref'\nimport './lazy'\nimport './class'\n"],
-  "mappings": ";AAIA,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;",
+  "sourcesContent": ["// Feature wiring. Each import is a side-effect import that triggers the\n// feature module's self-registration with the reconciler (renderer, type\n// matcher, element marker). A vite plugin can swap any entry to './stub'\n// to disable that feature in the emitted bundle.\nimport './portal'\nimport './context'\nimport './suspense'\nimport './memo'\nimport './forward-ref'\nimport './lazy'\nimport './class'\nimport './activity'\n"],
+  "mappings": ";AAIA,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;",
   "names": []
 }

package/dist/dom/features/lazy/full.js

@@ -1,6 +1,6 @@
-// packages/redact/src/dom/features/lazy/full.ts
-import { FiberTag } from "../../../core";
-import { REACT_LAZY_TYPE } from "../../../react";
+// src/dom/features/lazy/full.ts
+import { FiberTag } from "../../../core/index.js";
+import { REACT_LAZY_TYPE } from "../../../react/index.js";
 import {
   registerRenderer,
   registerTypeMatcher,
@@ -8,7 +8,7 @@ import {
   isThenable,
   handleSuspended,
   deferHydration
-} from "../../reconcile";
+} from "../../reconcile.js";
 function renderLazy(fiber, domParent, anchor) {
   const { _payload, _init } = fiber.type;
   let resolved;

package/dist/dom/features/lazy/index.d.ts

@@ -1 +1 @@
-export * from './full';
+export * from "./full.js";

package/dist/dom/features/lazy/index.js

@@ -1,3 +1,3 @@
-// packages/redact/src/dom/features/lazy/index.ts
-export * from "./full";
+// src/dom/features/lazy/index.ts
+export * from "./full.js";
 //# sourceMappingURL=index.js.map

package/dist/dom/features/lazy/stub.js

@@ -1,13 +1,13 @@
-// packages/redact/src/dom/features/lazy/stub.ts
-import { FiberTag } from "../../../core";
-import { REACT_LAZY_TYPE } from "../../../react";
+// src/dom/features/lazy/stub.ts
+import { FiberTag } from "../../../core/index.js";
+import { REACT_LAZY_TYPE } from "../../../react/index.js";
 import {
   registerRenderer,
   registerTypeMatcher,
   renderFiber,
   isThenable,
   handleSuspended
-} from "../../reconcile";
+} from "../../reconcile.js";
 function renderLazyStub(fiber, domParent, anchor) {
   const { _payload, _init } = fiber.type;
   let resolved;

package/dist/dom/features/memo/full.js

@@ -1,16 +1,17 @@
-// packages/redact/src/dom/features/memo/full.ts
-import { FiberTag } from "../../../core";
+// src/dom/features/memo/full.ts
+import { FiberTag } from "../../../core/index.js";
 import {
   REACT_FORWARD_REF_TYPE,
   REACT_MEMO_TYPE,
   REACT_LAZY_TYPE
-} from "../../../react";
+} from "../../../react/index.js";
 import {
   registerRenderer,
   registerTypeMatcher,
   renderFiber,
   getForceRerenderingFiber
-} from "../../reconcile";
+} from "../../reconcile.js";
+import { ownContextChanged, renderContextConsumers } from "../context/index.js";
 function shallowEqual(a, b) {
   if (a === b) return true;
   if (!a || !b) return false;
@@ -26,9 +27,10 @@ function renderMemo(fiber, domParent, anchor) {
   const { type, compare } = fiber.type;
   const props = fiber.pp ?? {};
   const prev = fiber.mp;
-  const bypassMemo = fiber === getForceRerenderingFiber();
+  const bypassMemo = fiber.dy || fiber === getForceRerenderingFiber();
   const eq = !bypassMemo && prev && (compare ? compare(prev, props) : shallowEqual(prev, props));
-  if (eq) {
+  if (eq && !ownContextChanged(fiber)) {
+    renderContextConsumers(fiber);
     return;
   }
   let innerTag;

package/dist/dom/features/memo/full.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dom/features/memo/full.ts"],
-  "sourcesContent": ["import { FiberTag, type Fiber } from '../../../core'\nimport {\n  REACT_FORWARD_REF_TYPE,\n  REACT_MEMO_TYPE,\n  REACT_LAZY_TYPE,\n} from '../../../react'\nimport {\n  registerRenderer,\n  registerTypeMatcher,\n  renderFiber,\n  getForceRerenderingFiber,\n} from '../../reconcile'\n\nfunction shallowEqual(a: any, b: any): boolean {\n  if (a === b) return true\n  if (!a || !b) return false\n  const ak = Object.keys(a)\n  const bk = Object.keys(b)\n  if (ak.length !== bk.length) return false\n  for (const k of ak) {\n    if (a[k] !== b[k]) return false\n  }\n  return true\n}\n\nfunction renderMemo(fiber: Fiber, domParent: Node, anchor: Node | null): void {\n  const { type, compare } = fiber.type as any\n  const props = fiber.pp ?? {}\n  const prev = fiber.mp\n\n  // Memo's prop-equality gate guards PARENT-triggered rerenders. If this\n  // render is a STATE-triggered rerender of this exact fiber (hook update,\n  // useSyncExternalStore notification), props haven't changed by definition \u2014\n  // bailing would swallow the state change and the subscriber never re-runs.\n  // rerenderFiber tags the fiber so we skip the gate here.\n  const bypassMemo = fiber === getForceRerenderingFiber()\n  const eq = !bypassMemo && prev && (compare ? compare(prev, props) : shallowEqual(prev, props))\n  if (eq) {\n    // Re-render children with previous output (already in tree)\n    return\n  }\n\n  // Determine the delegated tag based on the memoized type. `React.memo` can\n  // wrap plain functions, class components, OR other special types like\n  // `forwardRef`. Without the marker-based branch we'd mistreat\n  // `memo(forwardRef(...))` as a Fragment and render nothing.\n  let innerTag: FiberTag\n  if (typeof type == 'function') {\n    innerTag = type.prototype?.isReactComponent ? FiberTag.Class : FiberTag.Function\n  } else if (type && typeof type === 'object') {\n    const m = (type as any).$$typeof\n    if (m === REACT_FORWARD_REF_TYPE) innerTag = FiberTag.ForwardRef\n    else if (m === REACT_MEMO_TYPE) innerTag = FiberTag.Memo\n    else if (m === REACT_LAZY_TYPE) innerTag = FiberTag.Lazy\n    else innerTag = FiberTag.Fragment\n  } else {\n    innerTag = FiberTag.Fragment\n  }\n\n  // Swap tag and type for this render pass; this is a \"delegating\" render\n  const savedTag = fiber.tag\n  const savedType = fiber.type\n  fiber.tag = innerTag\n  fiber.type = type\n  try {\n    renderFiber(fiber, domParent, anchor)\n  } finally {\n    fiber.tag = savedTag\n    fiber.type = savedType\n  }\n}\n\nregisterTypeMatcher((_type, marker) => (marker === REACT_MEMO_TYPE ? FiberTag.Memo : null))\nregisterRenderer(FiberTag.Memo, renderMemo)\n"],
-  "mappings": ";AAAA,SAAS,gBAA4B;AACrC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,aAAa,GAAQ,GAAiB;AAC7C,MAAI,MAAM,EAAG,QAAO;AACpB,MAAI,CAAC,KAAK,CAAC,EAAG,QAAO;AACrB,QAAM,KAAK,OAAO,KAAK,CAAC;AACxB,QAAM,KAAK,OAAO,KAAK,CAAC;AACxB,MAAI,GAAG,WAAW,GAAG,OAAQ,QAAO;AACpC,aAAW,KAAK,IAAI;AAClB,QAAI,EAAE,CAAC,MAAM,EAAE,CAAC,EAAG,QAAO;AAAA,EAC5B;AACA,SAAO;AACT;AAEA,SAAS,WAAW,OAAc,WAAiB,QAA2B;AAC5E,QAAM,EAAE,MAAM,QAAQ,IAAI,MAAM;AAChC,QAAM,QAAQ,MAAM,MAAM,CAAC;AAC3B,QAAM,OAAO,MAAM;AAOnB,QAAM,aAAa,UAAU,yBAAyB;AACtD,QAAM,KAAK,CAAC,cAAc,SAAS,UAAU,QAAQ,MAAM,KAAK,IAAI,aAAa,MAAM,KAAK;AAC5F,MAAI,IAAI;AAEN;AAAA,EACF;AAMA,MAAI;AACJ,MAAI,OAAO,QAAQ,YAAY;AAC7B,eAAW,KAAK,WAAW,mBAAmB,SAAS,QAAQ,SAAS;AAAA,EAC1E,WAAW,QAAQ,OAAO,SAAS,UAAU;AAC3C,UAAM,IAAK,KAAa;AACxB,QAAI,MAAM,uBAAwB,YAAW,SAAS;AAAA,aAC7C,MAAM,gBAAiB,YAAW,SAAS;AAAA,aAC3C,MAAM,gBAAiB,YAAW,SAAS;AAAA,QAC/C,YAAW,SAAS;AAAA,EAC3B,OAAO;AACL,eAAW,SAAS;AAAA,EACtB;AAGA,QAAM,WAAW,MAAM;AACvB,QAAM,YAAY,MAAM;AACxB,QAAM,MAAM;AACZ,QAAM,OAAO;AACb,MAAI;AACF,gBAAY,OAAO,WAAW,MAAM;AAAA,EACtC,UAAE;AACA,UAAM,MAAM;AACZ,UAAM,OAAO;AAAA,EACf;AACF;AAEA,oBAAoB,CAAC,OAAO,WAAY,WAAW,kBAAkB,SAAS,OAAO,IAAK;AAC1F,iBAAiB,SAAS,MAAM,UAAU;",
+  "sourcesContent": ["import { FiberTag, type Fiber } from '../../../core'\nimport {\n  REACT_FORWARD_REF_TYPE,\n  REACT_MEMO_TYPE,\n  REACT_LAZY_TYPE,\n} from '../../../react'\nimport {\n  registerRenderer,\n  registerTypeMatcher,\n  renderFiber,\n  getForceRerenderingFiber,\n} from '../../reconcile'\nimport { ownContextChanged, renderContextConsumers } from '../context'\n\nfunction shallowEqual(a: any, b: any): boolean {\n  if (a === b) return true\n  if (!a || !b) return false\n  const ak = Object.keys(a)\n  const bk = Object.keys(b)\n  if (ak.length !== bk.length) return false\n  for (const k of ak) {\n    if (a[k] !== b[k]) return false\n  }\n  return true\n}\n\nfunction renderMemo(fiber: Fiber, domParent: Node, anchor: Node | null): void {\n  const { type, compare } = fiber.type as any\n  const props = fiber.pp ?? {}\n  const prev = fiber.mp\n\n  // Memo's prop-equality gate guards PARENT-triggered rerenders. If this\n  // render is a STATE-triggered rerender of this exact fiber (hook update,\n  // useSyncExternalStore notification), props haven't changed by definition \u2014\n  // bailing would swallow the state change and the subscriber never re-runs.\n  // rerenderFiber tags the fiber so we skip the gate here.\n  const bypassMemo = fiber.dy || fiber === getForceRerenderingFiber()\n  const eq = !bypassMemo && prev && (compare ? compare(prev, props) : shallowEqual(prev, props))\n  if (eq && !ownContextChanged(fiber)) {\n    renderContextConsumers(fiber)\n    return\n  }\n\n  // Determine the delegated tag based on the memoized type. `React.memo` can\n  // wrap plain functions, class components, OR other special types like\n  // `forwardRef`. Without the marker-based branch we'd mistreat\n  // `memo(forwardRef(...))` as a Fragment and render nothing.\n  let innerTag: FiberTag\n  if (typeof type == 'function') {\n    innerTag = type.prototype?.isReactComponent ? FiberTag.Class : FiberTag.Function\n  } else if (type && typeof type === 'object') {\n    const m = (type as any).$$typeof\n    if (m === REACT_FORWARD_REF_TYPE) innerTag = FiberTag.ForwardRef\n    else if (m === REACT_MEMO_TYPE) innerTag = FiberTag.Memo\n    else if (m === REACT_LAZY_TYPE) innerTag = FiberTag.Lazy\n    else innerTag = FiberTag.Fragment\n  } else {\n    innerTag = FiberTag.Fragment\n  }\n\n  // Swap tag and type for this render pass; this is a \"delegating\" render\n  const savedTag = fiber.tag\n  const savedType = fiber.type\n  fiber.tag = innerTag\n  fiber.type = type\n  try {\n    renderFiber(fiber, domParent, anchor)\n  } finally {\n    fiber.tag = savedTag\n    fiber.type = savedType\n  }\n}\n\nregisterTypeMatcher((_type, marker) => (marker === REACT_MEMO_TYPE ? FiberTag.Memo : null))\nregisterRenderer(FiberTag.Memo, renderMemo)\n"],
+  "mappings": ";AAAA,SAAS,gBAA4B;AACrC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,mBAAmB,8BAA8B;AAE1D,SAAS,aAAa,GAAQ,GAAiB;AAC7C,MAAI,MAAM,EAAG,QAAO;AACpB,MAAI,CAAC,KAAK,CAAC,EAAG,QAAO;AACrB,QAAM,KAAK,OAAO,KAAK,CAAC;AACxB,QAAM,KAAK,OAAO,KAAK,CAAC;AACxB,MAAI,GAAG,WAAW,GAAG,OAAQ,QAAO;AACpC,aAAW,KAAK,IAAI;AAClB,QAAI,EAAE,CAAC,MAAM,EAAE,CAAC,EAAG,QAAO;AAAA,EAC5B;AACA,SAAO;AACT;AAEA,SAAS,WAAW,OAAc,WAAiB,QAA2B;AAC5E,QAAM,EAAE,MAAM,QAAQ,IAAI,MAAM;AAChC,QAAM,QAAQ,MAAM,MAAM,CAAC;AAC3B,QAAM,OAAO,MAAM;AAOnB,QAAM,aAAa,MAAM,MAAM,UAAU,yBAAyB;AAClE,QAAM,KAAK,CAAC,cAAc,SAAS,UAAU,QAAQ,MAAM,KAAK,IAAI,aAAa,MAAM,KAAK;AAC5F,MAAI,MAAM,CAAC,kBAAkB,KAAK,GAAG;AACnC,2BAAuB,KAAK;AAC5B;AAAA,EACF;AAMA,MAAI;AACJ,MAAI,OAAO,QAAQ,YAAY;AAC7B,eAAW,KAAK,WAAW,mBAAmB,SAAS,QAAQ,SAAS;AAAA,EAC1E,WAAW,QAAQ,OAAO,SAAS,UAAU;AAC3C,UAAM,IAAK,KAAa;AACxB,QAAI,MAAM,uBAAwB,YAAW,SAAS;AAAA,aAC7C,MAAM,gBAAiB,YAAW,SAAS;AAAA,aAC3C,MAAM,gBAAiB,YAAW,SAAS;AAAA,QAC/C,YAAW,SAAS;AAAA,EAC3B,OAAO;AACL,eAAW,SAAS;AAAA,EACtB;AAGA,QAAM,WAAW,MAAM;AACvB,QAAM,YAAY,MAAM;AACxB,QAAM,MAAM;AACZ,QAAM,OAAO;AACb,MAAI;AACF,gBAAY,OAAO,WAAW,MAAM;AAAA,EACtC,UAAE;AACA,UAAM,MAAM;AACZ,UAAM,OAAO;AAAA,EACf;AACF;AAEA,oBAAoB,CAAC,OAAO,WAAY,WAAW,kBAAkB,SAAS,OAAO,IAAK;AAC1F,iBAAiB,SAAS,MAAM,UAAU;",
   "names": []
 }

package/dist/dom/features/memo/index.d.ts

@@ -1 +1 @@
-export * from './full';
+export * from "./full.js";

package/dist/dom/features/memo/index.js

@@ -1,3 +1,3 @@
-// packages/redact/src/dom/features/memo/index.ts
-export * from "./full";
+// src/dom/features/memo/index.ts
+export * from "./full.js";
 //# sourceMappingURL=index.js.map

package/dist/dom/features/memo/stub.js

@@ -1,11 +1,11 @@
-// packages/redact/src/dom/features/memo/stub.ts
-import { FiberTag } from "../../../core";
+// src/dom/features/memo/stub.ts
+import { FiberTag } from "../../../core/index.js";
 import {
   REACT_FORWARD_REF_TYPE,
   REACT_MEMO_TYPE,
   REACT_LAZY_TYPE
-} from "../../../react";
-import { registerRenderer, registerTypeMatcher, renderFiber } from "../../reconcile";
+} from "../../../react/index.js";
+import { registerRenderer, registerTypeMatcher, renderFiber } from "../../reconcile.js";
 function renderMemoStub(fiber, domParent, anchor) {
   const { type } = fiber.type;
   let innerTag;

package/dist/dom/features/portal/full.js

@@ -1,13 +1,13 @@
-// packages/redact/src/dom/features/portal/full.ts
-import { FiberTag } from "../../../core";
-import { REACT_PORTAL_TYPE } from "../../../react";
+// src/dom/features/portal/full.ts
+import { FiberTag } from "../../../core/index.js";
+import { REACT_PORTAL_TYPE } from "../../../react/index.js";
 import {
   registerRenderer,
   registerTypeMatcher,
   registerElementMarker,
   reconcileChildren,
   childrenToArray
-} from "../../reconcile";
+} from "../../reconcile.js";
 function renderPortal(fiber, _domParent, _anchor) {
   const { children, container } = fiber.pp;
   reconcileChildren(fiber, childrenToArray(children), container, null);

package/dist/dom/features/portal/index.d.ts

@@ -1 +1 @@
-export * from './full';
+export * from "./full.js";

package/dist/dom/features/portal/index.js

@@ -1,3 +1,3 @@
-// packages/redact/src/dom/features/portal/index.ts
-export * from "./full";
+// src/dom/features/portal/index.ts
+export * from "./full.js";
 //# sourceMappingURL=index.js.map

package/dist/dom/features/portal/stub.js

@@ -1,7 +1,7 @@
-// packages/redact/src/dom/features/portal/stub.ts
-import { FiberTag } from "../../../core";
-import { REACT_PORTAL_TYPE } from "../../../react";
-import { registerTypeMatcher, registerElementMarker } from "../../reconcile";
+// src/dom/features/portal/stub.ts
+import { FiberTag } from "../../../core/index.js";
+import { REACT_PORTAL_TYPE } from "../../../react/index.js";
+import { registerTypeMatcher, registerElementMarker } from "../../reconcile.js";
 registerElementMarker(REACT_PORTAL_TYPE);
 registerTypeMatcher((type) => type === REACT_PORTAL_TYPE ? FiberTag.Fragment : null);
 //# sourceMappingURL=stub.js.map

package/dist/dom/features/suspense/full.js

@@ -1,6 +1,6 @@
-// packages/redact/src/dom/features/suspense/full.ts
-import { FiberTag, createFiber } from "../../../core";
-import { REACT_SUSPENSE_TYPE } from "../../../react";
+// src/dom/features/suspense/full.ts
+import { FiberTag, createFiber } from "../../../core/index.js";
+import { REACT_SUSPENSE_TYPE, ReactSharedInternals, startTransition } from "../../../react/index.js";
 import {
   registerRenderer,
   registerTypeMatcher,
@@ -15,8 +15,20 @@ import {
   runEffects,
   getCurrentRoot,
   withCurrentRoot,
-  discardPendingWork
-} from "../../reconcile";
+  discardPendingWork,
+  findSuspenseBoundary,
+  RenderSuspenseCapture,
+  activityIsDisconnected,
+  isActivityHidden,
+  attachRef,
+  detachRef,
+  enqueueEffect,
+  flushFiberCommits,
+  scheduleLifecycle,
+  handleCommitError
+} from "../../reconcile.js";
+import { cleanupEffect } from "../../dispatcher.js";
+import { retainedEffects, inSuspensePrimary, setLayoutDisconnected, walkRetained } from "../../retained-effects.js";
 import {
   HydrationCursor,
   setHydrationCursor,
@@ -24,19 +36,33 @@ import {
   advanceCursorPast,
   tryConsumeBoundary,
   isHydrationBailout
-} from "../hydration";
+} from "../hydration/index.js";
+import { hasContextChanged, renderContextConsumers } from "../context/index.js";
+import { checkpointCommit, rewindCommit, queueMutation, onCommitFailure } from "../../commit.js";
 var suspendHandler = null;
+function scheduleRetry(fiber) {
+  const previous = ReactSharedInternals.T;
+  ReactSharedInternals.T = null;
+  try {
+    startTransition(() => scheduleUpdate(fiber));
+  } finally {
+    ReactSharedInternals.T = previous;
+  }
+}
 function realHandleSuspended(fiber, thenable) {
   if (suspendHandler) return suspendHandler(thenable);
+  const boundary = findSuspenseBoundary(fiber);
+  if (boundary) throw new RenderSuspenseCapture(boundary);
   thenable.then(
-    () => scheduleUpdate(fiber),
-    () => scheduleUpdate(fiber)
+    () => scheduleRetry(fiber),
+    () => scheduleRetry(fiber)
   );
 }
 function renderSuspense(fiber, domParent, anchor) {
   const props = fiber.pp ?? {};
-  const state = fiber.ms ??= {};
+  let state = fiber.ms ??= {};
   const root = getCurrentRoot();
+  if (root) root.sp = true;
   if (root?.h && !state.b) {
     const boundary = tryConsumeBoundary(fiber.parent);
     if (boundary) {
@@ -48,10 +74,9 @@ function renderSuspense(fiber, domParent, anchor) {
     fiber.mp = props;
     return;
   }
-  if (state.p) {
+  if (state.p && !state.u && props.children === fiber.mp?.children && !hasContextChanged(fiber, false)) {
     if (state.f) {
-      state.f.pp = { children: props.fallback };
-      renderFiber(state.f, domParent, anchor);
+      renderFallback(state.f, props.fallback, domParent, anchor);
     } else {
       reconcileChildren(fiber, childrenToArray(props.fallback), domParent, anchor);
     }
@@ -59,7 +84,10 @@ function renderSuspense(fiber, domParent, anchor) {
     return;
   }
   const hadCommittedPrimary = fiber.mp && fiber.child;
+  state.u = false;
+  const checkpoint = checkpointCommit(fiber);
   const prevHandler = suspendHandler;
+  fiber.cx?.clear();
   let pendingThenable;
   suspendHandler = (thenable) => {
     pendingThenable = thenable;
@@ -70,49 +98,133 @@ function renderSuspense(fiber, domParent, anchor) {
     suspendHandler = prevHandler;
   }
   if (pendingThenable) {
+    rewindCommit(checkpoint);
+    state = fiber.ms ??= {};
+    const previousThenable = state.p;
     state.p = pendingThenable;
     const onSettle = () => {
-      state.p = null;
-      scheduleUpdate(fiber);
+      const current = fiber.ms;
+      if (!current || current.p !== pendingThenable) return;
+      current.p = null;
+      scheduleRetry(fiber);
     };
-    pendingThenable.then(onSettle, onSettle);
-    if (hadCommittedPrimary) {
+    if (previousThenable !== pendingThenable) pendingThenable.then(onSettle, onSettle);
+    if (hadCommittedPrimary && !state.d) {
       const hidden = [];
       let c = hadCommittedPrimary;
+      while (c) {
+        setUpdateBoundary(c, fiber);
+        walkRetained(c, disconnectLayout);
+        c = c.sibling;
+      }
+      c = hadCommittedPrimary;
       while (c) {
         hideRootHostDoms(c, hidden);
         c = c.sibling;
       }
       state.d = hidden;
-      if (!state.f) {
-        state.f = createFiber(FiberTag.Fragment, null, null);
-        state.f.parent = fiber;
-      }
-      state.f.pp = { children: props.fallback };
-      renderFiber(state.f, domParent, anchor);
-    } else {
-      unmountAllChildren(fiber);
-      reconcileChildren(fiber, childrenToArray(props.fallback), domParent, anchor);
+    } else if (!hadCommittedPrimary) {
+      unmountAllChildren(fiber, domParent);
     }
+    if (!state.f) {
+      state.f = createFiber(FiberTag.Fragment, null, null);
+      state.f.parent = fiber;
+    }
+    renderFallback(state.f, props.fallback, domParent, anchor);
   } else {
+    state.p = null;
+    fiber.cx?.clear();
+    const wasHidden = !!state.d;
     if (state.d) {
-      for (const [el, origDisplay] of state.d) {
-        el.style.display = origDisplay;
-      }
+      for (let child = fiber.child; child; child = child.sibling) setUpdateBoundary(child, fiber.su);
+      const hidden = state.d;
+      queueMutation(() => {
+        for (const [el, origDisplay] of hidden) el.style.display = origDisplay;
+      });
       state.d = null;
     }
     if (state.f) {
-      unmountFiber(state.f);
+      unmountFiber(state.f, domParent);
       state.f = null;
     }
+    if (wasHidden) for (let child = fiber.child; child; child = child.sibling) walkRetained(child, reconnectLayout, true);
   }
   fiber.mp = props;
 }
+function renderFallback(fiber, children, domParent, anchor) {
+  if (fiber.mp && fiber.mp.children === children && !fiber.su) renderContextConsumers(fiber);
+  else {
+    fiber.pp = { children };
+    renderFiber(fiber, domParent, anchor);
+  }
+}
+function disconnectLayout(fiber) {
+  if (setLayoutDisconnected(fiber, true) || activityIsDisconnected(fiber)) return;
+  queueMutation(() => {
+    for (const [hook, effect] of retainedEffects.get(fiber) ?? []) {
+      if (effect.t === 1 && !effect.s) cleanupEffect(hook, fiber);
+    }
+    const cleanup = fiber.rc;
+    fiber.rc = null;
+    if (cleanup) {
+      const index = fiber.cu?.indexOf(cleanup) ?? -1;
+      if (index >= 0) fiber.cu.splice(index, 1);
+      try {
+        cleanup();
+      } catch (error) {
+        handleCommitError(fiber, error);
+      }
+    }
+    detachRef(fiber.cr ?? fiber.ref, fiber);
+    fiber.cr = null;
+    const instance = fiber.sn?._fiber === fiber ? fiber.sn : null;
+    if (instance?.componentWillUnmount) {
+      const props = instance.props, state = instance.state, committed = fiber.ms?.c;
+      if (committed) {
+        instance.props = committed.props;
+        instance.state = committed.state;
+      }
+      try {
+        instance.componentWillUnmount();
+      } catch (error) {
+        handleCommitError(fiber, error);
+      } finally {
+        instance.props = props;
+        instance.state = state;
+      }
+    }
+  });
+}
+function reconnectLayout(fiber) {
+  if (!fiber.ld || isActivityHidden(fiber) || activityIsDisconnected(fiber)) return;
+  if (inSuspensePrimary(fiber)) return;
+  setLayoutDisconnected(fiber, false);
+  const instance = fiber.sn?._fiber === fiber ? fiber.sn : null;
+  if (fiber.tag === FiberTag.Host || fiber.tag === FiberTag.Resource) attachRef(fiber, fiber.dom);
+  else if (instance || fiber.tag === FiberTag.Fragment) attachRef(fiber, fiber.sn);
+  for (const effect of retainedEffects.get(fiber)?.values() ?? []) {
+    if (effect.t === 1 && !effect.s) enqueueEffect(fiber, effect);
+  }
+  if (instance?.componentDidMount) scheduleLifecycle(fiber, () => instance.componentDidMount());
+  flushFiberCommits(fiber);
+}
+function setUpdateBoundary(fiber, boundary) {
+  fiber.su = boundary ?? null;
+  const primary = fiber.tag === FiberTag.Suspense && fiber.ms?.p ? fiber : boundary;
+  for (let child = fiber.child; child; child = child.sibling) setUpdateBoundary(child, primary);
+  if (fiber.tag === FiberTag.Suspense && fiber.ms?.f) setUpdateBoundary(fiber.ms.f, boundary);
+}
 function hideRootHostDoms(fiber, out) {
   if (fiber.tag === FiberTag.Host) {
     const el = fiber.dom;
-    out.push([el, el.style.display]);
-    el.style.display = "none";
+    const existing = out.find(([node]) => node === el);
+    const entry = existing ?? [el, el.style.display];
+    if (!existing) out.push(entry);
+    const display = fiber.pp?.style?.display;
+    queueMutation(() => {
+      if (!existing || el.style.display !== "none" || display === "none") entry[1] = el.style.display;
+      el.style.display = "none";
+    });
     return;
   }
   if (fiber.tag === FiberTag.Portal) return;
@@ -129,6 +241,12 @@ function hydrateSuspenseBoundary(fiber, props, boundary, domParent, anchor) {
     e: endMark,
     r: props.children
   };
+  if (pendingBoundary >= 2) {
+    if (pendingBoundary === 3) reportServerFailure(fiber);
+    recoverBoundaryHydration(fiber, props.children, startMark.parentNode, startMark, endMark, true);
+    fiber.mp = props;
+    return;
+  }
   if (!pendingBoundary) {
     const parent = startMark.parentNode;
     try {
@@ -137,8 +255,10 @@ function hydrateSuspenseBoundary(fiber, props, boundary, domParent, anchor) {
       advanceCursorPast(fiber.parent, endMark);
     } catch (e) {
       if (!isHydrationBailout(e)) {
-        clearBoundaryRange(startMark, endMark);
-        unmountAllChildren(fiber);
+        onCommitFailure(() => {
+          clearBoundaryRange(startMark, endMark);
+          unmountAllChildren(fiber, parent);
+        });
         throw e;
       }
       recoverBoundaryHydration(fiber, props.children, parent, startMark, endMark);
@@ -166,19 +286,24 @@ function hydrateSuspenseBoundary(fiber, props, boundary, domParent, anchor) {
   globalThis.$RH?.(id, () => rehydrateBoundary(fiber));
   fiber.mp = props;
 }
-function recoverBoundaryHydration(fiber, children, parent, startMark, endMark) {
+function recoverBoundaryHydration(fiber, children, parent, startMark, endMark, retryBoundary = false) {
   const root = findRoot(fiber);
   const prevHydrating = root.h;
-  discardPendingWork(root);
+  if (!retryBoundary) discardPendingWork(root);
   clearBoundaryRange(startMark, endMark);
-  unmountAllChildren(fiber);
+  unmountAllChildren(fiber, parent);
   root.h = false;
   try {
-    reconcileChildren(fiber, childrenToArray(children), parent, endMark);
+    if (retryBoundary) {
+      fiber.ms = {};
+      renderSuspense(fiber, parent, endMark);
+    } else reconcileChildren(fiber, childrenToArray(children), parent, endMark);
     advanceCursorPast(fiber.parent, endMark);
   } catch (clientError) {
-    clearBoundaryRange(startMark, endMark);
-    unmountAllChildren(fiber);
+    onCommitFailure(() => {
+      clearBoundaryRange(startMark, endMark);
+      unmountAllChildren(fiber, parent);
+    });
     throw clientError;
   } finally {
     root.h = prevHydrating;
@@ -188,14 +313,18 @@ function recoverFallbackHydration(fiber, fallback, parent) {
   const root = findRoot(fiber);
   const prevHydrating = root.h;
   discardPendingWork(root);
-  parent.textContent = "";
-  unmountAllChildren(fiber);
+  queueMutation(() => {
+    parent.textContent = "";
+  });
+  unmountAllChildren(fiber, parent);
   root.h = false;
   try {
     reconcileChildren(fiber, childrenToArray(fallback), parent, null);
   } catch (clientError) {
-    parent.textContent = "";
-    unmountAllChildren(fiber);
+    onCommitFailure(() => {
+      parent.textContent = "";
+      unmountAllChildren(fiber, parent);
+    });
     throw clientError;
   } finally {
     root.h = prevHydrating;
@@ -209,15 +338,23 @@ function rehydrateBoundary(fiber) {
   if (!(root && parent)) return;
   withCurrentRoot(root, () => {
     const prevHydrating = root.h;
+    if (state.b.data.startsWith("$!") || state.b.data.startsWith("$E")) {
+      if (state.b.data.startsWith("$E")) reportServerFailure(fiber);
+      recoverBoundaryHydration(fiber, state.r, parent, state.b, state.e, true);
+      runEffects(root);
+      return;
+    }
     try {
-      unmountAllChildren(fiber);
+      unmountAllChildren(fiber, parent);
       root.h = true;
       setHydrationCursor(fiber, new HydrationCursor(parent, state.b.nextSibling, state.e));
       reconcileChildren(fiber, childrenToArray(state.r), parent, null);
     } catch (e) {
       if (!isHydrationBailout(e)) {
-        clearBoundaryRange(state.b, state.e);
-        unmountAllChildren(fiber);
+        onCommitFailure(() => {
+          clearBoundaryRange(state.b, state.e);
+          unmountAllChildren(fiber, parent);
+        });
         throw e;
       }
       recoverBoundaryHydration(fiber, state.r, parent, state.b, state.e);
@@ -228,13 +365,21 @@ function rehydrateBoundary(fiber) {
     runEffects(root);
   });
 }
+function reportServerFailure(fiber) {
+  const error = new Error("Switched to client rendering because the server render did not complete.");
+  const handler = findRoot(fiber)?.re;
+  if (handler) handler(error, { componentStack: null });
+  else console.error(error);
+}
 function clearBoundaryRange(startMark, endMark) {
-  let node = startMark.nextSibling;
-  while (node && node !== endMark) {
-    const next = node.nextSibling;
-    node.parentNode?.removeChild(node);
-    node = next;
-  }
+  queueMutation(() => {
+    let node = startMark.nextSibling;
+    while (node && node !== endMark) {
+      const next = node.nextSibling;
+      node.parentNode?.removeChild(node);
+      node = next;
+    }
+  });
 }
 registerTypeMatcher((type) => type === REACT_SUSPENSE_TYPE ? FiberTag.Suspense : null);
 registerRenderer(FiberTag.Suspense, renderSuspense);