Repository navigation
Combine timeline editing from #25 and #30 - #31
Merged
Merged
Conversation
Word-boundary drag lets users fix ASR bleed (e.g. uh overlapping hello). Split (S) inserts scene boundaries that subdivide keep ranges into clips; selected clips expose trim handles that create manual cuts merged into preview and export. Undo coalesces drag gestures into a single step. Co-authored-by: Wassim Gharbi <wassgha@gmail.com>
Bring together PR #25 (word timing, Split, clip trim, manual cuts) and PR #30 (draggable cut edges, scroll-to-zoom/pan). CutAdjustments override word-derived cut edges without rewriting ASR timestamps; ManualCut and SceneBoundary still handle blade/trim and scene splits. Wheel zoom anchors at the cursor; cut-edge drags scrub preview and double-click resets. Co-authored-by: Wassim Gharbi <wassgha@gmail.com>
- Remove amber scene-boundary diamonds (split still works; clip edges are the source of truth after trim) and the playhead split-ready dot - When clip trim covers words, mark them deleted; expanding restores them - Transcript and wordbar treat words fully inside effective cuts as cut - Restoring words also clears covering manual cuts / cut adjustments Co-authored-by: Wassim Gharbi <wassgha@gmail.com>
wassgha
force-pushed
the
cursor/combine-timeline-editing-b6cb
branch
from
July 29, 2026 04:11
8315f1a to
ee50840
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Combines the best of #25 and #30 into one timeline editing model so we can close the duplicates.
From #25 (base)
S/ Split button creates selectable clip segments (no amber boundary markers; clip edges are the source of truth after trim)ManualCuts and mark fully covered words as deleted in the transcriptscripts/edits-test.tsFrom #30
CutAdjustments)How they compose
cutAdjustmentsmanualCuts)getCutRanges(words, duration, manualCuts, cutAdjustments)drives timeline, live preview, and exportAlso
main(keeps mobile-friendly timeline height:h-40 sm:h-52)npx tsx scripts/edits-test.ts,npm run lint, andnpm run buildall passTest plan
S/ Split on a kept region; two clips selectable (no yellow markers)npx tsx scripts/edits-test.tspassesSupersedes #25 and #30 once merged.