Skip to content

[FIX] Slash commands not cleaning is typing and not using state #1233

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

Merged
diegolmello merged 3 commits into from
Sep 25, 2019
Merged

[FIX] Slash commands not cleaning is typing and not using state #1233

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aaa358d
[FIX] Slash commands not cleaning is typing and not using state
diegolmello Sep 25, 2019
9e09754
Fix show preview & commands list
djorkaeffalexandre Sep 25, 2019
0367b2f
Merge branch 'develop' into fix.slash-commands-issues
diegolmello Sep 25, 2019
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
28 changes: 13 additions & 15 deletions app/containers/MessageBox/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ class MessageBox extends Component {
file: {
isVisible: false
},
commandPreview: []
commandPreview: [],
showCommandPreview: false
};
this.showCommandPreview = false;
this.onEmojiSelected = this.onEmojiSelected.bind(this);
this.text = '';
this.fileOptions = [
Expand Down Expand Up @@ -254,7 +254,6 @@ class MessageBox extends Component {
// matches if text either starts with '/' or have (@,#,:) then it groups whatever comes next of mention type
const regexp = /(#|@|:|^\/)([a-z0-9._-]+)$/im;
const result = lastNativeText.substr(0, cursor).match(regexp);
this.showCommandPreview = false;
if (!result) {
const slash = lastNativeText.match(/^\/$/); // matches only '/' in input
if (slash) {
Expand All @@ -266,7 +265,6 @@ class MessageBox extends Component {
this.identifyMentionKeyword(name, lastChar);
} else {
this.stopTrackingMention();
this.showCommandPreview = false;
}
}, 100)

Expand All @@ -289,7 +287,7 @@ class MessageBox extends Component {
: (item.username || item.name || item.command);
const text = `${ result }${ mentionName } ${ msg.slice(cursor) }`;
if ((trackingType === MENTIONS_TRACKING_TYPE_COMMANDS) && item.providesPreview) {
this.showCommandPreview = true;
this.setState({ showCommandPreview: true });
}
this.setInput(text);
this.focus();
Expand All @@ -301,10 +299,10 @@ class MessageBox extends Component {
const { text } = this;
const command = text.substr(0, text.indexOf(' ')).slice(1);
const params = text.substr(text.indexOf(' ') + 1) || 'params';
this.showCommandPreview = false;
this.setState({ commandPreview: [] });
this.setState({ commandPreview: [], showCommandPreview: false });
this.stopTrackingMention();
this.clearInput();
this.handleTyping(false);
try {
RocketChat.executeCommandPreview(command, params, rid, item);
} catch (e) {
Expand Down Expand Up @@ -414,10 +412,9 @@ class MessageBox extends Component {
const { rid } = this.props;
try {
const { preview } = await RocketChat.getCommandPreview(command, rid, params);
this.showCommandPreview = true;
this.setState({ commandPreview: preview.items });
this.setState({ commandPreview: preview.items, showCommandPreview: true });
} catch (e) {
this.showCommandPreview = false;
this.setState({ commandPreview: [], showCommandPreview: true });
log(e);
}
}
Expand Down Expand Up @@ -691,14 +688,15 @@ class MessageBox extends Component {
}

stopTrackingMention = () => {
const { trackingType } = this.state;
if (!trackingType) {
const { trackingType, showCommandPreview } = this.state;
if (!trackingType && !showCommandPreview) {
return;
}
this.setState({
mentions: [],
trackingType: '',
commandPreview: []
commandPreview: [],
showCommandPreview: false
});
}

Expand Down Expand Up @@ -828,8 +826,8 @@ class MessageBox extends Component {
);

renderCommandPreview = () => {
const { commandPreview } = this.state;
if (!this.showCommandPreview) {
const { commandPreview, showCommandPreview } = this.state;
if (!showCommandPreview) {
return null;
}
return (
Expand Down