From b8ce16a48fc37fc94dc7ea465c652b5c376ed016 Mon Sep 17 00:00:00 2001 From: Sophie Zhang Date: Fri, 18 Aug 2023 19:20:55 -0400 Subject: fix original image click --- src/client/views/nodes/generativeFill/GenerativeFill.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/client/views/nodes/generativeFill/GenerativeFill.tsx b/src/client/views/nodes/generativeFill/GenerativeFill.tsx index 998961f20..ce6ce672f 100644 --- a/src/client/views/nodes/generativeFill/GenerativeFill.tsx +++ b/src/client/views/nodes/generativeFill/GenerativeFill.tsx @@ -63,6 +63,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD const currImg = useRef(null); // the unedited version of each generation (parent) const originalImg = useRef(null); + const originalDoc = useRef(null); // stores history of data urls const undoStack = useRef([]); // stores redo stack @@ -186,6 +187,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD childrenDocs.current = []; currImg.current = null; originalImg.current = null; + originalDoc.current = null; undoStack.current = []; redoStack.current = []; ImageUtility.clearCanvas(canvasRef); @@ -291,6 +293,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD } originalImg.current = currImg.current; + originalDoc.current = parentDoc.current; const { urls } = res as APISuccess; const imgUrls = await Promise.all(urls.map(url => ImageUtility.convertImgToCanvasUrl(url, canvasDims.width, canvasDims.height))); const imgRes = await Promise.all( @@ -302,9 +305,9 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD setEdits(imgRes); const image = new Image(); image.src = imgUrls[0]; - ImageUtility.drawImgToCanvas(image, canvasRef, canvasDims.width, canvasDims.height); currImg.current = image; + parentDoc.current = imgRes[0][1] as Doc; } catch (err) { console.log(err); } @@ -511,6 +514,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD key={i} width={75} src={edit[0] as string} + style={{ cursor: 'pointer' }} onClick={async () => { const img = new Image(); img.src = edit[0] as string; @@ -545,6 +549,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD img.src = originalImg.current.src; ImageUtility.drawImgToCanvas(img, canvasRef, canvasDims.width, canvasDims.height); currImg.current = img; + parentDoc.current = originalDoc.current; }} /> -- cgit v1.2.3-70-g09d2