wip

pixiebrix · Apr 27, 2024 · 0832c12 · 0832c12
1 parent 0c94e51
commit 0832c12
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/store/sidebar/thunks/removeFormPanel.ts b/src/store/sidebar/thunks/removeFormPanel.ts
@@ -45,7 +45,11 @@ const removeFormPanel = createAsyncThunk<
     return;
   }
 
-  await closeForms([nonce]);
+  // Trigger form close for the mod only if it's not already unavailable,
+  // since forms won't exist on the form controller after the page navigation
+  if (!removedEntry.isUnavailable) {
+    await closeForms([nonce]);
+  }
 
   return {
     removedEntry,

diff --git a/src/types/sidebarTypes.ts b/src/types/sidebarTypes.ts
@@ -114,7 +114,10 @@ type BasePanelEntry = {
 
   /**
    * Determines if the panel cannot be displayed for the current tab. Used
-   * to show an overlay over the panel to indicate it is unavailable.
+   * to show an overlay over the panel to indicate it is unavailable. Added this
+   * field to account for MV3 side panel that persists across page navigation
+   *
+   * @since 1.8.14
    */
   isUnavailable?: boolean;
 };