view-anchor 0.2.0 → 0.2.1

package/dist/view-anchor.js

@@ -1,4 +1,7 @@
 const ZERO = { x: 0, y: 0, width: 0, height: 0 };
+// Replaces a disposed instance's publish callback so a retained handle does
+// not keep the caller's original callback (and whatever it captured) alive.
+const NOOP_PUBLISH = () => false;
 // Round to integer pixels. Width and height are clamped to >= 0 (0 represents
 // a collapsed rect). Coordinates (x, y) can be negative when an element is
 // scrolled out of view; clamping them to 0 would pin the view to the screen edge.
@@ -27,13 +30,16 @@ export function createViewAnchor(target, opts) {
     let present = opts.present;
     let publish = opts.publish;
     let observer = null;
+    // Local, clearable alias for the `target` parameter so dispose() can drop
+    // the strong reference without widening the public parameter's type.
+    let targetRef = target;
     // Last rect sent to publish. Reset on apply() so state changes (such as zoom)
     // force a re-publish even if the geometry did not change.
     let lastPublished = null;
     let publicationRevision = 0;
     let disposed = false;
     const measure = () => {
-        const r = target.getBoundingClientRect();
+        const r = targetRef.getBoundingClientRect();
         // Drop ticks with non-finite values (NaN / Infinity cannot be sent over IPC).
         if (!Number.isFinite(r.left) ||
             !Number.isFinite(r.top) ||
@@ -49,12 +55,14 @@ export function createViewAnchor(target, opts) {
         lastPublished = candidate;
         try {
             const accepted = publish(candidate) !== false;
-            if (!accepted && publicationRevision === attempt)
+            // A reentrant dispose() during publish() already cleared lastPublished;
+            // do not resurrect the pre-dispose value over that terminal state.
+            if (!accepted && publicationRevision === attempt && !disposed)
                 lastPublished = previous;
             return accepted;
         }
         catch (error) {
-            if (publicationRevision === attempt)
+            if (publicationRevision === attempt && !disposed)
                 lastPublished = previous;
             throw error;
         }
@@ -75,7 +83,7 @@ export function createViewAnchor(target, opts) {
         if (observer)
             return;
         observer = new ResizeObserver(emit);
-        observer.observe(target);
+        observer.observe(targetRef);
         window.addEventListener('resize', emit);
     };
     const stopObserving = () => {
@@ -114,6 +122,9 @@ export function createViewAnchor(target, opts) {
                 return;
             disposed = true;
             stopObserving();
+            targetRef = null;
+            publish = NOOP_PUBLISH;
+            lastPublished = null;
         },
     };
 }
@@ -148,6 +159,9 @@ export function createPlacementAnchor(target, opts) {
     let guardDisplayNone = opts.guardDisplayNone ?? false;
     let followScroll = opts.followScroll ?? false;
     let followGeometry = opts.followGeometry ?? false;
+    // Local, clearable alias for the `target` parameter so dispose() can drop
+    // the strong reference without widening the public parameter's type.
+    let targetRef = target;
     let observer = null;
     let io = null;
     let scrollListening = false;
@@ -171,16 +185,14 @@ export function createPlacementAnchor(target, opts) {
     let activePointerId = null;
     let sentinelDeadline = null;
     const computePlacement = () => {
-        const p = measurePlacement(target);
+        const p = measurePlacement(targetRef);
         if (p.visible &&
             (!Number.isFinite(p.bounds.x) ||
                 !Number.isFinite(p.bounds.y) ||
                 !Number.isFinite(p.bounds.width) ||
                 !Number.isFinite(p.bounds.height)))
             return null;
-        if (guardDisplayNone &&
-            p.visible &&
-            (p.bounds.width === 0 || p.bounds.height === 0)) {
+        if (guardDisplayNone && p.visible && (p.bounds.width === 0 || p.bounds.height === 0)) {
             return { visible: false };
         }
         return p;
@@ -191,12 +203,14 @@ export function createPlacementAnchor(target, opts) {
         lastPublished = candidate;
         try {
             const accepted = publish(candidate) !== false;
-            if (!accepted && publicationRevision === attempt)
+            // A reentrant dispose() during publish() already cleared lastPublished;
+            // do not resurrect the pre-dispose value over that terminal state.
+            if (!accepted && publicationRevision === attempt && !disposed)
                 lastPublished = previous;
             return accepted;
         }
         catch (error) {
-            if (publicationRevision === attempt)
+            if (publicationRevision === attempt && !disposed)
                 lastPublished = previous;
             throw error;
         }
@@ -328,7 +342,7 @@ export function createPlacementAnchor(target, opts) {
     const startOptionalObserving = () => {
         if (guardDisplayNone && !io && typeof IntersectionObserver !== 'undefined') {
             io = new IntersectionObserver(emit);
-            io.observe(target);
+            io.observe(targetRef);
         }
         if (followScroll && !scrollListening) {
             window.addEventListener('scroll', onScroll, passiveCapture);
@@ -382,7 +396,7 @@ export function createPlacementAnchor(target, opts) {
         if (observer)
             return;
         observer = new ResizeObserver(emit);
-        observer.observe(target);
+        observer.observe(targetRef);
         window.addEventListener('resize', emit);
         startOptionalObserving();
     };
@@ -431,6 +445,9 @@ export function createPlacementAnchor(target, opts) {
                 return;
             disposed = true;
             stopObserving();
+            targetRef = null;
+            publish = NOOP_PUBLISH;
+            lastPublished = null;
         },
         pulse(durationMs) {
             if (disposed || !followGeometry)

package/docs/bidirectional-design.md

@@ -79,21 +79,25 @@ export function createSizeAdvertiser(
 - 下游的 `createSizeAdvertiser` 将内容尺寸通知宿主，宿主更新占位元素的高度。
 - 宿主的 `createViewAnchor` 监听占位元素的矩形变化，将新位置同步给外部视图。
 
-```
-宿主渲染进程                          宿主主进程           下游渲染进程（如工具栏页面）
-──────────                          ────────            ────────────────────────────
-[占位 div]                                               [内容容器（自适应高度）]
-  │ ▲                                                      │
-  │ │ ② 宿主校验并更新占位高度                             │ ① createSizeAdvertiser
-  │ │    div.style.height = clamp(size.extent)             │    测量容器高度
-  │ └─────────── IPC / postMessage ◀───────────────────────┘    publish(size) ──▶
-  │
-  │ ③ 占位尺寸变化，ResizeObserver 触发
-  │    测量占位新矩形 → publish(bounds)
-  ▼
-  ──── IPC ──▶ ④ view.setBounds(bounds) ──▶ [WebContentsView / 原生视图]
-                                               │ 视图尺寸更新，下游视口变化
-                                               └──▶ 下游内容重新排版（单步收敛）
+```mermaid
+flowchart LR
+  subgraph DOWN["下游渲染进程（如工具栏页面）"]
+    C["内容容器<br/>高度由自身内容决定"]
+  end
+  subgraph HOST["宿主渲染进程"]
+    H["宿主消息处理器<br/>校验来源、clamp 数值"]
+    DIV["占位 div"]
+    VA["createViewAnchor"]
+  end
+  subgraph MAIN["宿主主进程"]
+    NV["WebContentsView / 原生视图"]
+  end
+
+  C -->|"① publish(size)"| H
+  H -->|"② clamp 后写入 style.height"| DIV
+  DIV -->|"ResizeObserver 观测"| VA
+  VA -->|"③ 测出新矩形，publish(bounds)"| NV
+  NV -->|"④ setBounds 后下游视口变化，内容重排"| C
 ```
 
 1. **下游**：通过 `createSizeAdvertiser` 测量高度并通过 IPC 发给宿主。