fix: linter
This commit is contained in:
parent
685d902740
commit
e6c6193638
|
|
@ -49,7 +49,12 @@ import {
|
||||||
import { buildWaveformGainSamples } from "@/timeline/audio-state";
|
import { buildWaveformGainSamples } from "@/timeline/audio-state";
|
||||||
import { getTimelinePixelsPerSecond } from "@/timeline";
|
import { getTimelinePixelsPerSecond } from "@/timeline";
|
||||||
import { buildWaveformSourceKey } from "@/media/waveform-summary";
|
import { buildWaveformSourceKey } from "@/media/waveform-summary";
|
||||||
import { addMediaTime, TICKS_PER_SECOND, ZERO_MEDIA_TIME } from "@/wasm";
|
import {
|
||||||
|
addMediaTime,
|
||||||
|
type MediaTime,
|
||||||
|
TICKS_PER_SECOND,
|
||||||
|
ZERO_MEDIA_TIME,
|
||||||
|
} from "@/wasm";
|
||||||
import {
|
import {
|
||||||
getActionDefinition,
|
getActionDefinition,
|
||||||
type TAction,
|
type TAction,
|
||||||
|
|
@ -96,7 +101,7 @@ const PixelsPerSecondContext = createContext<number | null>(null);
|
||||||
const THUMBNAIL_ASPECT_RATIO = 16 / 9;
|
const THUMBNAIL_ASPECT_RATIO = 16 / 9;
|
||||||
|
|
||||||
interface KeyframeIndicator {
|
interface KeyframeIndicator {
|
||||||
time: number;
|
time: MediaTime;
|
||||||
offsetPx: number;
|
offsetPx: number;
|
||||||
keyframes: SelectedKeyframeRef[];
|
keyframes: SelectedKeyframeRef[];
|
||||||
}
|
}
|
||||||
|
|
@ -112,11 +117,11 @@ export function buildKeyframeIndicator({
|
||||||
keyframe: ElementKeyframe;
|
keyframe: ElementKeyframe;
|
||||||
trackId: string;
|
trackId: string;
|
||||||
elementId: string;
|
elementId: string;
|
||||||
displayedStartTime: number;
|
displayedStartTime: MediaTime;
|
||||||
zoomLevel: number;
|
zoomLevel: number;
|
||||||
elementLeft: number;
|
elementLeft: number;
|
||||||
}): {
|
}): {
|
||||||
time: number;
|
time: MediaTime;
|
||||||
offsetPx: number;
|
offsetPx: number;
|
||||||
keyframeRef: SelectedKeyframeRef;
|
keyframeRef: SelectedKeyframeRef;
|
||||||
} {
|
} {
|
||||||
|
|
@ -149,7 +154,7 @@ export function getKeyframeIndicators({
|
||||||
keyframes: ElementKeyframe[];
|
keyframes: ElementKeyframe[];
|
||||||
trackId: string;
|
trackId: string;
|
||||||
elementId: string;
|
elementId: string;
|
||||||
displayedStartTime: number;
|
displayedStartTime: MediaTime;
|
||||||
zoomLevel: number;
|
zoomLevel: number;
|
||||||
elementLeft: number;
|
elementLeft: number;
|
||||||
elementWidth: number;
|
elementWidth: number;
|
||||||
|
|
@ -158,7 +163,7 @@ export function getKeyframeIndicators({
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
const keyframesByTime = new Map<number, KeyframeIndicator>();
|
const keyframesByTime = new Map<MediaTime, KeyframeIndicator>();
|
||||||
for (const keyframe of keyframes) {
|
for (const keyframe of keyframes) {
|
||||||
const indicator = buildKeyframeIndicator({
|
const indicator = buildKeyframeIndicator({
|
||||||
keyframe,
|
keyframe,
|
||||||
|
|
@ -662,7 +667,7 @@ function KeyframeIndicators({
|
||||||
}: {
|
}: {
|
||||||
indicators: KeyframeIndicator[];
|
indicators: KeyframeIndicator[];
|
||||||
dragState: KeyframeDragState;
|
dragState: KeyframeDragState;
|
||||||
displayedStartTime: number;
|
displayedStartTime: MediaTime;
|
||||||
elementLeft: number;
|
elementLeft: number;
|
||||||
onKeyframeMouseDown: (params: {
|
onKeyframeMouseDown: (params: {
|
||||||
event: React.MouseEvent;
|
event: React.MouseEvent;
|
||||||
|
|
@ -672,13 +677,13 @@ function KeyframeIndicators({
|
||||||
event: React.MouseEvent;
|
event: React.MouseEvent;
|
||||||
keyframes: SelectedKeyframeRef[];
|
keyframes: SelectedKeyframeRef[];
|
||||||
orderedKeyframes: SelectedKeyframeRef[];
|
orderedKeyframes: SelectedKeyframeRef[];
|
||||||
indicatorTime: number;
|
indicatorTime: MediaTime;
|
||||||
}) => void;
|
}) => void;
|
||||||
getVisualOffsetPx: (params: {
|
getVisualOffsetPx: (params: {
|
||||||
indicatorTime: number;
|
indicatorTime: MediaTime;
|
||||||
indicatorOffsetPx: number;
|
indicatorOffsetPx: number;
|
||||||
isBeingDragged: boolean;
|
isBeingDragged: boolean;
|
||||||
displayedStartTime: number;
|
displayedStartTime: MediaTime;
|
||||||
elementLeft: number;
|
elementLeft: number;
|
||||||
}) => number;
|
}) => number;
|
||||||
}) {
|
}) {
|
||||||
|
|
@ -756,7 +761,7 @@ function ExpandedKeyframeLanes({
|
||||||
keyframes: ElementKeyframe[];
|
keyframes: ElementKeyframe[];
|
||||||
trackId: string;
|
trackId: string;
|
||||||
elementId: string;
|
elementId: string;
|
||||||
displayedStartTime: number;
|
displayedStartTime: MediaTime;
|
||||||
zoomLevel: number;
|
zoomLevel: number;
|
||||||
elementLeft: number;
|
elementLeft: number;
|
||||||
keyframeDragState: KeyframeDragState;
|
keyframeDragState: KeyframeDragState;
|
||||||
|
|
@ -777,13 +782,13 @@ function ExpandedKeyframeLanes({
|
||||||
event: React.MouseEvent;
|
event: React.MouseEvent;
|
||||||
keyframes: SelectedKeyframeRef[];
|
keyframes: SelectedKeyframeRef[];
|
||||||
orderedKeyframes: SelectedKeyframeRef[];
|
orderedKeyframes: SelectedKeyframeRef[];
|
||||||
indicatorTime: number;
|
indicatorTime: MediaTime;
|
||||||
}) => void;
|
}) => void;
|
||||||
getVisualOffsetPx: (params: {
|
getVisualOffsetPx: (params: {
|
||||||
indicatorTime: number;
|
indicatorTime: MediaTime;
|
||||||
indicatorOffsetPx: number;
|
indicatorOffsetPx: number;
|
||||||
isBeingDragged: boolean;
|
isBeingDragged: boolean;
|
||||||
displayedStartTime: number;
|
displayedStartTime: MediaTime;
|
||||||
elementLeft: number;
|
elementLeft: number;
|
||||||
}) => number;
|
}) => number;
|
||||||
}) {
|
}) {
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ export function useTimelinePlayhead({
|
||||||
) as MediaTime;
|
) as MediaTime;
|
||||||
|
|
||||||
const shouldSnap = snappingEnabled && !isShiftHeldRef.current;
|
const shouldSnap = snappingEnabled && !isShiftHeldRef.current;
|
||||||
const time = (() => {
|
const time: MediaTime = (() => {
|
||||||
if (!shouldSnap) return frameTime;
|
if (!shouldSnap) return frameTime;
|
||||||
const tracks = editor.scenes.getActiveScene().tracks;
|
const tracks = editor.scenes.getActiveScene().tracks;
|
||||||
const bookmarks = editor.scenes.getActiveScene()?.bookmarks ?? [];
|
const bookmarks = editor.scenes.getActiveScene()?.bookmarks ?? [];
|
||||||
|
|
@ -118,7 +118,9 @@ export function useTimelinePlayhead({
|
||||||
snapPoints,
|
snapPoints,
|
||||||
maxSnapDistance: getTimelineSnapThresholdInTicks({ zoomLevel }),
|
maxSnapDistance: getTimelineSnapThresholdInTicks({ zoomLevel }),
|
||||||
});
|
});
|
||||||
return snapResult.snapPoint ? snapResult.snappedTime : frameTime;
|
return snapResult.snapPoint
|
||||||
|
? (snapResult.snappedTime as MediaTime)
|
||||||
|
: frameTime;
|
||||||
})();
|
})();
|
||||||
|
|
||||||
scrubTimeRef.current = time;
|
scrubTimeRef.current = time;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue