Skip to content

Commit 3f8b46c

Browse files
fix(studio): shift+drag moves a selection along one axis instead of deselecting it (#4747)
* fix(studio): shift+drag moves a selection along one axis instead of deselecting it * fix(studio): a tap on a selection puts the preview back and a travelled drag never toggles * test(studio): a cancelled drag returns the preview to its start
1 parent 67327a8 commit 3f8b46c

7 files changed

Lines changed: 418 additions & 20 deletions

File tree

‎packages/studio/src/components/editor/DomEditSelectionChrome.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export function DomEditGroupChrome({
105105
cursor: !allowBodyDrag ? undefined : canManipulate && groupCanMove ? "move" : "default",
106106
}}
107107
onPointerDown={(e) => {
108-
if (!canManipulate || e.shiftKey || !allowBodyDrag) return;
108+
if (!canManipulate || !allowBodyDrag || (e.shiftKey && !groupCanMove)) return;
109109
gestures.startGroupDrag(e);
110110
}}
111111
onMouseDown={onBoxMouseDown}
@@ -218,12 +218,12 @@ export function DomEditSelectionChrome({
218218
e.stopPropagation();
219219
return;
220220
}
221-
if (!allowBodyDrag || !canManipulate || e.shiftKey) return;
221+
if (!allowBodyDrag || !canManipulate) return;
222222
if (selection.capabilities.canApplyManualOffset) {
223223
gestures.startGesture("drag", e);
224224
return;
225225
}
226-
gestures.startBlockedMove(e, selection);
226+
if (!e.shiftKey) gestures.startBlockedMove(e, selection);
227227
}}
228228
onMouseDown={onBoxMouseDown}
229229
onClick={onBoxClick}

‎packages/studio/src/components/editor/domEditOverlayGestures.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,20 @@ export type GestureKind = "drag" | "resize" | "rotate";
1818
export type ResizeHandle = "nw" | "ne" | "sw" | "se";
1919

2020
export const BLOCKED_MOVE_THRESHOLD_PX = 4;
21+
22+
export interface AxisLockedDelta {
23+
dx: number;
24+
dy: number;
25+
lockedAxis?: "x" | "y";
26+
}
27+
28+
export function lockDragToDominantAxis(dx: number, dy: number, shiftKey: boolean): AxisLockedDelta {
29+
if (!shiftKey) return { dx, dy };
30+
return Math.abs(dx) >= Math.abs(dy)
31+
? { dx, dy: 0, lockedAxis: "y" }
32+
: { dx: 0, dy, lockedAxis: "x" };
33+
}
34+
2135
const ROTATION_COMMIT_EPSILON_DEGREES = 0.05;
2236
const ROTATION_SNAP_DEGREES = 15;
2337
/**
@@ -73,6 +87,7 @@ export interface GestureState {
7387
snapContext?: SnapContext;
7488
lastSnappedDx?: number;
7589
lastSnappedDy?: number;
90+
travelled?: boolean;
7691
/** Corner the resize gesture grabbed (resize gestures only). */
7792
resizeHandle?: ResizeHandle;
7893
/** Last anchoring translation applied during a corner resize (overlay px). */
@@ -96,6 +111,7 @@ export interface GroupGestureState {
96111
snapContext?: SnapContext;
97112
lastSnappedDx?: number;
98113
lastSnappedDy?: number;
114+
travelled?: boolean;
99115
}
100116

101117
export interface BlockedMoveState {

‎packages/studio/src/components/editor/groupDragMove.ts‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ import {
66
SNAP_THRESHOLD_PX,
77
} from "./snapEngine";
88
import { applyManualOffsetDragDraft } from "./manualOffsetDrag";
9-
import type { GroupGestureState, UseDomEditOverlayGesturesOptions } from "./domEditOverlayGestures";
9+
import {
10+
lockDragToDominantAxis,
11+
type AxisLockedDelta,
12+
type GroupGestureState,
13+
type UseDomEditOverlayGesturesOptions,
14+
} from "./domEditOverlayGestures";
1015
import type { GroupOverlayItem } from "./domEditOverlayGeometry";
1116
import {
1217
findNonRigidMembers,
@@ -33,7 +38,7 @@ export function createGroupDragMover(
3338
const snapGroupDelta = (
3439
groupG: GroupGestureState,
3540
e: React.PointerEvent<HTMLDivElement>,
36-
proposed: { dx: number; dy: number },
41+
proposed: AxisLockedDelta,
3742
) => {
3843
const sc = groupG.snapContext;
3944
if (!sc?.snapEnabled || sc.targets.length === 0) return proposed;
@@ -52,6 +57,7 @@ export function createGroupDragMover(
5257
gridEdges: sc.gridEdges ?? undefined,
5358
threshold: SNAP_THRESHOLD_PX,
5459
disabled: e.altKey,
60+
lockedAxis: proposed.lockedAxis,
5561
});
5662
const movingRect = {
5763
...groupBounds,
@@ -75,10 +81,11 @@ export function createGroupDragMover(
7581
lastGesture = groupG;
7682
lastGroupPositions = {};
7783
}
78-
const { dx, dy } = snapGroupDelta(groupG, e, {
79-
dx: e.clientX - groupG.startX,
80-
dy: e.clientY - groupG.startY,
81-
});
84+
const { dx, dy } = snapGroupDelta(
85+
groupG,
86+
e,
87+
lockDragToDominantAxis(e.clientX - groupG.startX, e.clientY - groupG.startY, e.shiftKey),
88+
);
8289
groupG.lastSnappedDx = dx;
8390
groupG.lastSnappedDy = dy;
8491

‎packages/studio/src/components/editor/manualOffsetDrag.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@ export function applyManualOffsetNudgeCommit(
514514

515515
function restoreManualOffsetDragMember(member: ManualOffsetDragMember): void {
516516
restoreStudioPathOffset(member.element, member.initialPathOffset);
517+
getOffsetDragGsap(member.element)?.set(member.element, { ...member.baseGsap });
517518
endStudioManualEditGesture(member.element, member.gestureToken);
518519
}
519520

0 commit comments

Comments
 (0)