Skip to content

Deduplicate yarn.lock #36560

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
ravicious merged 2 commits into from
Jan 11, 2024
Merged

Deduplicate yarn.lock #36560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcb651d
Deduplicate yarn.lock
ravicious Jan 11, 2024
2e65dd6
Fix types in ProgressBar
ravicious Jan 11, 2024
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
6 changes: 3 additions & 3 deletions web/packages/teleport/src/Player/ProgressBar/ProgressBarDesktop.tsx
View file
Open in desktop
Copy link
Copy Markdown
Member

@ryanclark ryanclark Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this meant to be here?

Copy link
Copy Markdown
Member Author

@ravicious ravicious Jan 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh the changes to types here? Yeah, sorry, I forgot to mention it. After deduping @types/node, this started to raise type errors. TypeScript resolves setInterval without window to the Node version, but clearInterval without window gets resolved to the browser version AFAIR. So TypeScript was complaining about passing intervalRef.current to clearInterval.

Since this code only ever runs on the client side, I just prepended window to resolve the interval functions to the correct variants.

Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const ProgressBarDesktop = (props: {
id?: string;
}) => {
const { playerClient, durationMs } = props;
const intervalRef = useRef<NodeJS.Timer>();
const intervalRef = useRef<number>();
let playSpeed = 1.0;

const toHuman = (currentMs: number) => {
Expand Down Expand Up @@ -73,7 +73,7 @@ export const ProgressBarDesktop = (props: {
const smoothOutProgress = (speed: number) => {
const smoothingInterval = 25;

intervalRef.current = setInterval(() => {
intervalRef.current = window.setInterval(() => {
setState(prevState => {
const nextTimeMs = prevState.current + smoothingInterval * speed;
if (nextTimeMs <= durationMs) {
Expand All @@ -93,7 +93,7 @@ export const ProgressBarDesktop = (props: {
// should be called when the playback is paused or ended.
const stopProgress = () => {
throttledUpdateCurrentTime.cancel();
clearInterval(intervalRef.current);
window.clearInterval(intervalRef.current);
};

const throttledUpdateCurrentTime = throttle(
Expand Down
Loading