search: remove event loop when clearing results + pass thru which men…

…u is open (#953) * search: remove event loop when clearing results + pass thru which menu is open * do not open search panel if closing results set and panel is closed already
internetarchive · Feb 16, 2022 · c76b617 · c76b617
1 parent 8ef6116
commit c76b617
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/BookNavigator/book-navigator.js b/src/BookNavigator/book-navigator.js
@@ -185,13 +185,19 @@ export class BookNavigator extends LitElement {
             /* refresh br instance reference */
             this.bookreader = brInstance;
           }
+
+          this.updateMenuContents();
+
+          if (searchUpdates.openMenu === false) {
+            return;
+          }
+
           if (this.isWideEnoughToOpenMenu && !searchUpdates?.searchCanceled) {
             /* open side search menu */
             setTimeout(() => {
               this.updateSideMenu('search', 'open');
             }, 0);
           }
-          this.updateMenuContents();
         },
       });
     }

diff --git a/src/BookNavigator/search/search-provider.js b/src/BookNavigator/search/search-provider.js
@@ -144,8 +144,8 @@ export default class SearchProvider {
       queryInProgress: false,
       errorMessage: '',
     };
-    this.updateMenu();
-    this.bookreader?.searchView?.clearSearchFieldAndResults();
+    this.updateMenu({ openMenu: false });
+    this.bookreader?.searchView?.clearSearchFieldAndResults(false);
   }
 
   /**

diff --git a/src/ia-bookreader/ia-bookreader.js b/src/ia-bookreader/ia-bookreader.js
@@ -40,6 +40,7 @@ export class IaBookReader extends LitElement {
     this.loaded = false;
     this.menuShortcuts = [];
     this.menuContents = [];
+    this.openMenuName = '';
   }
 
   updated() {
@@ -98,10 +99,11 @@ export class IaBookReader extends LitElement {
       return;
     }
 
+    this.openMenuName = menuId;
+
     if (action === 'open') {
       this.itemNav?.openShortcut(menuId);
     } else if (action === 'toggle') {
-      this.itemNav?.openMenu(menuId);
       this.itemNav?.toggleMenu();
     }
   }
@@ -119,6 +121,7 @@ export class IaBookReader extends LitElement {
           ?signedIn=${this.signedIn}
           .menuShortcuts=${this.menuShortcuts}
           .menuContents=${this.menuContents}
+          .openMenu=${this.openMenuName}
         >
           <div slot="header">
             <slot name="header"></slot>