cleanup

packages/apps/web-viewer-test/src/components/home/ViewerHome.tsx

@@ -26,7 +26,7 @@ import {
 } from "@itwin/tree-widget-react";
 import type { ViewerBackstageItem } from "@itwin/web-viewer-react";
 import {
-  BackstageItemsProvider,
+  // BackstageItemsProvider,
   Viewer,
   ViewerContentToolsProvider,
   ViewerNavigationToolsProvider,
@@ -150,7 +150,7 @@ const ViewerHome: React.FC = () => {
         enablePerformanceMonitors={true}
         onIModelAppInit={onIModelAppInit}
         uiProviders={[
-          new BackstageItemsProvider(backstageItems, "BackstageItemsProvider1"),
+          // new BackstageItemsProvider(backstageItems, "BackstageItemsProvider1"),
           new ViewerNavigationToolsProvider(),
           new ViewerContentToolsProvider({
             vertical: {

packages/modules/viewer-react/src/components/app-ui/providers/DefaultContentGroupProvider.tsx

@@ -12,6 +12,8 @@ import {
   UiFramework,
 } from "@itwin/appui-react";
 import { ScreenViewport } from "@itwin/core-frontend";
+import { ViewportComponent } from "@itwin/imodel-components-react";
+import { viewWithUnifiedSelection } from "@itwin/presentation-components";
 import React from "react";
 
 import { getAndSetViewState } from "../../../services/iModel";
@@ -20,10 +22,8 @@ import type {
   ViewerViewCreator3dOptions,
   ViewerViewportControlOptions,
 } from "../../../types";
-import {
-  UnifiedSelectionViewport,
-  UnifiedSelectionViewportControl,
-} from "./UnifiedSelectionViewportControl";
+
+const UnifiedSelectionViewport = viewWithUnifiedSelection(ViewportComponent);
 
 /**
  * Provide a default content group to the default frontstage
@@ -67,13 +67,6 @@ export class DefaultContentGroupProvider extends ContentGroupProvider {
         {
           id: "iTwinViewer.UnifiedSelectionViewport",
           classId: "",
-          // content: <UnifiedSelectionViewportControl  />,
-          // classId: UnifiedSelectionViewportControl,
-          // applicationData: {
-          //   ...this._viewportOptions,
-          //   viewState,
-          //   iModelConnection,
-          // },
           content: (
             <UnifiedSelectionViewport
               viewState={viewState}

packages/modules/viewer-react/src/components/app-ui/providers/index.ts

@@ -4,8 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 export * from "./DefaultContentGroupProvider";
-export * from "./BackstageItemsProvider";
 export * from "./ViewerContentToolsProvider";
 export * from "./ViewerNavigationToolsProvider";
 export * from "./ViewerStatusbarItemsProvider";
-export * from "./UnifiedSelectionViewportControl";

packages/modules/viewer-react/src/components/iModel/IModelLoader.tsx

@@ -28,7 +28,6 @@ import {
 } from "../../services/iModel";
 import { ViewerPerformance } from "../../services/telemetry";
 import type { ModelLoaderProps } from "../../types";
-import { BackstageItemsProvider } from "../app-ui/providers";
 import { IModelViewer } from "./IModelViewer";
 
 const IModelLoader = React.memo((viewerProps: ModelLoaderProps) => {
@@ -46,14 +45,6 @@ const IModelLoader = React.memo((viewerProps: ModelLoaderProps) => {
   } = viewerProps;
   const { error, connection } = useConnection(viewerProps);
 
-  // const providers = useMemo<UiItemsProvider[]>(() => {
-  //   const providers = [...(uiProviders || [])];
-  //   if (backstageItems?.length) {
-  //     providers.push(new BackstageItemsProvider(backstageItems));
-  //   }
-  //   return providers;
-  // }, [uiProviders, backstageItems]);
-
   useUiProviders(uiProviders);
   useUnifiedSelectionSync({
     iModelConnection: connection,