From f0a23ca35dcd62bfce1c27bb2997149108528764 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Mon, 4 Mar 2024 20:19:13 +0100
Subject: [PATCH 1/2] improve the refs detection This should make it possible
 to have refs share the same origin as each other and as the main storybook.

This is useful if you have static-storybooks in static directories
---
 code/lib/channels/src/postmessage/getEventSourceUrl.ts |  8 ++++++++
 code/lib/manager-api/src/lib/events.ts                 | 10 +++++++---
 code/lib/manager-api/src/modules/refs.ts               |  8 ++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/code/lib/channels/src/postmessage/getEventSourceUrl.ts b/code/lib/channels/src/postmessage/getEventSourceUrl.ts
index da3f4ec4d2f6..33c5729a7a08 100644
--- a/code/lib/channels/src/postmessage/getEventSourceUrl.ts
+++ b/code/lib/channels/src/postmessage/getEventSourceUrl.ts
@@ -7,6 +7,14 @@ export const getEventSourceUrl = (event: MessageEvent) => {
   // try to find the originating iframe by matching it's contentWindow
   // This might not be cross-origin safe
   const [frame, ...remainder] = frames.filter((element) => {
+    try {
+      return (
+        element.contentWindow?.location.origin === (event.source as Window).location.origin &&
+        element.contentWindow?.location.pathname === (event.source as Window).location.pathname
+      );
+    } catch (err) {
+      // continue
+    }
     try {
       return element.contentWindow === event.source;
     } catch (err) {
diff --git a/code/lib/manager-api/src/lib/events.ts b/code/lib/manager-api/src/lib/events.ts
index c66c5a9e1403..1892d71ed57a 100644
--- a/code/lib/manager-api/src/lib/events.ts
+++ b/code/lib/manager-api/src/lib/events.ts
@@ -19,9 +19,13 @@ export const getEventMetadata = (context: Meta, fullAPI: API) => {
   const { source, refId, type } = context;
   const [sourceType, sourceLocation] = getSourceType(source!, refId);
 
-  const ref =
-    refId && fullAPI.getRefs()[refId] ? fullAPI.getRefs()[refId] : fullAPI.findRef(sourceLocation!);
-
+  let ref: API_ComposedRef | undefined;
+  if (refId || sourceType === 'external') {
+    ref =
+      refId && fullAPI.getRefs()[refId]
+        ? fullAPI.getRefs()[refId]
+        : fullAPI.findRef(sourceLocation!);
+  }
   const meta = {
     source,
     sourceType,
diff --git a/code/lib/manager-api/src/modules/refs.ts b/code/lib/manager-api/src/modules/refs.ts
index 906798848e16..bc4b94755a53 100644
--- a/code/lib/manager-api/src/modules/refs.ts
+++ b/code/lib/manager-api/src/modules/refs.ts
@@ -20,8 +20,6 @@ import type { ModuleFn } from '../lib/types';
 
 const { location, fetch } = global;
 
-const findFilename = /(\/((?:[^\/]+?)\.[^\/]+?)|\/)$/;
-
 export interface SubState {
   refs: API_Refs;
 }
@@ -75,8 +73,10 @@ export const getSourceType = (source: string, refId?: string) => {
   const { origin: localOrigin, pathname: localPathname } = location;
   const { origin: sourceOrigin, pathname: sourcePathname } = new URL(source);
 
-  const localFull = `${localOrigin + localPathname}`.replace(findFilename, '');
-  const sourceFull = `${sourceOrigin + sourcePathname}`.replace(findFilename, '');
+  const localFull = `${localOrigin + localPathname}`.replace('/iframe.html', '').replace(/\/$/, '');
+  const sourceFull = `${sourceOrigin + sourcePathname}`
+    .replace('/iframe.html', '')
+    .replace(/\/$/, '');
 
   if (localFull === sourceFull) {
     return ['local', sourceFull];

From 7e6438f7ef201a6e844b48d94eb3a34b500be012 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Tue, 5 Mar 2024 10:07:38 +0100
Subject: [PATCH 2/2] fix test

---
 code/lib/manager-api/src/tests/refs.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/lib/manager-api/src/tests/refs.test.ts b/code/lib/manager-api/src/tests/refs.test.ts
index afdb0747e39e..791325c27337 100644
--- a/code/lib/manager-api/src/tests/refs.test.ts
+++ b/code/lib/manager-api/src/tests/refs.test.ts
@@ -25,7 +25,7 @@ vi.mock('@storybook/global', () => {
   // Add additional variations of global.location mock return values in this array.
   // NOTE: The order must match the order that global.location is called in the unit tests.
   const edgecaseLocations = [
-    { origin: 'https://storybook.js.org', pathname: '/storybook/index.html' },
+    { origin: 'https://storybook.js.org', pathname: '/storybook/iframe.html' },
   ];
   // global.location value after all edgecaseLocations are returned
   const lastLocation = { origin: 'https://storybook.js.org', pathname: '/storybook/' };