Skip to content

feat: Improved capture seek #19

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

Open
IlyaRazuvaev wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: Improved capture seek #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92a463a
feat: Improved capture seek
IlyaRazuvaev Aug 16, 2023
43ccd42
fix: refactored capture UI
IlyaRazuvaev Aug 17, 2023
312951d
refactor: change place of disposable for capture UI
IlyaRazuvaev Aug 17, 2023
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
53 changes: 23 additions & 30 deletions src/adaptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import {
IMediaDetails,
IPlayerAdaptorApi,
PlayerEventCallback,
captureUIEvents,
Disposable,
CaptureUIEventCallback,
} from '@annoto/widget-api';
import {
Expand All @@ -25,7 +27,7 @@ export class PlaykitPlayerAdaptor implements IPlayerAdaptorApi {
event: string;
fn: PlaykitListenerType;
}[] = [];
private captureUIDispose?: (() => void);
private captureUIDisposable: Disposable | undefined;

constructor(
private readonly player: IPlaykitPlayer,
Expand Down Expand Up @@ -167,48 +169,39 @@ export class PlaykitPlayerAdaptor implements IPlayerAdaptorApi {
cb();
}

onCaptureUIEvent(cb: CaptureUIEventCallback): void {
if (this.captureUIDisposable) {
this.captureUIDisposable.dispose();
}
const { element } = this;
const progressBarEl = element?.querySelector('.playkit-seek-bar') as HTMLElement;
this.captureUIDisposable = captureUIEvents({
mouseEventsElements: [ progressBarEl ],
keyEventsElements: [ element as HTMLElement ],
mouseEvents: ['mousedown'],
keyEvents: ['keydown'],
getDuration: this.duration.bind(this),
cb: cb,
});
}

onRemove(cb: PlayerEventCallback): void {
this.on(CustomEventType.PLAYER_DESTROY, () => {
this.reset();
cb();
});
}

onCaptureUIEvent(cb: CaptureUIEventCallback) {
if (this.captureUIDispose) {
this.captureUIDispose();
}
const { element } = this;
const progressBarEl = element?.querySelector('.playkit-seek-bar') as HTMLElement;
const mouseDownHandler = (ev: MouseEvent) => {
const { clientX } = ev;
const rect = progressBarEl.getBoundingClientRect();
const timestamp = (clientX - rect.x) / rect.width * this.duration();
cb({ ev, timestamp });
};
const keyDownHandler = (ev: KeyboardEvent) => {
cb({ ev });
};

progressBarEl?.addEventListener('mousedown', mouseDownHandler , { capture: true });
progressBarEl?.addEventListener('keydown', keyDownHandler, { capture: true });

this.captureUIDispose = () => {
progressBarEl.removeEventListener('mousedown', mouseDownHandler, { capture: true });
progressBarEl.removeEventListener('keydown', keyDownHandler, { capture: true });
};
}

private reset() {
for (const ev of this.events) {
this.player.removeEventListener(ev.event, ev.fn);
}
if (this.captureUIDispose) {
this.captureUIDispose();
}

this.events = [];
this.element = undefined;
if (this.captureUIDisposable) {
this.captureUIDisposable.dispose();
this.captureUIDisposable = undefined;
}
}

private on(event: string, fn: PlaykitListenerType) {
Expand Down