Visualize Your Ideas With Code
feat(ui): vertical line on time event (#808)
Alson Garbuja18015d6714ff
diff --git a/packages/ui/src/components/timeline/Label.tsx b/packages/ui/src/components/timeline/Label.tsxindex 68927531..5ca83c3a 100644--- a/packages/ui/src/components/timeline/Label.tsx+++ b/packages/ui/src/components/timeline/Label.tsx@@ -2,10 +2,10 @@ import styles from './Timeline.module.scss';import type {Scene} from '@motion-canvas/core/lib/scenes';import type {TimeEvent} from '@motion-canvas/core/lib/scenes/timeEvents';-import {useDrag} from '../../hooks';-import {useCallback, useLayoutEffect, useState} from 'preact/hooks';+import {useLayoutEffect, useState} from 'preact/hooks';import {useApplication, useTimelineContext} from '../../contexts';import {findAndOpenFirstUserFile} from '../../utils';+import {labelClipDraggingLeftSignal} from '../../signals';interface LabelProps {event: TimeEvent;@@ -16,25 +16,6 @@ export function Label({event, scene}: LabelProps) {const {framesToPercents, pixelsToFrames} = useTimelineContext();const {player} = useApplication();const [eventTime, setEventTime] = useState(event.offset);- const [handleDrag] = useDrag(- useCallback(- dx => {- setEventTime(- eventTime + player.status.framesToSeconds(pixelsToFrames(dx)),- );- },- [eventTime, player, pixelsToFrames],- ),- useCallback(- e => {- const newFrame = Math.max(0, eventTime);- if (event.offset !== newFrame) {- scene.timeEvents.set(event.name, newFrame, e.shiftKey);- }- },- [event, eventTime],- ),- );useLayoutEffect(() => {setEventTime(event.offset);@@ -48,15 +29,31 @@ export function Label({event, scene}: LabelProps) {await findAndOpenFirstUserFile(event.stack);}}}- onMouseDown={e => {+ onPointerDown={e => {+ e.currentTarget.setPointerCapture(e.pointerId);if (e.button === 1) {e.preventDefault();player.requestSeek(scene.firstFrame +player.status.secondsToFrames(event.initialTime + event.offset),);- } else {- handleDrag(e);+ }+ }}+ onPointerMove={e => {+ if (e.currentTarget.hasPointerCapture(e.pointerId)) {+ const newTime =+ eventTime ++ player.status.framesToSeconds(pixelsToFrames(e.movementX));+ labelClipDraggingLeftSignal.value = newTime;+ setEventTime(newTime);+ }+ }}+ onPointerUp={e => {+ e.currentTarget.releasePointerCapture(e.pointerId);+ labelClipDraggingLeftSignal.value = null;+ const newFrame = Math.max(0, eventTime);+ if (event.offset !== newFrame) {+ scene.timeEvents.set(event.name, newFrame, e.shiftKey);}}}className={styles.labelClip}diff --git a/packages/ui/src/components/timeline/Timeline.tsx b/packages/ui/src/components/timeline/Timeline.tsxindex 671c7e46..a8fa8568 100644--- a/packages/ui/src/components/timeline/Timeline.tsx+++ b/packages/ui/src/components/timeline/Timeline.tsx@@ -23,6 +23,7 @@ import {} from '../../contexts';import clsx from 'clsx';import {useShortcut} from '../../hooks/useShortcut';+import {labelClipDraggingLeftSignal} from '../../signals';const ZOOM_SPEED = 0.1;const ZOOM_MIN = 0.5;@@ -194,7 +195,17 @@ export function Timeline() {}}}onPointerMove={event => {- playheadRef.current.style.left = `${event.x - rect.x + offset}px`;+ if (labelClipDraggingLeftSignal.value) {+ playheadRef.current.style.left = `${+ state.framesToPixels(+ player.status.secondsToFrames(+ labelClipDraggingLeftSignal.value,+ ),+ ) + sizes.paddingLeft+ }px`;+ } else {+ playheadRef.current.style.left = `${event.x - rect.x + offset}px`;+ }if (event.currentTarget.hasPointerCapture(event.pointerId)) {const newOffset = clamp(0,diff --git a/packages/ui/src/signals/index.ts b/packages/ui/src/signals/index.tsindex 5bbb64bd..6b6c287c 100644--- a/packages/ui/src/signals/index.ts+++ b/packages/ui/src/signals/index.ts@@ -2,3 +2,4 @@ export * from './EditorPanel';export * from './projectName';export * from './panels';export * from './storedSignal';+export * from './labelClip';diff --git a/packages/ui/src/signals/labelClip.ts b/packages/ui/src/signals/labelClip.tsnew file mode 100644index 00000000..8b6e3635--- /dev/null+++ b/packages/ui/src/signals/labelClip.ts@@ -0,0 +1,3 @@+import {signal} from '@preact/signals';++export const labelClipDraggingLeftSignal = signal<number | null>(null);