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

Jump to bottom

Bug Resizable with modifier aspectRatio #963

Merged
merged 1 commit into from Jun 11, 2022
Merged

Bug Resizable with modifier aspectRatio #963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 17 additions & 8 deletions packages/@interactjs/modifiers/aspectRatio.ts
View file
Open in desktop
Expand Up @@ -40,7 +40,10 @@ AspectRatioOptions,
ratio: number
equalDelta: boolean
xIsPrimaryAxis: boolean
edgeSign: 1 | -1
edgeSign: {
x: number
y: number
}
subModification: Modification
}
>
Expand Down Expand Up @@ -70,10 +73,16 @@ const aspectRatio: ModifierModule<AspectRatioOptions, AspectRatioState> = {
state.xIsPrimaryAxis = !!(originalEdges.left || originalEdges.right)

if (state.equalDelta) {
state.edgeSign = ((linkedEdges.left ? 1 : -1) * (linkedEdges.top ? 1 : -1)) as 1 | -1
const sign = (linkedEdges.left ? 1 : -1) * (linkedEdges.top ? 1 : -1)
state.edgeSign = {
x: sign,
y: sign,
}
} else {
const negativeSecondaryEdge = state.xIsPrimaryAxis ? linkedEdges.top : linkedEdges.left
state.edgeSign = negativeSecondaryEdge ? -1 : 1
state.edgeSign = {
x: linkedEdges.left ? -1 : 1,
y: linkedEdges.top ? -1 : 1,
}
}

extend(arg.edges, linkedEdges)
Expand Down Expand Up @@ -139,9 +148,9 @@ const aspectRatio: ModifierModule<AspectRatioOptions, AspectRatioState> = {

function setEqualDelta ({ startCoords, edgeSign }: AspectRatioState, xIsPrimaryAxis: boolean, coords: Point) {
if (xIsPrimaryAxis) {
coords.y = startCoords.y + (coords.x - startCoords.x) * edgeSign
coords.y = startCoords.y + (coords.x - startCoords.x) * edgeSign.y
} else {
coords.x = startCoords.x + (coords.y - startCoords.y) * edgeSign
coords.x = startCoords.x + (coords.y - startCoords.y) * edgeSign.x
}
}

Expand All @@ -154,11 +163,11 @@ function setRatio (
if (xIsPrimaryAxis) {
const newHeight = rect.width / ratio

coords.y = startCoords.y + (newHeight - startRect.height) * edgeSign
coords.y = startCoords.y + (newHeight - startRect.height) * edgeSign.y
} else {
const newWidth = rect.height * ratio

coords.x = startCoords.x + (newWidth - startRect.width) * edgeSign
coords.x = startCoords.x + (newWidth - startRect.width) * edgeSign.x
}
}

Expand Down