@ohhwells/bridge 0.1.117-next.319 → 0.1.117-next.320

package/dist/index.cjs

@@ -15709,16 +15709,24 @@ function defaultFloatingPanelPosition(parentScroll, _panelHeight = 280) {
     y: clip.top + EDGE_MARGIN
   };
 }
-function clampPosition(pos, parentScroll, panelW, _panelH = 280) {
+function clampX(x, panelW) {
+  const left = EDGE_MARGIN;
+  const maxX = Math.max(left, window.innerWidth - panelW - EDGE_MARGIN);
+  return Math.min(Math.max(x, left), maxX);
+}
+function clampDragPosition(pos, parentScroll, panelW) {
   const clip = getVisibleClip(parentScroll);
-  const maxX = Math.max(clip.left + EDGE_MARGIN, clip.right - panelW - EDGE_MARGIN);
   const minY = clip.top + EDGE_MARGIN;
   const maxY = Math.max(minY, clip.bottom - EDGE_MARGIN - HEADER_MIN);
   return {
-    x: Math.min(Math.max(pos.x, clip.left + EDGE_MARGIN), maxX),
+    x: clampX(pos.x, panelW),
     y: Math.min(Math.max(pos.y, minY), maxY)
   };
 }
+function stickyPageY(homeY, parentScroll) {
+  const clip = getVisibleClip(parentScroll);
+  return Math.max(homeY, clip.top + EDGE_MARGIN);
+}
 function availablePanelHeight(parentScroll, top) {
   const clip = getVisibleClip(parentScroll);
   const available = Math.floor(clip.bottom - top - EDGE_MARGIN);
@@ -15740,20 +15748,40 @@ function FloatingPanel({
   const panelRef = (0, import_react15.useRef)(null);
   const [measured, setMeasured] = (0, import_react15.useState)({ w: PANEL_WIDTH, h: 280 });
   const dragRef = (0, import_react15.useRef)(null);
-  const resolved = position ?? defaultFloatingPanelPosition(parentScroll);
-  const clamped = clampPosition(resolved, parentScroll, measured.w);
-  const maxHeight = availablePanelHeight(parentScroll, clamped.y);
+  const homeRef = (0, import_react15.useRef)(null);
+  if (!open) {
+    homeRef.current = null;
+  } else if (position) {
+    homeRef.current = position;
+  } else if (homeRef.current == null) {
+    homeRef.current = defaultFloatingPanelPosition(parentScroll);
+  }
+  const [liveScroll, setLiveScroll] = (0, import_react15.useState)(parentScroll);
+  const home = position ?? homeRef.current ?? defaultFloatingPanelPosition(parentScroll);
+  const clamped = {
+    x: clampX(home.x, measured.w),
+    y: stickyPageY(home.y, liveScroll)
+  };
+  const maxHeight = availablePanelHeight(liveScroll, clamped.y);
+  (0, import_react15.useEffect)(() => {
+    if (!open) {
+      setLiveScroll(parentScroll);
+      return;
+    }
+    const onParentScroll = (e) => {
+      if (e.data?.type !== "ow:parent-scroll") return;
+      const { iframeOffsetTop, headerH, canvasH, promptBarH = 0 } = e.data;
+      setLiveScroll({ iframeOffsetTop, headerH, canvasH, promptBarH });
+    };
+    window.addEventListener("message", onParentScroll);
+    return () => window.removeEventListener("message", onParentScroll);
+  }, [open, parentScroll]);
   (0, import_react15.useLayoutEffect)(() => {
     if (!open || !panelRef.current) return;
     const el = panelRef.current;
     const next = { w: el.offsetWidth || PANEL_WIDTH, h: el.offsetHeight || 280 };
     setMeasured((prev) => prev.w === next.w && prev.h === next.h ? prev : next);
   }, [open, children, title, context]);
-  (0, import_react15.useEffect)(() => {
-    if (!open || !position || !onPositionChange) return;
-    const next = clampPosition(position, parentScroll, measured.w, measured.h);
-    if (next.x !== position.x || next.y !== position.y) onPositionChange(next);
-  }, [open, parentScroll, measured.w, measured.h, position, onPositionChange]);
   const onHeaderPointerDown = (0, import_react15.useCallback)(
     (e) => {
       if (e.button !== 0) return;
@@ -15787,18 +15815,17 @@ function FloatingPanel({
         return;
       }
       e.preventDefault();
-      const next = clampPosition(
+      const next = clampDragPosition(
         {
           x: drag.originX + (e.clientX - drag.startX),
           y: drag.originY + (e.clientY - drag.startY)
         },
-        parentScroll,
-        measured.w,
-        measured.h
+        liveScroll,
+        measured.w
       );
       onPositionChange?.(next);
     },
-    [measured.h, measured.w, onPositionChange, parentScroll]
+    [measured.w, onPositionChange, liveScroll]
   );
   const endDrag = (0, import_react15.useCallback)((e) => {
     const drag = dragRef.current;
@@ -25914,9 +25941,6 @@ function OhhwellsBridge() {
       if (e.data?.type !== "ow:parent-scroll") return;
       const { iframeOffsetTop, headerH, canvasH, promptBarH = 0 } = e.data;
       parentScrollRef.current = { iframeOffsetTop, headerH, canvasH, promptBarH };
-      if (floatingPanelOpenRef.current) {
-        setParentScrollSnap({ iframeOffsetTop, headerH, canvasH, promptBarH });
-      }
       if (visibleViewportRef.current) {
         applyVisibleViewport(visibleViewportRef.current, parentScrollRef.current);
       }