From 7408cf88fedc302eeaddb01b364e1e6dd1679a95 Mon Sep 17 00:00:00 2001 From: AlexAlexandre Date: Thu, 2 Dec 2021 00:20:03 -0300 Subject: [PATCH] chore: Migrate JoinCode room to ts --- app/containers/TextInput.tsx | 5 ---- .../RoomView/{JoinCode.js => JoinCode.tsx} | 26 +++++++++---------- 2 files changed, 13 insertions(+), 18 deletions(-) rename app/views/RoomView/{JoinCode.js => JoinCode.tsx} (83%) diff --git a/app/containers/TextInput.tsx b/app/containers/TextInput.tsx index 28ae1c2f1..e291d9295 100644 --- a/app/containers/TextInput.tsx +++ b/app/containers/TextInput.tsx @@ -69,11 +69,6 @@ interface IRCTextInputProps extends TextInputProps { } export default class RCTextInput extends React.PureComponent { - static defaultProps = { - error: {}, - theme: 'light' - }; - state = { showPassword: false }; diff --git a/app/views/RoomView/JoinCode.js b/app/views/RoomView/JoinCode.tsx similarity index 83% rename from app/views/RoomView/JoinCode.js rename to app/views/RoomView/JoinCode.tsx index ceccc1ae7..db35957c1 100644 --- a/app/views/RoomView/JoinCode.js +++ b/app/views/RoomView/JoinCode.tsx @@ -1,5 +1,4 @@ import React, { forwardRef, useImperativeHandle, useState } from 'react'; -import PropTypes from 'prop-types'; import { InteractionManager, StyleSheet, Text, View } from 'react-native'; import Modal from 'react-native-modal'; import { connect } from 'react-redux'; @@ -41,10 +40,18 @@ const styles = StyleSheet.create({ } }); +interface IRoomJoinCodeProps { + rid: string; + t: string; + onJoin: Function; + isMasterDetail: boolean; + theme: string; +} + const JoinCode = React.memo( - forwardRef(({ rid, t, onJoin, isMasterDetail, theme }, ref) => { + forwardRef(({ rid, t, onJoin, isMasterDetail, theme }: IRoomJoinCodeProps, ref) => { const [visible, setVisible] = useState(false); - const [error, setError] = useState(false); + const [error, setError] = useState(false); const [code, setCode] = useState(''); const show = () => setVisible(true); @@ -64,7 +71,7 @@ const JoinCode = React.memo( useImperativeHandle(ref, () => ({ show })); return ( - + InteractionManager.runAfterInteractions(() => e?.getNativeRef()?.focus())} + inputRef={(e: any) => InteractionManager.runAfterInteractions(() => e?.getNativeRef()?.focus())} returnKeyType='send' autoCapitalize='none' onChangeText={setCode} @@ -111,15 +118,8 @@ const JoinCode = React.memo( ); }) ); -JoinCode.propTypes = { - rid: PropTypes.string, - t: PropTypes.string, - onJoin: PropTypes.func, - isMasterDetail: PropTypes.bool, - theme: PropTypes.string -}; -const mapStateToProps = state => ({ +const mapStateToProps = (state: any) => ({ isMasterDetail: state.app.isMasterDetail }); export default connect(mapStateToProps, null, null, { forwardRef: true })(JoinCode);