@ohhwells/bridge 0.1.90 → 0.1.91

package/dist/index.js

@@ -8046,9 +8046,6 @@ var LINK_PICKER_EXCLUDED_IDS = /* @__PURE__ */ new Set(["navbar", "footer"]);
 function isChromeSection(el) {
   return el.matches("header, nav, footer, aside");
 }
-function isSchedulingSection(el) {
-  return (el.dataset.ohwSection ?? "").startsWith("scheduling-");
-}
 function titleCaseSectionId(id) {
   return id.split("-").filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
 }
@@ -8084,50 +8081,12 @@ function isRemovedSection(el) {
 }
 function topLevelSections() {
   return Array.from(document.querySelectorAll("[data-ohw-section]")).filter(
-    (el) => !el.parentElement?.closest("[data-ohw-section]") && !isChromeSection(el) && !isSchedulingSection(el) && !isRemovedSection(el)
+    (el) => !el.parentElement?.closest("[data-ohw-section]") && !isChromeSection(el) && !isRemovedSection(el)
   );
 }
 function instanceIdOf(el) {
   return el.dataset.ohwInstance ?? el.dataset.ohwSection ?? "";
 }
-function moveableSequence() {
-  const scheduling = Array.from(
-    document.querySelectorAll('[data-ohw-section-container="scheduling"]')
-  );
-  return [...topLevelSections(), ...scheduling].sort((a, b) => {
-    const pos = a.compareDocumentPosition(b);
-    if (pos & Node.DOCUMENT_POSITION_FOLLOWING) return -1;
-    if (pos & Node.DOCUMENT_POSITION_PRECEDING) return 1;
-    return 0;
-  });
-}
-function planSchedulingMoveTarget(instanceId, direction) {
-  const inner = document.querySelector(`[data-ohw-section="${CSS.escape(instanceId)}"]`);
-  const wrapper = inner?.closest('[data-ohw-section-container="scheduling"]');
-  if (!wrapper) return null;
-  const sequence = moveableSequence();
-  const index = sequence.indexOf(wrapper);
-  if (index === -1) return null;
-  const siblingIndex = direction === "up" ? index - 1 : index + 1;
-  if (siblingIndex < 0 || siblingIndex >= sequence.length) return null;
-  const others = sequence.filter((_, i) => i !== index);
-  const clamped = Math.max(0, Math.min(siblingIndex, others.length));
-  if (clamped === 0) return null;
-  const newPrev = others[clamped - 1];
-  if (newPrev.hasAttribute("data-ohw-section-container")) return null;
-  const newAnchorId = instanceIdOf(newPrev);
-  if (!newAnchorId) return null;
-  return { wrapper, others, clamped, newAnchorId };
-}
-function canMoveSchedulingSection(instanceId, direction) {
-  return planSchedulingMoveTarget(instanceId, direction) !== null;
-}
-function planSchedulingMove(instanceId, direction) {
-  const plan = planSchedulingMoveTarget(instanceId, direction);
-  if (!plan) return null;
-  plan.others[plan.clamped - 1].after(plan.wrapper);
-  return { newAnchorId: plan.newAnchorId };
-}
 function findByInstanceId(instanceId) {
   const escapedId = CSS.escape(instanceId);
   return document.querySelector(`[data-ohw-instance="${escapedId}"]`) ?? document.querySelector(`[data-ohw-section="${escapedId}"]:not([data-ohw-instance])`);
@@ -8333,12 +8292,6 @@ function useLiveSectionRect(sectionId) {
   return rect;
 }
 function computeSectionBoundaryFlags(instanceId) {
-  if (instanceId.startsWith("scheduling-")) {
-    return {
-      isFirst: !canMoveSchedulingSection(instanceId, "up"),
-      isLast: !canMoveSchedulingSection(instanceId, "down")
-    };
-  }
   const topLevel = topLevelSections();
   const index = topLevel.findIndex((el) => (el.dataset.ohwInstance ?? el.dataset.ohwSection) === instanceId);
   if (index === -1) return { isFirst: true, isLast: true };
@@ -14934,21 +14887,14 @@ function updateSectionScheduleId(insertAfter, scheduleId) {
   tracker.textContent = JSON.stringify(updated);
   return tracker.textContent ?? "[]";
 }
-function updateSchedulingInsertAfter(oldInsertAfter, newInsertAfter) {
-  const tracker = getSectionsTracker();
-  let sections = [];
-  try {
-    sections = JSON.parse(tracker.textContent || "[]");
-  } catch {
+var schedulingRoots = /* @__PURE__ */ new WeakMap();
+function unmountSchedulingWrapper(wrapper) {
+  const root = schedulingRoots.get(wrapper);
+  if (root) {
+    schedulingRoots.delete(wrapper);
+    setTimeout(() => root.unmount(), 0);
   }
-  const currentPath = window.location.pathname;
-  const updated = sections.map((s) => {
-    if (s.type !== "scheduling" || s.insertAfter !== oldInsertAfter) return s;
-    if (s.pagePath && s.pagePath !== currentPath) return s;
-    return { ...s, insertAfter: newInsertAfter };
-  });
-  tracker.textContent = JSON.stringify(updated);
-  return tracker.textContent ?? "[]";
+  wrapper.remove();
 }
 function schedulingSectionId(insertAfter) {
   return `scheduling-${insertAfter}`;
@@ -15003,12 +14949,12 @@ function retryMissingSchedulingMounts(entries, notifyOnConnect = false) {
   if (!hasMissingSchedulingWidgets(entries)) return;
   mountSchedulingEntries(entries, notifyOnConnect);
 }
-function initSectionsFromContent(content, removeExisting = false) {
+function initSectionsFromContent(content, removeExisting = false, currentPath = typeof window !== "undefined" ? window.location.pathname : "/") {
   const raw = content["__ohw_sections"];
   if (!raw) return;
   try {
     if (removeExisting) {
-      document.querySelectorAll('[data-ohw-section-container="scheduling"]').forEach((el) => el.remove());
+      document.querySelectorAll('[data-ohw-section-container="scheduling"]').forEach((el) => unmountSchedulingWrapper(el));
     }
     const inEditor = typeof window !== "undefined" && window.self !== window.top;
     if (inEditor) getSectionsTracker().textContent = raw;
@@ -15016,8 +14962,16 @@ function initSectionsFromContent(content, removeExisting = false) {
     const preExisting = pageEntries.filter((e) => !isSchedulingWidgetMissing(e));
     const notifyForEntry = inEditor ? (e) => !e.scheduleId : false;
     mountSchedulingEntries(pageEntries, notifyForEntry);
-    requestAnimationFrame(() => retryMissingSchedulingMounts(pageEntries, notifyForEntry));
-    setTimeout(() => retryMissingSchedulingMounts(pageEntries, notifyForEntry), 250);
+    const reapplyOrder = () => applyPersistedOrder(getPageSectionOrderEntries(content[SECTION_ORDER_KEY], currentPath));
+    reapplyOrder();
+    requestAnimationFrame(() => {
+      retryMissingSchedulingMounts(pageEntries, notifyForEntry);
+      reapplyOrder();
+    });
+    setTimeout(() => {
+      retryMissingSchedulingMounts(pageEntries, notifyForEntry);
+      reapplyOrder();
+    }, 250);
     for (const entry of preExisting) {
       window.postMessage({ type: "ow:schedule-config", insertAfter: entry.insertAfter, scheduleId: entry.scheduleId ?? null }, "*");
     }
@@ -15032,6 +14986,8 @@ function mountSchedulingWidget(insertAfter, notifyOnConnect = false, scheduleId,
   if (!mountPoint) return false;
   const container = document.createElement("div");
   container.dataset.ohwSectionContainer = "scheduling";
+  container.dataset.ohwSection = sectionId;
+  container.dataset.ohwInstance = sectionId;
   if (insertBefore) {
     const beforeAnchor = document.querySelector(`[data-ohw-section="${insertBefore}"]`);
     const beforePoint = beforeAnchor?.closest('[data-ohw-section-container="scheduling"]') ?? beforeAnchor;
@@ -15045,6 +15001,7 @@ function mountSchedulingWidget(insertAfter, notifyOnConnect = false, scheduleId,
     tail.insertAdjacentElement("afterend", container);
   }
   const root = createRoot2(container);
+  schedulingRoots.set(container, root);
   flushSync2(() => {
     root.render(
       /* @__PURE__ */ jsx33(
@@ -20320,15 +20277,6 @@ function OhhwellsBridge() {
       const instanceId = typeof e.data.instanceId === "string" ? e.data.instanceId : "";
       const direction = e.data.direction === "up" || e.data.direction === "down" ? e.data.direction : null;
       if (!instanceId || !direction) return;
-      if (instanceId.startsWith("scheduling-")) {
-        const result = planSchedulingMove(instanceId, direction);
-        if (!result) return;
-        const oldInsertAfter = instanceId.slice("scheduling-".length);
-        const sectionsJson = updateSchedulingInsertAfter(oldInsertAfter, result.newAnchorId);
-        postToParentRef.current({ type: "ow:change", nodes: [{ key: "__ohw_sections", text: sectionsJson }] });
-        window.dispatchEvent(new Event("resize"));
-        return;
-      }
       const entries = moveSectionInstance(instanceId, direction, window.location.pathname);
       if (!entries) return;
       const orderJson = JSON.stringify(entries);
@@ -20350,8 +20298,13 @@ function OhhwellsBridge() {
       if (!instanceId) return;
       if (instanceId.startsWith("scheduling-")) {
         const insertAfter = instanceId.slice("scheduling-".length);
-        const inner = document.querySelector(`[data-ohw-section="${CSS.escape(instanceId)}"]`);
-        inner?.closest('[data-ohw-section-container="scheduling"]')?.remove();
+        const el = document.querySelector(`[data-ohw-section="${CSS.escape(instanceId)}"]`);
+        const wrapper = el?.closest('[data-ohw-section-container="scheduling"]') ?? null;
+        if (wrapper) {
+          unmountSchedulingWrapper(wrapper);
+        } else {
+          el?.setAttribute("style", "display:none");
+        }
         const tracker = getSectionsTracker();
         let sections = [];
         try {
@@ -21330,7 +21283,7 @@ function OhhwellsBridge() {
       postToParent2({
         type: "ow:ready",
         version: "1",
-        bridgeVersion: "0.1.89",
+        bridgeVersion: "0.1.90",
         path: pathname,
         nodes: collectEditableNodes(editContentRef.current),
         sections