remove reload_on_navigation modal panel option

voxel51 · Oct 31, 2024 · dc01277 · dc01277
1 parent 5eac141
commit dc01277
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 31 deletions.
diff --git a/app/packages/operators/src/Panel/register.tsx b/app/packages/operators/src/Panel/register.tsx
@@ -23,7 +23,6 @@ export default function registerPanel(ctx: ExecutionContext) {
     panelOptions: {
       allowDuplicates: ctx.params.allow_duplicates,
       helpMarkdown: ctx.params.help_markdown,
-      reloadOnNavigation: ctx.params.reload_on_navigation,
       surfaces: ctx.params.surfaces,
     },
   });

diff --git a/app/packages/plugins/src/index.ts b/app/packages/plugins/src/index.ts
@@ -325,12 +325,6 @@ type PanelOptions = {
    * Content displayed on the right side of the label in the panel title bar.
    */
   TabIndicator?: React.ComponentType;
-
-  /**
-   * If true, the plugin will be remounted when the user navigates to a different sample or group.
-   * This is only applicable to plugins that are in a modal.
-   */
-  reloadOnNavigation?: boolean;
 };
 
 type PluginComponentProps<T> = T & {

diff --git a/app/packages/spaces/src/components/Panel.tsx b/app/packages/spaces/src/components/Panel.tsx
@@ -1,7 +1,7 @@
 import { CenteredStack, scrollable } from "@fiftyone/components";
 import * as fos from "@fiftyone/state";
 import React, { useEffect } from "react";
-import { useRecoilValue, useSetRecoilState } from "recoil";
+import { useSetRecoilState } from "recoil";
 import { PANEL_LOADING_TIMEOUT } from "../constants";
 import { PanelContext } from "../contexts";
 import { useReactivePanel } from "../hooks";
@@ -20,8 +20,6 @@ function Panel(props: PanelProps) {
   const setPanelIdToScope = useSetRecoilState(panelIdToScopeAtom);
   const scope = isModalPanel ? "modal" : "grid";
 
-  const thisModalUniqueId = useRecoilValue(fos.currentModalUniqueId);
-
   useEffect(() => {
     setPanelIdToScope((ids) => ({ ...ids, [node.id]: scope }));
   }, [scope, setPanelIdToScope, node.id]);
@@ -42,9 +40,7 @@ function Panel(props: PanelProps) {
     );
   }
 
-  const { component: Component, panelOptions } = panel;
-
-  const shouldKeyComponent = isModalPanel && panelOptions?.reloadOnNavigation;
+  const { component: Component } = panel;
 
   return (
     <StyledPanel
@@ -55,11 +51,7 @@ function Panel(props: PanelProps) {
       ref={dimensions.ref}
     >
       <PanelContext.Provider value={{ node, scope }}>
-        <Component
-          key={shouldKeyComponent ? thisModalUniqueId : panelName}
-          panelNode={node}
-          dimensions={dimensions}
-        />
+        <Component panelNode={node} dimensions={dimensions} />
       </PanelContext.Provider>
     </StyledPanel>
   );

diff --git a/fiftyone/operators/operations.py b/fiftyone/operators/operations.py
@@ -305,7 +305,6 @@ def register_panel(
         light_icon=None,
         dark_icon=None,
         surfaces="grid",
-        reload_on_navigation=False,
         on_load=None,
         on_unload=None,
         on_change=None,
@@ -333,10 +332,7 @@ def register_panel(
                 is in dark mode
             surfaces ('grid'): surfaces in which to show the panel. Must be
                 one of 'grid', 'modal', or 'grid modal'
-            reload_on_navigation (False): whether to reload the panel when the
-                user navigates to a new page. This is only applicable to panels
-                that are not shown in a modal
-            on_load (None): an operator to invoke when the panel is loaded
+           on_load (None): an operator to invoke when the panel is loaded
             on_unload (None): an operator to invoke when the panel is unloaded
             on_change (None): an operator to invoke when the panel state
                 changes
@@ -367,7 +363,6 @@ def register_panel(
             "light_icon": light_icon,
             "dark_icon": dark_icon,
             "surfaces": surfaces,
-            "reload_on_navigation": reload_on_navigation,
             "on_load": on_load,
             "on_unload": on_unload,
             "on_change": on_change,

diff --git a/fiftyone/operators/panel.py b/fiftyone/operators/panel.py
@@ -28,9 +28,6 @@ class PanelConfig(OperatorConfig):
             in dark mode
         allow_multiple (False): whether to allow multiple instances of the
             panel to be opened
-        reload_on_navigation (False): whether to reload the panel when the
-            user navigates to a new page. This is only applicable to panels
-            that are not shown in a modal
         surfaces ("grid"): the surfaces on which the panel can be displayed
         help_markdown (None): a markdown string to display in the panel's help
             tooltip
@@ -46,7 +43,6 @@ def __init__(
         dark_icon=None,
         allow_multiple=False,
         surfaces: PANEL_SURFACE = "grid",
-        reload_on_navigation=False,
         **kwargs
     ):
         super().__init__(name)
@@ -59,7 +55,6 @@ def __init__(
         self.allow_multiple = allow_multiple
         self.unlisted = True
         self.on_startup = True
-        self.reload_on_navigation = reload_on_navigation
         self.surfaces = surfaces
         self.kwargs = kwargs  # unused, placeholder for future extensibility
 
@@ -74,7 +69,6 @@ def to_json(self):
             "allow_multiple": self.allow_multiple,
             "on_startup": self.on_startup,
             "unlisted": self.unlisted,
-            "reload_on_navigation": self.reload_on_navigation,
             "surfaces": self.surfaces,
         }
 
@@ -114,7 +108,6 @@ def on_startup(self, ctx):
             "dark_icon": self.config.dark_icon,
             "light_icon": self.config.light_icon,
             "surfaces": self.config.surfaces,
-            "reload_on_navigation": self.config.reload_on_navigation,
         }
         methods = ["on_load", "on_unload", "on_change"]
         ctx_change_events = [