Merge "ui: Fix omnibox state restoration bug" into main

Author: stevegolton

ui/src/core/omnibox_manager.ts

@@ -21,7 +21,6 @@ export enum OmniboxMode {
   Query,
   Command,
   Prompt,
-  StatusMessage,
 }
 
 interface Prompt {
@@ -101,17 +100,12 @@ export class OmniboxManagerImpl implements OmniboxManager {
   showStatusMessage(msg: string, durationMs = 2000) {
     this._statusMessage = msg;
     const generation = ++this._statusMessageGeneration;
-    const prevMode = this._mode;
-    this._mode = OmniboxMode.StatusMessage;
     raf.scheduleFullRedraw();
     if (durationMs === 0) return; // Don't auto-reset
     setTimeout(() => {
       if (this._statusMessageGeneration !== generation) return;
       raf.scheduleFullRedraw();
       this._statusMessage = '';
-      if (this._mode === OmniboxMode.StatusMessage) {
-        this._mode = prevMode;
-      }
     }, durationMs);
   }
 
@@ -160,6 +154,7 @@ export class OmniboxManagerImpl implements OmniboxManager {
   reset(focus = true): void {
     this.setMode(defaultMode, focus);
     this._omniboxSelectionIndex = 0;
+    this._statusMessage = '';
     raf.scheduleFullRedraw();
   }
 

ui/src/frontend/ui_main.ts

@@ -399,13 +399,15 @@ export class UiMainPerTrace implements m.ClassComponent {
   }
 
   private renderOmnibox(): m.Children {
-    const omniboxMode = AppImpl.instance.omnibox.mode;
-    if (omniboxMode === OmniboxMode.StatusMessage) {
+    const omnibox = AppImpl.instance.omnibox;
+    const omniboxMode = omnibox.mode;
+    const statusMessage = omnibox.statusMessage;
+    if (statusMessage !== '') {
       return m(
         `.omnibox.message-mode`,
         m(`input[readonly][disabled][ref=omnibox]`, {
           value: '',
-          placeholder: AppImpl.instance.omnibox.statusMessage,
+          placeholder: statusMessage,
         }),
       );
     } else if (omniboxMode === OmniboxMode.Command) {