PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Make more of the codebase conform to strict types (#10859)

Browse source
This commit is contained in:
Michael Telatynski 2023-05-12 09:49:37 +01:00 committed by GitHub
parent 6f58dd49e3
commit f758cbd38a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 111 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/autocomplete/UserProvider.tsx
View file

@ -74,7 +74,7 @@ export default class UserProvider extends AutocompleteProvider {
private onRoomTimeline = (
ev: MatrixEvent,
room: Room | undefined,
toStartOfTimeline: boolean,
toStartOfTimeline: boolean | undefined,
removed: boolean,
data: IRoomTimelineData,
): void => {

2
src/components/structures/FilePanel.tsx
View file

@ -67,7 +67,7 @@ class FilePanel extends React.Component<IProps, IState> {
private onRoomTimeline = (
ev: MatrixEvent,
room: Room | undefined,
toStartOfTimeline: boolean,
toStartOfTimeline: boolean | undefined,
removed: boolean,
data: IRoomTimelineData,
): void => {

4
src/components/structures/MatrixChat.tsx
View file

@ -113,7 +113,7 @@ import { PosthogAnalytics } from "../../PosthogAnalytics";
import { initSentry } from "../../sentry";
import LegacyCallHandler from "../../LegacyCallHandler";
import { showSpaceInvite } from "../../utils/space";
import AccessibleButton from "../views/elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../views/elements/AccessibleButton";
import { ActionPayload } from "../../dispatcher/payloads";
import { SummarizedNotificationState } from "../../stores/notifications/SummarizedNotificationState";
import Views from "../../Views";
@ -1874,7 +1874,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
this.setPageSubtitle();
}
private onLogoutClick(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>): void {
private onLogoutClick(event: ButtonEvent): void {
dis.dispatch({
action: "logout",
});

2
src/components/structures/RoomView.tsx
View file

@ -1461,7 +1461,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
this.updateRoomMembers();
};
private onMyMembership = (room: Room, membership: string, oldMembership: string): void => {
private onMyMembership = (room: Room): void => {
if (room.roomId === this.state.roomId) {
this.forceUpdate();
this.loadMembersIfJoined(room);

8
src/components/structures/TimelinePanel.tsx
View file

@ -666,7 +666,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
private onRoomTimeline = (
ev: MatrixEvent,
room: Room | undefined,
toStartOfTimeline: boolean,
toStartOfTimeline: boolean | undefined,
removed: boolean,
data: IRoomTimelineData,
): void => {
@ -769,7 +769,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
});
};
private onRoomTimelineReset = (room: Room, timelineSet: EventTimelineSet): void => {
private onRoomTimelineReset = (room: Room | undefined, timelineSet: EventTimelineSet): void => {
if (timelineSet !== this.props.timelineSet) return;
if (this.canResetTimeline()) {
@ -873,7 +873,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
this.forceUpdate();
};
private onLocalEchoUpdated = (ev: MatrixEvent, room: Room, oldEventId: string): void => {
private onLocalEchoUpdated = (ev: MatrixEvent, room: Room, oldEventId?: string): void => {
if (this.unmounted) return;
// ignore events for other rooms
@ -921,7 +921,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
this.forceUpdate();
};
private onSync = (clientSyncState: SyncState, prevState: SyncState, data: object): void => {
private onSync = (clientSyncState: SyncState, prevState: SyncState | null, data?: object): void => {
if (this.unmounted) return;
this.setState({ clientSyncState });
};

6
src/components/structures/UserMenu.tsx
View file

@ -113,7 +113,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
return !!getHomePageUrl(SdkConfig.get());
}
private onCurrentVoiceBroadcastRecordingChanged = (recording: VoiceBroadcastRecording): void => {
private onCurrentVoiceBroadcastRecordingChanged = (recording: VoiceBroadcastRecording | null): void => {
this.setState({
showLiveAvatarAddon: recording !== null,
});
@ -195,7 +195,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
}
};
private onOpenMenuClick = (ev: React.MouseEvent): void => {
private onOpenMenuClick = (ev: ButtonEvent): void => {
ev.preventDefault();
ev.stopPropagation();
this.setState({ contextMenuPosition: ev.currentTarget.getBoundingClientRect() });
@ -218,7 +218,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
this.setState({ contextMenuPosition: null });
};
private onSwitchThemeClick = (ev: React.MouseEvent): void => {
private onSwitchThemeClick = (ev: ButtonEvent): void => {
ev.preventDefault();
ev.stopPropagation();

4
src/components/structures/auth/SetupEncryptionBody.tsx
View file

@ -26,7 +26,7 @@ import Modal from "../../../Modal";
import VerificationRequestDialog from "../../views/dialogs/VerificationRequestDialog";
import { SetupEncryptionStore, Phase } from "../../../stores/SetupEncryptionStore";
import EncryptionPanel from "../../views/right_panel/EncryptionPanel";
import AccessibleButton from "../../views/elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../../views/elements/AccessibleButton";
import Spinner from "../../views/elements/Spinner";
function keyHasPassphrase(keyInfo: ISecretStorageKeyInfo): boolean {
@ -115,7 +115,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
store.returnAfterSkip();
};
private onResetClick = (ev: React.MouseEvent<HTMLButtonElement>): void => {
private onResetClick = (ev: ButtonEvent): void => {
ev.preventDefault();
const store = SetupEncryptionStore.sharedInstance();
store.reset();

6
src/components/views/auth/InteractiveAuthEntryComponents.tsx
View file

@ -18,14 +18,14 @@ import classNames from "classnames";
import { MatrixClient } from "matrix-js-sdk/src/client";
import { AuthType, IAuthDict, IInputs, IStageStatus } from "matrix-js-sdk/src/interactive-auth";
import { logger } from "matrix-js-sdk/src/logger";
import React, { ChangeEvent, createRef, FormEvent, Fragment, MouseEvent } from "react";
import React, { ChangeEvent, createRef, FormEvent, Fragment } from "react";
import EmailPromptIcon from "../../../../res/img/element-icons/email-prompt.svg";
import { _t } from "../../../languageHandler";
import SettingsStore from "../../../settings/SettingsStore";
import { LocalisedPolicy, Policies } from "../../../Terms";
import { AuthHeaderModifier } from "../../structures/auth/header/AuthHeaderModifier";
import AccessibleButton from "../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
import Field from "../elements/Field";
import Spinner from "../elements/Spinner";
@ -943,7 +943,7 @@ export class FallbackAuthEntry extends React.Component<IAuthEntryProps> {
this.fallbackButton.current?.focus();
};
private onShowFallbackClick = (e: MouseEvent): void => {
private onShowFallbackClick = (e: ButtonEvent): void => {
if (!this.props.authSessionId) return;
e.preventDefault();

4
src/components/views/avatars/BaseAvatar.tsx
View file

@ -24,7 +24,7 @@ import { ClientEvent } from "matrix-js-sdk/src/client";
import * as AvatarLogic from "../../../Avatar";
import SettingsStore from "../../../settings/SettingsStore";
import AccessibleButton from "../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
import RoomContext from "../../../contexts/RoomContext";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import { useTypedEventEmitter } from "../../../hooks/useEventEmitter";
@ -42,7 +42,7 @@ interface IProps {
// XXX: resizeMethod not actually used.
resizeMethod?: ResizeMethod;
defaultToInitialLetter?: boolean; // true to add default url
onClick?: React.MouseEventHandler;
onClick?: (ev: ButtonEvent) => void;
inputRef?: React.RefObject<HTMLImageElement & HTMLSpanElement>;
className?: string;
tabIndex?: number;

2
src/components/views/avatars/MemberAvatar.tsx
View file

@ -33,8 +33,6 @@ interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" |
width: number;
height: number;
resizeMethod?: ResizeMethod;
// The onClick to give the avatar
onClick?: React.MouseEventHandler;
// Whether the onClick of the avatar should be overridden to dispatch `Action.ViewUser`
viewUserOnClick?: boolean;
pushUserOnClick?: boolean;

4
src/components/views/dialogs/StorageEvictedDialog.tsx
View file

@ -22,14 +22,14 @@ import { _t } from "../../../languageHandler";
import BaseDialog from "./BaseDialog";
import DialogButtons from "../elements/DialogButtons";
import BugReportDialog from "./BugReportDialog";
import AccessibleButton from "../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
interface IProps {
onFinished(signOut?: boolean): void;
}
export default class StorageEvictedDialog extends React.Component<IProps> {
private sendBugReport = (ev: React.MouseEvent): void => {
private sendBugReport = (ev: ButtonEvent): void => {
ev.preventDefault();
Modal.createDialog(BugReportDialog, {});
};

4
src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
View file

@ -22,7 +22,7 @@ import { logger } from "matrix-js-sdk/src/logger";
import { MatrixClientPeg } from "../../../../MatrixClientPeg";
import Field from "../../elements/Field";
import AccessibleButton from "../../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../../elements/AccessibleButton";
import { _t } from "../../../../languageHandler";
import { accessSecretStorage } from "../../../../SecurityManager";
import Modal from "../../../../Modal";
@ -217,7 +217,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
});
};
private onResetAllClick = (ev: React.MouseEvent<HTMLAnchorElement>): void => {
private onResetAllClick = (ev: ButtonEvent): void => {
ev.preventDefault();
this.setState({ resetting: true });
};

2
src/components/views/elements/AppTile.tsx
View file

@ -106,7 +106,7 @@ interface IState {
export default class AppTile extends React.Component<IProps, IState> {
public static contextType = MatrixClientContext;
public context: ContextType<typeof MatrixClientContext>;
public context!: ContextType<typeof MatrixClientContext>;
public static defaultProps: Partial<IProps> = {
waitForIframeLoad: true,

2
src/components/views/elements/PersistentApp.tsx
View file

@ -32,7 +32,7 @@ interface IProps {
export default class PersistentApp extends React.Component<IProps> {
public static contextType = MatrixClientContext;
public context: ContextType<typeof MatrixClientContext>;
public context!: ContextType<typeof MatrixClientContext>;
private room: Room;
public constructor(props: IProps, context: ContextType<typeof MatrixClientContext>) {

2
src/components/views/messages/MBeaconBody.tsx
View file

@ -131,7 +131,7 @@ const useHandleBeaconRedaction = (
}, [event, onBeforeBeaconInfoRedaction]);
};
const MBeaconBody: React.FC<IBodyProps> = React.forwardRef(({ mxEvent, getRelationsForEvent }, ref) => {
const MBeaconBody = React.forwardRef<HTMLDivElement, IBodyProps>(({ mxEvent, getRelationsForEvent }, ref) => {
const { beacon, isLive, latestLocationState, waitingToStart } = useBeaconState(mxEvent);
const mapId = useUniqueId(mxEvent.getId()!);

17
src/components/views/messages/MessageActionBar.tsx
View file

@ -58,6 +58,7 @@ import { ShowThreadPayload } from "../../../dispatcher/payloads/ShowThreadPayloa
import useFavouriteMessages from "../../../hooks/useFavouriteMessages";
import { GetRelationsForEvent } from "../rooms/EventTile";
import { VoiceBroadcastInfoEventType } from "../../../voice-broadcast/types";
import { ButtonEvent } from "../elements/AccessibleButton";
interface IOptionsButtonProps {
mxEvent: MatrixEvent;
@ -84,7 +85,7 @@ const OptionsButton: React.FC<IOptionsButtonProps> = ({
}, [onFocusChange, menuDisplayed]);
const onOptionsClick = useCallback(
(e: React.MouseEvent): void => {
(e: ButtonEvent): void => {
// Don't open the regular browser or our context menu on right-click
e.preventDefault();
e.stopPropagation();
@ -159,7 +160,7 @@ const ReactButton: React.FC<IReactButtonProps> = ({ mxEvent, reactions, onFocusC
}
const onClick = useCallback(
(e: React.MouseEvent) => {
(e: ButtonEvent) => {
// Don't open the regular browser or our context menu on right-click
e.preventDefault();
e.stopPropagation();
@ -203,7 +204,7 @@ const ReplyInThreadButton: React.FC<IReplyInThreadButton> = ({ mxEvent }) => {
const relationType = mxEvent?.getRelation()?.rel_type;
const hasARelation = !!relationType && relationType !== RelationType.Thread;
const onClick = (e: React.MouseEvent): void => {
const onClick = (e: ButtonEvent): void => {
// Don't open the regular browser or our context menu on right-click
e.preventDefault();
e.stopPropagation();
@ -266,7 +267,7 @@ const FavouriteButton: React.FC<IFavouriteButtonProp> = ({ mxEvent }) => {
});
const onClick = useCallback(
(e: React.MouseEvent) => {
(e: ButtonEvent) => {
// Don't open the regular browser or our context menu on right-click
e.preventDefault();
e.stopPropagation();
@ -345,7 +346,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
this.props.onFocusChange?.(focused);
};
private onReplyClick = (e: React.MouseEvent): void => {
private onReplyClick = (e: ButtonEvent): void => {
// Don't open the regular browser or our context menu on right-click
e.preventDefault();
e.stopPropagation();
@ -357,7 +358,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
});
};
private onEditClick = (e: React.MouseEvent): void => {
private onEditClick = (e: ButtonEvent): void => {
// Don't open the regular browser or our context menu on right-click
e.preventDefault();
e.stopPropagation();
@ -406,7 +407,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
}
}
private onResendClick = (ev: React.MouseEvent): void => {
private onResendClick = (ev: ButtonEvent): void => {
// Don't open the regular browser or our context menu on right-click
ev.preventDefault();
ev.stopPropagation();
@ -414,7 +415,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
this.runActionOnFailedEv((tarEv) => Resend.resend(tarEv));
};
private onCancelClick = (ev: React.MouseEvent): void => {
private onCancelClick = (ev: ButtonEvent): void => {
this.runActionOnFailedEv(
(tarEv) => Resend.removeFromQueue(tarEv),
(testEv) => canCancel(testEv.status),

2
src/components/views/messages/UnknownBody.tsx
View file

@ -23,7 +23,7 @@ interface IProps {
children?: React.ReactNode;
}
export default forwardRef(({ mxEvent, children }: IProps, ref: React.RefObject<HTMLDivElement>) => {
export default forwardRef<HTMLDivElement, IProps>(({ mxEvent, children }, ref) => {
const text = mxEvent.getContent().body;
return (
<div className="mx_UnknownBody" ref={ref}>

4
src/components/views/messages/ViewSourceEvent.tsx
View file

@ -20,7 +20,7 @@ import classNames from "classnames";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
import { _t } from "../../../languageHandler";
import AccessibleButton from "../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
interface IProps {
mxEvent: MatrixEvent;
@ -50,7 +50,7 @@ export default class ViewSourceEvent extends React.PureComponent<IProps, IState>
}
}
private onToggle = (ev: React.MouseEvent): void => {
private onToggle = (ev: ButtonEvent): void => {
ev.preventDefault();
const { expanded } = this.state;
this.setState({

2
src/components/views/room_settings/AliasSettings.tsx
View file

@ -102,7 +102,7 @@ interface IState {
export default class AliasSettings extends React.Component<IProps, IState> {
public static contextType = MatrixClientContext;
public context: ContextType<typeof MatrixClientContext>;
public context!: ContextType<typeof MatrixClientContext>;
public static defaultProps = {
canSetAliases: false,

4
src/components/views/room_settings/RoomProfileSettings.tsx
View file

@ -22,7 +22,7 @@ import { _t } from "../../../languageHandler";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
import Field from "../elements/Field";
import { mediaFromMxc } from "../../../customisations/Media";
import AccessibleButton from "../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
import AvatarSetting from "../settings/AvatarSetting";
import { htmlSerializeFromMdIfNeeded } from "../../../editor/serialize";
import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
@ -103,7 +103,7 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
return Boolean(Object.values(this.state.profileFieldsTouched).length);
};
private cancelProfileChanges = async (e: React.MouseEvent): Promise<void> => {
private cancelProfileChanges = async (e: ButtonEvent): Promise<void> => {
e.stopPropagation();
e.preventDefault();

4
src/components/views/rooms/EventTile.tsx
View file

@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React, { createRef, forwardRef, MouseEvent, ReactNode, RefObject, useRef } from "react";
import React, { createRef, forwardRef, MouseEvent, ReactNode, useRef } from "react";
import classNames from "classnames";
import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event";
import { EventStatus, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
@ -1437,7 +1437,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
}
// Wrap all event tiles with the tile error boundary so that any throws even during construction are captured
const SafeEventTile = forwardRef((props: EventTileProps, ref: RefObject<UnwrappedEventTile>) => {
const SafeEventTile = forwardRef<UnwrappedEventTile, EventTileProps>((props, ref) => {
return (
<>
<TileErrorBoundary mxEvent={props.mxEvent} layout={props.layout ?? Layout.Group}>

4
src/components/views/rooms/JumpToBottomButton.tsx
View file

@ -18,12 +18,12 @@ import React from "react";
import classNames from "classnames";
import { _t } from "../../../languageHandler";
import AccessibleButton from "../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
interface IProps {
numUnreadMessages?: number;
highlight: boolean;
onScrollToBottomClick: (e: React.MouseEvent) => void;
onScrollToBottomClick: (e: ButtonEvent) => void;
}
const JumpToBottomButton: React.FC<IProps> = (props) => {

4
src/components/views/rooms/MemberList.tsx
View file

@ -142,7 +142,7 @@ export default class MemberList extends React.Component<IProps, IState> {
};
}
private onUserPresenceChange = (event: MatrixEvent, user: User): void => {
private onUserPresenceChange = (event: MatrixEvent | undefined, user: User): void => {
// Attach a SINGLE listener for global presence changes then locate the
// member tile and re-render it. This is more efficient than every tile
// ever attaching their own listener.
@ -162,7 +162,7 @@ export default class MemberList extends React.Component<IProps, IState> {
this.updateListNow(true);
};
private onMyMembership = (room: Room, membership: string, oldMembership: string): void => {
private onMyMembership = (room: Room, membership: string, oldMembership?: string): void => {
if (room.roomId === this.props.roomId && membership === "join" && oldMembership !== "join") {
// we just joined the room, load the member list
this.updateListNow(true);

5
src/components/views/rooms/MessageComposerButtons.tsx
View file

@ -17,7 +17,7 @@ limitations under the License.
import classNames from "classnames";
import { IEventRelation } from "matrix-js-sdk/src/models/event";
import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
import React, { createContext, MouseEventHandler, ReactElement, ReactNode, useContext, useRef } from "react";
import React, { createContext, ReactElement, ReactNode, useContext, useRef } from "react";
import { Room } from "matrix-js-sdk/src/models/room";
import { MatrixClient } from "matrix-js-sdk/src/client";
import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
@ -40,6 +40,7 @@ import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
import IconizedContextMenu, { IconizedContextMenuOptionList } from "../context_menus/IconizedContextMenu";
import { EmojiButton } from "./EmojiButton";
import { useSettingValue } from "../../../hooks/useSettings";
import { ButtonEvent } from "../elements/AccessibleButton";
interface IProps {
addEmoji: (emoji: string) => boolean;
@ -362,7 +363,7 @@ function showLocationButton(props: IProps, room: Room, matrixClient: MatrixClien
interface WysiwygToggleButtonProps {
isRichTextEnabled: boolean;
onClick: MouseEventHandler<HTMLDivElement>;
onClick: (ev: ButtonEvent) => void;
}
function ComposerModeButton({ isRichTextEnabled, onClick }: WysiwygToggleButtonProps): JSX.Element {

4
src/components/views/rooms/NotificationBadge/StatelessNotificationBadge.tsx
View file

@ -18,7 +18,7 @@ import React, { MouseEvent, ReactNode } from "react";
import classNames from "classnames";
import { formatCount } from "../../../../utils/FormattingUtils";
import AccessibleButton from "../../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../../elements/AccessibleButton";
import { NotificationColor } from "../../../../stores/notifications/NotificationColor";
import { useSettingValue } from "../../../../hooks/useSettings";
import { XOR } from "../../../../@types/common";
@ -37,7 +37,7 @@ interface ClickableProps extends Props {
/**
* If specified will return an AccessibleButton instead of a div.
*/
onClick(ev: React.MouseEvent): void;
onClick(ev: ButtonEvent): void;
tabIndex?: number;
}

4
src/components/views/rooms/RoomSublist.tsx
View file

@ -48,7 +48,7 @@ import ContextMenu, {
StyledMenuItemCheckbox,
StyledMenuItemRadio,
} from "../../structures/ContextMenu";
import AccessibleButton from "../../views/elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../../views/elements/AccessibleButton";
import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
import ExtraTile from "./ExtraTile";
import SettingsStore from "../../../settings/SettingsStore";
@ -369,7 +369,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
}
};
private onOpenMenuClick = (ev: React.MouseEvent): void => {
private onOpenMenuClick = (ev: ButtonEvent): void => {
ev.preventDefault();
ev.stopPropagation();
const target = ev.target as HTMLButtonElement;

4
src/components/views/rooms/RoomTile.tsx
View file

@ -220,11 +220,11 @@ export class RoomTile extends React.PureComponent<ClassProps, State> {
});
};
private onTileClick = async (ev: React.KeyboardEvent): Promise<void> => {
private onTileClick = async (ev: ButtonEvent): Promise<void> => {
ev.preventDefault();
ev.stopPropagation();
const action = getKeyBindingsManager().getAccessibilityAction(ev);
const action = getKeyBindingsManager().getAccessibilityAction(ev as React.KeyboardEvent);
const clearSearch = ([KeyBindingAction.Enter, KeyBindingAction.Space] as Array<string | undefined>).includes(
action,
);

6
src/components/views/rooms/TopUnreadMessagesBar.tsx
View file

@ -17,11 +17,11 @@ limitations under the License.
import React from "react";
import { _t } from "../../../languageHandler";
import AccessibleButton from "../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
interface IProps {
onScrollUpClick: (e: React.MouseEvent) => void;
onCloseClick: (e: React.MouseEvent) => void;
onScrollUpClick: (e: ButtonEvent) => void;
onCloseClick: (e: ButtonEvent) => void;
}
export default class TopUnreadMessagesBar extends React.PureComponent<IProps> {

6
src/components/views/settings/ProfileSettings.tsx
View file

@ -24,7 +24,7 @@ import { OwnProfileStore } from "../../../stores/OwnProfileStore";
import Modal from "../../../Modal";
import ErrorDialog from "../dialogs/ErrorDialog";
import { mediaFromMxc } from "../../../customisations/Media";
import AccessibleButton from "../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
import AvatarSetting from "./AvatarSetting";
import UserIdentifierCustomisations from "../../../customisations/UserIdentifier";
import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
@ -75,7 +75,7 @@ export default class ProfileSettings extends React.Component<{}, IState> {
});
};
private cancelProfileChanges = async (e: React.MouseEvent): Promise<void> => {
private cancelProfileChanges = async (e: ButtonEvent): Promise<void> => {
e.stopPropagation();
e.preventDefault();
@ -88,7 +88,7 @@ export default class ProfileSettings extends React.Component<{}, IState> {
});
};
private saveProfile = async (e: React.FormEvent<HTMLFormElement>): Promise<void> => {
private saveProfile = async (e: ButtonEvent): Promise<void> => {
e.stopPropagation();
e.preventDefault();

10
src/components/views/settings/account/EmailAddresses.tsx
View file

@ -23,7 +23,7 @@ import { MatrixError } from "matrix-js-sdk/src/matrix";
import { _t, UserFriendlyError } from "../../../../languageHandler";
import { MatrixClientPeg } from "../../../../MatrixClientPeg";
import Field from "../../elements/Field";
import AccessibleButton from "../../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../../elements/AccessibleButton";
import * as Email from "../../../../email";
import AddThreepid from "../../../../AddThreepid";
import Modal from "../../../../Modal";
@ -59,21 +59,21 @@ export class ExistingEmailAddress extends React.Component<IExistingEmailAddressP
};
}
private onRemove = (e: React.MouseEvent): void => {
private onRemove = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
this.setState({ verifyRemove: true });
};
private onDontRemove = (e: React.MouseEvent): void => {
private onDontRemove = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
this.setState({ verifyRemove: false });
};
private onActuallyRemove = (e: React.MouseEvent): void => {
private onActuallyRemove = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
@ -196,7 +196,7 @@ export default class EmailAddresses extends React.Component<IProps, IState> {
});
};
private onContinueClick = (e: React.MouseEvent): void => {
private onContinueClick = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();

12
src/components/views/settings/account/PhoneNumbers.tsx
View file

@ -22,7 +22,7 @@ import { logger } from "matrix-js-sdk/src/logger";
import { _t, UserFriendlyError } from "../../../../languageHandler";
import { MatrixClientPeg } from "../../../../MatrixClientPeg";
import Field from "../../elements/Field";
import AccessibleButton from "../../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../../elements/AccessibleButton";
import AddThreepid from "../../../../AddThreepid";
import CountryDropdown from "../../auth/CountryDropdown";
import Modal from "../../../../Modal";
@ -54,21 +54,21 @@ export class ExistingPhoneNumber extends React.Component<IExistingPhoneNumberPro
};
}
private onRemove = (e: React.MouseEvent): void => {
private onRemove = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
this.setState({ verifyRemove: true });
};
private onDontRemove = (e: React.MouseEvent): void => {
private onDontRemove = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
this.setState({ verifyRemove: false });
};
private onActuallyRemove = (e: React.MouseEvent): void => {
private onActuallyRemove = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
@ -173,7 +173,7 @@ export default class PhoneNumbers extends React.Component<IProps, IState> {
});
};
private onAddClick = (e: React.MouseEvent | React.FormEvent): void => {
private onAddClick = (e: ButtonEvent | React.FormEvent): void => {
e.stopPropagation();
e.preventDefault();
@ -199,7 +199,7 @@ export default class PhoneNumbers extends React.Component<IProps, IState> {
});
};
private onContinueClick = (e: React.MouseEvent | React.FormEvent): void => {
private onContinueClick = (e: ButtonEvent | React.FormEvent): void => {
e.stopPropagation();
e.preventDefault();

6
src/components/views/settings/devices/DeviceDetailHeading.tsx
View file

@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React, { FormEvent, useEffect, useState } from "react";
import React, { useEffect, useState } from "react";
import { _t } from "../../../../languageHandler";
import AccessibleButton from "../../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../../elements/AccessibleButton";
import Field from "../../elements/Field";
import LearnMore from "../../elements/LearnMore";
import Spinner from "../../elements/Spinner";
@ -41,7 +41,7 @@ const DeviceNameEditor: React.FC<Props & { stopEditing: () => void }> = ({ devic
const onInputChange = (event: React.ChangeEvent<HTMLInputElement>): void => setDeviceName(event.target.value);
const onSubmit = async (event: FormEvent<HTMLFormElement>): Promise<void> => {
const onSubmit = async (event: ButtonEvent): Promise<void> => {
setIsLoading(true);
setError(null);
event.preventDefault();

8
src/components/views/settings/discovery/EmailAddresses.tsx
View file

@ -25,7 +25,7 @@ import { MatrixClientPeg } from "../../../../MatrixClientPeg";
import Modal from "../../../../Modal";
import AddThreepid, { Binding } from "../../../../AddThreepid";
import ErrorDialog, { extractErrorMessageFromError } from "../../dialogs/ErrorDialog";
import AccessibleButton from "../../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../../elements/AccessibleButton";
/*
TODO: Improve the UX for everything in here.
@ -147,7 +147,7 @@ export class EmailAddress extends React.Component<IEmailAddressProps, IEmailAddr
}
}
private onRevokeClick = (e: React.MouseEvent): void => {
private onRevokeClick = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
this.changeBinding({
@ -157,7 +157,7 @@ export class EmailAddress extends React.Component<IEmailAddressProps, IEmailAddr
});
};
private onShareClick = (e: React.MouseEvent): void => {
private onShareClick = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
this.changeBinding({
@ -167,7 +167,7 @@ export class EmailAddress extends React.Component<IEmailAddressProps, IEmailAddr
});
};
private onContinueClick = async (e: React.MouseEvent): Promise<void> => {
private onContinueClick = async (e: ButtonEvent): Promise<void> => {
e.stopPropagation();
e.preventDefault();

8
src/components/views/settings/discovery/PhoneNumbers.tsx
View file

@ -26,7 +26,7 @@ import Modal from "../../../../Modal";
import AddThreepid, { Binding } from "../../../../AddThreepid";
import ErrorDialog, { extractErrorMessageFromError } from "../../dialogs/ErrorDialog";
import Field from "../../elements/Field";
import AccessibleButton from "../../elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../../elements/AccessibleButton";
/*
TODO: Improve the UX for everything in here.
@ -154,7 +154,7 @@ export class PhoneNumber extends React.Component<IPhoneNumberProps, IPhoneNumber
}
}
private onRevokeClick = (e: React.MouseEvent): void => {
private onRevokeClick = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
this.changeBinding({
@ -164,7 +164,7 @@ export class PhoneNumber extends React.Component<IPhoneNumberProps, IPhoneNumber
});
};
private onShareClick = (e: React.MouseEvent): void => {
private onShareClick = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
this.changeBinding({
@ -180,7 +180,7 @@ export class PhoneNumber extends React.Component<IPhoneNumberProps, IPhoneNumber
});
};
private onContinueClick = async (e: React.MouseEvent | React.FormEvent): Promise<void> => {
private onContinueClick = async (e: ButtonEvent | React.FormEvent): Promise<void> => {
e.stopPropagation();
e.preventDefault();

2
src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
View file

@ -41,7 +41,7 @@ interface IState {
export default class GeneralRoomSettingsTab extends React.Component<IProps, IState> {
public static contextType = MatrixClientContext;
public context: ContextType<typeof MatrixClientContext>;
public context!: ContextType<typeof MatrixClientContext>;
public constructor(props: IProps, context: ContextType<typeof MatrixClientContext>) {
super(props, context);

6
src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
View file

@ -70,7 +70,7 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
};
}
private triggerUploader = async (e: React.MouseEvent): Promise<void> => {
private triggerUploader = async (e: ButtonEvent): Promise<void> => {
e.stopPropagation();
e.preventDefault();
@ -91,7 +91,7 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
});
};
private onClickSaveSound = async (e: React.MouseEvent): Promise<void> => {
private onClickSaveSound = async (e: ButtonEvent): Promise<void> => {
e.stopPropagation();
e.preventDefault();
@ -133,7 +133,7 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
});
}
private clearSound = (e: React.MouseEvent): void => {
private clearSound = (e: ButtonEvent): void => {
e.stopPropagation();
e.preventDefault();
SettingsStore.setValue("notificationSound", this.props.roomId, SettingLevel.ROOM_ACCOUNT, null);

2
src/indexing/EventIndex.ts
View file

@ -193,7 +193,7 @@ export default class EventIndex extends EventEmitter {
private onRoomTimeline = async (
ev: MatrixEvent,
room: Room | undefined,
toStartOfTimeline: boolean,
toStartOfTimeline: boolean | undefined,
removed: boolean,
data: IRoomTimelineData,
): Promise<void> => {

2
src/settings/handlers/AccountSettingsHandler.ts
View file

@ -50,7 +50,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
newClient.on(ClientEvent.AccountData, this.onAccountData);
}
private onAccountData = (event: MatrixEvent, prevEvent: MatrixEvent): void => {
private onAccountData = (event: MatrixEvent, prevEvent?: MatrixEvent): void => {
if (event.getType() === "org.matrix.preview_urls") {
let val = event.getContent()["disable"];
if (typeof val !== "boolean") {

4
src/settings/handlers/RoomAccountSettingsHandler.ts
View file

@ -44,7 +44,7 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
newClient.on(RoomEvent.AccountData, this.onAccountData);
}
private onAccountData = (event: MatrixEvent, room: Room, prevEvent: MatrixEvent): void => {
private onAccountData = (event: MatrixEvent, room: Room, prevEvent?: MatrixEvent): void => {
const roomId = room.roomId;
if (event.getType() === "org.matrix.room.preview_urls") {
@ -58,7 +58,7 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
this.watchers.notifyUpdate("urlPreviewsEnabled", roomId, SettingLevel.ROOM_ACCOUNT, val);
} else if (event.getType() === DEFAULT_SETTINGS_EVENT_TYPE) {
// Figure out what changed and fire those updates
const prevContent = prevEvent ? prevEvent.getContent() : {};
const prevContent = prevEvent?.getContent() ?? {};
const changedSettings = objectKeyChanges<Record<string, any>>(prevContent, event.getContent());
for (const settingName of changedSettings) {
const val = event.getContent()[settingName];

4
src/settings/handlers/RoomSettingsHandler.ts
View file

@ -43,7 +43,7 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
newClient.on(RoomStateEvent.Events, this.onEvent);
}
private onEvent = (event: MatrixEvent, state: RoomState, prevEvent: MatrixEvent): void => {
private onEvent = (event: MatrixEvent, state: RoomState, prevEvent: MatrixEvent | null): void => {
const roomId = event.getRoomId()!;
const room = this.client.getRoom(roomId);
@ -67,7 +67,7 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
this.watchers.notifyUpdate("urlPreviewsEnabled", roomId, SettingLevel.ROOM, val);
} else if (event.getType() === DEFAULT_SETTINGS_EVENT_TYPE) {
// Figure out what changed and fire those updates
const prevContent = prevEvent ? prevEvent.getContent() : {};
const prevContent = prevEvent?.getContent() ?? {};
const changedSettings = objectKeyChanges<Record<string, any>>(prevContent, event.getContent());
for (const settingName of changedSettings) {
this.watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM, event.getContent()[settingName]);

6
src/stores/AutoRageshakeStore.ts
View file

@ -142,7 +142,11 @@ export default class AutoRageshakeStore extends AsyncStoreWithClient<IState> {
}
}
private async onSyncStateChange(_state: SyncState, _prevState: SyncState, data?: ISyncStateData): Promise<void> {
private async onSyncStateChange(
_state: SyncState,
_prevState: SyncState | null,
data?: ISyncStateData,
): Promise<void> {
if (!this.state.initialSyncCompleted) {
await this.updateState({ initialSyncCompleted: !!data?.nextSyncToken });
}

8
src/toasts/IncomingLegacyCallToast.tsx
View file

@ -26,7 +26,7 @@ import { MatrixClientPeg } from "../MatrixClientPeg";
import { _t } from "../languageHandler";
import RoomAvatar from "../components/views/avatars/RoomAvatar";
import AccessibleTooltipButton from "../components/views/elements/AccessibleTooltipButton";
import AccessibleButton from "../components/views/elements/AccessibleButton";
import AccessibleButton, { ButtonEvent } from "../components/views/elements/AccessibleButton";
export const getIncomingLegacyCallToastKey = (callId: string): string => `call_${callId}`;
@ -73,17 +73,17 @@ export default class IncomingLegacyCallToast extends React.Component<IProps, ISt
this.setState({ silenced: LegacyCallHandler.instance.isCallSilenced(this.props.call.callId) });
};
private onAnswerClick = (e: React.MouseEvent): void => {
private onAnswerClick = (e: ButtonEvent): void => {
e.stopPropagation();
LegacyCallHandler.instance.answerCall(this.roomId);
};
private onRejectClick = (e: React.MouseEvent): void => {
private onRejectClick = (e: ButtonEvent): void => {
e.stopPropagation();
LegacyCallHandler.instance.hangupOrReject(this.roomId, true);
};
private onSilenceClick = (e: React.MouseEvent): void => {
private onSilenceClick = (e: ButtonEvent): void => {
e.stopPropagation();
const callId = this.props.call.callId;
this.state.silenced

2
src/utils/connection.ts
View file

@ -22,7 +22,7 @@ import { SyncState } from "matrix-js-sdk/src/sync";
* @param callback The callback to be called on reconnect
*/
export const createReconnectedListener = (callback: () => void): ClientEventHandlerMap[ClientEvent.Sync] => {
return (syncState: SyncState, prevState: SyncState) => {
return (syncState: SyncState, prevState: SyncState | null) => {
if (syncState !== SyncState.Error && prevState !== syncState) {
// Consider the client reconnected if there is no error with syncing.
// This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.

6
test/components/views/rooms/MessageComposer-test.tsx
View file

@ -268,9 +268,11 @@ describe("MessageComposer", () => {
let resizeCallback: Function;
beforeEach(() => {
jest.spyOn(UIStore.instance, "on").mockImplementation((_event: string, listener: Function): any => {
jest.spyOn(UIStore.instance, "on").mockImplementation(
(_event: string | symbol, listener: Function): any => {
resizeCallback = listener;
});
},
);
});
describe("when a non-resize event occurred in UIStore", () => {

2
test/voice-broadcast/stores/VoiceBroadcastPlaybacksStore-test.ts
View file

@ -40,7 +40,7 @@ describe("VoiceBroadcastPlaybacksStore", () => {
let playback1: VoiceBroadcastPlayback;
let playback2: VoiceBroadcastPlayback;
let playbacks: VoiceBroadcastPlaybacksStore;
let onCurrentChanged: (playback: VoiceBroadcastPlayback) => void;
let onCurrentChanged: (playback: VoiceBroadcastPlayback | null) => void;
beforeEach(() => {
client = stubClient();

2
test/voice-broadcast/stores/VoiceBroadcastRecordingsStore-test.ts
View file

@ -35,7 +35,7 @@ describe("VoiceBroadcastRecordingsStore", () => {
let recording: VoiceBroadcastRecording;
let otherRecording: VoiceBroadcastRecording;
let recordings: VoiceBroadcastRecordingsStore;
let onCurrentChanged: (recording: VoiceBroadcastRecording) => void;
let onCurrentChanged: (recording: VoiceBroadcastRecording | null) => void;
beforeEach(() => {
client = stubClient();