Skip to content

Core: Ensure valid QR code URL #32661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yannbf merged 5 commits into from
Oct 8, 2025
Merged

Core: Ensure valid QR code URL #32661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5e412b
Ensure valid QR code URL
ghengeveld Oct 7, 2025
d405672
change qrcode text in prod
yannbf Oct 7, 2025
4bf26dc
fix story
yannbf Oct 7, 2025
b7753dc
Customize text for production mode
ghengeveld Oct 7, 2025
3614922
fix story test
yannbf Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion code/core/src/manager/components/preview/tools/share.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,31 @@ type Story = StoryObj<typeof meta>;

export const Default: Story = {
beforeEach: () => {
const originalConfigType = global.CONFIG_TYPE;
global.STORYBOOK_NETWORK_ADDRESS = 'http://127.0.0.1:6006';
global.CONFIG_TYPE = 'DEVELOPMENT';

return () => {
global.CONFIG_TYPE = originalConfigType;
};
},
play: async ({ userEvent, canvas }) => {
await waitFor(async () => {
await userEvent.click(canvas.getByRole('button'));
await expect(await screen.findByText('Scan me')).toBeVisible();
await expect(await screen.findByText('Scan to open')).toBeVisible();
});
},
};

export const Production: Story = {
...Default,
beforeEach: () => {
const originalConfigType = global.CONFIG_TYPE;
global.STORYBOOK_NETWORK_ADDRESS = 'http://127.0.0.1:6006';
global.CONFIG_TYPE = 'PRODUCTION';

return () => {
global.CONFIG_TYPE = originalConfigType;
};
},
};
21 changes: 15 additions & 6 deletions code/core/src/manager/components/preview/tools/share.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,13 @@ function ShareMenu({
storyId,
queryParams,
qrUrl,
isDevelopment,
}: {
baseUrl: string;
storyId: string;
queryParams: Record<string, any>;
qrUrl: string;
isDevelopment: boolean;
}) {
const api = useStorybookApi();
const shortcutKeys = api.getShortcutKeys();
Expand Down Expand Up @@ -129,18 +131,22 @@ function ShareMenu({
<QRContainer>
<QRImage value={qrUrl} />
<QRContent>
<QRTitle>Scan me</QRTitle>
<QRDescription>Must be on the same network as this device.</QRDescription>
<QRTitle>Scan to open</QRTitle>
<QRDescription>
{isDevelopment
? 'Device must be on the same network.'
: 'View story on another device.'}
</QRDescription>
</QRContent>
</QRContainer>
),
},
]);

return baseLinks;
}, [baseUrl, storyId, queryParams, copied, qrUrl, enableShortcuts, copyStoryLink]);
}, [baseUrl, storyId, queryParams, copied, qrUrl, enableShortcuts, copyStoryLink, isDevelopment]);

return <TooltipLinkList links={links} />;
return <TooltipLinkList links={links} style={{ width: 210 }} />;
}

export const shareTool: Addon_BaseType = {
Expand All @@ -152,15 +158,18 @@ export const shareTool: Addon_BaseType = {
return (
<Consumer filter={mapper}>
{({ baseUrl, storyId, queryParams }) => {
const isDevelopment = global.CONFIG_TYPE === 'DEVELOPMENT';
const storyUrl = global.STORYBOOK_NETWORK_ADDRESS
? `${global.STORYBOOK_NETWORK_ADDRESS}${window.location.search}`
? new URL(window.location.search, global.STORYBOOK_NETWORK_ADDRESS).href
: window.location.href;

return storyId ? (
<WithTooltip
hasChrome
placement="bottom"
tooltip={<ShareMenu {...{ baseUrl, storyId, queryParams, qrUrl: storyUrl }} />}
tooltip={
<ShareMenu {...{ baseUrl, storyId, queryParams, qrUrl: storyUrl, isDevelopment }} />
}
>
<IconButton title="Share">
<ShareIcon />
Expand Down