Compare commits

...

6 Commits

Author SHA1 Message Date
Gerzon Z d6e9c48fd4 remove: `isAndroidTablet` 2022-04-07 17:40:48 -04:00
Gerzon Z d9ac30fae0
Merge branch 'develop' into update.enable-multiline-android-tablets 2022-04-07 15:57:09 -04:00
Gerzon Z c369baf63f Merge branch 'develop' into update.enable-multiline-android-tablets 2022-04-04 17:11:05 -04:00
Gerzon Z ac61087940
Merge branch 'develop' into update.enable-multiline-android-tablets 2022-03-28 11:28:26 -04:00
Gerzon Z bb49aa0a06 update: `MessageBox` 2022-03-28 11:26:51 -04:00
Gerzon Z 7418eb7c05 update: `MessageBox` for Android tablets 2022-03-25 12:29:35 -04:00
1 changed files with 1 additions and 11 deletions

View File

@ -9,7 +9,7 @@ import { Q } from '@nozbe/watermelondb';
import { TouchableWithoutFeedback } from 'react-native-gesture-handler'; import { TouchableWithoutFeedback } from 'react-native-gesture-handler';
import { generateTriggerId } from '../../lib/methods/actions'; import { generateTriggerId } from '../../lib/methods/actions';
import TextInput, { IThemedTextInput } from '../../presentation/TextInput'; import TextInput from '../../presentation/TextInput';
import { userTyping as userTypingAction } from '../../actions/room'; import { userTyping as userTypingAction } from '../../actions/room';
import RocketChat from '../../lib/rocketchat'; import RocketChat from '../../lib/rocketchat';
import styles from './styles'; import styles from './styles';
@ -1037,15 +1037,6 @@ class MessageBox extends Component<IMessageBoxProps, IMessageBoxState> {
tmid tmid
} = this.props; } = this.props;
const isAndroidTablet: Partial<IThemedTextInput> =
isTablet && isAndroid
? {
multiline: false,
onSubmitEditing: this.submit,
returnKeyType: 'send'
}
: {};
const recordAudio = const recordAudio =
showSend || !Message_AudioRecorderEnabled ? null : ( showSend || !Message_AudioRecorderEnabled ? null : (
<RecordAudio <RecordAudio
@ -1100,7 +1091,6 @@ class MessageBox extends Component<IMessageBoxProps, IMessageBoxState> {
multiline multiline
testID={`messagebox-input${tmid ? '-thread' : ''}`} testID={`messagebox-input${tmid ? '-thread' : ''}`}
theme={theme} theme={theme}
{...isAndroidTablet}
/> />
<RightButtons <RightButtons
theme={theme} theme={theme}