Merge branch 'master' into nathan-starter

1 files changed, 6 insertions, 6 deletions

diff --git a/src/client/views/nodes/generativeFill/GenerativeFill.tsx b/src/client/views/nodes/generativeFill/GenerativeFill.tsx
index 91b0ebd5c..6d8ba9222 100644
--- a/src/client/views/nodes/generativeFill/GenerativeFill.tsx
+++ b/src/client/views/nodes/generativeFill/GenerativeFill.tsx
@@ -56,7 +56,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD
     const [isBrushing, setIsBrushing] = useState(false);
     const [canvasScale, setCanvasScale] = useState(0.5);
     // format: array of [image source, corresponding image Doc]
-    const [edits, setEdits] = useState<(string | Doc)[][]>([]);
+    const [edits, setEdits] = useState<{ url: string; saveRes: Doc | undefined }[]>([]);
     const [edited, setEdited] = useState(false);
     // const [brushStyle] = useState<BrushStyle>(BrushStyle.ADD);
     const [input, setInput] = useState('');
@@ -317,7 +317,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD
                     imgUrls.map(async url => {
                         // eslint-disable-next-line no-use-before-define
                         const saveRes = await onSave(url);
-                        return [url, saveRes as Doc];
+                        return { url, saveRes };
                     })
                 );
                 setEdits(imgRes);
@@ -326,7 +326,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD
                 image.src = imgUrls[0];
                 ImageUtility.drawImgToCanvas(image, canvasRef, canvasDims.width, canvasDims.height);
                 currImg.current = image;
-                parentDoc.current = imgRes[0][1] as Doc;
+                parentDoc.current = imgRes[0].saveRes ?? null;
             }
         } catch (err) {
             console.log(err);
@@ -535,14 +535,14 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD
                             key={i}
                             alt="image edits"
                             width={75}
-                            src={edit[0] as string}
+                            src={edit.url}
                             style={{ cursor: 'pointer' }}
                             onClick={async () => {
                                 const img = new Image();
-                                img.src = edit[0] as string;
+                                img.src = edit.url;
                                 ImageUtility.drawImgToCanvas(img, canvasRef, canvasDims.width, canvasDims.height);
                                 currImg.current = img;
-                                parentDoc.current = edit[1] as Doc;
+                                parentDoc.current = edit.saveRes ?? null;
                             }}
                         />
                     ))}