Skip to content

🎥 Make videos programmatically with React

`@remotion/studio`: Only show 3D rotation cursor in 3D mode (#10671)

Jonny Burger275e1163fa7f
diff --git a/packages/example/e2e/inspector-section-collapse.test.mts b/packages/example/e2e/inspector-section-collapse.test.mts
index 074b0fcf84..436bc7b1a9 100644
--- a/packages/example/e2e/inspector-section-collapse.test.mts
+++ b/packages/example/e2e/inspector-section-collapse.test.mts
@@ -529,6 +529,11 @@ test.describe('inspector section collapse', () => {
laterCompositionBox.y + laterCompositionBox.height / 2,
);
await expect(canvasRotationSurface).toBeVisible();
+ expect(
+ await canvasRotationSurface.evaluate((surface) =>
+ decodeURIComponent(surface.getAttribute('cursor') ?? ''),
+ ),
+ ).toContain('<svg width="24" height="24"');
await expect(
page.locator('[data-remotion-studio-transform-origin-handle]').first(),
).toBeVisible();
@@ -560,6 +565,11 @@ test.describe('inspector section collapse', () => {
laterCompositionBox.y + laterCompositionBox.height / 2,
);
await expect(canvasRotationSurface).toBeVisible();
+ expect(
+ await canvasRotationSurface.evaluate((surface) =>
+ decodeURIComponent(surface.getAttribute('cursor') ?? ''),
+ ),
+ ).toContain('<svg width="29" height="30"');
const threeDRotationSurfaceBox = await canvasRotationSurface.boundingBox();
if (threeDRotationSurfaceBox === null) {
throw new Error(
diff --git a/packages/studio/src/components/SelectedOutlineCanvasRotation.tsx b/packages/studio/src/components/SelectedOutlineCanvasRotation.tsx
index f4e2033d72..0c0a6977b3 100644
--- a/packages/studio/src/components/SelectedOutlineCanvasRotation.tsx
+++ b/packages/studio/src/components/SelectedOutlineCanvasRotation.tsx
@@ -23,6 +23,7 @@ import {
import type {SelectedOutline} from './selected-outline-geometry';
import {
getAngleDegrees,
+ getRotationCursor,
getSelectedOutlineRotationDeltaDegrees,
getSelectedOutlineRotationPivot,
} from './selected-outline-measurement';
@@ -38,6 +39,7 @@ import {getCurrentFrame} from './Timeline/imperative-state';
import {saveSequenceProps} from './Timeline/save-sequence-prop';
const rotationDegreesPerPixel = 0.5;
+const canvas2DRotationCursor = getRotationCursor(0);
export const SelectedOutlineCanvasRotation: React.FC<{
readonly getLatestTargetByKey: (
@@ -46,7 +48,14 @@ export const SelectedOutlineCanvasRotation: React.FC<{
readonly layoutTarget: SelectedOutlineLayoutTarget;
readonly onDraggingChange: (dragging: boolean) => void;
readonly outline: SelectedOutline;
-}> = ({getLatestTargetByKey, layoutTarget, onDraggingChange, outline}) => {
+ readonly transform3DMode: boolean;
+}> = ({
+ getLatestTargetByKey,
+ layoutTarget,
+ onDraggingChange,
+ outline,
+ transform3DMode,
+}) => {
const {getDragOverrides} = useContext(
Internals.VisualModeDragOverridesContext,
);
@@ -54,6 +63,9 @@ export const SelectedOutlineCanvasRotation: React.FC<{
Internals.VisualModeSettersContext,
);
const {editorSnapping} = useContext(EditorSnappingContext);
+ const cursor = transform3DMode
+ ? canvasRotationCursor
+ : canvas2DRotationCursor;
const onPointerDown = React.useCallback(
(event: React.PointerEvent<SVGPathElement>) => {
@@ -79,7 +91,10 @@ export const SelectedOutlineCanvasRotation: React.FC<{
}
const previousSvgCursor = svg.style.cursor;
- svg.style.cursor = canvasRotationCursor;
+ const dragCursor = rotationDrag.transform3DMode
+ ? canvasRotationCursor
+ : canvas2DRotationCursor;
+ svg.style.cursor = dragCursor;
const startPointer = {x: event.clientX, y: event.clientY};
const center = svgPointToClientPoint(
@@ -115,7 +130,7 @@ export const SelectedOutlineCanvasRotation: React.FC<{
}
dragStarted = true;
- forceSpecificCursor(canvasRotationCursor);
+ forceSpecificCursor(dragCursor);
onDraggingChange(true);
}
@@ -277,7 +292,7 @@ export const SelectedOutlineCanvasRotation: React.FC<{
points={outline.points.map((point) => `${point.x},${point.y}`).join(' ')}
fill={TRANSPARENT}
pointerEvents="all"
- cursor={canvasRotationCursor}
+ cursor={cursor}
onPointerDown={onPointerDown}
data-remotion-studio-canvas-rotation
/>
diff --git a/packages/studio/src/components/SelectedOutlineElement.tsx b/packages/studio/src/components/SelectedOutlineElement.tsx
index a25304b677..98eef71375 100644
--- a/packages/studio/src/components/SelectedOutlineElement.tsx
+++ b/packages/studio/src/components/SelectedOutlineElement.tsx
@@ -536,6 +536,7 @@ const SelectedOutlineElementUnmemoized: React.FC<
layoutTarget={layoutTarget}
onDraggingChange={onDraggingChange}
outline={outline}
+ transform3DMode={controlTarget.rotationDrag.transform3DMode}
/>
) : null}
<SelectedOutlineCropControls