Skip to content

Visualize Your Ideas With Code

fix(ui): correctly drag time events (#912)

Jacob81f6dd6e485b
diff --git a/packages/2d/src/editor/index.ts b/packages/2d/src/editor/index.ts
index 8ab41ae5..59b94cc0 100644
--- a/packages/2d/src/editor/index.ts
+++ b/packages/2d/src/editor/index.ts
@@ -1,4 +1,4 @@
-// import './index.css';
+import './index.css';
import {makeEditorPlugin} from '@motion-canvas/ui';
import {PreviewOverlayConfig} from './PreviewOverlayConfig';
diff --git a/packages/ui/src/components/timeline/Label.tsx b/packages/ui/src/components/timeline/Label.tsx
index a93f598c..4399fe81 100644
--- a/packages/ui/src/components/timeline/Label.tsx
+++ b/packages/ui/src/components/timeline/Label.tsx
@@ -34,7 +34,8 @@ export function Label({event, scene}: LabelProps) {
if (e.button === 0) {
e.stopPropagation();
e.currentTarget.setPointerCapture(e.pointerId);
- labelClipDraggingLeftSignal.value = eventTime;
+ labelClipDraggingLeftSignal.value =
+ event.initialTime + Math.max(0, eventTime);
} else if (e.button === 1) {
player.requestSeek(
scene.firstFrame +
@@ -48,7 +49,8 @@ export function Label({event, scene}: LabelProps) {
const newTime =
eventTime +
player.status.framesToSeconds(pixelsToFrames(e.movementX));
- labelClipDraggingLeftSignal.value = Math.max(0, newTime);
+ labelClipDraggingLeftSignal.value =
+ event.initialTime + Math.max(0, newTime);
setEventTime(newTime);
}
}}
@@ -57,6 +59,7 @@ export function Label({event, scene}: LabelProps) {
e.currentTarget.releasePointerCapture(e.pointerId);
labelClipDraggingLeftSignal.value = null;
const newFrame = Math.max(0, eventTime);
+ setEventTime(newFrame);
if (event.offset !== newFrame) {
scene.timeEvents.set(event.name, newFrame, e.shiftKey);
}