mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
[MM-56478] Only clear the suggestion pretext when the suggestion is completed and not when the list is cleared (#26151)
* [MM-56478] Only clear the suggestion pretext when the suggestion is completed and not when the list is cleared * Also clear pretext when unfocusing the box
This commit is contained in:
parent
c723bf345a
commit
cf11adff98
@ -259,6 +259,7 @@ export default class SuggestionBox extends React.PureComponent {
|
|||||||
handleEmitClearSuggestions = (delay = 0) => {
|
handleEmitClearSuggestions = (delay = 0) => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.clear();
|
this.clear();
|
||||||
|
this.handlePretextChanged('');
|
||||||
}, delay);
|
}, delay);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -465,6 +466,7 @@ export default class SuggestionBox extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.clear();
|
this.clear();
|
||||||
|
this.handlePretextChanged('');
|
||||||
|
|
||||||
if (openCommandInModal) {
|
if (openCommandInModal) {
|
||||||
const appProvider = this.props.providers.find((p) => p.openAppsModalFromCommand);
|
const appProvider = this.props.providers.find((p) => p.openAppsModalFromCommand);
|
||||||
@ -556,7 +558,6 @@ export default class SuggestionBox extends React.PureComponent {
|
|||||||
selection: '',
|
selection: '',
|
||||||
suggestionBoxAlgn: undefined,
|
suggestionBoxAlgn: undefined,
|
||||||
});
|
});
|
||||||
this.handlePretextChanged('');
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -293,4 +293,12 @@ describe('components/SuggestionBox', () => {
|
|||||||
instance.componentDidMount();
|
instance.componentDidMount();
|
||||||
expect(instance.handlePretextChanged).toHaveBeenCalledTimes(1);
|
expect(instance.handlePretextChanged).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('should not clear pretext when clearing the suggestion list', () => {
|
||||||
|
const wrapper = shallow(<SuggestionBox {...baseProps}/>);
|
||||||
|
const instance = wrapper.instance();
|
||||||
|
instance.handlePretextChanged = jest.fn();
|
||||||
|
instance.clear();
|
||||||
|
expect(instance.handlePretextChanged).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user