mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Add "clean up timer if necessary" utility

Browse source
This commit is contained in:
Evan Hahn 2022-02-25 12:37:15 -06:00 • committed by GitHub
parent c2a65306e2
commit 052a8e65e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 150 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ts/components/conversation/Timeline.tsx
View file

@ -18,6 +18,7 @@ import type { PreferredBadgeSelectorType } from '../../state/selectors/badges';
import { assert } from '../../util/assert';
import { missingCaseError } from '../../util/missingCaseError';
import { createRefMerger } from '../../util/refMerger';
import { clearTimeoutIfNecessary } from '../../util/clearTimeoutIfNecessary';
import { WidthBreakpoint } from '../_util';
import type { PropsActions as MessageActionsType } from './Message';
@ -483,9 +484,7 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
}
this.setState({ hasRecentlyScrolled: true });
if (this.hasRecentlyScrolledTimeout) {
clearTimeout(this.hasRecentlyScrolledTimeout);
}
clearTimeoutIfNecessary(this.hasRecentlyScrolledTimeout);
this.hasRecentlyScrolledTimeout = setTimeout(() => {
this.setState({ hasRecentlyScrolled: false });
}, 3000);
@ -549,10 +548,8 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
const atTop = scrollTop <= AT_TOP_THRESHOLD;
const loadCountdownStart = atTop && !haveOldest ? Date.now() : undefined;
if (this.loadCountdownTimeout) {
clearTimeout(this.loadCountdownTimeout);
this.loadCountdownTimeout = null;
}
clearTimeoutIfNecessary(this.loadCountdownTimeout);
this.loadCountdownTimeout = null;
if (isNumber(loadCountdownStart)) {
this.loadCountdownTimeout = setTimeout(
this.loadOlderMessages,
@ -746,10 +743,8 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
const { haveOldest, isLoadingMessages, items, loadOlderMessages } =
this.props;
if (this.loadCountdownTimeout) {
clearTimeout(this.loadCountdownTimeout);
this.loadCountdownTimeout = null;
}
clearTimeoutIfNecessary(this.loadCountdownTimeout);
this.loadCountdownTimeout = null;
if (isLoadingMessages || haveOldest || !items || items.length < 1) {
return;
@ -962,9 +957,7 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
window.unregisterForActive(this.updateWithVisibleRows);
if (delayedPeekTimeout) {
clearTimeout(delayedPeekTimeout);
}
clearTimeoutIfNecessary(delayedPeekTimeout);
}
public override componentDidUpdate(