Skip to content

Merge pull request #16 from FireAndIceFrog/copilot/fix-image-upload-background-removal Prevent blank preview fallback when uploaded image produces no drawable output #17

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
FireAndIceFrog merged 5 commits into from
Jun 3, 2026
Merged

Merge pull request #16 from FireAndIceFrog/copilot/fix-image-upload-background-removal Prevent blank preview fallback when uploaded image produces no drawable output #17

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ce6085
Initial plan
Copilot Jun 3, 2026
6ddeda1
fix: keep original upload visible when preview is empty
Copilot Jun 3, 2026
8f1c565
chore: revert generated image artifact
Copilot Jun 3, 2026
1206c1b
fix: clarify preview toggle fallback label
Copilot Jun 3, 2026
0012e86
Merge pull request #16 from FireAndIceFrog/copilot/fix-image-upload-b…
FireAndIceFrog Jun 3, 2026
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
12 changes: 7 additions & 5 deletions string-art-website/src/features/3RenderImage/components/StringArtCanvas/StringArtCanvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ export const StringArtCanvas = forwardRef<HTMLCanvasElement, StringArtCanvasProp
);
const canvasInternalRef = useRef<HTMLCanvasElement>(null);
const [showOriginal, setShowOriginal] = useState(false);
const hasDrawableStringArt = currentPath.length > 1;
const shouldShowOriginal = !!imageUrl && (showOriginal || !hasDrawableStringArt);

useImperativeHandle(ref, () => canvasInternalRef.current as HTMLCanvasElement);

Expand All @@ -29,11 +31,11 @@ export const StringArtCanvas = forwardRef<HTMLCanvasElement, StringArtCanvasProp

// Always clear the canvas at the start of a render
ctx.fillStyle = 'white';
ctx.clearRect(0, 0, width, height);
ctx.fillRect(0, 0, width, height);

let isCancelled = false;

if (showOriginal && imageUrl) {
if (shouldShowOriginal) {
const img = new Image();
img.onload = () => {
if (isCancelled) return;
Expand Down Expand Up @@ -86,7 +88,7 @@ export const StringArtCanvas = forwardRef<HTMLCanvasElement, StringArtCanvasProp
return () => {
isCancelled = true;
};
}, [width, height, nailCoords, currentPath, showOriginal, imageUrl]);
}, [width, height, nailCoords, currentPath, shouldShowOriginal, imageUrl]);

return (
<div className={style['string-art-canvas-container']}>
Expand All @@ -96,9 +98,9 @@ export const StringArtCanvas = forwardRef<HTMLCanvasElement, StringArtCanvasProp
<button
onClick={() => setShowOriginal(!showOriginal)}
className={style['toggle-button']}
disabled={!imageUrl}
disabled={!imageUrl || !hasDrawableStringArt}
>
{showOriginal ? 'Show String Art' : 'Show Original'}
{hasDrawableStringArt && shouldShowOriginal ? 'Show String Art' : 'Show Original'}
</button>
</div>
</div>
Expand Down
Loading