@babylonjs/inspector 8.39.1-preview → 8.39.2-preview

package/lib/{index-DUdNW7K3.js → index-B1xdfROw.js}

@@ -32,8 +32,8 @@ import { PerfCollectionStrategy } from '@babylonjs/core/Misc/PerformanceViewer/p
 import '@babylonjs/core/Misc/PerformanceViewer/performanceViewerSceneExtension.js';
 import { PressureObserverWrapper } from '@babylonjs/core/Misc/pressureObserverWrapper.js';
 import { AbstractEngine } from '@babylonjs/core/Engines/abstractEngine.js';
-import { createRoot } from 'react-dom/client';
 import { Logger } from '@babylonjs/core/Misc/logger.js';
+import { createRoot } from 'react-dom/client';
 import { FrameGraphUtils } from '@babylonjs/core/FrameGraph/frameGraphUtils.js';
 import { CameraGizmo } from '@babylonjs/core/Gizmos/cameraGizmo.js';
 import { LightGizmo } from '@babylonjs/core/Gizmos/lightGizmo.js';
@@ -2062,11 +2062,13 @@ function MakeShellServiceDefinition({ leftPaneDefaultWidth = 350, leftPaneMinWid
             const onSelectSidePane = new Observable(undefined, true);
             const onDockChanged = new Observable(undefined, true);
             const leftSidePaneContainerState = {
+                isPresent: false,
                 isDocked: true,
                 dock: () => onDockChanged.notifyObservers({ location: "left", dock: true }),
                 undock: () => onDockChanged.notifyObservers({ location: "left", dock: false }),
             };
             const rightSidePaneContainerState = {
+                isPresent: false,
                 isDocked: true,
                 dock: () => onDockChanged.notifyObservers({ location: "right", dock: true }),
                 undock: () => onDockChanged.notifyObservers({ location: "right", dock: false }),
@@ -2174,6 +2176,14 @@ function MakeShellServiceDefinition({ leftPaneDefaultWidth = 350, leftPaneMinWid
                 }, [coercedSidePanes]);
                 const hasLeftPanes = coercedSidePanes.some((entry) => entry.horizontalLocation === "left");
                 const hasRightPanes = coercedSidePanes.some((entry) => entry.horizontalLocation === "right");
+                useEffect(() => {
+                    leftSidePaneContainerState.isPresent = hasLeftPanes;
+                    rightSidePaneContainerState.isPresent = hasRightPanes;
+                    return () => {
+                        leftSidePaneContainerState.isPresent = false;
+                        rightSidePaneContainerState.isPresent = false;
+                    };
+                }, [hasLeftPanes, hasRightPanes]);
                 // If we are in compact toolbar mode, we may need to move toolbar items from the left to the right or vice versa,
                 // depending on whether there are any side panes on that side.
                 const coerceToolBarItemHorizontalLocation = useMemo(() => (item) => {
@@ -2240,8 +2250,12 @@ function MakeShellServiceDefinition({ leftPaneDefaultWidth = 350, leftPaneMinWid
                 },
                 addCentralContent: (entry) => centralContentCollection.add(entry),
                 resetSidePaneLayout: () => localStorage.removeItem("Babylon/Settings/SidePaneDockOverrides"),
-                leftSidePaneContainer: leftSidePaneContainerState,
-                rightSidePaneContainer: rightSidePaneContainerState,
+                get leftSidePaneContainer() {
+                    return leftSidePaneContainerState.isPresent ? leftSidePaneContainerState : null;
+                },
+                get rightSidePaneContainer() {
+                    return rightSidePaneContainerState.isPresent ? rightSidePaneContainerState : null;
+                },
                 onDockChanged,
                 get sidePanes() {
                     return [...sidePaneCollection.items].map((sidePaneDefinition) => {
@@ -3646,7 +3660,7 @@ const DefaultInspectorExtensionFeed = new BuiltInsExtensionFeed("Inspector", [
         keywords: ["export", "gltf", "glb", "babylon", "exporter", "tools"],
         ...BabylonWebResources,
         author: { name: "Alex Chuber", forumUserName: "alexchuber" },
-        getExtensionModuleAsync: async () => await import('./exportService-BqnzQ5KY.js'),
+        getExtensionModuleAsync: async () => await import('./exportService-BtAoouDO.js'),
     },
     {
         name: "Capture Tools",
@@ -3654,7 +3668,7 @@ const DefaultInspectorExtensionFeed = new BuiltInsExtensionFeed("Inspector", [
         keywords: ["capture", "screenshot", "gif", "video", "tools"],
         ...BabylonWebResources,
         author: { name: "Alex Chuber", forumUserName: "alexchuber" },
-        getExtensionModuleAsync: async () => await import('./captureService-BNAvQLVs.js'),
+        getExtensionModuleAsync: async () => await import('./captureService-Drl3-xpS.js'),
     },
     {
         name: "Import Tools",
@@ -3662,7 +3676,7 @@ const DefaultInspectorExtensionFeed = new BuiltInsExtensionFeed("Inspector", [
         keywords: ["import", "tools"],
         ...BabylonWebResources,
         author: { name: "Alex Chuber", forumUserName: "alexchuber" },
-        getExtensionModuleAsync: async () => await import('./importService-Bv9STG4_.js'),
+        getExtensionModuleAsync: async () => await import('./importService-BhIQoWkj.js'),
     },
 ]);
 
@@ -4770,7 +4784,7 @@ function MakeModularTool(options) {
                 });
                 // Register the extension list service (for browsing/installing extensions) if extension feeds are provided.
                 if (extensionFeeds.length > 0) {
-                    const { ExtensionListServiceDefinition } = await import('./extensionsListService-CvofHYEa.js');
+                    const { ExtensionListServiceDefinition } = await import('./extensionsListService-C7fWebOE.js');
                     await serviceContainer.addServiceAsync(ExtensionListServiceDefinition);
                 }
                 // Register the theme selector service (for selecting the theme) if theming is configured.
@@ -4851,11 +4865,15 @@ function MakeModularTool(options) {
     // Create and render the react root component.
     const reactRoot = createRoot(containerElement);
     reactRoot.render(createElement(modularToolRootComponent));
+    let disposed = false;
     return {
         dispose: () => {
             // Unmount and restore the original container element display.
-            reactRoot.unmount();
-            containerElement.style.display = originalContainerElementDisplay;
+            if (!disposed) {
+                disposed = true;
+                reactRoot.unmount();
+                containerElement.style.display = originalContainerElementDisplay;
+            }
         },
     };
 }
@@ -9429,185 +9447,217 @@ const UserFeedbackServiceDefinition = {
 //       If it is called for a different scene that is rendering to the same canvas, then we should probably
 //       switch the inspector instance to that scene (once this is supported).
 const InspectorTokens = new WeakMap();
+// This async lock is used to sequentialize all calls to ShowInspector and dispose of existing inspectors.
+// This is needed because each time Inspector is shown or hidden, it is potentially mutating the same DOM element.
+const InspectorLock = new AsyncLock();
 function ShowInspector(scene, options = {}) {
+    // Dispose of any existing inspector for this scene.
+    InspectorTokens.get(scene)?.dispose();
+    // Default the dispose logic to a no-op until we know that we are actually going
+    // to show the Inspector and there will be cleanup work to do.
+    let disposeAsync = async () => await Promise.resolve();
+    // Create an inspector dispose token. The dispose will use the same async lock to
+    // make sure async dispose (hide) does not actually start until async show is finished.
+    const inspectorToken = {
+        dispose: () => {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            InspectorLock.lockAsync(async () => {
+                await disposeAsync();
+            });
+        },
+    };
+    // Track the inspector token for the scene.
+    InspectorTokens.set(scene, inspectorToken);
+    // Set default options.
     options = {
         autoResizeEngine: true,
         ...options,
     };
-    const inspectorToken = {
-        dispose: () => { },
-    };
-    let parentElement = options.containerElement ?? null;
-    if (!parentElement) {
-        parentElement = scene.getEngine().getRenderingCanvas()?.parentElement ?? null;
-        while (parentElement) {
-            const rootNode = parentElement.getRootNode();
-            // TODO: Right now we never parent the inspector within a ShadowRoot because we need to do more work to get FluentProvider to work correctly in this context.
-            if (!(rootNode instanceof ShadowRoot)) {
-                break;
+    // Sequentialize showing the inspector (e.g. don't start showing until after a previous hide (for example) is finished).
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    InspectorLock.lockAsync(async () => {
+        let parentElement = options.containerElement ?? null;
+        // If a container element was not found, find an appropriate one above the engine's rendering canvas.
+        if (!parentElement) {
+            parentElement = scene.getEngine().getRenderingCanvas()?.parentElement ?? null;
+            while (parentElement) {
+                const rootNode = parentElement.getRootNode();
+                // TODO: Right now we never parent the inspector within a ShadowRoot because we need to do more work to get FluentProvider to work correctly in this context.
+                if (!(rootNode instanceof ShadowRoot)) {
+                    break;
+                }
+                parentElement = rootNode.host.parentElement;
             }
-            parentElement = rootNode.host.parentElement;
         }
-    }
-    if (!parentElement) {
-        return inspectorToken;
-    }
-    const existingToken = InspectorTokens.get(scene);
-    if (existingToken) {
-        existingToken.dispose();
-        InspectorTokens.delete(scene);
-    }
-    InspectorTokens.set(scene, inspectorToken);
-    const disposeActions = [];
-    const canvasContainerDisplay = parentElement.style.display;
-    const canvasContainerChildren = [];
-    canvasContainerChildren.push(...parentElement.childNodes);
-    disposeActions.push(() => {
-        canvasContainerChildren.forEach((child) => parentElement.appendChild(child));
-    });
-    // This service is responsible for injecting the passed in canvas as the "central content" of the shell UI (the main area between the side panes and toolbars).
-    const canvasInjectorServiceDefinition = {
-        friendlyName: "Canvas Injector",
-        consumes: [ShellServiceIdentity],
-        factory: (shellService) => {
-            const useStyles = makeStyles({
-                canvasContainer: {
-                    display: canvasContainerDisplay,
-                    width: "100%",
-                    height: "100%",
-                },
-            });
-            const registration = shellService.addCentralContent({
-                key: "Canvas Injector",
-                component: () => {
-                    const classes = useStyles();
-                    const canvasContainerRef = useRef(null);
-                    useEffect(() => {
-                        if (canvasContainerRef.current) {
-                            for (const child of canvasContainerChildren) {
-                                canvasContainerRef.current.appendChild(child);
-                            }
-                        }
-                    }, []);
-                    return jsx("div", { ref: canvasContainerRef, className: classes.canvasContainer });
-                },
-            });
-            return {
-                dispose: () => {
-                    registration.dispose();
-                },
-            };
-        },
-    };
-    // This service exposes the scene that was passed into Inspector through ISceneContext, which is used by other services that may be used in other contexts outside of Inspector.
-    const sceneContextServiceDefinition = {
-        friendlyName: "Inspector Scene Context",
-        produces: [SceneContextIdentity],
-        factory: () => {
-            return {
-                currentScene: scene,
-                currentSceneObservable: new Observable(),
-            };
-        },
-    };
-    if (options.autoResizeEngine) {
-        const observer = scene.onBeforeRenderObservable.add(() => scene.getEngine().resize());
-        disposeActions.push(() => observer.remove());
-    }
-    const modularTool = MakeModularTool({
-        containerElement: parentElement,
-        serviceDefinitions: [
-            // Injects the canvas the scene is rendering to into the central "content" area of the shell UI.
-            canvasInjectorServiceDefinition,
-            // Provides access to the scene in a generic way (other tools might provide a scene in a different way).
-            sceneContextServiceDefinition,
-            // Helps with managing gizmos and a shared utility layer.
-            GizmoServiceDefinition,
-            // Scene explorer tab and related services.
-            SceneExplorerServiceDefinition,
-            NodeExplorerServiceDefinition,
-            SkeletonExplorerServiceDefinition,
-            MaterialExplorerServiceDefinition,
-            TextureExplorerServiceDefinition,
-            PostProcessExplorerServiceDefinition,
-            RenderingPipelineExplorerServiceDefinition,
-            EffectLayerExplorerServiceDefinition,
-            ParticleSystemExplorerServiceDefinition,
-            SpriteManagerExplorerServiceDefinition,
-            AnimationGroupExplorerServiceDefinition,
-            GuiExplorerServiceDefinition,
-            FrameGraphExplorerServiceDefinition,
-            AtmosphereExplorerServiceDefinition,
-            // Properties pane tab and related services.
-            ScenePropertiesServiceDefinition,
-            PropertiesServiceDefinition,
-            TexturePropertiesServiceDefinition,
-            CommonPropertiesServiceDefinition,
-            TransformPropertiesServiceDefinition,
-            AnimationPropertiesServiceDefinition,
-            NodePropertiesServiceDefinition,
-            PhysicsPropertiesServiceDefinition,
-            SkeletonPropertiesServiceDefinition,
-            MaterialPropertiesServiceDefinition,
-            LightPropertiesServiceDefinition,
-            SpritePropertiesServiceDefinition,
-            ParticleSystemPropertiesServiceDefinition,
-            CameraPropertiesServiceDefinition,
-            PostProcessPropertiesServiceDefinition,
-            RenderingPipelinePropertiesServiceDefinition,
-            EffectLayerPropertiesServiceDefinition,
-            FrameGraphPropertiesServiceDefinition,
-            AnimationGroupPropertiesServiceDefinition,
-            MetadataPropertiesServiceDefinition,
-            AtmospherePropertiesServiceDefinition,
-            // Debug pane tab and related services.
-            DebugServiceDefinition,
-            // Stats pane tab and related services.
-            StatsServiceDefinition,
-            // Tools pane tab and related services.
-            ToolsServiceDefinition,
-            // Settings pane tab and related services.
-            SettingsServiceDefinition,
-            // Tracks entity selection state (e.g. which Mesh or Material or other entity is currently selected in scene explorer and bound to the properties pane, etc.).
-            SelectionServiceDefinition,
-            // Gizmos for manipulating objects in the scene.
-            GizmoToolbarServiceDefinition,
-            // Allows picking objects from the scene to select them.
-            PickingServiceDefinition,
-            // Adds entry points for user feedback on Inspector v2 (probably eventually will be removed).
-            UserFeedbackServiceDefinition,
-            // Adds always present "mini stats" (like fps) to the toolbar, etc.
-            MiniStatsServiceDefinition,
-            // Legacy service to support custom inspectable properties on objects.
-            LegacyInspectableObjectPropertiesServiceDefinition,
-            // Additional services passed in to the Inspector.
-            ...(options.serviceDefinitions ?? []),
-        ],
-        themeMode: options.themeMode,
-        showThemeSelector: options.showThemeSelector,
-        extensionFeeds: [DefaultInspectorExtensionFeed, ...(options.extensionFeeds ?? [])],
-        layoutMode: options.layoutMode,
-        toolbarMode: "compact",
-        sidePaneRemapper: options.sidePaneRemapper,
-    });
-    disposeActions.push(() => modularTool.dispose());
-    let disposed = false;
-    inspectorToken.dispose = () => {
-        if (disposed) {
+        // If we couldn't find a parent element, we can't show the inspector.
+        if (!parentElement) {
+            Logger.Warn("Unable to find a parent element to host the Inspector.");
             return;
         }
-        disposeActions.reverse().forEach((dispose) => dispose());
+        // This will keep track of all the cleanup work we need to do when hiding the inspector.
+        const disposeActions = [];
+        // Update the disposeAsync function to walk the dispose actions in reverse order
+        // and call each one.
+        let disposed = false;
+        disposeAsync = async () => {
+            if (disposed) {
+                return;
+            }
+            disposed = true;
+            for (const disposeAction of disposeActions.reverse()) {
+                const result = disposeAction();
+                if (result) {
+                    // eslint-disable-next-line no-await-in-loop
+                    await result;
+                }
+            }
+        };
+        // If we were responsible for resizing the engine, resize one more after the inspector UI is hidden.
+        disposeActions.push(() => {
+            if (options.autoResizeEngine) {
+                scene.getEngine().resize();
+            }
+        });
+        // Remove all the existing children from the parent element.
+        const canvasContainerDisplay = parentElement.style.display;
+        const canvasContainerChildren = [...parentElement.childNodes];
+        parentElement.replaceChildren();
+        disposeActions.push(async () => {
+            // When the ModularTool token is disposed, it unmounts the react element, which asynchronously
+            // removes all children from the parentElement. We need to wait for that to complete before
+            // re-adding the canvas children back to the parentElement.
+            await new Promise((resolve) => setTimeout(resolve));
+            parentElement.replaceChildren(...canvasContainerChildren);
+        });
+        // This service is responsible for injecting the passed in canvas as the "central content" of the shell UI (the main area between the side panes and toolbars).
+        const canvasInjectorServiceDefinition = {
+            friendlyName: "Canvas Injector",
+            consumes: [ShellServiceIdentity],
+            factory: (shellService) => {
+                const useStyles = makeStyles({
+                    canvasContainer: {
+                        display: canvasContainerDisplay,
+                        width: "100%",
+                        height: "100%",
+                    },
+                });
+                const registration = shellService.addCentralContent({
+                    key: "Canvas Injector",
+                    component: () => {
+                        const classes = useStyles();
+                        const canvasContainerRef = useRef(null);
+                        useEffect(() => {
+                            canvasContainerRef.current?.replaceChildren(...canvasContainerChildren);
+                        }, []);
+                        return jsx("div", { ref: canvasContainerRef, className: classes.canvasContainer });
+                    },
+                });
+                return {
+                    dispose: () => {
+                        registration.dispose();
+                    },
+                };
+            },
+        };
+        // This service exposes the scene that was passed into Inspector through ISceneContext, which is used by other services that may be used in other contexts outside of Inspector.
+        const sceneContextServiceDefinition = {
+            friendlyName: "Inspector Scene Context",
+            produces: [SceneContextIdentity],
+            factory: () => {
+                return {
+                    currentScene: scene,
+                    currentSceneObservable: new Observable(),
+                };
+            },
+        };
         if (options.autoResizeEngine) {
-            scene.getEngine().resize();
-        }
-        disposed = true;
-    };
-    const sceneDisposedObserver = scene.onDisposeObservable.addOnce(() => {
-        inspectorToken.dispose();
-    });
-    disposeActions.push(() => sceneDisposedObserver.remove());
-    disposeActions.push(() => {
-        InspectorTokens.delete(scene);
+            const observer = scene.onBeforeRenderObservable.add(() => scene.getEngine().resize());
+            disposeActions.push(() => observer.remove());
+        }
+        const modularTool = MakeModularTool({
+            containerElement: parentElement,
+            serviceDefinitions: [
+                // Injects the canvas the scene is rendering to into the central "content" area of the shell UI.
+                canvasInjectorServiceDefinition,
+                // Provides access to the scene in a generic way (other tools might provide a scene in a different way).
+                sceneContextServiceDefinition,
+                // Helps with managing gizmos and a shared utility layer.
+                GizmoServiceDefinition,
+                // Scene explorer tab and related services.
+                SceneExplorerServiceDefinition,
+                NodeExplorerServiceDefinition,
+                SkeletonExplorerServiceDefinition,
+                MaterialExplorerServiceDefinition,
+                TextureExplorerServiceDefinition,
+                PostProcessExplorerServiceDefinition,
+                RenderingPipelineExplorerServiceDefinition,
+                EffectLayerExplorerServiceDefinition,
+                ParticleSystemExplorerServiceDefinition,
+                SpriteManagerExplorerServiceDefinition,
+                AnimationGroupExplorerServiceDefinition,
+                GuiExplorerServiceDefinition,
+                FrameGraphExplorerServiceDefinition,
+                AtmosphereExplorerServiceDefinition,
+                // Properties pane tab and related services.
+                ScenePropertiesServiceDefinition,
+                PropertiesServiceDefinition,
+                TexturePropertiesServiceDefinition,
+                CommonPropertiesServiceDefinition,
+                TransformPropertiesServiceDefinition,
+                AnimationPropertiesServiceDefinition,
+                NodePropertiesServiceDefinition,
+                PhysicsPropertiesServiceDefinition,
+                SkeletonPropertiesServiceDefinition,
+                MaterialPropertiesServiceDefinition,
+                LightPropertiesServiceDefinition,
+                SpritePropertiesServiceDefinition,
+                ParticleSystemPropertiesServiceDefinition,
+                CameraPropertiesServiceDefinition,
+                PostProcessPropertiesServiceDefinition,
+                RenderingPipelinePropertiesServiceDefinition,
+                EffectLayerPropertiesServiceDefinition,
+                FrameGraphPropertiesServiceDefinition,
+                AnimationGroupPropertiesServiceDefinition,
+                MetadataPropertiesServiceDefinition,
+                AtmospherePropertiesServiceDefinition,
+                // Debug pane tab and related services.
+                DebugServiceDefinition,
+                // Stats pane tab and related services.
+                StatsServiceDefinition,
+                // Tools pane tab and related services.
+                ToolsServiceDefinition,
+                // Settings pane tab and related services.
+                SettingsServiceDefinition,
+                // Tracks entity selection state (e.g. which Mesh or Material or other entity is currently selected in scene explorer and bound to the properties pane, etc.).
+                SelectionServiceDefinition,
+                // Gizmos for manipulating objects in the scene.
+                GizmoToolbarServiceDefinition,
+                // Allows picking objects from the scene to select them.
+                PickingServiceDefinition,
+                // Adds entry points for user feedback on Inspector v2 (probably eventually will be removed).
+                UserFeedbackServiceDefinition,
+                // Adds always present "mini stats" (like fps) to the toolbar, etc.
+                MiniStatsServiceDefinition,
+                // Legacy service to support custom inspectable properties on objects.
+                LegacyInspectableObjectPropertiesServiceDefinition,
+                // Additional services passed in to the Inspector.
+                ...(options.serviceDefinitions ?? []),
+            ],
+            themeMode: options.themeMode,
+            showThemeSelector: options.showThemeSelector,
+            extensionFeeds: [DefaultInspectorExtensionFeed, ...(options.extensionFeeds ?? [])],
+            layoutMode: options.layoutMode,
+            toolbarMode: "compact",
+            sidePaneRemapper: options.sidePaneRemapper,
+        });
+        disposeActions.push(() => modularTool.dispose());
+        const sceneDisposedObserver = scene.onDisposeObservable.addOnce(() => {
+            inspectorToken.dispose();
+        });
+        disposeActions.push(() => sceneDisposedObserver.remove());
+        disposeActions.push(() => {
+            InspectorTokens.delete(scene);
+        });
     });
     return inspectorToken;
 }
@@ -9944,6 +9994,10 @@ function ConvertOptions(v1Options) {
  * @deprecated This class only exists for backward compatibility. Use the module-level ShowInspector function instead.
  */
 class Inspector {
+    // @ts-expect-error TS6133: This is private, but used by debugLayer (same as Inspector v1).
+    static get _OpenedPane() {
+        return this._SidePaneOpenCounter?.() ?? 0;
+    }
     static MarkLineContainerTitleForHighlighting(title) {
         this.MarkMultipleLineContainerTitlesForHighlighting([title]);
     }
@@ -9960,7 +10014,7 @@ class Inspector {
         this._PopupToggler?.("right");
     }
     static get IsVisible() {
-        return !!this._CurrentInspectorToken;
+        return !!this._CurrentInstance;
     }
     static Show(scene, userOptions) {
         this._Show(scene, userOptions);
@@ -9980,11 +10034,13 @@ class Inspector {
             factory: (shellService) => {
                 this._PopupToggler = (side) => {
                     const sidePaneContainer = side === "left" ? shellService.leftSidePaneContainer : shellService.rightSidePaneContainer;
-                    if (sidePaneContainer.isDocked) {
-                        sidePaneContainer.undock();
-                    }
-                    else {
-                        sidePaneContainer.dock();
+                    if (sidePaneContainer) {
+                        if (sidePaneContainer.isDocked) {
+                            sidePaneContainer.undock();
+                        }
+                        else {
+                            sidePaneContainer.dock();
+                        }
                     }
                 };
                 return {
@@ -10047,20 +10103,52 @@ class Inspector {
             },
         };
         serviceDefinitions.push(sectionHighlighterServiceDefinition);
+        const openedPanesServiceDefinition = {
+            friendlyName: "Opened Panes Service (Backward Compatibility)",
+            consumes: [ShellServiceIdentity],
+            factory: (shellService) => {
+                this._SidePaneOpenCounter = () => (shellService.leftSidePaneContainer ? 1 : 0) + (shellService.rightSidePaneContainer ? 1 : 0);
+                return {
+                    dispose: () => {
+                        this._SidePaneOpenCounter = null;
+                    },
+                };
+            },
+        };
+        serviceDefinitions.push(openedPanesServiceDefinition);
         options = {
             ...options,
             serviceDefinitions: [...(options.serviceDefinitions ?? []), ...serviceDefinitions],
         };
-        this._CurrentInspectorToken = ShowInspector(scene, options);
+        this._CurrentInstance = {
+            scene,
+            options,
+            disposeToken: ShowInspector(scene, options),
+        };
     }
     static Hide() {
-        this._CurrentInspectorToken?.dispose();
-        this._CurrentInspectorToken = null;
+        this._CurrentInstance?.disposeToken.dispose();
+        this._CurrentInstance = null;
+    }
+    // @ts-expect-error TS6133: This is private, but used by debugLayer (same as Inspector v1).
+    static _SetNewScene(scene) {
+        if (this._CurrentInstance && this._CurrentInstance.scene !== scene) {
+            // TODO: For now, just hide and re-show the Inspector.
+            // Need to think more about this when we work on multi-scene support in Inspector v2.
+            const options = this._CurrentInstance.options;
+            this.Hide();
+            this._CurrentInstance = {
+                scene,
+                options,
+                disposeToken: ShowInspector(scene, options),
+            };
+        }
     }
 }
-Inspector._CurrentInspectorToken = null;
+Inspector._CurrentInstance = null;
 Inspector._PopupToggler = null;
 Inspector._SectionHighlighter = null;
+Inspector._SidePaneOpenCounter = null;
 Inspector.OnSelectionChangeObservable = new Observable();
 Inspector.OnPropertyChangedObservable = new Observable();
 
@@ -10320,4 +10408,4 @@ const TextAreaPropertyLine = (props) => {
 };
 
 export { SettingsContextIdentity as $, useAsyncResource as A, ButtonLine as B, Collapse as C, DebugServiceIdentity as D, ExtensibleAccordion as E, FileUploadLine as F, useCompactMode as G, useSidePaneDockOverrides as H, Inspector as I, useAngleConverters as J, MakeTeachingMoment as K, Link as L, MakeLazyComponent as M, NumberDropdownPropertyLine as N, MakeDialogTeachingMoment as O, PropertiesServiceIdentity as P, InterceptFunction as Q, GetPropertyDescriptor as R, SwitchPropertyLine as S, ToolsServiceIdentity as T, IsPropertyReadonly as U, InterceptProperty as V, ObservableCollection as W, ConstructorFactory as X, SceneContextIdentity as Y, SelectionServiceIdentity as Z, SelectionServiceDefinition as _, SyncedSliderPropertyLine as a, ShowInspector as a0, AccordionSection as a1, Accordion as a2, Button as a3, Checkbox as a4, ColorPickerPopup as a5, InputHexField as a6, InputHsvField as a7, ComboBox as a8, DraggableLine as a9, Color4PropertyLine as aA, HexPropertyLine as aB, TextInputPropertyLine as aC, NumberInputPropertyLine as aD, LinkPropertyLine as aE, PropertyLine as aF, LineContainer as aG, PlaceholderPropertyLine as aH, SpinButtonPropertyLine as aI, StringifiedPropertyLine as aJ, TextAreaPropertyLine as aK, TextPropertyLine as aL, RotationVectorPropertyLine as aM, QuaternionPropertyLine as aN, Vector2PropertyLine as aO, Vector3PropertyLine as aP, Vector4PropertyLine as aQ, Dropdown as aa, NumberDropdown as ab, StringDropdown as ac, FactorGradientComponent as ad, Color3GradientComponent as ae, Color4GradientComponent as af, ColorStepGradientComponent as ag, InfoLabel as ah, List as ai, MessageBar as aj, PositionedPopover as ak, SearchBar as al, SearchBox as am, SpinButton as an, Switch as ao, SyncedSliderInput as ap, Textarea as aq, TextInput as ar, ToggleButton as as, FactorGradientList as at, Color3GradientList as au, Color4GradientList as av, Pane as aw, BooleanBadgePropertyLine as ax, CheckboxPropertyLine as ay, Color3PropertyLine as az, ShellServiceIdentity as b, MakePopoverTeachingMoment as c, TeachingMoment as d, SidePaneContainer as e, SceneExplorerServiceIdentity as f, SettingsServiceIdentity as g, StatsServiceIdentity as h, StringDropdownPropertyLine as i, BoundProperty as j, LinkToEntityPropertyLine as k, BuiltInsExtensionFeed as l, useProperty as m, useVector3Property as n, useColor3Property as o, useColor4Property as p, useQuaternionProperty as q, MakePropertyHook as r, useInterceptObservable as s, useEventfulState as t, useExtensionManager as u, useObservableState as v, useObservableCollection as w, useOrderedObservableCollection as x, usePollingObservable as y, useResource as z };
-//# sourceMappingURL=index-DUdNW7K3.js.map
+//# sourceMappingURL=index-B1xdfROw.js.map