@tanstack/redact 0.0.19 → 0.0.21

package/src/dom/features/suspense/full.ts

@@ -147,7 +147,7 @@ function renderSuspense(fiber: Fiber, domParent: Node, anchor: Node | null): voi
       renderFiber(state.f, domParent, anchor)
     } else {
       // First-mount suspension — nothing to preserve.
-      unmountAllChildren(fiber, domParent)
+      unmountAllChildren(fiber)
       reconcileChildren(fiber, childrenToArray(props.fallback), domParent, anchor)
     }
   } else {
@@ -160,7 +160,7 @@ function renderSuspense(fiber: Fiber, domParent: Node, anchor: Node | null): voi
       state.d = null
     }
     if (state.f) {
-      unmountFiber(state.f, domParent)
+      unmountFiber(state.f)
       state.f = null
     }
   }
@@ -210,7 +210,7 @@ function hydrateSuspenseBoundary(
     } catch (e) {
       if (!isHydrationBailout(e)) {
         clearBoundaryRange(startMark, endMark)
-        unmountAllChildren(fiber, parent)
+        unmountAllChildren(fiber)
         throw e
       }
       recoverBoundaryHydration(fiber, props.children, parent, startMark, endMark)
@@ -258,14 +258,14 @@ function recoverBoundaryHydration(
   const prevHydrating = root.h
   discardPendingWork(root)
   clearBoundaryRange(startMark, endMark)
-  unmountAllChildren(fiber, parent)
+  unmountAllChildren(fiber)
   root.h = false
   try {
     reconcileChildren(fiber, childrenToArray(children), parent, endMark)
     advanceCursorPast(fiber.parent!, endMark)
   } catch (clientError) {
     clearBoundaryRange(startMark, endMark)
-    unmountAllChildren(fiber, parent)
+    unmountAllChildren(fiber)
     throw clientError
   } finally {
     root.h = prevHydrating
@@ -277,13 +277,13 @@ function recoverFallbackHydration(fiber: Fiber, fallback: any, parent: HTMLEleme
   const prevHydrating = root.h
   discardPendingWork(root)
   parent.textContent = ''
-  unmountAllChildren(fiber, parent)
+  unmountAllChildren(fiber)
   root.h = false
   try {
     reconcileChildren(fiber, childrenToArray(fallback), parent, null)
   } catch (clientError) {
     parent.textContent = ''
-    unmountAllChildren(fiber, parent)
+    unmountAllChildren(fiber)
     throw clientError
   } finally {
     root.h = prevHydrating
@@ -303,7 +303,7 @@ function rehydrateBoundary(fiber: Fiber): void {
   withCurrentRoot(root, () => {
     const prevHydrating = root.h
     try {
-      unmountAllChildren(fiber, parent)
+      unmountAllChildren(fiber)
 
       // Re-hydrate with real children against the now-real DOM range.
       root.h = true
@@ -312,7 +312,7 @@ function rehydrateBoundary(fiber: Fiber): void {
     } catch (e) {
       if (!isHydrationBailout(e)) {
         clearBoundaryRange(state.b, state.e)
-        unmountAllChildren(fiber, parent)
+        unmountAllChildren(fiber)
         throw e
       }
 

package/src/dom/reconcile.ts

@@ -531,14 +531,14 @@ export function reconcileChildren(
     // Unmount unclaimed
     for (const f of existing) {
       if (!claimed.has(f)) {
-        unmountFiber(f, domParent)
+        unmountFiber(f)
         structurallyChanged = true
       }
     }
     // Leftover keyed
     for (const f of keyed.values()) {
       if (!claimed.has(f)) {
-        unmountFiber(f, domParent)
+        unmountFiber(f)
         structurallyChanged = true
       }
     }
@@ -1017,13 +1017,13 @@ export function isThenable(x: any): x is Promise<any> {
 // Unmount
 // ---------------------------------------------------------------------------
 
-export function unmountFiber(fiber: Fiber, domParent: Node): void {
+export function unmountFiber(fiber: Fiber, removeDom = true): void {
   fiber.um = true
   // Recurse first
   let c = fiber.child
   while (c) {
     const next = c.sibling
-    unmountFiber(c, fiber.tag === FiberTag.Host ? fiber.dom! : domParent)
+    unmountFiber(c, removeDom || fiber.tag === FiberTag.Portal)
     c = next
   }
   fiber.child = null
@@ -1040,12 +1040,7 @@ export function unmountFiber(fiber: Fiber, domParent: Node): void {
     fiber.cu = null
   }
 
-  if (fiber.tag === FiberTag.Class && fiber.sn?.componentWillUnmount) {
-    try {
-      fiber.sn.componentWillUnmount()
-    } catch (e) {
-      if (currentRoot?.re) currentRoot.re(e)
-    }
+  if (fiber.tag === FiberTag.Class && fiber.sn) {
     fiber.sn._fiber = null
     fiber.sn._enqueueUpdate = null
     fiber.sn._forceUpdate = null
@@ -1054,19 +1049,17 @@ export function unmountFiber(fiber: Fiber, domParent: Node): void {
   // Detach ref
   if (fiber.ref) detachRef(fiber.ref)
 
-  // Remove DOM if host
-  if (fiber.tag === FiberTag.Host && fiber.dom && fiber.dom.parentNode) {
-    fiber.dom.parentNode.removeChild(fiber.dom)
-  } else if (fiber.tag === FiberTag.Text && fiber.dom && fiber.dom.parentNode) {
-    fiber.dom.parentNode.removeChild(fiber.dom)
+  // Only host and text fibers own DOM nodes.
+  if (removeDom) {
+    fiber.dom?.parentNode?.removeChild(fiber.dom)
   }
 }
 
-export function unmountAllChildren(parent: Fiber, domParent: Node): void {
+export function unmountAllChildren(parent: Fiber): void {
   let c = parent.child
   while (c) {
     const next = c.sibling
-    unmountFiber(c, domParent)
+    unmountFiber(c)
     c = next
   }
   parent.child = null
@@ -1228,8 +1221,8 @@ export function enqueueEffect(fiber: Fiber, effect: Effect): void {
   }
 }
 
-export function scheduleLifecycle(_fiber: Fiber, fn: () => void): void {
-  pendingLifecycles.push(fn)
+export function scheduleLifecycle(fiber: Fiber, fn: () => void): void {
+  pendingLifecycles.push(() => { if (!fiber.um) fn() })
 }
 
 export function runEffects(root: FiberRoot): void {
@@ -1257,6 +1250,7 @@ export function runEffects(root: FiberRoot): void {
 }
 
 function runEffect(fiber: Fiber, effect: Effect, root: FiberRoot): void {
+  if (fiber.um) return
   try {
     const cleanup = effect.c()
     if (typeof cleanup == 'function') {

package/src/server/escape.ts

@@ -1,4 +1,4 @@
-import { attributeName } from '../core/attributes'
+import { attributeName, STRING_BOOLEAN_ATTRS } from '../core/attributes'
 
 const ATTR_MAP: Record<string, string> = {
   '&': '&amp;',
@@ -96,11 +96,12 @@ export function attrToHtml(name: string, value: unknown, isSvg = false): string
 
   const htmlName = attributeName(name, isSvg)
 
-  // aria-* and data-* stringify booleans to `"true"`/`"false"` rather than
-  // using boolean-attribute presence semantics — matches React and the ARIA
-  // spec. Must branch before the general `value === false` / BOOLEAN_ATTRS
-  // path, which would drop them.
-  if (name.startsWith('aria-') || name.startsWith('data-')) {
+  // These attributes need explicit "false", not boolean-attribute absence.
+  if (
+    STRING_BOOLEAN_ATTRS.has(htmlName) ||
+    name.startsWith('aria-') ||
+    name.startsWith('data-')
+  ) {
     return ` ${htmlName}="${escapeAttr(String(value))}"`
   }