Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

🐛 Fix image crop shift (#2111)

Luke Vellaf3c3c3a256f8
diff --git a/apps/web/src/components/image-upload/image-crop-dialog.tsx b/apps/web/src/components/image-upload/image-crop-dialog.tsx
index fe5d90b26..6594cb36c 100644
--- a/apps/web/src/components/image-upload/image-crop-dialog.tsx
+++ b/apps/web/src/components/image-upload/image-crop-dialog.tsx
@@ -9,7 +9,7 @@ import {
DialogTitle,
} from "@rallly/ui/dialog";
import React from "react";
-import type { Crop, PixelCrop } from "react-image-crop";
+import type { Crop, PercentCrop } from "react-image-crop";
import ReactCrop, { centerCrop, makeAspectCrop } from "react-image-crop";
import "react-image-crop/dist/ReactCrop.css";
import { Trans } from "@/components/trans";
@@ -41,7 +41,7 @@ export function ImageCropDialog({
}: ImageCropDialogProps) {
const { t } = useTranslation();
const [crop, setCrop] = React.useState<Crop>();
- const [completedCrop, setCompletedCrop] = React.useState<PixelCrop>();
+ const [completedCrop, setCompletedCrop] = React.useState<PercentCrop>();
const imgRef = React.useRef<HTMLImageElement>(null);
const onImageLoad = (e: React.SyntheticEvent<HTMLImageElement>) => {
@@ -102,7 +102,9 @@ export function ImageCropDialog({
<ReactCrop
crop={crop}
onChange={(_, percentCrop) => setCrop(percentCrop)}
- onComplete={(c) => setCompletedCrop(c)}
+ onComplete={(_, percentCrop) => {
+ setCompletedCrop(percentCrop);
+ }}
aspect={1}
minWidth={100}
minHeight={100}
diff --git a/apps/web/src/lib/image-processing.ts b/apps/web/src/lib/image-processing.ts
index 1bf00e8a2..b5f42418e 100644
--- a/apps/web/src/lib/image-processing.ts
+++ b/apps/web/src/lib/image-processing.ts
@@ -1,4 +1,4 @@
-import type { PixelCrop } from "react-image-crop";
+import type { PercentCrop } from "react-image-crop";
// Configuration for image optimization
export const IMAGE_OPTIMIZATION = {
@@ -16,14 +16,14 @@ export const IMAGE_OPTIMIZATION = {
/**
* Converts a cropped image to an optimized file with compression and format selection
* @param image - The source image element
- * @param crop - The crop coordinates
+ * @param crop - The crop coordinates in percentage (0-100)
* @param fileName - Original filename
* @param fileType - Original file MIME type
* @returns Promise resolving to optimized File
*/
export function getCroppedImg(
image: HTMLImageElement,
- crop: PixelCrop,
+ crop: PercentCrop,
fileName: string,
fileType: string,
): Promise<File> {
@@ -33,17 +33,27 @@ export function getCroppedImg(
throw new Error("No 2d context");
}
+ // Convert percent crop to pixel values based on displayed image dimensions
+ const cropX = (crop.x / 100) * image.width;
+ const cropY = (crop.y / 100) * image.height;
+ const cropWidth = (crop.width / 100) * image.width;
+ const cropHeight = (crop.height / 100) * image.height;
+
+ // Scale to natural image dimensions
const scaleX = image.naturalWidth / image.width;
const scaleY = image.naturalHeight / image.height;
- // Calculate the actual crop dimensions
- const cropWidth = crop.width * scaleX;
- const cropHeight = crop.height * scaleY;
+ // Calculate the actual crop dimensions in natural image coordinates
+ // Round to integers to avoid sub-pixel rendering artifacts
+ const naturalCropX = Math.round(cropX * scaleX);
+ const naturalCropY = Math.round(cropY * scaleY);
+ const naturalCropWidth = Math.round(cropWidth * scaleX);
+ const naturalCropHeight = Math.round(cropHeight * scaleY);
// Calculate optimized dimensions while maintaining aspect ratio
- const aspectRatio = cropWidth / cropHeight;
- let outputWidth = cropWidth;
- let outputHeight = cropHeight;
+ const aspectRatio = naturalCropWidth / naturalCropHeight;
+ let outputWidth = naturalCropWidth;
+ let outputHeight = naturalCropHeight;
// Resize if the image is larger than our maximum dimensions
if (
@@ -53,11 +63,11 @@ export function getCroppedImg(
if (aspectRatio > 1) {
// Width is the constraining dimension
outputWidth = Math.min(IMAGE_OPTIMIZATION.MAX_WIDTH, outputWidth);
- outputHeight = outputWidth / aspectRatio;
+ outputHeight = Math.round(outputWidth / aspectRatio);
} else {
// Height is the constraining dimension
outputHeight = Math.min(IMAGE_OPTIMIZATION.MAX_HEIGHT, outputHeight);
- outputWidth = outputHeight * aspectRatio;
+ outputWidth = Math.round(outputHeight * aspectRatio);
}
}
@@ -78,10 +88,10 @@ export function getCroppedImg(
// Draw the cropped and resized image
ctx.drawImage(
image,
- crop.x * scaleX,
- crop.y * scaleY,
- cropWidth,
- cropHeight,
+ naturalCropX,
+ naturalCropY,
+ naturalCropWidth,
+ naturalCropHeight,
0,
0,
outputWidth,