Merge pull request #12233 from storybookjs/fix/12162-correct-baseUrl-…

…copy-eject UI: Fix eject and copy URLs for composition
storybookjs · Aug 26, 2020 · 4fcf339 · 4fcf339
2 parents 7506c1e + b7f082c
commit 4fcf339
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/ui/src/components/preview/tools/copy.tsx b/lib/ui/src/components/preview/tools/copy.tsx
@@ -1,3 +1,4 @@
+import { PREVIEW_URL } from 'global';
 import React from 'react';
 import copy from 'copy-to-clipboard';
 import { IconButton, Icons } from '@storybook/components';
@@ -11,9 +12,7 @@ const copyMapper = ({ state }: Combo) => {
 
   return {
     refId,
-    baseUrl: ref
-      ? `${ref.url}/iframe.html`
-      : `${state.location.origin + state.location.pathname}iframe.html`,
+    baseUrl: ref ? `${ref.url}/iframe.html` : (PREVIEW_URL as string) || 'iframe.html',
     storyId,
     queryParams: state.customQueryParams,
   };

diff --git a/lib/ui/src/components/preview/tools/eject.tsx b/lib/ui/src/components/preview/tools/eject.tsx
@@ -1,3 +1,4 @@
+import { PREVIEW_URL } from 'global';
 import React from 'react';
 import { IconButton, Icons } from '@storybook/components';
 import { Consumer, Combo } from '@storybook/api';
@@ -10,9 +11,7 @@ const ejectMapper = ({ state }: Combo) => {
 
   return {
     refId,
-    baseUrl: ref
-      ? `${ref.url}/iframe.html`
-      : `${state.location.origin + state.location.pathname}iframe.html`,
+    baseUrl: ref ? `${ref.url}/iframe.html` : (PREVIEW_URL as string) || 'iframe.html',
     storyId,
     queryParams: state.customQueryParams,
   };