jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use window reload

Browse Source 
Summary: Let's keep it simple, do not reload. Just show/hide the right content.

Reviewed By: antonk52

Differential Revision: D49377316

fbshipit-source-id: 9b2a47374da3e72f17e2d55c9290960b703fd43e
This commit is contained in:
Lorenzo Blasa
2023-09-18 12:03:09 -07:00
committed by Facebook GitHub Bot
parent 2fd8003fd8
commit f1c88a464b
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
desktop/flipper-ui-browser/src/index.tsx
View File

@@ -19,7 +19,6 @@ if (loadingContainer) {
let cachedFile: {name: string; data: string} | undefined; let cachedFile: {name: string; data: string} | undefined;
let cachedDeepLinkURL: string | undefined; let cachedDeepLinkURL: string | undefined;
let once: boolean = false;
async function start() { async function start() {
// @ts-ignore // @ts-ignore
electronRequire = function (path: string) { electronRequire = function (path: string) {
@@ -76,10 +75,6 @@ async function start() {
window.flipperShowMessage?.('Connecting to server...'); window.flipperShowMessage?.('Connecting to server...');
break; break;
case FlipperServerState.CONNECTED: case FlipperServerState.CONNECTED:
if (once) {
return window.location.reload();
}
once = true;
window.flipperHideMessage?.(); window.flipperHideMessage?.();
break; break;
case FlipperServerState.DISCONNECTED: case FlipperServerState.DISCONNECTED:

21
desktop/static/index.web.dev.html
View File

@@ -143,12 +143,17 @@
window.location.reload(); window.location.reload();
}); });
function showNoConnection(reload) { function toggleUI(main) {
const root = document.getElementById('root'); const root = document.getElementById('root');
root.remove();
const troubleshoot = document.getElementById('troubleshoot'); const troubleshoot = document.getElementById('troubleshoot');
troubleshoot.style.display = 'flex';
if (main) {
root.style.display = 'block';
troubleshoot.style.display = 'none';
} else {
root.style.display = 'none';
troubleshoot.style.display = 'flex';
}
} }
const params = new URL(location.href).searchParams; const params = new URL(location.href).searchParams;
@@ -208,8 +213,14 @@
box.textContent = text; box.textContent = text;
} }
} }
window.flipperShowMessage = showMessage; window.flipperShowMessage = showMessage;
window.flipperShowNoConnection = showNoConnection; window.flipperShowNoConnection = () => {
toggleUI(false);
};
window.flipperHideMessage = () => {
toggleUI(true);
}
// load correct theme (n.b. this doesn't handle system value specifically, will assume light in such cases) // load correct theme (n.b. this doesn't handle system value specifically, will assume light in such cases)
try { try {

19
desktop/static/index.web.html
View File

@@ -153,12 +153,17 @@
window.location.reload(); window.location.reload();
}); });
function showNoConnection() { function toggleUI(main) {
const root = document.getElementById('root'); const root = document.getElementById('root');
root.remove();
const troubleshoot = document.getElementById('troubleshoot'); const troubleshoot = document.getElementById('troubleshoot');
troubleshoot.style.display = 'flex';
if (main) {
root.style.display = 'block';
troubleshoot.style.display = 'none';
} else {
root.style.display = 'none';
troubleshoot.style.display = 'flex';
}
} }
function showMessage(text) { function showMessage(text) {
@@ -178,10 +183,14 @@
} }
} }
window.flipperShowMessage = showMessage; window.flipperShowMessage = showMessage;
window.flipperShowNoConnection = showNoConnection; window.flipperShowNoConnection = () => {
toggleUI(false);
};
window.flipperHideMessage = () => { window.flipperHideMessage = () => {
const box = document.querySelector('.__infinity-dev-box-error'); const box = document.querySelector('.__infinity-dev-box-error');
box.setAttribute('hidden', true); box.setAttribute('hidden', true);
toggleUI(true);
} }
const closeButton = document.createElement('button'); const closeButton = document.createElement('button');