Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Slow messagebox #658

Merged
merged 1 commit into from
Feb 27, 2019
Merged

[FIX] Slow messagebox #658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 33 additions & 19 deletions app/containers/MessageBox/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import './EmojiKeyboard';
import log from '../../utils/log';
import I18n from '../../i18n';
import ReplyPreview from './ReplyPreview';
import debounce from '../../utils/debounce';

const MENTIONS_TRACKING_TYPE_USERS = '@';
const MENTIONS_TRACKING_TYPE_EMOJIS = ':';
Expand Down Expand Up @@ -93,6 +94,7 @@ export default class MessageBox extends Component {
showFilesAction: false,
showSend: false,
recording: false,
trackingType: '',
file: {
isVisible: false
}
Expand Down Expand Up @@ -154,9 +156,16 @@ export default class MessageBox extends Component {
return false;
}

onChangeText(text) {
onChangeText = (text) => {
const isTextEmpty = text.length === 0;
this.setShowSend(!isTextEmpty);
this.handleTyping(!isTextEmpty);
this.debouncedOnChangeText(text);
}

// eslint-disable-next-line react/sort-comp
debouncedOnChangeText = debounce((text) => {
this.setInput(text);
this.handleTyping(text.length > 0);

requestAnimationFrame(() => {
const { start, end } = this.component._lastNativeSelection;
Expand All @@ -170,13 +179,13 @@ export default class MessageBox extends Component {
const [, lastChar, name] = result;
this.identifyMentionKeyword(name, lastChar);
});
}
}, 100);

onKeyboardResigned() {
onKeyboardResigned = () => {
this.closeEmoji();
}

onPressMention(item) {
onPressMention = (item) => {
const { trackingType } = this.state;
const msg = this.text;
const { start, end } = this.component._lastNativeSelection;
Expand All @@ -192,7 +201,7 @@ export default class MessageBox extends Component {
requestAnimationFrame(() => this.stopTrackingMention());
}

onEmojiSelected(keyboardId, params) {
onEmojiSelected = (keyboardId, params) => {
const { text } = this;
const { emoji } = params;
let newText = '';
Expand All @@ -207,6 +216,7 @@ export default class MessageBox extends Component {
newText = `${ text }${ emoji }`;
}
this.setInput(newText);
this.showSend(true);
}

get leftButtons() {
Expand Down Expand Up @@ -271,7 +281,7 @@ export default class MessageBox extends Component {
icons.push(
<BorderlessButton
key='send-message'
onPress={() => this.submit()}
onPress={this.submit}
style={styles.actionButton}
testID='messagebox-send-message'
accessibilityLabel={I18n.t('Send message')}
Expand Down Expand Up @@ -317,7 +327,7 @@ export default class MessageBox extends Component {
}
}

getFixedMentions(keyword) {
getFixedMentions = (keyword) => {
if ('all'.indexOf(keyword) !== -1) {
this.users = [{ _id: -1, username: 'all' }, ...this.users];
}
Expand All @@ -326,7 +336,7 @@ export default class MessageBox extends Component {
}
}

async getUsers(keyword) {
getUsers = async(keyword) => {
this.users = database.objects('users');
if (keyword) {
this.users = this.users.filtered('username CONTAINS[c] $0', keyword);
Expand Down Expand Up @@ -371,7 +381,7 @@ export default class MessageBox extends Component {
}
}

async getRooms(keyword = '') {
getRooms = async(keyword = '') => {
this.roomsCache = this.roomsCache || [];
this.rooms = database.objects('subscriptions')
.filtered('t != $0', 'd');
Expand Down Expand Up @@ -413,7 +423,7 @@ export default class MessageBox extends Component {
}
}

getEmojis(keyword) {
getEmojis = (keyword) => {
if (keyword) {
this.customEmojis = database.objects('customEmojis').filtered('name CONTAINS[c] $0', keyword).slice(0, 4);
this.emojis = emojis.filter(emoji => emoji.indexOf(keyword) !== -1).slice(0, 4);
Expand Down Expand Up @@ -446,11 +456,15 @@ export default class MessageBox extends Component {
setInput = (text) => {
this.text = text;
this.component.setNativeProps({ text });
this.setState({ showSend: text.length > 0 });
}

setShowSend = (showSend) => {
this.setState({ showSend });
}

clearInput = () => {
this.setInput('');
this.setShowSend(false);
}

toggleFilesActions = () => {
Expand Down Expand Up @@ -543,7 +557,6 @@ export default class MessageBox extends Component {
} = this.props;
const message = this.text;

this.clearInput();
this.closeEmoji();
this.stopTrackingMention();
this.handleTyping(false);
Expand Down Expand Up @@ -577,6 +590,7 @@ export default class MessageBox extends Component {
// if is submiting a new message
onSubmit(message);
}
this.clearInput();
}

updateMentions = (keyword, type) => {
Expand All @@ -589,15 +603,15 @@ export default class MessageBox extends Component {
}
}

identifyMentionKeyword(keyword, type) {
identifyMentionKeyword = (keyword, type) => {
this.setState({
showEmojiKeyboard: false,
trackingType: type
});
this.updateMentions(keyword, type);
}

stopTrackingMention() {
stopTrackingMention = () => {
const { trackingType } = this.state;
if (!trackingType) {
return;
Expand Down Expand Up @@ -725,7 +739,7 @@ export default class MessageBox extends Component {
);
}

renderContent() {
renderContent = () => {
const { recording } = this.state;
const { editing } = this.props;

Expand All @@ -749,7 +763,7 @@ export default class MessageBox extends Component {
keyboardType='twitter'
blurOnSubmit={false}
placeholder={I18n.t('New_Message')}
onChangeText={t => this.onChangeText(t)}
onChangeText={this.onChangeText}
underlineColorAndroid='transparent'
defaultValue=''
multiline
Expand All @@ -769,10 +783,10 @@ export default class MessageBox extends Component {
[
<KeyboardAccessoryView
key='input'
renderContent={() => this.renderContent()}
renderContent={this.renderContent}
kbInputRef={this.component}
kbComponent={showEmojiKeyboard ? 'EmojiKeyboard' : null}
onKeyboardResigned={() => this.onKeyboardResigned()}
onKeyboardResigned={this.onKeyboardResigned}
onItemSelected={this.onEmojiSelected}
trackInteractive
// revealKeyboardInteractive
Expand Down