Skip to content

restructure zoom track to not require extra state and effects #1220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2025
Merged

restructure zoom track to not require extra state and effects #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions apps/desktop/src/routes/editor/Timeline/ClipTrack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ export function ClipTrack(
totalDuration,
micWaveforms,
systemAudioWaveforms,
metaQuery,
} = useEditorContext();

const { secsPerPixel, duration } = useTimelineContext();
Expand All @@ -196,7 +195,11 @@ export function ClipTrack(
editorInstance.recordings.segments.length > 1;

return (
<TrackRoot ref={props.ref}>
<TrackRoot
ref={props.ref}
onMouseEnter={() => setEditorState("timeline", "hoveredTrack", "clip")}
onMouseLeave={() => setEditorState("timeline", "hoveredTrack", null)}
>
<For each={segments()}>
{(segment, i) => {
const prevDuration = () =>
Expand Down
2 changes: 2 additions & 0 deletions apps/desktop/src/routes/editor/Timeline/SceneTrack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export function SceneTrack(props: {

return (
<TrackRoot
onMouseEnter={() => setEditorState("timeline", "hoveredTrack", "scene")}
onMouseMove={(e) => {
if (hoveringSegment()) {
setHoveredTime(undefined);
Expand Down Expand Up @@ -144,6 +145,7 @@ export function SceneTrack(props: {
onMouseLeave={() => {
setHoveredTime();
setMaxAvailableDuration(3);
setEditorState("timeline", "hoveredTrack", null);
}}
onMouseDown={(e) => {
createRoot((dispose) => {
Expand Down
Loading
Loading