[MM-61201] Call reactAppInitialized() when app is done loading for Desktop App (#28897)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
131064596d
Коммит
39b6bc563e
@@ -33,6 +33,7 @@ import webSocketClient from 'client/web_websocket_client';
|
|||||||
import {initializePlugins} from 'plugins';
|
import {initializePlugins} from 'plugins';
|
||||||
import A11yController from 'utils/a11y_controller';
|
import A11yController from 'utils/a11y_controller';
|
||||||
import {PageLoadContext} from 'utils/constants';
|
import {PageLoadContext} from 'utils/constants';
|
||||||
|
import DesktopApp from 'utils/desktop_api';
|
||||||
import {EmojiIndicesByAlias} from 'utils/emoji';
|
import {EmojiIndicesByAlias} from 'utils/emoji';
|
||||||
import {TEAM_NAME_PATH_PATTERN} from 'utils/path';
|
import {TEAM_NAME_PATH_PATTERN} from 'utils/path';
|
||||||
import {getSiteURL} from 'utils/url';
|
import {getSiteURL} from 'utils/url';
|
||||||
@@ -280,6 +281,7 @@ export default class Root extends React.PureComponent<Props, State> {
|
|||||||
|
|
||||||
if (prevState.shouldMountAppRoutes === false && this.state.shouldMountAppRoutes === true) {
|
if (prevState.shouldMountAppRoutes === false && this.state.shouldMountAppRoutes === true) {
|
||||||
if (!doesRouteBelongToTeamControllerRoutes(this.props.location.pathname)) {
|
if (!doesRouteBelongToTeamControllerRoutes(this.props.location.pathname)) {
|
||||||
|
DesktopApp.reactAppInitialized();
|
||||||
InitialLoadingScreen.stop();
|
InitialLoadingScreen.stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import useTelemetryIdentitySync from 'components/common/hooks/useTelemetryIdenti
|
|||||||
import InitialLoadingScreen from 'components/initial_loading_screen';
|
import InitialLoadingScreen from 'components/initial_loading_screen';
|
||||||
|
|
||||||
import Constants from 'utils/constants';
|
import Constants from 'utils/constants';
|
||||||
|
import DesktopApp from 'utils/desktop_api';
|
||||||
import {cmdOrCtrlPressed, isKeyPressed} from 'utils/keyboard';
|
import {cmdOrCtrlPressed, isKeyPressed} from 'utils/keyboard';
|
||||||
import {TEAM_NAME_PATH_PATTERN} from 'utils/path';
|
import {TEAM_NAME_PATH_PATTERN} from 'utils/path';
|
||||||
import {isIosSafari} from 'utils/user_agent';
|
import {isIosSafari} from 'utils/user_agent';
|
||||||
@@ -55,6 +56,7 @@ function TeamController(props: Props) {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
InitialLoadingScreen.stop();
|
InitialLoadingScreen.stop();
|
||||||
|
DesktopApp.reactAppInitialized();
|
||||||
async function fetchAllChannels() {
|
async function fetchAllChannels() {
|
||||||
await props.fetchAllMyTeamsChannels();
|
await props.fetchAllMyTeamsChannels();
|
||||||
|
|
||||||
|
|||||||
@@ -217,8 +217,9 @@ export class DesktopAppAPI {
|
|||||||
updateUnreadsAndMentions = (isUnread: boolean, mentionCount: number) =>
|
updateUnreadsAndMentions = (isUnread: boolean, mentionCount: number) =>
|
||||||
window.desktopAPI?.setUnreadsAndMentions && window.desktopAPI.setUnreadsAndMentions(isUnread, mentionCount);
|
window.desktopAPI?.setUnreadsAndMentions && window.desktopAPI.setUnreadsAndMentions(isUnread, mentionCount);
|
||||||
setSessionExpired = (expired: boolean) => window.desktopAPI?.setSessionExpired && window.desktopAPI.setSessionExpired(expired);
|
setSessionExpired = (expired: boolean) => window.desktopAPI?.setSessionExpired && window.desktopAPI.setSessionExpired(expired);
|
||||||
signalLogin = () => window.desktopAPI?.onLogin && window.desktopAPI?.onLogin();
|
signalLogin = () => window.desktopAPI?.onLogin?.();
|
||||||
signalLogout = () => window.desktopAPI?.onLogout && window.desktopAPI?.onLogout();
|
signalLogout = () => window.desktopAPI?.onLogout?.();
|
||||||
|
reactAppInitialized = () => window.desktopAPI?.reactAppInitialized?.();
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
* Helper functions for legacy code
|
* Helper functions for legacy code
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user