feat: improve preview url loading (#78)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
'use client';
|
||||
|
||||
import { useState, useEffect } from 'react';
|
||||
import { IconRefresh } from '@tabler/icons-react';
|
||||
import { IconRefresh, IconExternalLink, IconLoader2 } from '@tabler/icons-react';
|
||||
import { Button } from '@kandev/ui/button';
|
||||
import { Input } from '@kandev/ui/input';
|
||||
import { usePreviewPanel } from '@/hooks/use-preview-panel';
|
||||
@@ -23,6 +23,8 @@ export function PreviewPanel({ sessionId, hasDevScript }: PreviewPanelProps) {
|
||||
setPreviewUrlDraft,
|
||||
isStopping,
|
||||
handleStop,
|
||||
detectedUrl,
|
||||
isRunning,
|
||||
} = usePreviewPanel({ sessionId, hasDevScript });
|
||||
const closeLayoutPreview = useLayoutStore((state) => state.closePreview);
|
||||
const setPreviewOpen = useAppStore((state) => state.setPreviewOpen);
|
||||
@@ -50,14 +52,21 @@ export function PreviewPanel({ sessionId, hasDevScript }: PreviewPanelProps) {
|
||||
const devProcess = useAppStore((state) =>
|
||||
devProcessId ? state.processes.processesById[devProcessId] : undefined
|
||||
);
|
||||
const devOutput = useAppStore ((state) =>
|
||||
const devOutput = useAppStore((state) =>
|
||||
devProcessId ? state.processes.outputsByProcessId[devProcessId] ?? '' : ''
|
||||
);
|
||||
const [refreshKey, setRefreshKey] = useState(0);
|
||||
const [showIframe, setShowIframe] = useState(false);
|
||||
const [allowManualUrl, setAllowManualUrl] = useState(false);
|
||||
const [showLoadingSpinner, setShowLoadingSpinner] = useState(true);
|
||||
|
||||
const isProcessFailed = devProcess?.status === 'failed';
|
||||
const isProcessExited = devProcess?.status === 'exited';
|
||||
|
||||
// Check if we're waiting for a URL (for button spinner)
|
||||
// Show spinner on "Preview" button when on output view and waiting for URL
|
||||
const isWaitingForUrl = isRunning && previewView === 'output' && !previewUrl && showLoadingSpinner;
|
||||
|
||||
// Sync the view from localStorage to store if needed
|
||||
useEffect(() => {
|
||||
if (!sessionId) return;
|
||||
@@ -71,6 +80,54 @@ export function PreviewPanel({ sessionId, hasDevScript }: PreviewPanelProps) {
|
||||
}
|
||||
}, [sessionId, appStoreApi, setPreviewView]);
|
||||
|
||||
// 10-second timeout to enable manual URL entry and stop loading spinner when no URL detected
|
||||
useEffect(() => {
|
||||
if (!isRunning || detectedUrl) {
|
||||
// Clear immediately using setTimeout to avoid synchronous setState in effect
|
||||
const immediate = setTimeout(() => {
|
||||
setAllowManualUrl(false);
|
||||
setShowLoadingSpinner(true);
|
||||
}, 0);
|
||||
return () => clearTimeout(immediate);
|
||||
}
|
||||
|
||||
// Reset loading spinner when starting to wait
|
||||
const resetTimer = setTimeout(() => setShowLoadingSpinner(true), 0);
|
||||
|
||||
// After 10 seconds, enable manual URL, stop showing loading spinner, and switch to preview view
|
||||
const timer = setTimeout(() => {
|
||||
setAllowManualUrl(true);
|
||||
setShowLoadingSpinner(false);
|
||||
// Switch to preview view to show the "No URL detected" message
|
||||
if (sessionId) {
|
||||
setPreviewView(sessionId, 'preview');
|
||||
}
|
||||
}, 10000);
|
||||
|
||||
return () => {
|
||||
clearTimeout(resetTimer);
|
||||
clearTimeout(timer);
|
||||
};
|
||||
}, [isRunning, detectedUrl, sessionId, setPreviewView]);
|
||||
|
||||
// 2-second delay before showing iframe after URL detection
|
||||
useEffect(() => {
|
||||
if (!previewUrl) {
|
||||
// Clear immediately using setTimeout to avoid synchronous setState in effect
|
||||
const immediate = setTimeout(() => setShowIframe(false), 0);
|
||||
return () => clearTimeout(immediate);
|
||||
}
|
||||
|
||||
// Start hidden, then show after delay
|
||||
const hideTimer = setTimeout(() => setShowIframe(false), 0);
|
||||
const showTimer = setTimeout(() => setShowIframe(true), 2000);
|
||||
|
||||
return () => {
|
||||
clearTimeout(hideTimer);
|
||||
clearTimeout(showTimer);
|
||||
};
|
||||
}, [previewUrl, refreshKey]);
|
||||
|
||||
if (!sessionId) {
|
||||
return (
|
||||
<div className="h-full w-full flex items-center justify-center text-muted-foreground mr-[5px]">
|
||||
@@ -101,28 +158,61 @@ export function PreviewPanel({ sessionId, hasDevScript }: PreviewPanelProps) {
|
||||
await handleStop();
|
||||
};
|
||||
|
||||
const handleUrlSubmit = () => {
|
||||
if (!sessionId) return;
|
||||
const trimmed = previewUrlDraft.trim();
|
||||
if (trimmed) {
|
||||
setPreviewUrl(sessionId, trimmed);
|
||||
}
|
||||
};
|
||||
|
||||
const handleOpenInTab = () => {
|
||||
if (!sessionId || !previewUrl) return;
|
||||
|
||||
// Open URL in new tab
|
||||
window.open(previewUrl, '_blank', 'noopener,noreferrer');
|
||||
|
||||
// Close the preview panel but keep dev server running
|
||||
setPreviewOpen(sessionId, false);
|
||||
setPreviewStage(sessionId, 'closed');
|
||||
setPreviewView(sessionId, 'preview');
|
||||
setPreviewUrl(sessionId, '');
|
||||
setPreviewUrlDraft(sessionId, '');
|
||||
closeLayoutPreview(sessionId);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="h-full min-h-0 flex flex-col rounded-lg border border-border/70 bg-card p-3 mr-[5px]">
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<Input
|
||||
value={previewUrlDraft}
|
||||
onChange={(event) => setPreviewUrlDraft(sessionId, event.target.value)}
|
||||
onBlur={() => setPreviewUrl(sessionId, previewUrlDraft)}
|
||||
onKeyDown={(event) => {
|
||||
if (event.key === 'Enter') {
|
||||
event.preventDefault();
|
||||
setPreviewUrl(sessionId, previewUrlDraft);
|
||||
handleUrlSubmit();
|
||||
}
|
||||
}}
|
||||
placeholder="http://localhost:3000"
|
||||
className="h-8 flex-1 min-w-[240px]"
|
||||
placeholder={detectedUrl || "http://localhost:3000"}
|
||||
className="h-6 flex-1 min-w-[240px]"
|
||||
/>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
onClick={handleOpenInTab}
|
||||
disabled={!previewUrl}
|
||||
className="cursor-pointer"
|
||||
title="Open in browser tab"
|
||||
>
|
||||
<IconExternalLink className="h-4 w-4" />
|
||||
</Button>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
onClick={() => setRefreshKey((value) => value + 1)}
|
||||
disabled={!previewUrl}
|
||||
className="cursor-pointer"
|
||||
title="Refresh preview"
|
||||
>
|
||||
<IconRefresh className="h-4 w-4" />
|
||||
</Button>
|
||||
@@ -143,6 +233,9 @@ export function PreviewPanel({ sessionId, hasDevScript }: PreviewPanelProps) {
|
||||
setPreviewView(sessionId, previewView === 'output' ? 'preview' : 'output')
|
||||
}
|
||||
>
|
||||
{isWaitingForUrl && (
|
||||
<IconLoader2 className="h-4 w-4 mr-1 animate-spin" />
|
||||
)}
|
||||
{previewView === 'output' ? 'Preview' : 'Logs'}
|
||||
</Button>
|
||||
</div>
|
||||
@@ -152,7 +245,7 @@ export function PreviewPanel({ sessionId, hasDevScript }: PreviewPanelProps) {
|
||||
<div className="h-full w-full">
|
||||
<ProcessOutputTerminal output={devOutput} processId={devProcessId ?? null} />
|
||||
</div>
|
||||
) : previewUrl ? (
|
||||
) : showIframe && previewUrl ? (
|
||||
<div className="h-full w-full flex items-center justify-center overflow-hidden">
|
||||
<div className="h-full w-full bg-background border border-border rounded-md overflow-hidden">
|
||||
<iframe
|
||||
@@ -165,9 +258,28 @@ export function PreviewPanel({ sessionId, hasDevScript }: PreviewPanelProps) {
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
) : previewUrl && !showIframe ? (
|
||||
<div className="h-full w-full flex flex-col items-center justify-center text-muted-foreground gap-2">
|
||||
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary" />
|
||||
<p className="text-sm">Loading preview...</p>
|
||||
</div>
|
||||
) : isRunning && showLoadingSpinner ? (
|
||||
<div className="h-full w-full flex flex-col items-center justify-center text-muted-foreground gap-2">
|
||||
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary" />
|
||||
<p className="text-sm">Waiting for preview URL...</p>
|
||||
</div>
|
||||
) : isRunning ? (
|
||||
<div className="h-full w-full flex flex-col items-center justify-center text-muted-foreground gap-2">
|
||||
<p className="text-sm">No preview URL detected</p>
|
||||
{allowManualUrl && !detectedUrl && (
|
||||
<p className="text-sm text-muted-foreground/70 mt-2 max-w-md text-center">
|
||||
You can manually enter a URL in the input above and press Enter.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<div className="h-full w-full flex items-center justify-center text-muted-foreground">
|
||||
Waiting for a preview URL…
|
||||
Start the dev server to enable preview.
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user