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

Ensure setNavigatorStyles is called with Channel componentId (#3515)

Browse source
This commit is contained in:
Miguel Alatzar 2019-11-03 12:04:05 -07:00 committed by GitHub
parent b2f14a27f1
commit 0ab53505af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/screens/channel/channel_base.js
View file

@ -108,6 +108,8 @@ export default class ChannelBase extends PureComponent {
componentWillReceiveProps(nextProps) {
if (this.props.theme !== nextProps.theme) {
setNavigatorStyles(this.props.componentId, nextProps.theme);
EphemeralStore.allNavigationComponentIds.forEach((componentId) => {
setNavigatorStyles(componentId, nextProps.theme);
});

6
app/screens/channel/channel_base.test.js
View file

@ -14,6 +14,7 @@ import ChannelBase from './channel_base';
jest.mock('react-intl');
describe('ChannelBase', () => {
const channelBaseComponentId = 'component-0';
const componentIds = ['component-1', 'component-2', 'component-3'];
const baseProps = {
actions: {
@ -24,7 +25,7 @@ describe('ChannelBase', () => {
recordLoadTime: jest.fn(),
getChannelStats: jest.fn(),
},
componentId: componentIds[0],
componentId: channelBaseComponentId,
theme: Preferences.THEMES.default,
};
const optionsForTheme = (theme) => {
@ -61,7 +62,7 @@ describe('ChannelBase', () => {
const themeOptions = optionsForTheme(Preferences.THEMES.default);
expect(mergeNavigationOptions.mock.calls).toEqual([
[componentIds[0], themeOptions],
[baseProps.componentId, themeOptions],
]);
mergeNavigationOptions.mockClear();
@ -69,6 +70,7 @@ describe('ChannelBase', () => {
const newThemeOptions = optionsForTheme(Preferences.THEMES.mattermostDark);
expect(mergeNavigationOptions.mock.calls).toEqual([
[baseProps.componentId, newThemeOptions],
[componentIds[2], newThemeOptions],
[componentIds[1], newThemeOptions],
[componentIds[0], newThemeOptions],