@sentry/replay 11.0.0-rc.1 → 11.0.0

package/build/npm/cjs/index.js

@@ -6161,8 +6161,13 @@ function handleGlobalEventListener(replay) {
         return event;
       }
       if (isFeedbackEvent(event)) {
+        const sessionId = replay.getSessionId();
+        const feedbackReplayId = event.contexts.feedback.replay_id;
+        if (feedbackReplayId && feedbackReplayId !== sessionId) {
+          return event;
+        }
         replay.flush();
-        event.contexts.feedback.replay_id = replay.getSessionId();
+        event.contexts.feedback.replay_id = sessionId;
         addFeedbackBreadcrumb(replay, event);
         return event;
       }
@@ -6797,17 +6802,29 @@ function addGlobalListeners(replay) {
     client.on("spanEnd", (span) => {
       replay.lastActiveSpan = span;
     });
+    let replayIdOnFeedbackOpen;
     client.on("beforeSendFeedback", async (feedbackEvent, options) => {
+      const feedbackContext = feedbackEvent.contexts?.feedback;
+      if (!options?.includeReplay || !feedbackContext) {
+        return;
+      }
+      if (feedbackContext.source === "widget" && replayIdOnFeedbackOpen) {
+        feedbackContext.replay_id = replayIdOnFeedbackOpen;
+        replayIdOnFeedbackOpen = void 0;
+        return;
+      }
       const replayId = replay.getSessionId();
-      if (options?.includeReplay && replay.isEnabled() && replayId && feedbackEvent.contexts?.feedback) {
-        if (feedbackEvent.contexts.feedback.source === "api") {
+      if (replay.isEnabled() && replayId) {
+        if (feedbackContext.source === "api") {
           await replay.sendBufferedReplayOrFlush();
         }
-        feedbackEvent.contexts.feedback.replay_id = replayId;
+        feedbackContext.replay_id = replayId;
       }
     });
     client.on("openFeedbackWidget", async () => {
+      replayIdOnFeedbackOpen = void 0;
       await replay.sendBufferedReplayOrFlush();
+      replayIdOnFeedbackOpen = replay.isEnabled() ? replay.getSessionId() : void 0;
     });
   }
 }