Skip to content

fix: LEAP-1442: Fix unexpected scrolling on region select in Video #7392

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 11 commits into from
Apr 24, 2025
Merged

fix: LEAP-1442: Fix unexpected scrolling on region select in Video #7392

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9afa7f2
fix: LEAP-1442: Fix unexpected scrolling on region select in Video
hlomzik Apr 17, 2025
94142bd
Experiment to scroll to the beginning of the region
hlomzik Apr 17, 2025
a0c08c4
Merge branch 'develop' into 'fb-leap-1442/video-scroll'
hlomzik Apr 17, 2025
1d87367
Don't scroll at all when user clicks everywhere on timeline
hlomzik Apr 18, 2025
63608d6
Merge branch 'fb-leap-1442/video-scroll' of github.com:HumanSignal/la…
hlomzik Apr 18, 2025
49425d6
Merge branch 'develop' into fb-leap-1442/video-scroll
hlomzik Apr 21, 2025
a9284ed
Revert some change we don't actually need
hlomzik Apr 21, 2025
52c3d89
Sync Follow Merge dependencies
vladimirheartex Apr 23, 2025
2dc3e8a
Merge branch 'develop' into 'fb-leap-1442/video-scroll'
vladimirheartex Apr 23, 2025
20bff3f
Merge branch 'develop' into 'fb-leap-1442/video-scroll'
hlomzik Apr 23, 2025
9dbaa67
Merge branch 'develop' into 'fb-leap-1442/video-scroll'
hlomzik Apr 24, 2025
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
3 changes: 2 additions & 1 deletion web/libs/editor/src/components/Timeline/Views/Frames/Frames.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ export const Frames: FC<TimelineViewProps> = ({
let baseFrame = toSteps(offset, step) + 1;
let isInstant = false;

setIndicatorOffset(offset);
// don't scroll if we select region clicking on keyframes, outside of scrollable area
if (onKeyframes) setIndicatorOffset(offset);

if (isDrawing) {
// always a timeline region
Expand Down
6 changes: 6 additions & 0 deletions web/libs/editor/src/regions/TimelineRegion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ const Model = types
* @property {string[]} [value.timelinelabels] Regions are created by `TimelineLabels`, and the corresponding label is listed here.
*/

onSelectInOutliner() {
// skip video to the first frame of this region
// @todo hidden/disabled timespans?
self.object.setFrame(self.ranges[0].start);
},

/**
* @return {TimelineRegionResult}
*/
Expand Down
Loading