toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

MM-12952 Avoid iOS autocorrect from overriding autocomplete values (#2335)

Browse source 
* Avoid iOS autocorrect from overriding autocomplete values

* Fix double ~ for channel mentions in Android
This commit is contained in:
Elias Nahum 2018-11-13 19:46:31 -03:00 committed by GitHub
parent 70b7487c6f
commit 0079d7e27a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/components/autocomplete/channel_mention/channel_mention.js
View file

@ -3,7 +3,7 @@
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import {SectionList} from 'react-native';
import {Platform, SectionList} from 'react-native';
import {RequestStatus} from 'mattermost-redux/constants';
import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers';
@ -158,6 +158,10 @@ export default class ChannelMention extends PureComponent {
if (isSearch) {
const channelOrIn = mentionPart.includes('in:') ? 'in:' : 'channel:';
completedDraft = mentionPart.replace(CHANNEL_MENTION_SEARCH_REGEX, `${channelOrIn} ${mention} `);
} else if (Platform.OS === 'ios') {
// We are going to set a double ~ on iOS to prevent the auto correct from taking over and replacing it
// with the wrong value, this is a hack but I could not found another way to solve it
completedDraft = mentionPart.replace(CHANNEL_MENTION_REGEX, `~~${mention} `);
} else {
completedDraft = mentionPart.replace(CHANNEL_MENTION_REGEX, `~${mention} `);
}
@ -167,6 +171,14 @@ export default class ChannelMention extends PureComponent {
}
onChangeText(completedDraft, true);
if (Platform.OS === 'ios') {
// This is the second part of the hack were we replace the double ~ with just one
// after the auto correct vanished
setTimeout(() => {
onChangeText(completedDraft.replace(`~~${mention} `, `~${mention} `));
});
}
this.setState({mentionComplete: true});
};

18
app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
View file

@ -5,6 +5,7 @@ import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {
FlatList,
Platform,
Text,
TouchableOpacity,
View,
@ -133,13 +134,28 @@ export default class EmojiSuggestion extends Component {
actions.addReactionToLatestPost(emoji, rootId);
onChangeText('');
} else {
let completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, `:${emoji}: `);
// We are going to set a double : on iOS to prevent the auto correct from taking over and replacing it
// with the wrong value, this is a hack but I could not found another way to solve it
let completedDraft;
if (Platform.OS === 'ios') {
completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, `::${emoji}: `);
} else {
completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, `:${emoji}: `);
}
if (value.length > cursorPosition) {
completedDraft += value.substring(cursorPosition);
}
onChangeText(completedDraft);
if (Platform.OS === 'ios') {
// This is the second part of the hack were we replace the double : with just one
// after the auto correct vanished
setTimeout(() => {
onChangeText(completedDraft.replace(`::${emoji}: `, `:${emoji}: `));
});
}
}
this.setState({

16
app/components/autocomplete/slash_suggestion/slash_suggestion.js
View file

@ -5,6 +5,7 @@ import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {
FlatList,
Platform,
} from 'react-native';
import {RequestStatus} from 'mattermost-redux/constants';
@ -112,10 +113,23 @@ export default class SlashSuggestion extends Component {
completeSuggestion = (command) => {
const {onChangeText} = this.props;
const completedDraft = `/${command} `;
// We are going to set a double / on iOS to prevent the auto correct from taking over and replacing it
// with the wrong value, this is a hack but I could not found another way to solve it
let completedDraft = `/${command} `;
if (Platform.OS === 'ios') {
completedDraft = `//${command} `;
}
onChangeText(completedDraft);
if (Platform.OS === 'ios') {
// This is the second part of the hack were we replace the double / with just one
// after the auto correct vanished
setTimeout(() => {
onChangeText(completedDraft.replace(`//${command} `, `/${command} `));
});
}
this.setState({
active: false,
suggestionComplete: true,