Skip to content
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.

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

fix animation timeline drag and drop and add edge scrolling #10354

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion theme/image-editor/timeline.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
height: 6rem;
margin: 0 0.4rem;

transition: border 0.2s, color 0.2s, background-color 0.2s;
transition: border 0.2s, color 0.2s;
overflow: hidden;
position: relative;
}
Expand Down
77 changes: 68 additions & 9 deletions webapp/src/components/ImageEditor/Timeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export class TimelineImpl extends React.Component<TimelineProps, TimelineState>
protected frameScroller: HTMLDivElement;
protected scrollOffset = 0;
protected dragEnd = false;
protected animHandler: any;
protected lastTimestamp: number;

constructor(props: TimelineProps) {
super(props);
Expand Down Expand Up @@ -99,6 +101,7 @@ export class TimelineImpl extends React.Component<TimelineProps, TimelineState>

let last: number;
let isScroll = false;
let offsetY = 0;
bindGestureEvents(this.frameScroller, {
onClick: coord => {
this.dragEnd = false;
Expand All @@ -107,11 +110,18 @@ export class TimelineImpl extends React.Component<TimelineProps, TimelineState>
last = coord.clientY;
pxt.BrowserUtils.addClass(this.frameScroller, "scrolling");

const parent = this.frameScroller.getBoundingClientRect();
const scrollY = coord.clientY - parent.top;
let index = -1;

const unit = this.frameScroller.firstElementChild.getBoundingClientRect().height;
const index = Math.floor(scrollY / unit);
for (let i = 0; i < this.frameScroller.childElementCount; i++) {
const el = this.frameScroller.children.item(i);

const rect = el.getBoundingClientRect();
if (coord.clientY >= rect.top && coord.clientY <= rect.bottom) {
index = i;
offsetY = coord.clientY - rect.top;
break;
}
}

isScroll = index !== this.props.currentFrame;
},
Expand All @@ -137,7 +147,7 @@ export class TimelineImpl extends React.Component<TimelineProps, TimelineState>
}
}
else {
this.updateDragDrop(coord);
this.updateDragDrop(coord, offsetY);
}
},
onDragEnd: () => {
Expand Down Expand Up @@ -204,13 +214,60 @@ export class TimelineImpl extends React.Component<TimelineProps, TimelineState>
else dispatchNewFrame();
}

protected updateDragDrop(coord: ClientCoordinates) {
protected updateDragDrop(coord: ClientCoordinates, offsetY: number) {
if (this.animHandler) {
cancelAnimationFrame(this.animHandler);
this.animHandler = undefined;
}
else {
this.lastTimestamp = undefined;
}

const parent = this.frameScroller.getBoundingClientRect();
const scrollY = coord.clientY - parent.top;
const scrollY = coord.clientY - parent.top - offsetY;

const unit = this.frameScroller.firstElementChild.getBoundingClientRect().height;
const buttonBBox = this.frameScroller.lastElementChild.getBoundingClientRect().height
const unit = (parent.height - buttonBBox) / this.props.frames.length;
const index = Math.floor(scrollY / unit);

const SCROLL_RANGE = 80;
const MIN_SPEED_DY = 100;
const MAX_SPEED_DY = 500;

const container = this.frameScroller.parentElement.getBoundingClientRect();
const maxScroll = parent.height - container.height;

if (maxScroll > 0) {
if (Math.abs(container.top - coord.clientY) < SCROLL_RANGE) {
this.animHandler = requestAnimationFrame(timestamp => {
if (!this.state.isMovingFrame || this.frameScroller.parentElement.scrollTop <= 0) return;

const dt = timestamp - (this.lastTimestamp || timestamp);
this.lastTimestamp = timestamp;

const scale = 1 - (Math.abs(container.top - coord.clientY) / SCROLL_RANGE);

const dy = (MIN_SPEED_DY + scale * (MAX_SPEED_DY - MIN_SPEED_DY)) * (dt / 1000);
this.frameScroller.parentElement.scrollTop = Math.max(0, this.frameScroller.parentElement.scrollTop - dy);
this.updateDragDrop(coord, offsetY);
});
}
else if (Math.abs(container.bottom - coord.clientY) < SCROLL_RANGE) {
this.animHandler = requestAnimationFrame(timestamp => {
if (!this.state.isMovingFrame || this.frameScroller.parentElement.scrollTop >= maxScroll) return;

const dt = timestamp - (this.lastTimestamp || timestamp);
this.lastTimestamp = timestamp;

const scale = 1 - (Math.abs(container.bottom - coord.clientY) / SCROLL_RANGE);

const dy = (MIN_SPEED_DY + scale * (MAX_SPEED_DY - MIN_SPEED_DY)) * (dt / 1000);
this.frameScroller.parentElement.scrollTop = Math.min(maxScroll, this.frameScroller.parentElement.scrollTop + dy);
this.updateDragDrop(coord, offsetY);
});
}
}

if (!this.state.isMovingFrame) {
this.setState({
isMovingFrame: true,
Expand All @@ -221,7 +278,9 @@ export class TimelineImpl extends React.Component<TimelineProps, TimelineState>
const floating = this.refs["floating-frame"] as HTMLDivElement;
floating.style.top = scrollY + "px";

this.setState({ dropPreviewIndex: index });
if (this.state.dropPreviewIndex !== index) {
this.setState({ dropPreviewIndex: index });
}
}
}
}
Expand Down
Loading