sitepong 0.2.10 → 0.2.11

package/dist/entries/rn.js

@@ -3430,33 +3430,35 @@ function attrDiff(id, prev, next) {
 }
 function diff(prev, next, mirror) {
   const { next: nextIndex, order } = indexTree(next, mirror);
-  const messages = [];
-  const removed = /* @__PURE__ */ new Set();
-  for (const id of prev.keys()) if (!nextIndex.has(id)) removed.add(id);
-  for (const id of removed) {
-    const rec = prev.get(id);
-    if (!removed.has(rec.parentId)) messages.push(RemoveNode(id));
-  }
+  const creates = [];
+  const updates = [];
   for (const id of order) {
     const rec = nextIndex.get(id);
     const before = prev.get(id);
     if (!before) {
       if (rec.tag === "#text") {
-        messages.push(CreateTextNode(id, rec.parentId, rec.index));
+        creates.push(CreateTextNode(id, rec.parentId, rec.index));
       } else {
-        messages.push(CreateElementNode(id, rec.parentId, rec.index, rec.tag));
+        creates.push(CreateElementNode(id, rec.parentId, rec.index, rec.tag));
       }
-      for (const k of Object.keys(rec.attrs)) messages.push(SetNodeAttribute(id, k, rec.attrs[k]));
-      if (rec.text !== void 0 && rec.text !== "") messages.push(SetNodeData(id, rec.text));
+      for (const k of Object.keys(rec.attrs)) creates.push(SetNodeAttribute(id, k, rec.attrs[k]));
+      if (rec.text !== void 0 && rec.text !== "") creates.push(SetNodeData(id, rec.text));
     } else {
       if (before.parentId !== rec.parentId || before.index !== rec.index) {
-        messages.push(MoveNode(id, rec.parentId, rec.index));
+        updates.push(MoveNode(id, rec.parentId, rec.index));
       }
-      messages.push(...attrDiff(id, before.attrs, rec.attrs));
-      if ((before.text ?? "") !== (rec.text ?? "")) messages.push(SetNodeData(id, rec.text ?? ""));
+      updates.push(...attrDiff(id, before.attrs, rec.attrs));
+      if ((before.text ?? "") !== (rec.text ?? "")) updates.push(SetNodeData(id, rec.text ?? ""));
     }
   }
-  return { messages, index: nextIndex };
+  const removed = /* @__PURE__ */ new Set();
+  for (const id of prev.keys()) if (!nextIndex.has(id)) removed.add(id);
+  const removes = [];
+  for (const id of removed) {
+    const rec = prev.get(id);
+    if (!removed.has(rec.parentId)) removes.push(RemoveNode(id));
+  }
+  return { messages: [...creates, ...updates, ...removes], index: nextIndex };
 }
 function stableAnchor(step) {
   if (step.attrs.testID) return `@${step.attrs.testID}`;
@@ -4776,9 +4778,30 @@ function StructuralCaptureProvider({ children, ...cfg }) {
   cfgRef.current = cfg;
   const rootRef = React2.useRef(null);
   React2.useEffect(() => {
-    structuralCapture.start(cfgRef.current);
-    structuralCapture.setRootInstance(rootRef.current);
+    let cancelled = false;
+    let poll = null;
+    const begin = (sessionId) => {
+      if (cancelled) return;
+      structuralCapture.start({ ...cfgRef.current, sessionId });
+      structuralCapture.setRootInstance(rootRef.current);
+    };
+    const explicit = cfgRef.current.sessionId;
+    if (explicit) {
+      begin(explicit);
+    } else {
+      let tries = 0;
+      const resolve = () => {
+        if (cancelled) return;
+        const wt = getWatchtowerSessionId();
+        if (wt) return begin(wt);
+        if (++tries >= 25) return begin(void 0);
+        poll = setTimeout(resolve, 200);
+      };
+      resolve();
+    }
     return () => {
+      cancelled = true;
+      if (poll) clearTimeout(poll);
       void structuralCapture.stop();
     };
   }, []);