From 3cb7a6ab7825542a7c74e0817bf5f61ff223a43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Tue, 20 Jul 2021 12:30:41 +0200 Subject: [PATCH] Improve more typing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/UserAddress.ts | 4 ++-- src/components/views/dialogs/AddressPickerDialog.tsx | 2 +- src/components/views/elements/ActionButton.tsx | 2 +- src/components/views/elements/AddressTile.tsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/UserAddress.ts b/src/UserAddress.ts index b1ebf34cf3..248814aa01 100644 --- a/src/UserAddress.ts +++ b/src/UserAddress.ts @@ -18,14 +18,14 @@ const emailRegex = /^\S+@\S+\.\S+$/; const mxUserIdRegex = /^@\S+:\S+$/; const mxRoomIdRegex = /^!\S+:\S+$/; -export const addressTypes = ['mx-user-id', 'mx-room-id', 'email']; - export enum AddressType { Email = "email", MatrixUserId = "mx-user-id", MatrixRoomId = "mx-room-id", } +export const addressTypes = [AddressType.Email, AddressType.MatrixRoomId, AddressType.MatrixUserId]; + // PropType definition for an object describing // an address that can be invited to a room (which // could be a third party identifier or a matrix ID) diff --git a/src/components/views/dialogs/AddressPickerDialog.tsx b/src/components/views/dialogs/AddressPickerDialog.tsx index 1bf5e7da2c..807ce9d7f0 100644 --- a/src/components/views/dialogs/AddressPickerDialog.tsx +++ b/src/components/views/dialogs/AddressPickerDialog.tsx @@ -93,7 +93,7 @@ export default class AddressPickerDialog extends React.Component private queryChangedDebouncer: NodeJS.Timeout; private cancelThreepidLookup: () => void; - static defaultProps = { + static defaultProps: Partial = { value: "", focus: true, validAddressTypes: addressTypes, diff --git a/src/components/views/elements/ActionButton.tsx b/src/components/views/elements/ActionButton.tsx index f776174722..73dc43b815 100644 --- a/src/components/views/elements/ActionButton.tsx +++ b/src/components/views/elements/ActionButton.tsx @@ -38,7 +38,7 @@ interface IState { @replaceableComponent("views.elements.ActionButton") export default class ActionButton extends React.Component { - static defaultProps = { + static defaultProps: Partial = { size: "25", tooltip: false, }; diff --git a/src/components/views/elements/AddressTile.tsx b/src/components/views/elements/AddressTile.tsx index ec3e63c62d..1bd5a5c45c 100644 --- a/src/components/views/elements/AddressTile.tsx +++ b/src/components/views/elements/AddressTile.tsx @@ -33,7 +33,7 @@ interface IProps { @replaceableComponent("views.elements.AddressTile") export default class AddressTile extends React.Component { - static defaultProps = { + static defaultProps: Partial = { canDismiss: false, onDismissed: function() {}, // NOP justified: false,