Skip to content
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

Receipts are displayed in the full size of canvas when not needed #42174

Merged
merged 8 commits into from
May 31, 2024
Merged

Receipts are displayed in the full size of canvas when not needed #42174

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
99e0265
Fixed image attachment fit to scale even when not needed
samilabud May 7, 2024
e699cb7
Merge branch 'main' into receipt_image_resize_fix_alternative_40788
samilabud May 13, 2024
6134d1f
Merge branch 'main' into receipt_image_resize_fix_alternative_40788
samilabud May 14, 2024
2e10e73
Merge branch 'main' into receipt_image_resize_fix_40788
samilabud May 16, 2024
0bfd04e
Removing function resizeToFit and using clamp to calculate the new scale
samilabud May 16, 2024
b313612
Removing declaration of unnecessary variables
samilabud May 16, 2024
e8d20ed
Merge branch 'main' into receipt_image_resize_fix_40788
samilabud May 16, 2024
c19a2f3
Merge branch 'main' into receipt_image_resize_fix_40788
samilabud May 17, 2024
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
20 changes: 11 additions & 9 deletions src/components/MultiGestureCanvas/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@ import type {CanvasSize, ContentSize} from './types';

type GetCanvasFitScale = (props: {canvasSize: CanvasSize; contentSize: ContentSize}) => {scaleX: number; scaleY: number; minScale: number; maxScale: number};

/** Clamps a value between a lower and upper bound */
function clamp(value: number, lowerBound: number, upperBound: number) {
'worklet';

return Math.min(Math.max(lowerBound, value), upperBound);
}

const getCanvasFitScale: GetCanvasFitScale = ({canvasSize, contentSize}) => {
const scaleX = canvasSize.width / contentSize.width;
const scaleY = canvasSize.height / contentSize.height;
const trueScaleX = canvasSize.width / contentSize.width;
const trueScaleY = canvasSize.height / contentSize.height;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can get rid of shouldResizeToFit altogether

    const trueScaleX = canvasSize.width / contentSize.width;
    const trueScaleY = canvasSize.height / contentSize.height;
    const scaleX = trueScaleX > 1 ? 1 : trueScaleX;
    const scaleY = trueScaleY > 1 ? 1 : trueScaleY;

@samilabud, could you please test if this works?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even simpler, we can use an already existing NumberUtils.clamp instead of the ternary

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh that makes a lot of sense thank you!, it seems to be working:

receipt.resize.clamp.test.mp4

const scaleX = clamp(trueScaleX, 0, 1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const scaleX = clamp(trueScaleX, 0, 1);
const scaleX = clamp(canvasSize.width / contentSize.width, 0, 1);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

const scaleY = clamp(trueScaleY, 0, 1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const scaleY = clamp(trueScaleY, 0, 1);
const scaleY = clamp(canvasSize.height / contentSize.height, 0, 1);

const minScale = Math.min(scaleX, scaleY);
const maxScale = Math.max(scaleX, scaleY);

return {scaleX, scaleY, minScale, maxScale};
};

/** Clamps a value between a lower and upper bound */
function clamp(value: number, lowerBound: number, upperBound: number) {
'worklet';

return Math.min(Math.max(lowerBound, value), upperBound);
}

export {getCanvasFitScale, clamp};
Loading