@snowcone-app/ui 0.9.3 → 0.9.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.9.4
+
+### Patch Changes
+
+- [#4344](https://github.com/snowcone-app/snowcone-monorepo/pull/4344) [`379a042`](https://github.com/snowcone-app/snowcone-monorepo/commit/379a042eb69a26f98fe0050f694c4ccf342e55b8) Thanks [@kevinsproles](https://github.com/kevinsproles)! - Per-placement render versions and an explicit re-render. SDK: `MockupResult.versions` (every placement folded into a frame, from boxes that stamp it), `getLatestSentVersions()`, and `rerender(mockupIds)` (answered by `rerender_queued`; refusals are typed `E_RERENDER_*` errors). UI: a picture's `data-render-state` is `current` only when every placement is at its latest sent version, and a picture whose cropped frame failed is re-rendered with `rerender` once the box stamps versions (falling back to forcing it with configs on an `E_RERENDER_*` refusal or an older box).
+
+- Updated dependencies [[`379a042`](https://github.com/snowcone-app/snowcone-monorepo/commit/379a042eb69a26f98fe0050f694c4ccf342e55b8)]:
+  - @snowcone-app/sdk@0.25.0
+
 ## 0.9.3
 
 ### Patch Changes

package/dist/index.cjs

@@ -6145,6 +6145,12 @@ function RealtimeProvider({
     },
     onError: (error, detail) => {
       console.error(`[RealtimeProvider] Render error [${detail.code}]:`, error);
+      if (detail.code.startsWith("E_RERENDER_") && pendingRerenderRef.current.length > 0) {
+        const ids = pendingRerenderRef.current;
+        pendingRerenderRef.current = [];
+        forceRerenderByConfigRef.current?.(ids);
+        return;
+      }
       if (detail.mockupId) {
         const id = detail.mockupId;
         setUnavailableMockups((prev) => prev.get(id)?.code === detail.code ? prev : new Map(prev).set(id, detail));
@@ -6170,7 +6176,9 @@ function RealtimeProvider({
     disconnect,
     flushPendingBlobs,
     hasPendingBlobs,
-    getLastSentVersion
+    getLastSentVersion,
+    getLatestSentVersions,
+    rerender: rerenderRaw
   } = realtimeMockup;
   const mockupResultsRef = (0, import_react25.useRef)([]);
   const mockupSubscribersRef = (0, import_react25.useRef)(
@@ -6208,6 +6216,9 @@ function RealtimeProvider({
   const compositeBusyRef = (0, import_react25.useRef)(/* @__PURE__ */ new Set());
   const compositeCanvasRef = (0, import_react25.useRef)(null);
   const requestedMockupIdsRef = (0, import_react25.useRef)([]);
+  const serverStampsVersionsRef = (0, import_react25.useRef)(false);
+  const pendingRerenderRef = (0, import_react25.useRef)([]);
+  const forceRerenderByConfigRef = (0, import_react25.useRef)(null);
   const fullFrameRerenderIdsRef = (0, import_react25.useRef)(/* @__PURE__ */ new Set());
   const fullFrameRerenderTimerRef = (0, import_react25.useRef)(null);
   (0, import_react25.useEffect)(
@@ -6260,6 +6271,36 @@ function RealtimeProvider({
     if (!croppedActiveRef.current) return;
     sendCropConfig(false);
   }, [sendCropConfig]);
+  const sendFullFrameConfig = (0, import_react25.useCallback)(
+    (mockupIds) => {
+      const base = lastConfigBaseRef.current;
+      if (!base) return;
+      sendConfigRaw({
+        ...base,
+        mockupIds,
+        placementSettings: { ...placementSettingsOverridesRef.current }
+      });
+    },
+    [sendConfigRaw]
+  );
+  const forceRerenderByConfig = (0, import_react25.useCallback)(
+    (failed) => {
+      const inForce = requestedMockupIdsRef.current;
+      const fp = (list) => [...list].sort().join(",");
+      const step = fp(failed) !== fp(inForce) ? failed : inForce.slice(0, -1);
+      if (step.length === 0) {
+        console.error(
+          `[RealtimeProvider] E_OVERLAY_RERENDER_UNAVAILABLE: cannot force a full-frame re-render of ${failed.join(", ")} (single-mockup session on a box without \`rerender\`); it updates on the next edit.`
+        );
+        sendFullFrameConfig(inForce);
+        return;
+      }
+      sendFullFrameConfig(step);
+      sendFullFrameConfig(inForce);
+    },
+    [sendFullFrameConfig]
+  );
+  forceRerenderByConfigRef.current = forceRerenderByConfig;
   const rerenderFullFrame = (0, import_react25.useCallback)(
     (mockupId) => {
       fullFrameRerenderIdsRef.current.add(mockupId);
@@ -6268,35 +6309,26 @@ function RealtimeProvider({
         fullFrameRerenderTimerRef.current = null;
         const failed = [...fullFrameRerenderIdsRef.current];
         fullFrameRerenderIdsRef.current.clear();
-        const base = lastConfigBaseRef.current;
-        if (!base || failed.length === 0) return;
+        if (!lastConfigBaseRef.current || failed.length === 0) return;
         const previous = requestedMockupIdsRef.current;
         const ids = mergeMockupIds(previous, failed);
         croppedActiveRef.current = false;
         requestedMockupIdsRef.current = ids;
-        const send = (mockupIds) => sendConfigRaw({
-          ...base,
-          mockupIds,
-          placementSettings: { ...placementSettingsOverridesRef.current }
-        });
-        const fingerprint = (list) => [...list].sort().join(",");
-        if (fingerprint(ids) !== fingerprint(previous)) {
-          send(ids);
+        const fp = (list) => [...list].sort().join(",");
+        if (fp(ids) !== fp(previous)) {
+          sendFullFrameConfig(ids);
           return;
         }
-        const step = fingerprint(failed) !== fingerprint(previous) ? failed : ids.slice(0, -1);
-        if (step.length === 0) {
-          console.error(
-            `[RealtimeProvider] E_OVERLAY_RERENDER_UNAVAILABLE: cannot force a full-frame re-render of ${failed.join(", ")} (single-mockup session); it updates on the next edit.`
-          );
-          send(ids);
-          return;
+        if (serverStampsVersionsRef.current) {
+          sendFullFrameConfig(ids);
+          pendingRerenderRef.current = failed;
+          if (rerenderRaw(failed)) return;
+          pendingRerenderRef.current = [];
         }
-        send(step);
-        send(ids);
+        forceRerenderByConfig(failed);
       }, 0);
     },
-    [sendConfigRaw]
+    [sendFullFrameConfig, forceRerenderByConfig, rerenderRaw]
   );
   const maybeFlipCrop = (0, import_react25.useCallback)(() => {
     if (!croppedDeliveryEnabled || !cropCapableRef.current) return;
@@ -6331,6 +6363,10 @@ function RealtimeProvider({
         else merged.push(result);
       });
       mockupResultsRef.current = merged;
+      if (pendingRerenderRef.current.length > 0) {
+        const delivered = new Set(results.map((r) => r.mockupId));
+        pendingRerenderRef.current = pendingRerenderRef.current.filter((id) => !delivered.has(id));
+      }
       const clearedPlacements = /* @__PURE__ */ new Set();
       results.forEach((result) => {
         const wasPending = pendingMockupIdsRef.current.has(result.mockupId);
@@ -6452,6 +6488,9 @@ function RealtimeProvider({
     }
     console.log(`[RTP] rawMockupResults changed: ${rawMockupResults.length} result(s)`, rawMockupResults.map((r) => `${r.mockupId}${r.imageUrl ? " \u2713url" : " \u2717NO-URL"}${r.cropRect ? " [crop]" : ""}`));
     const displayable = [];
+    if (!serverStampsVersionsRef.current && rawMockupResults.some((r) => r.versions && typeof r.versions === "object")) {
+      serverStampsVersionsRef.current = true;
+    }
     rawMockupResults.forEach((result) => {
       if (!result.imageUrl) {
         console.log(`[RTP] Result for ${result.mockupId} has NO imageUrl \u2014 not caching, pending NOT cleared`);
@@ -6934,6 +6973,9 @@ function RealtimeProvider({
   const getLastSentVersionRef = (0, import_react25.useRef)(getLastSentVersion);
   getLastSentVersionRef.current = getLastSentVersion;
   const getCanvasVersion = (0, import_react25.useCallback)(() => getLastSentVersionRef.current?.() ?? 0, []);
+  const getLatestSentVersionsRef = (0, import_react25.useRef)(getLatestSentVersions);
+  getLatestSentVersionsRef.current = getLatestSentVersions;
+  const getLatestSentVersionsStable = (0, import_react25.useCallback)(() => getLatestSentVersionsRef.current?.() ?? {}, []);
   const stableSubscribePipelineSettled = (0, import_react25.useCallback)(
     (callback) => {
       return subscribePipelineSettledRef.current(callback);
@@ -6983,6 +7025,7 @@ function RealtimeProvider({
       getMockupUrl: getMockupUrl3,
       getMockupUrls,
       getCanvasVersion,
+      getLatestSentVersions: getLatestSentVersionsStable,
       isMockupLoading,
       registerBlobUrl,
       // WebRTC streaming
@@ -7015,6 +7058,7 @@ function RealtimeProvider({
       getMockupUrl3,
       getMockupUrls,
       getCanvasVersion,
+      getLatestSentVersionsStable,
       isMockupLoading,
       registerBlobUrl
     ]
@@ -10769,6 +10813,8 @@ var HeroProductImage = (0, import_react46.memo)(function HeroProductImage2({
     };
   }, [mode, realtimeContext?.subscribePendingBlob, placement]);
   const renderVersionRef = (0, import_react46.useRef)(0);
+  const renderVersionsRef = (0, import_react46.useRef)(null);
+  const getLatestSentVersions = realtimeContext?.getLatestSentVersions;
   const refusalCodeRef = (0, import_react46.useRef)(null);
   refusalCodeRef.current = unavailable?.code ?? null;
   const sessionErrorCodeRef = (0, import_react46.useRef)(null);
@@ -10785,11 +10831,13 @@ var HeroProductImage = (0, import_react46.memo)(function HeroProductImage2({
       return;
     }
     const rendered = renderVersionRef.current;
-    const behind = rendered < canvas;
+    const versions = renderVersionsRef.current;
+    const sent = versions ? getLatestSentVersions?.() : void 0;
+    const behind = versions && sent ? Object.entries(sent).some(([placement2, v]) => (versions[placement2] ?? -1) < v) : rendered < canvas;
     node.dataset.canvasVersion = String(canvas);
     node.dataset.renderVersion = String(rendered);
     node.dataset.renderState = refusalCodeRef.current || behind && sessionErrorCodeRef.current ? "refused" : behind ? "stale" : "current";
-  }, [getCanvasVersion]);
+  }, [getCanvasVersion, getLatestSentVersions]);
   (0, import_react46.useEffect)(() => {
     applyRenderStamp();
   });
@@ -10799,8 +10847,9 @@ var HeroProductImage = (0, import_react46.memo)(function HeroProductImage2({
     if (!actualMockupId || !subscribeSent || !subscribeResult) return;
     const offSent = subscribeSent(() => applyRenderStamp());
     const offResult = subscribeResult(actualMockupId, (result) => {
-      if (typeof result?.requestVersion === "number" && result.requestVersion > renderVersionRef.current) {
+      if (typeof result?.requestVersion === "number" && result.requestVersion >= renderVersionRef.current) {
         renderVersionRef.current = result.requestVersion;
+        renderVersionsRef.current = result.versions ?? null;
       }
       applyRenderStamp();
     });