feat(ui): revert to original image when crop discarded

Author: psychedelicious

invokeai/frontend/web/src/features/editImageModal/lib/editor.ts

@@ -18,7 +18,7 @@ export type CropBox = {
  * The callbacks supported by the editor.
  */
 type EditorCallbacks = {
-  onCropBoxChange: Set<(crop: CropBox) => void>;
+  onCropBoxChange: Set<(crop: Readonly<CropBox>) => void>;
   onCropReset: Set<() => void>;
   onZoomChange: Set<(zoom: number) => void>;
   onImageLoad: Set<() => void>;
@@ -598,13 +598,7 @@ export class Editor {
    * Update the crop box state and re-render all related Konva objects.
    */
   private updateCropBox = (cropBox: CropBox) => {
-    const { x, y, width, height } = cropBox;
-    this.cropBox = {
-      x: Math.floor(x),
-      y: Math.floor(y),
-      width: Math.floor(width),
-      height: Math.floor(height),
-    };
+    this.cropBox = cropBox;
     this.updateKonvaCropOverlay();
     this.updateKonvaCropInteractionRect();
     this.updateKonvaCropInteractionGuides();

invokeai/frontend/web/src/features/settingsAccordions/components/VideoSettingsAccordion/StartingFrameImage.tsx

@@ -56,10 +56,15 @@ export const StartingFrameImage = () => {
     // re-opens the editor they see the same crop
     const onApplyCrop = async () => {
       const box = editor.getCropBox();
-      if (!box || objectEquals(box, startingFrameImage?.crop?.box)) {
+      if (objectEquals(box, startingFrameImage?.crop?.box)) {
         // If the box hasn't changed, don't do anything
         return;
       }
+      if (!box || objectEquals(box, { x: 0, y: 0, width: originalImageDTO.width, height: originalImageDTO.height })) {
+        // There is a crop applied but it is the whole iamge - revert to original image
+        dispatch(startingFrameImageChanged(imageDTOToCroppableImage(originalImageDTO)));
+        return;
+      }
       const blob = await editor.exportImage('blob');
       const file = new File([blob], 'image.png', { type: 'image/png' });