@ohhwells/bridge 0.1.35 → 0.1.36-next.46

package/README.md

@@ -318,6 +318,18 @@ npm run build
 npm publish --access public
 ```
 
+### Staging → rebound-template auto-bump
+
+When `staging` publishes successfully, the bridge workflow dispatches a `bridge-published` event to `TheFlowOps-Eng/rebound-template`. That repo’s `bump-bridge.yml` workflow checks out `staging`, runs `npm install @ohhwells/bridge@<version> --save-exact`, and pushes the lockfile bump.
+
+**One-time setup** (in `ohhwells-bridge` GitHub repo → Settings → Secrets):
+
+| Secret | Value |
+|--------|--------|
+| `REBOUND_TEMPLATE_DISPATCH_TOKEN` | Fine-grained or classic PAT with `repo` access to `rebound-template` (needs permission to trigger `repository_dispatch`) |
+
+The published staging version looks like `0.1.31-next.42` and is tagged `next` on npm.
+
 ---
 
 ## Link dialog (Canvas Editor)

package/dist/index.cjs

@@ -110,6 +110,7 @@ var import_react3 = require("react");
 var import_react2 = require("react");
 var import_radix_ui = require("radix-ui");
 var import_jsx_runtime = require("react/jsx-runtime");
+var isValidEmail = (value) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value);
 function Spinner() {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
     "svg",
@@ -143,12 +144,17 @@ function EmailCaptureModal({ title, subtitle, onSubmit, onClose }) {
   const [error, setError] = (0, import_react2.useState)(null);
   const isBook = title === "Confirm your spot";
   const handleSubmit = async () => {
-    if (!email.trim()) return;
+    const trimmed = email.trim();
+    if (!trimmed) return;
+    if (!isValidEmail(trimmed)) {
+      setError("Please enter a valid email address.");
+      return;
+    }
     setLoading(true);
     setError(null);
     try {
-      await onSubmit(email.trim());
-      setSubmittedEmail(email.trim());
+      await onSubmit(trimmed);
+      setSubmittedEmail(trimmed);
       setSuccess(true);
     } catch (e) {
       setError(e instanceof Error ? e.message : "Something went wrong. Please try again.");
@@ -223,7 +229,10 @@ function EmailCaptureModal({ title, subtitle, onSubmit, onClose }) {
                   {
                     type: "email",
                     value: email,
-                    onChange: (e) => setEmail(e.target.value),
+                    onChange: (e) => {
+                      setEmail(e.target.value);
+                      if (error) setError(null);
+                    },
                     onKeyDown: handleKeyDown,
                     placeholder: "hello@gmail.com",
                     autoFocus: true,
@@ -280,12 +289,20 @@ function formatClassTime(cls) {
   const em = endTotal % 60;
   return `${h}:${cls.startTime.minutes}-${eh}:${String(em).padStart(2, "0")}`;
 }
+function formatBookingLabel(cls) {
+  const price = cls.price;
+  const isFree = price === null || price === void 0 || `${price}` === "" || `${price}` === "0";
+  return isFree ? "Book for free" : `Book for ${cls.currency ?? ""} ${price}`.trim();
+}
 function getBookingsOnDate(cls, date) {
   if (!cls.bookings?.length) return 0;
-  const ds = date.toISOString().split("T")[0];
+  const target = new Date(date);
+  target.setHours(0, 0, 0, 0);
   return cls.bookings.filter((b) => {
     try {
-      return new Date(b.classDate).toISOString().split("T")[0] === ds;
+      const bookingDate = new Date(b.classDate);
+      bookingDate.setHours(0, 0, 0, 0);
+      return bookingDate.getTime() === target.getTime();
     } catch {
       return false;
     }
@@ -589,7 +606,7 @@ function ScheduleView({ schedule, dates, selectedIdx, onSelectDate, onOpenModal
                   if (!cls.id) return;
                   onOpenModal?.(isFull ? "waitlist" : "book", cls.id, selectedDate);
                 },
-                children: isFull ? "Join Waitlist" : "Book Now"
+                children: isFull ? "Join Waitlist" : formatBookingLabel(cls)
               }
             )
           ] })
@@ -631,6 +648,17 @@ function SchedulingWidget({ notifyOnConnect = false, initialScheduleId, insertAf
   const [isHovered, setIsHovered] = (0, import_react3.useState)(false);
   const [modalState, setModalState] = (0, import_react3.useState)(null);
   const switchScheduleIdRef = (0, import_react3.useRef)(null);
+  const liveScheduleIdRef = (0, import_react3.useRef)(null);
+  const refetchLiveSchedule = (0, import_react3.useCallback)(async () => {
+    const id = liveScheduleIdRef.current;
+    if (!id) return;
+    try {
+      const res = await fetch(`${API_URL}/api/schedule/id/${id}`);
+      const data = await res.json();
+      if (data?.id) setSchedule(data);
+    } catch {
+    }
+  }, []);
   const dates = (0, import_react3.useMemo)(() => {
     const today = /* @__PURE__ */ new Date();
     today.setHours(0, 0, 0, 0);
@@ -650,6 +678,18 @@ function SchedulingWidget({ notifyOnConnect = false, initialScheduleId, insertAf
       }
     }
   }, [schedule, dates]);
+  (0, import_react3.useEffect)(() => {
+    if (typeof window === "undefined") return;
+    const onVisible = () => {
+      if (!document.hidden) void refetchLiveSchedule();
+    };
+    window.addEventListener("focus", refetchLiveSchedule);
+    document.addEventListener("visibilitychange", onVisible);
+    return () => {
+      window.removeEventListener("focus", refetchLiveSchedule);
+      document.removeEventListener("visibilitychange", onVisible);
+    };
+  }, [refetchLiveSchedule]);
   (0, import_react3.useEffect)(() => {
     if (typeof window === "undefined") return;
     const isInEditor = window.self !== window.top;
@@ -711,7 +751,7 @@ function SchedulingWidget({ notifyOnConnect = false, initialScheduleId, insertAf
         setLoading(false);
         return;
       }
-      ;
+      liveScheduleIdRef.current = effectiveId;
       (async () => {
         try {
           const res = await fetch(`${API_URL}/api/schedule/id/${effectiveId}`);
@@ -768,18 +808,14 @@ function SchedulingWidget({ notifyOnConnect = false, initialScheduleId, insertAf
       const data = await res.json().catch(() => ({}));
       throw new Error(data?.message ?? "Something went wrong. Please try again.");
     }
+    await refetchLiveSchedule();
   };
   const handleReplaceSchedule = () => {
     setIsHovered(false);
-    if (schedule) {
-      window.parent.postMessage({
-        type: "ow:schedule-connected",
-        schedule: { id: schedule.id, name: schedule.name },
-        insertAfter
-      }, "*");
-    } else {
-      window.parent.postMessage({ type: "ow:scheduling-not-connected", insertAfter }, "*");
-    }
+    window.parent.postMessage(
+      { type: "ow:scheduling-not-connected", insertAfter, currentScheduleId: schedule?.id },
+      "*"
+    );
   };
   if (!inEditor && !loading && !schedule) return null;
   const sectionId = `scheduling-${insertAfter}`;
@@ -822,7 +858,19 @@ function SchedulingWidget({ notifyOnConnect = false, initialScheduleId, insertAf
         ),
         /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "max-w-[1280px] mx-auto flex flex-col items-center gap-16", children: [
           /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "flex flex-col items-center gap-4", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("h2", { className: "font-display text-4xl sm:text-5xl font-bold text-center m-0 text-(--color-dark,#200C02)", children: schedule?.name ?? "Book an appointment" }),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+              "h2",
+              {
+                className: "font-display text-center m-0 text-(--color-dark,#200C02)",
+                style: {
+                  fontSize: "var(--fs-section-h2, clamp(40px, 4.4vw, 64px))",
+                  fontWeight: "var(--font-weight-heading, 400)",
+                  lineHeight: 1.05,
+                  letterSpacing: "-0.02em"
+                },
+                children: schedule?.name ?? "Book an appointment"
+              }
+            ),
             schedule?.description && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "font-body text-body text-center m-0 text-(--color-accent,#A89B83)", children: schedule.description })
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "w-full flex flex-col items-end gap-3", children: [
@@ -6085,6 +6133,8 @@ var ICONS = {
   insertUnorderedList: '<line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/>',
   insertOrderedList: '<line x1="10" y1="6" x2="21" y2="6"/><line x1="10" y1="12" x2="21" y2="12"/><line x1="10" y1="18" x2="21" y2="18"/><path d="M4 6h1v4"/><path d="M4 10h2"/><path d="M6 18H4c0-1 2-2 2-3s-1-1.5-2-1"/>'
 };
+var TOOLBAR_PILL_PADDING = 2;
+var TOOLBAR_TOGGLE_GAP = 4;
 var TOOLBAR_GROUPS = [
   [
     { cmd: "bold", title: "Bold" },
@@ -6203,9 +6253,9 @@ function clampToolbarToClip(top, transform, rect, clip, approxH, gap) {
   const pinnedTop = Math.min(maxBottom - approxH, Math.max(minTop, clip.top + gap));
   return { top: pinnedTop + approxH, transform: "translateX(-50%) translateY(-100%)" };
 }
-function calcToolbarPos(rect, parentScroll, approxW = 330) {
+function calcToolbarPos(rect, parentScroll, approxW = 306) {
   const GAP = 8;
-  const APPROX_H = 36;
+  const APPROX_H = 32;
   const APPROX_W = approxW;
   const clip = getIframeVisibleClip(parentScroll);
   const clipTop = clip?.top ?? 0;
@@ -6263,6 +6313,15 @@ function FloatingToolbar({
         left,
         transform,
         zIndex: 2147483647,
+        background: "#fff",
+        border: "1px solid #E7E5E4",
+        borderRadius: 6,
+        boxShadow: "0px 2px 4px -2px rgba(0,0,0,.1),0px 4px 6px -1px rgba(0,0,0,.1)",
+        display: "flex",
+        alignItems: "center",
+        padding: TOOLBAR_PILL_PADDING,
+        gap: TOOLBAR_TOGGLE_GAP,
+        fontFamily: "sans-serif",
         pointerEvents: "auto"
       },
       children: /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(CustomToolbar, { children: [
@@ -8179,7 +8238,32 @@ function OhhwellsBridge() {
           onSubmit: handleLinkPopoverSubmit
         },
         `${linkPopover.key}-${pathname}`
-      ) : null
+      ) : null,
+      sectionGap && /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
+        "div",
+        {
+          "data-ohw-section-insert-line": "",
+          className: "fixed left-0 w-full z-2147483646 flex items-center pointer-events-none",
+          style: { top: sectionGap.y, transform: "translateY(-50%)" },
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: "flex-1 bg-primary", style: { height: 3 } }),
+            /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+              Badge,
+              {
+                className: "px-8 py-1 bg-primary hover:bg-primary text-primary-foreground text-xs font-medium shrink-0 rounded-full cursor-pointer pointer-events-auto",
+                onClick: () => {
+                  window.parent.postMessage(
+                    { type: "ow:add-section", insertAfter: sectionGap.insertAfter, insertBefore: sectionGap.insertBefore },
+                    "*"
+                  );
+                },
+                children: "Add Section"
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: "flex-1 bg-primary", style: { height: 3 } })
+          ]
+        }
+      )
     ] }),
     bridgeRoot
   ) : null;