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

Rebuild emojis when emojis change and use props.deviceWidth (#3208)

Browse source
This commit is contained in:
Miguel Alatzar 2019-09-01 09:03:28 +09:00 committed by GitHub
parent 6ab325ca9e
commit 02ecaf8de9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/components/emoji_picker/emoji_picker.js
View file

@ -106,14 +106,14 @@ export default class EmojiPicker extends PureComponent {
if (this.props.emojis !== nextProps.emojis) {
this.rebuildEmojis = true;
this.deviceWidth = nextProps.deviceWidth;
this.setRebuiltEmojis();
}
}
setRebuiltEmojis = (searchBarAnimationComplete) => {
setRebuiltEmojis = (searchBarAnimationComplete = true) => {
if (this.rebuildEmojis && searchBarAnimationComplete) {
this.rebuildEmojis = false;
const emojis = this.renderableEmojis(this.props.emojisBySection, this.deviceWidth);
const emojis = this.renderableEmojis(this.props.emojisBySection, this.props.deviceWidth);
this.setState({emojis});
}
}

10
app/components/emoji_picker/emoji_picker.test.js
View file

@ -59,19 +59,17 @@ describe('components/emoji_picker/EmojiPicker', () => {
expect(instance.rebuildEmojis).toBe(true);
});
test('should set rebuildEmojis to true and new deviceWidth when emojis change', () => {
test('should rebuild emojis emojis when emojis change', () => {
const wrapper = shallowWithIntl(<EmojiPicker {...baseProps}/>);
const instance = wrapper.instance();
const renderableEmojis = jest.spyOn(instance, 'renderableEmojis');
expect(instance.rebuildEmojis).toBe(undefined);
expect(instance.deviceWidth).toBe(undefined);
const newDeviceWidth = baseProps.deviceWidth * 2;
const newEmojis = [{}];
wrapper.setProps({deviceWidth: newDeviceWidth, emojis: newEmojis});
wrapper.setProps({emojis: newEmojis});
expect(instance.rebuildEmojis).toBe(true);
expect(instance.deviceWidth).toBe(newDeviceWidth);
expect(renderableEmojis).toHaveBeenCalledWith(baseProps.emojisBySection, baseProps.deviceWidth);
});
test('should set rebuilt emojis when rebuildEmojis is true and searchBarAnimationComplete is true', () => {