Browse Source

Backport PR #11065: Remove status bar item flickering (#11066)

Co-authored-by: Frédéric Collonval <fcollonval@gmail.com>
MeeseeksMachine 3 years ago
parent
commit
6117678f61

+ 2 - 3
packages/docmanager-extension/src/index.ts

@@ -286,7 +286,7 @@ export const savingStatusPlugin: JupyterFrontEndPlugin<void> = {
     statusBar.registerStatusItem(savingStatusPlugin.id, {
       item: saving,
       align: 'middle',
-      isActive: () => true,
+      isActive: () => saving.model !== null && saving.model.status !== null,
       activeStateChanged: saving.model!.stateChanged
     });
   }
@@ -321,8 +321,7 @@ export const pathStatusPlugin: JupyterFrontEndPlugin<void> = {
     statusBar.registerStatusItem(pathStatusPlugin.id, {
       item: path,
       align: 'right',
-      rank: 0,
-      isActive: () => true
+      rank: 0
     });
   }
 };

+ 1 - 1
packages/logconsole-extension/src/index.tsx

@@ -246,7 +246,7 @@ function activateLogConsole(
     statusBar.registerStatusItem('@jupyterlab/logconsole-extension:status', {
       item: status,
       align: 'left',
-      isActive: () => true,
+      isActive: () => status.model?.version > 0,
       activeStateChanged: status.model!.stateChanged
     });
   }

+ 1 - 2
packages/logconsole-extension/src/status.tsx

@@ -102,10 +102,9 @@ export class LogConsoleStatus extends VDomRenderer<LogConsoleStatus.Model> {
    */
   render() {
     if (this.model === null || this.model.version === 0) {
-      this.hide();
       return null;
     }
-    this.show();
+
     const {
       flashEnabled,
       messages,

+ 0 - 1
packages/statusbar-extension/src/index.ts

@@ -373,7 +373,6 @@ const modeSwitch: JupyterFrontEndPlugin<void> = {
       {
         item: modeSwitch,
         align: 'left',
-        isActive: () => true,
         rank: -1
       }
     );