@itwin/appui-react 4.0.0-dev.1 → 4.0.0-dev.10

package/lib/esm/appui-react/content/ContentViewManager.js

@@ -5,197 +5,88 @@
 /** @packageDocumentation
  * @module ContentView
  */
-import { UiEvent } from "@itwin/appui-abstract";
-import { FrontstageManager } from "../frontstage/FrontstageManager";
-import { ViewUtilities } from "../utils/ViewUtilities";
-import { ContentLayoutManager } from "./ContentLayoutManager";
-import { IModelApp } from "@itwin/core-frontend";
-import { Logger } from "@itwin/core-bentley";
-import { UiFramework } from "../UiFramework";
-/** Mouse Down Changed Event class.
- * @public
- */
-export class MouseDownChangedEvent extends UiEvent {
-}
-/** Active Content Changed Event class.
- * @public
- */
-export class ActiveContentChangedEvent extends UiEvent {
-}
+import { InternalContentViewManager as internal } from "./InternalContentViewManager";
 /** Content View Manager class.
  * @public
+ * @deprecated in 3.7. Use `UiFramework.content` property
  */
 export class ContentViewManager {
+    static get onMouseDownChangedEvent() { return internal.onMouseDownChangedEvent; }
     /** Determines if the mouse is down in a content view */
     static get isMouseDown() {
-        return this._mouseDown;
+        return internal.isMouseDown;
     }
     /** Sets the mouse down status for a content view */
     static setMouseDown(mouseDown) {
-        this._mouseDown = mouseDown;
-        this.onMouseDownChangedEvent.emit({ mouseDown });
+        return internal.setMouseDown(mouseDown);
     }
+    /** Gets the [[ActiveContentChangedEvent]] */
+    static get onActiveContentChangedEvent() { return internal.onActiveContentChangedEvent; }
+    /** Fires when floating contents are added or removed */
+    static get onAvailableContentChangedEvent() { return internal.onAvailableContentChangedEvent; }
     /** Gets the active content as a React.ReactNode. */
     static getActiveContent() {
-        return this._activeContent;
-    }
-    static getControlFromElement(content, activeContentGroup, floatingControls, logIfNotFound = false) {
-        if (floatingControls === null || floatingControls === void 0 ? void 0 : floatingControls.length) {
-            // if we find a React node that matches exactly, return its containing control
-            let control = floatingControls.find((contentControl) => contentControl.reactNode === content);
-            if (control)
-                return control;
-            // if we don't find a React node that matches exactly, rely on the id specified by the creator
-            let controlId;
-            if (content && content.key) {
-                const key = content.key;
-                // key has format `${contentProps.id}::${this.groupId}` which is stored as unique id
-                controlId = key.split("::", 1)[0];
-            }
-            floatingControls.forEach((contentControl) => {
-                const node = contentControl.reactNode;
-                const key = node.key;
-                const nodeId = key && key.split("::", 1)[0];
-                if (nodeId === controlId)
-                    control = contentControl;
-            });
-            if (control)
-                return control;
-        }
-        // if it's not a floating control, look through the content area views
-        // istanbul ignore else
-        if (activeContentGroup) {
-            const activeContentControl = activeContentGroup.getControlFromElement(content);
-            if (activeContentControl)
-                return activeContentControl;
-        }
-        if (logIfNotFound)
-            Logger.logError(UiFramework.loggerCategory(this), `getControlFromElement: no control found for element`);
-        return undefined;
+        return internal.getActive();
     }
     /** Return the active ContentControl. */
     static getActiveContentControl() {
-        let activeContentControl;
-        const activeFrontstageDef = FrontstageManager.activeFrontstageDef;
-        // istanbul ignore else
-        if (this._activeContent && activeFrontstageDef) {
-            const activeContentGroup = activeFrontstageDef.contentGroup;
-            activeContentControl = this.getControlFromElement(this._activeContent, activeContentGroup, activeFrontstageDef.floatingContentControls);
-        }
-        return activeContentControl;
+        return internal.getActiveContentControl();
     }
     static addFloatingContentControl(contentControl) {
-        const activeFrontstageDef = FrontstageManager.activeFrontstageDef;
-        // istanbul ignore else
-        if (activeFrontstageDef && contentControl) {
-            activeFrontstageDef.addFloatingContentControl(contentControl);
-        }
+        return internal.addFloatingContentControl(contentControl);
     }
     static dropFloatingContentControl(contentControl) {
-        const activeFrontstageDef = FrontstageManager.activeFrontstageDef;
-        // istanbul ignore else
-        if (activeFrontstageDef && contentControl)
-            activeFrontstageDef.dropFloatingContentControl(contentControl);
+        return internal.dropFloatingContentControl(contentControl);
     }
     /** Sets the active [[ContentControl]] */
     static setActiveContent(activeContent, forceEventProcessing = false) {
-        // istanbul ignore else
-        if (this._activeContent !== activeContent || forceEventProcessing) {
-            const oldContent = this._activeContent;
-            this._activeContent = activeContent;
-            const activeFrontstageDef = FrontstageManager.activeFrontstageDef;
-            // istanbul ignore else
-            if (activeFrontstageDef) {
-                const activeContentGroup = activeFrontstageDef.contentGroup;
-                // istanbul ignore else
-                const oldContentControl = this.getControlFromElement(oldContent, activeContentGroup, activeFrontstageDef.floatingContentControls);
-                const activeContentControl = this.getControlFromElement(activeContent, activeContentGroup, activeFrontstageDef.floatingContentControls, true);
-                // Only call setActiveView if going to or coming from a non-viewport ContentControl
-                // istanbul ignore else
-                if (activeContentControl) {
-                    // istanbul ignore next
-                    const doSetActiveView = forceEventProcessing || (!activeContentControl.viewport ||
-                        ( /* istanbul ignore next */oldContentControl && /* istanbul ignore next */ !oldContentControl.viewport));
-                    // istanbul ignore else
-                    if (doSetActiveView) {
-                        activeFrontstageDef.setActiveView(activeContentControl, oldContentControl);
-                        this.onActiveContentChangedEvent.emit({ activeContent, oldContent });
-                    }
-                    else {
-                        if (activeContentControl.viewport && activeContentControl.viewport !== IModelApp.viewManager.selectedView) {
-                            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                            IModelApp.viewManager.setSelectedView(activeContentControl.viewport);
-                        }
-                    }
-                }
-            }
-        }
+        return internal.setActive(activeContent, forceEventProcessing);
     }
     /** Refreshes the active [[ContentControl]] */
     static refreshActiveContent(activeContent) {
-        ContentLayoutManager.refreshActiveLayout();
-        this.setActiveContent(activeContent, true);
+        return internal.refreshActive(activeContent);
     }
     /**
      * Determines if content displays a Sheet view.
      * @param content ContentControl to check
      */
     static isContentSheetView(content) {
-        if (!content || !content.viewport)
-            return false;
-        return (ViewUtilities.isSheetView(content.viewport));
+        return internal.isContentSheetView(content);
     }
     /**
      * Determines if content displays a Drawing view.
      * @param content ContentControl to check
      */
     static isContentDrawingView(content) {
-        if (!content || !content.viewport)
-            return false;
-        return (ViewUtilities.isDrawingView(content.viewport));
+        return internal.isContentDrawingView(content);
     }
     /**
      * Determines if content displays a Spatial view.
      * @param content ContentControl to check
      */
     static isContentSpatialView(content) {
-        if (!content || !content.viewport)
-            return false;
-        return (ViewUtilities.isSpatialView(content.viewport));
+        return internal.isContentSpatialView(content);
     }
     /**
      * Determines if content displays a Orthographic view.
      * @param content ContentControl to check
      */
     static isContentOrthographicView(content) {
-        if (!content || !content.viewport)
-            return false;
-        return (ViewUtilities.isOrthographicView(content.viewport));
+        return internal.isContentOrthographicView(content);
     }
     /**
      * Determines if content displays a 3d view.
      * @param content ContentControl to check
      */
     static isContent3dView(content) {
-        if (!content || !content.viewport)
-            return false;
-        return (ViewUtilities.is3dView(content.viewport));
+        return internal.isContent3dView(content);
     }
     /**
      * Determines if viewport supports use of a camera.
      * @param content ContentControl to check
      */
     static contentSupportsCamera(content) {
-        if (!content || !content.viewport)
-            return false;
-        return (ViewUtilities.viewSupportsCamera(content.viewport));
+        return internal.contentSupportsCamera(content);
     }
 }
-ContentViewManager._mouseDown = false;
-/** Gets the [[MouseDownChangedEvent]] */
-ContentViewManager.onMouseDownChangedEvent = new MouseDownChangedEvent();
-/** Gets the [[ActiveContentChangedEvent]] */
-ContentViewManager.onActiveContentChangedEvent = new ActiveContentChangedEvent();
-/** Fires when floating contents are added or removed */
-ContentViewManager.onAvailableContentChangedEvent = new UiEvent();
 //# sourceMappingURL=ContentViewManager.js.map

package/lib/esm/appui-react/content/ContentViewManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContentViewManager.js","sourceRoot":"","sources":["../../../../src/appui-react/content/ContentViewManager.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F;;GAEG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAU7C;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,OAAkC;CAAI;AAYjF;;GAEG;AACH,MAAM,OAAO,yBAA0B,SAAQ,OAAsC;CAAI;AAEzF;;GAEG;AACH,MAAM,OAAO,kBAAkB;IAO7B,wDAAwD;IACjD,MAAM,KAAK,WAAW;QAC3B,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,oDAAoD;IAC7C,MAAM,CAAC,YAAY,CAAC,SAAkB;QAC3C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IACnD,CAAC;IASD,oDAAoD;IAC7C,MAAM,CAAC,gBAAgB;QAC5B,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAAC,OAAwB,EAAE,kBAA4C,EAAE,gBAA8C,EAAE,aAAa,GAAG,KAAK;QAChL,IAAI,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,MAAM,EAAE;YAC5B,8EAA8E;YAC9E,IAAI,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC;YAC9F,IAAI,OAAO;gBACT,OAAO,OAAO,CAAC;YAEjB,8FAA8F;YAC9F,IAAI,SAAiB,CAAC;YACtB,IAAI,OAAO,IAAK,OAAmC,CAAC,GAAG,EAAE;gBACvD,MAAM,GAAG,GAAK,OAAmC,CAAC,GAAc,CAAC;gBACjE,oFAAoF;gBACpF,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACnC;YACD,gBAAgB,CAAC,OAAO,CAAE,CAAC,cAA8B,EAAE,EAAE;gBAC3D,MAAM,IAAI,GAAG,cAAc,CAAC,SAAS,CAAC;gBACtC,MAAM,GAAG,GAAK,IAAgC,CAAC,GAAc,CAAC;gBAC9D,MAAM,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5C,IAAI,MAAM,KAAK,SAAS;oBACtB,OAAO,GAAG,cAAc,CAAC;YAC7B,CAAC,CAAC,CAAC;YACH,IAAI,OAAO;gBACT,OAAO,OAAO,CAAC;SAClB;QAED,sEAAsE;QACtE,uBAAuB;QACvB,IAAI,kBAAkB,EAAE;YACtB,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YAC/E,IAAI,oBAAoB;gBACtB,OAAO,oBAAoB,CAAC;SAC/B;QAED,IAAI,aAAa;YACf,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,qDAAqD,CAAC,CAAC;QAE3G,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,wCAAwC;IACjC,MAAM,CAAC,uBAAuB;QACnC,IAAI,oBAAgD,CAAC;QACrD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC;QAElE,uBAAuB;QACvB,IAAI,IAAI,CAAC,cAAc,IAAI,mBAAmB,EAAE;YAC9C,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,YAAY,CAAC;YAC5D,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;SACzI;QAED,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAEM,MAAM,CAAC,yBAAyB,CAAC,cAA+B;QACrE,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC;QAClE,uBAAuB;QACvB,IAAI,mBAAmB,IAAI,cAAc,EAAE;YACzC,mBAAmB,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;SAC/D;IACH,CAAC;IAEM,MAAM,CAAC,0BAA0B,CAAC,cAA+B;QACtE,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC;QAClE,uBAAuB;QACvB,IAAI,mBAAmB,IAAI,cAAc;YACvC,mBAAmB,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC;IACnE,CAAC;IAED,yCAAyC;IAClC,MAAM,CAAC,gBAAgB,CAAC,aAA+B,EAAE,oBAAoB,GAAG,KAAK;QAC1F,uBAAuB;QACvB,IAAI,IAAI,CAAC,cAAc,KAAK,aAAa,IAAI,oBAAoB,EAAE;YACjE,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC;YACvC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;YAEpC,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC;YAElE,uBAAuB;YACvB,IAAI,mBAAmB,EAAE;gBACvB,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,YAAY,CAAC;gBAE5D,uBAAuB;gBACvB,MAAM,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;gBAClI,MAAM,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;gBAE9I,mFAAmF;gBACnF,uBAAuB;gBACvB,IAAI,oBAAoB,EAAE;oBACxB,uBAAuB;oBACvB,MAAM,eAAe,GACnB,oBAAoB,IAAI,CAAC,CAAC,oBAAoB,CAAC,QAAQ;wBACrD,EAAC,0BAA2B,iBAAiB,IAAI,0BAA0B,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAE9G,uBAAuB;oBACvB,IAAI,eAAe,EAAE;wBACnB,mBAAmB,CAAC,aAAa,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;wBAC3E,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;qBACtE;yBAAM;wBACL,IAAI,oBAAoB,CAAC,QAAQ,IAAI,oBAAoB,CAAC,QAAQ,KAAK,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE;4BACzG,mEAAmE;4BACnE,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;yBACtE;qBACF;iBACF;aACF;SACF;IACH,CAAC;IAED,8CAA8C;IACvC,MAAM,CAAC,oBAAoB,CAAC,aAA8B;QAC/D,oBAAoB,CAAC,mBAAmB,EAAE,CAAC;QAC3C,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,kBAAkB,CAAC,OAAmC;QAClE,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,OAAO,KAAK,CAAC;QACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,oBAAoB,CAAC,OAAmC;QACpE,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,OAAO,KAAK,CAAC;QACf,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,oBAAoB,CAAC,OAAmC;QACpE,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,OAAO,KAAK,CAAC;QACf,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,yBAAyB,CAAC,OAAmC;QACzE,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,OAAO,KAAK,CAAC;QACf,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,eAAe,CAAC,OAAmC;QAC/D,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,OAAO,KAAK,CAAC;QACf,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpD,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,qBAAqB,CAAC,OAAmC;QACrE,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,OAAO,KAAK,CAAC;QACf,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9D,CAAC;;AAzMc,6BAAU,GAAY,KAAK,CAAC;AAG3C,yCAAyC;AAClB,0CAAuB,GAAG,IAAI,qBAAqB,EAAE,CAAC;AAa7E,6CAA6C;AACtB,8CAA2B,GAAG,IAAI,yBAAyB,EAAE,CAAC;AAErF,wDAAwD;AAEjC,iDAA8B,GAAG,IAAI,OAAO,EAAyB,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module ContentView\r\n */\r\n\r\nimport * as React from \"react\";\r\nimport { UiEvent } from \"@itwin/appui-abstract\";\r\nimport { FrontstageManager } from \"../frontstage/FrontstageManager\";\r\nimport { ViewUtilities } from \"../utils/ViewUtilities\";\r\nimport { ContentControl } from \"./ContentControl\";\r\nimport { ContentLayoutManager } from \"./ContentLayoutManager\";\r\nimport { IModelApp } from \"@itwin/core-frontend\";\r\nimport { ContentGroup } from \"./ContentGroup\";\r\nimport { Logger } from \"@itwin/core-bentley\";\r\nimport { UiFramework } from \"../UiFramework\";\r\n\r\n/** [[MouseDownChangedEvent]] Args interface.\r\n * @public\r\n */\r\nexport interface MouseDownChangedEventArgs {\r\n  /** Indicates whether the mouse is down */\r\n  mouseDown: boolean;\r\n}\r\n\r\n/** Mouse Down Changed Event class.\r\n * @public\r\n */\r\nexport class MouseDownChangedEvent extends UiEvent<MouseDownChangedEventArgs> { }\r\n\r\n/** [[ActiveContentChangedEvent]] Args interface.\r\n * @public\r\n */\r\nexport interface ActiveContentChangedEventArgs {\r\n  /** React node of the old content */\r\n  oldContent?: React.ReactNode;\r\n  /** React node of the newly active content */\r\n  activeContent?: React.ReactNode;\r\n}\r\n\r\n/** Active Content Changed Event class.\r\n * @public\r\n */\r\nexport class ActiveContentChangedEvent extends UiEvent<ActiveContentChangedEventArgs> { }\r\n\r\n/** Content View Manager class.\r\n * @public\r\n */\r\nexport class ContentViewManager {\r\n  private static _mouseDown: boolean = false;\r\n  private static _activeContent?: React.ReactNode;\r\n\r\n  /** Gets the [[MouseDownChangedEvent]] */\r\n  public static readonly onMouseDownChangedEvent = new MouseDownChangedEvent();\r\n\r\n  /** Determines if the mouse is down in a content view */\r\n  public static get isMouseDown(): boolean {\r\n    return this._mouseDown;\r\n  }\r\n\r\n  /** Sets the mouse down status for a content view */\r\n  public static setMouseDown(mouseDown: boolean): void {\r\n    this._mouseDown = mouseDown;\r\n    this.onMouseDownChangedEvent.emit({ mouseDown });\r\n  }\r\n\r\n  /** Gets the [[ActiveContentChangedEvent]] */\r\n  public static readonly onActiveContentChangedEvent = new ActiveContentChangedEvent();\r\n\r\n  /** Fires when floating contents are added or removed */\r\n\r\n  public static readonly onAvailableContentChangedEvent = new UiEvent<{ contentId: string }>();\r\n\r\n  /** Gets the active content as a React.ReactNode. */\r\n  public static getActiveContent(): React.ReactNode | undefined {\r\n    return this._activeContent;\r\n  }\r\n\r\n  private static getControlFromElement(content: React.ReactNode, activeContentGroup: ContentGroup | undefined, floatingControls: ContentControl[] | undefined, logIfNotFound = false) {\r\n    if (floatingControls?.length) {\r\n      // if we find a React node that matches exactly, return its containing control\r\n      let control = floatingControls.find((contentControl) => contentControl.reactNode === content);\r\n      if (control)\r\n        return control;\r\n\r\n      // if we don't find a React node that matches exactly, rely on the id specified by the creator\r\n      let controlId: string;\r\n      if (content && (content as React.ReactElement<any>).key) {\r\n        const key = ((content as React.ReactElement<any>).key as string);\r\n        // key has format `${contentProps.id}::${this.groupId}` which is stored as unique id\r\n        controlId = key.split(\"::\", 1)[0];\r\n      }\r\n      floatingControls.forEach ((contentControl: ContentControl) => {\r\n        const node = contentControl.reactNode;\r\n        const key = ((node as React.ReactElement<any>).key as string);\r\n        const nodeId = key && key.split(\"::\", 1)[0];\r\n        if (nodeId === controlId)\r\n          control = contentControl;\r\n      });\r\n      if (control)\r\n        return control;\r\n    }\r\n\r\n    // if it's not a floating control, look through the content area views\r\n    // istanbul ignore else\r\n    if (activeContentGroup) {\r\n      const activeContentControl = activeContentGroup.getControlFromElement(content);\r\n      if (activeContentControl)\r\n        return activeContentControl;\r\n    }\r\n\r\n    if (logIfNotFound)\r\n      Logger.logError(UiFramework.loggerCategory(this), `getControlFromElement: no control found for element`);\r\n\r\n    return undefined;\r\n  }\r\n\r\n  /** Return the active ContentControl. */\r\n  public static getActiveContentControl(): ContentControl | undefined {\r\n    let activeContentControl: ContentControl | undefined;\r\n    const activeFrontstageDef = FrontstageManager.activeFrontstageDef;\r\n\r\n    // istanbul ignore else\r\n    if (this._activeContent && activeFrontstageDef) {\r\n      const activeContentGroup = activeFrontstageDef.contentGroup;\r\n      activeContentControl = this.getControlFromElement(this._activeContent, activeContentGroup, activeFrontstageDef.floatingContentControls);\r\n    }\r\n\r\n    return activeContentControl;\r\n  }\r\n\r\n  public static addFloatingContentControl(contentControl?: ContentControl) {\r\n    const activeFrontstageDef = FrontstageManager.activeFrontstageDef;\r\n    // istanbul ignore else\r\n    if (activeFrontstageDef && contentControl) {\r\n      activeFrontstageDef.addFloatingContentControl(contentControl);\r\n    }\r\n  }\r\n\r\n  public static dropFloatingContentControl(contentControl?: ContentControl) {\r\n    const activeFrontstageDef = FrontstageManager.activeFrontstageDef;\r\n    // istanbul ignore else\r\n    if (activeFrontstageDef && contentControl)\r\n      activeFrontstageDef.dropFloatingContentControl(contentControl);\r\n  }\r\n\r\n  /** Sets the active [[ContentControl]] */\r\n  public static setActiveContent(activeContent?: React.ReactNode, forceEventProcessing = false): void {\r\n    // istanbul ignore else\r\n    if (this._activeContent !== activeContent || forceEventProcessing) {\r\n      const oldContent = this._activeContent;\r\n      this._activeContent = activeContent;\r\n\r\n      const activeFrontstageDef = FrontstageManager.activeFrontstageDef;\r\n\r\n      // istanbul ignore else\r\n      if (activeFrontstageDef) {\r\n        const activeContentGroup = activeFrontstageDef.contentGroup;\r\n\r\n        // istanbul ignore else\r\n        const oldContentControl = this.getControlFromElement(oldContent, activeContentGroup, activeFrontstageDef.floatingContentControls);\r\n        const activeContentControl = this.getControlFromElement(activeContent, activeContentGroup, activeFrontstageDef.floatingContentControls, true);\r\n\r\n        // Only call setActiveView if going to or coming from a non-viewport ContentControl\r\n        // istanbul ignore else\r\n        if (activeContentControl) {\r\n          // istanbul ignore next\r\n          const doSetActiveView =\r\n            forceEventProcessing || (!activeContentControl.viewport ||\r\n              (/* istanbul ignore next */ oldContentControl && /* istanbul ignore next */ !oldContentControl.viewport));\r\n\r\n          // istanbul ignore else\r\n          if (doSetActiveView) {\r\n            activeFrontstageDef.setActiveView(activeContentControl, oldContentControl);\r\n            this.onActiveContentChangedEvent.emit({ activeContent, oldContent });\r\n          } else {\r\n            if (activeContentControl.viewport && activeContentControl.viewport !== IModelApp.viewManager.selectedView) {\r\n              // eslint-disable-next-line @typescript-eslint/no-floating-promises\r\n              IModelApp.viewManager.setSelectedView(activeContentControl.viewport);\r\n            }\r\n          }\r\n        }\r\n      }\r\n    }\r\n  }\r\n\r\n  /** Refreshes the active [[ContentControl]] */\r\n  public static refreshActiveContent(activeContent: React.ReactNode) {\r\n    ContentLayoutManager.refreshActiveLayout();\r\n    this.setActiveContent(activeContent, true);\r\n  }\r\n\r\n  /**\r\n   * Determines if content displays a Sheet view.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static isContentSheetView(content: ContentControl | undefined): boolean {\r\n    if (!content || !content.viewport)\r\n      return false;\r\n    return (ViewUtilities.isSheetView(content.viewport));\r\n  }\r\n\r\n  /**\r\n   * Determines if content displays a Drawing view.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static isContentDrawingView(content: ContentControl | undefined): boolean {\r\n    if (!content || !content.viewport)\r\n      return false;\r\n    return (ViewUtilities.isDrawingView(content.viewport));\r\n  }\r\n\r\n  /**\r\n   * Determines if content displays a Spatial view.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static isContentSpatialView(content: ContentControl | undefined): boolean {\r\n    if (!content || !content.viewport)\r\n      return false;\r\n    return (ViewUtilities.isSpatialView(content.viewport));\r\n  }\r\n\r\n  /**\r\n   * Determines if content displays a Orthographic view.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static isContentOrthographicView(content: ContentControl | undefined): boolean {\r\n    if (!content || !content.viewport)\r\n      return false;\r\n    return (ViewUtilities.isOrthographicView(content.viewport));\r\n  }\r\n\r\n  /**\r\n   * Determines if content displays a 3d view.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static isContent3dView(content: ContentControl | undefined): boolean {\r\n    if (!content || !content.viewport)\r\n      return false;\r\n    return (ViewUtilities.is3dView(content.viewport));\r\n  }\r\n\r\n  /**\r\n   * Determines if viewport supports use of a camera.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static contentSupportsCamera(content: ContentControl | undefined): boolean {\r\n    if (!content || !content.viewport)\r\n      return false;\r\n    return (ViewUtilities.viewSupportsCamera(content.viewport));\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ContentViewManager.js","sourceRoot":"","sources":["../../../../src/appui-react/content/ContentViewManager.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F;;GAEG;AAIH,OAAO,EAAE,0BAA0B,IAAI,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAEtF;;;GAGG;AACH,MAAM,OAAO,kBAAkB;IACtB,MAAM,KAAK,uBAAuB,KAAK,OAAO,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAExF,wDAAwD;IACjD,MAAM,KAAK,WAAW;QAC3B,OAAO,QAAQ,CAAC,WAAW,CAAC;IAC9B,CAAC;IAED,oDAAoD;IAC7C,MAAM,CAAC,YAAY,CAAC,SAAkB;QAC3C,OAAO,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED,6CAA6C;IACtC,MAAM,KAAK,2BAA2B,KAAK,OAAO,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAEhG,wDAAwD;IAEjD,MAAM,KAAK,8BAA8B,KAAK,OAAO,QAAQ,CAAC,8BAA8B,CAAC,CAAC,CAAC;IAEtG,oDAAoD;IAC7C,MAAM,CAAC,gBAAgB;QAC5B,OAAO,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC9B,CAAC;IAED,wCAAwC;IACjC,MAAM,CAAC,uBAAuB;QACnC,OAAO,QAAQ,CAAC,uBAAuB,EAAE,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,yBAAyB,CAAC,cAA+B;QACrE,OAAO,QAAQ,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,0BAA0B,CAAC,cAA+B;QACtE,OAAO,QAAQ,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC;IAC7D,CAAC;IAED,yCAAyC;IAClC,MAAM,CAAC,gBAAgB,CAAC,aAA+B,EAAE,oBAAoB,GAAG,KAAK;QAC1F,OAAO,QAAQ,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,CAAC;IACjE,CAAC;IAED,8CAA8C;IACvC,MAAM,CAAC,oBAAoB,CAAC,aAA8B;QAC/D,OAAO,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,kBAAkB,CAAC,OAAmC;QAClE,OAAO,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,oBAAoB,CAAC,OAAmC;QACpE,OAAO,QAAQ,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,oBAAoB,CAAC,OAAmC;QACpE,OAAO,QAAQ,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,yBAAyB,CAAC,OAAmC;QACzE,OAAO,QAAQ,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,eAAe,CAAC,OAAmC;QAC/D,OAAO,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,qBAAqB,CAAC,OAAmC;QACrE,OAAO,QAAQ,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACF","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module ContentView\r\n */\r\n\r\nimport * as React from \"react\";\r\nimport { ContentControl } from \"./ContentControl\";\r\nimport { InternalContentViewManager as internal } from \"./InternalContentViewManager\";\r\n\r\n/** Content View Manager class.\r\n * @public\r\n * @deprecated in 3.7. Use `UiFramework.content` property\r\n */\r\nexport class ContentViewManager {\r\n  public static get onMouseDownChangedEvent() { return internal.onMouseDownChangedEvent; }\r\n\r\n  /** Determines if the mouse is down in a content view */\r\n  public static get isMouseDown(): boolean {\r\n    return internal.isMouseDown;\r\n  }\r\n\r\n  /** Sets the mouse down status for a content view */\r\n  public static setMouseDown(mouseDown: boolean): void {\r\n    return internal.setMouseDown(mouseDown);\r\n  }\r\n\r\n  /** Gets the [[ActiveContentChangedEvent]] */\r\n  public static get onActiveContentChangedEvent() { return internal.onActiveContentChangedEvent; }\r\n\r\n  /** Fires when floating contents are added or removed */\r\n\r\n  public static get onAvailableContentChangedEvent() { return internal.onAvailableContentChangedEvent; }\r\n\r\n  /** Gets the active content as a React.ReactNode. */\r\n  public static getActiveContent(): React.ReactNode | undefined {\r\n    return internal.getActive();\r\n  }\r\n\r\n  /** Return the active ContentControl. */\r\n  public static getActiveContentControl(): ContentControl | undefined {\r\n    return internal.getActiveContentControl();\r\n  }\r\n\r\n  public static addFloatingContentControl(contentControl?: ContentControl) {\r\n    return internal.addFloatingContentControl(contentControl);\r\n  }\r\n\r\n  public static dropFloatingContentControl(contentControl?: ContentControl) {\r\n    return internal.dropFloatingContentControl(contentControl);\r\n  }\r\n\r\n  /** Sets the active [[ContentControl]] */\r\n  public static setActiveContent(activeContent?: React.ReactNode, forceEventProcessing = false): void {\r\n    return internal.setActive(activeContent, forceEventProcessing);\r\n  }\r\n\r\n  /** Refreshes the active [[ContentControl]] */\r\n  public static refreshActiveContent(activeContent: React.ReactNode) {\r\n    return internal.refreshActive(activeContent);\r\n  }\r\n\r\n  /**\r\n   * Determines if content displays a Sheet view.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static isContentSheetView(content: ContentControl | undefined): boolean {\r\n    return internal.isContentSheetView(content);\r\n  }\r\n\r\n  /**\r\n   * Determines if content displays a Drawing view.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static isContentDrawingView(content: ContentControl | undefined): boolean {\r\n    return internal.isContentDrawingView(content);\r\n  }\r\n\r\n  /**\r\n   * Determines if content displays a Spatial view.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static isContentSpatialView(content: ContentControl | undefined): boolean {\r\n    return internal.isContentSpatialView(content);\r\n  }\r\n\r\n  /**\r\n   * Determines if content displays a Orthographic view.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static isContentOrthographicView(content: ContentControl | undefined): boolean {\r\n    return internal.isContentOrthographicView(content);\r\n  }\r\n\r\n  /**\r\n   * Determines if content displays a 3d view.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static isContent3dView(content: ContentControl | undefined): boolean {\r\n    return internal.isContent3dView(content);\r\n  }\r\n\r\n  /**\r\n   * Determines if viewport supports use of a camera.\r\n   * @param content ContentControl to check\r\n   */\r\n  public static contentSupportsCamera(content: ContentControl | undefined): boolean {\r\n    return internal.contentSupportsCamera(content);\r\n  }\r\n}\r\n"]}

package/lib/esm/appui-react/content/DefaultViewOverlay.scss

@@ -4,7 +4,6 @@
 *--------------------------------------------------------------------------------------------*/
 @import "~@itwin/core-react/lib/cjs/core-react/style/themecolors";
 @import "~@itwin/core-react/lib/cjs/core-react/z-index";
-@import "~@itwin/itwinui-css/scss/style/variables";
 
 // 40px is used to ensure scrubber is not drawn behind a widget tab
 .uifw-view-overlay {
@@ -22,7 +21,7 @@
   @include uicore-z-index(view-overlay);
 }
 
-$widget-transparency: 0.90;
+$widget-transparency: 0.9;
 
 .uifw-animation-overlay {
   display: flex;
@@ -33,12 +32,12 @@ $widget-transparency: 0.90;
   height: auto;
   background: $buic-background-dialog;
   border: 1px solid $buic-background-dialog-stroke;
-  border-radius: $iui-border-radius;
+  border-radius: var(--iui-border-radius-1);
   // overflow: hidden;
   opacity: $widget-transparency;
   pointer-events: auto;
 
   &:hover {
-    opacity: 1.00;
+    opacity: 1;
   }
-}
+}

package/lib/esm/appui-react/content/FloatingViewportContent.d.ts

@@ -1,7 +1,6 @@
 /** @packageDocumentation
  * @module ContentView
  */
-import "./FloatingViewportContent.css";
 import * as React from "react";
 import { ScreenViewport } from "@itwin/core-frontend";
 import { ViewStateProp } from "@itwin/imodel-components-react";
@@ -18,11 +17,24 @@ export interface FloatingViewportContentProps {
     /** Function to get a reference to the ScreenViewport */
     viewportRef?: React.Ref<ScreenViewport>;
 }
-/**
- * FloatingViewportContent component that creates its own [FloatingViewportContentControl].
- * This allows it to be recognized as an "active" content control so that tools operate on this
- * content.
- * @beta
- */
+/** @beta */
 export declare function FloatingViewportContent(props: FloatingViewportContentProps): JSX.Element;
+/** @alpha */
+export interface FloatingViewportContentWrapperProps {
+    readonly children?: React.ReactNode;
+}
+/** @alpha */
+export declare function FloatingViewportContentWrapper({ children }: FloatingViewportContentWrapperProps): JSX.Element;
+/** @alpha */
+export interface UseFloatingViewportArgs {
+    /** viewport/content control uniqueId */
+    contentId: string;
+    /** The initial view state used to create the viewport, or a function that returns it (will refresh when the function changes) */
+    initialViewState: ViewStateProp;
+}
+/** @alpha */
+export declare function useFloatingViewport(args: UseFloatingViewportArgs): {
+    viewportRef: (v: ScreenViewport) => void;
+    viewState: import("@itwin/core-frontend").ViewState;
+};
 //# sourceMappingURL=FloatingViewportContent.d.ts.map

package/lib/esm/appui-react/content/FloatingViewportContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FloatingViewportContent.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/content/FloatingViewportContent.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,+BAA+B,CAAC;AACvC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAa,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEjE,OAAO,EAAqB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAUlF;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C,wFAAwF;IACxF,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC;IACjD,wCAAwC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,iIAAiI;IACjI,gBAAgB,EAAE,aAAa,CAAC;IAChC,wDAAwD;IACxD,WAAW,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;CACzC;AAED;;;;;GAKG;AAEH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,4BAA4B,eAqE1E"}
+{"version":3,"file":"FloatingViewportContent.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/content/FloatingViewportContent.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAa,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAqB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAMlF;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C,wFAAwF;IACxF,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC;IACjD,wCAAwC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,iIAAiI;IACjI,gBAAgB,EAAE,aAAa,CAAC;IAChC,wDAAwD;IACxD,WAAW,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;CACzC;AAED,YAAY;AACZ,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,4BAA4B,eAmB1E;AAED,aAAa;AACb,MAAM,WAAW,mCAAmC;IAClD,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACrC;AAED,aAAa;AACb,wBAAgB,8BAA8B,CAAC,EAAE,QAAQ,EAAE,EAAE,mCAAmC,eAM/F;AAED,aAAa;AACb,MAAM,WAAW,uBAAuB;IACtC,wCAAwC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,iIAAiI;IACjI,gBAAgB,EAAE,aAAa,CAAC;CACjC;AAED,aAAa;AACb,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,uBAAuB;qBAMrB,cAAc;;EAsCzD"}

package/lib/esm/appui-react/content/FloatingViewportContent.js

@@ -5,76 +5,69 @@
 /** @packageDocumentation
  * @module ContentView
  */
-import "./FloatingViewportContent.css";
 import * as React from "react";
 import { IModelApp } from "@itwin/core-frontend";
-import { viewWithUnifiedSelection } from "@itwin/presentation-components";
 import { ViewportComponent } from "@itwin/imodel-components-react";
 import { FloatingViewportContentControl } from "./ViewportContentControl";
-import { ContentViewManager } from "./ContentViewManager";
-import { UiShowHideManager } from "../utils/UiShowHideManager";
 import { ContentWrapper } from "./ContentLayout";
 import { useRefs } from "@itwin/core-react";
-// eslint-disable-next-line @typescript-eslint/naming-convention
-const FloatingViewport = viewWithUnifiedSelection(ViewportComponent);
-/**
- * FloatingViewportContent component that creates its own [FloatingViewportContentControl].
- * This allows it to be recognized as an "active" content control so that tools operate on this
- * content.
- * @beta
- */
-// istanbul ignore next
+import { UiFramework } from "../UiFramework";
+/** @beta */
 export function FloatingViewportContent(props) {
-    const { contentId, initialViewState, viewportRef } = props;
+    const { contentId, initialViewState, viewportRef, onContextMenu } = props;
+    const { viewState, viewportRef: floatingViewportRef } = useFloatingViewport({
+        contentId,
+        initialViewState,
+    });
+    const refs = useRefs(viewportRef, floatingViewportRef);
+    return (React.createElement(FloatingViewportContentWrapper, null,
+        React.createElement(ViewportComponent, { key: contentId, imodel: viewState.iModel, viewState: viewState, controlId: contentId, onContextMenu: onContextMenu, viewportRef: refs })));
+}
+/** @alpha */
+export function FloatingViewportContentWrapper({ children }) {
+    return (React.createElement("div", { onMouseMove: UiFramework.visibility.handleContentMouseMove, className: "uifw-dialog-imodel-content", style: { height: "100%", position: "relative" } },
+        React.createElement(ContentWrapper, { content: children, style: { height: "100%", position: "relative" } })));
+}
+/** @alpha */
+export function useFloatingViewport(args) {
+    const { contentId, initialViewState } = args;
     const [viewport, setViewport] = React.useState();
     const contentControl = React.useRef();
     const viewState = React.useMemo(() => typeof initialViewState === "function" ? initialViewState() : initialViewState, [initialViewState]);
-    const ref = React.useCallback((v) => {
+    const viewportRef = React.useCallback((v) => {
         setViewport(v);
     }, []);
-    const onViewportRef = useRefs(ref, ...(viewportRef ? [viewportRef] : []));
     React.useEffect(() => {
         if (!contentControl.current) {
             contentControl.current = new FloatingViewportContentControl(contentId, contentId, null);
-            ContentViewManager.addFloatingContentControl(contentControl.current);
+            UiFramework.content.addFloatingContentControl(contentControl.current);
         }
         return () => {
             if (contentControl.current) {
-                ContentViewManager.dropFloatingContentControl(contentControl.current);
+                UiFramework.content.dropFloatingContentControl(contentControl.current);
                 contentControl.current = undefined;
             }
         };
     }, [contentId]);
-    const viewPortControl = React.useMemo(() => {
-        const node = React.createElement(FloatingViewport, { viewportRef: onViewportRef, imodel: viewState.iModel, viewState: viewState, onContextMenu: props.onContextMenu, controlId: contentId });
-        let control = node;
-        if (!node.key) {
-            const additionalProps = { key: contentId };
-            control = React.cloneElement(node, additionalProps);
-        }
-        return control;
-    }, [onViewportRef, props.onContextMenu, viewState, contentId]);
     React.useEffect(() => {
         if (viewport && contentControl.current) {
             contentControl.current.viewport = viewport;
-            if (null === contentControl.current.reactNode) {
-                contentControl.current.reactNode = viewPortControl;
-            }
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            contentControl.current.viewport.changeView(viewState);
+            void contentControl.current.viewport.changeView(viewState);
         }
-    }, [viewState, viewPortControl, viewport]);
+    }, [viewState, viewport]);
     React.useEffect(() => {
         const onViewClose = (vp) => {
             var _a;
             if (((_a = contentControl.current) === null || _a === void 0 ? void 0 : _a.viewport) === vp) {
-                ContentViewManager.dropFloatingContentControl(contentControl.current);
+                UiFramework.content.dropFloatingContentControl(contentControl.current);
                 contentControl.current = undefined;
             }
         };
         return IModelApp.viewManager.onViewClose.addListener(onViewClose);
     }, []);
-    return (React.createElement("div", { onMouseMove: UiShowHideManager.handleContentMouseMove, className: "uifw-dialog-imodel-content", style: { height: "100%", position: "relative" } },
-        React.createElement(ContentWrapper, { content: viewPortControl, style: { height: "100%", position: "relative" } })));
+    return {
+        viewportRef,
+        viewState,
+    };
 }
 //# sourceMappingURL=FloatingViewportContent.js.map

package/lib/esm/appui-react/content/FloatingViewportContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"FloatingViewportContent.js","sourceRoot":"","sources":["../../../../src/appui-react/content/FloatingViewportContent.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module ContentView\r\n */\r\n\r\nimport \"./FloatingViewportContent.css\";\r\nimport * as React from \"react\";\r\nimport { IModelApp, ScreenViewport } from \"@itwin/core-frontend\";\r\nimport { viewWithUnifiedSelection } from \"@itwin/presentation-components\";\r\nimport { ViewportComponent, ViewStateProp } from \"@itwin/imodel-components-react\";\r\nimport { FloatingViewportContentControl } from \"./ViewportContentControl\";\r\nimport { ContentViewManager } from \"./ContentViewManager\";\r\nimport { UiShowHideManager } from \"../utils/UiShowHideManager\";\r\nimport { ContentWrapper } from \"./ContentLayout\";\r\nimport { useRefs } from \"@itwin/core-react\";\r\n\r\n// eslint-disable-next-line @typescript-eslint/naming-convention\r\nconst FloatingViewport = viewWithUnifiedSelection(ViewportComponent);\r\n\r\n/**\r\n * @beta\r\n */\r\nexport interface FloatingViewportContentProps {\r\n  /** callback used to construct context menu when user right-clicks on canvas/viewport */\r\n  onContextMenu?: (e: React.MouseEvent) => boolean;\r\n  /** viewport/content control uniqueId */\r\n  contentId: string;\r\n  /** The initial view state used to create the viewport, or a function that returns it (will refresh when the function changes) */\r\n  initialViewState: ViewStateProp;\r\n  /** Function to get a reference to the ScreenViewport */\r\n  viewportRef?: React.Ref<ScreenViewport>;\r\n}\r\n\r\n/**\r\n * FloatingViewportContent component that creates its own [FloatingViewportContentControl].\r\n * This allows it to be recognized as an \"active\" content control so that tools operate on this\r\n * content.\r\n * @beta\r\n */\r\n// istanbul ignore next\r\nexport function FloatingViewportContent(props: FloatingViewportContentProps) { // eslint-disable-line @typescript-eslint/naming-convention\r\n  const { contentId, initialViewState, viewportRef } = props;\r\n  const [viewport, setViewport] = React.useState<ScreenViewport | undefined>();\r\n  const contentControl = React.useRef<FloatingViewportContentControl | undefined>();\r\n\r\n  const viewState = React.useMemo(() => typeof initialViewState === \"function\" ? initialViewState() : initialViewState, [initialViewState]);\r\n  const ref = React.useCallback((v: ScreenViewport) => {\r\n    setViewport(v);\r\n  }, []);\r\n  const onViewportRef = useRefs(ref, ...(viewportRef ? [viewportRef] : []));\r\n\r\n  React.useEffect(() => {\r\n    if (!contentControl.current) {\r\n      contentControl.current = new FloatingViewportContentControl(contentId, contentId, null);\r\n      ContentViewManager.addFloatingContentControl(contentControl.current);\r\n    }\r\n    return () => {\r\n      if (contentControl.current) {\r\n        ContentViewManager.dropFloatingContentControl(contentControl.current);\r\n        contentControl.current = undefined;\r\n      }\r\n    };\r\n  }, [contentId]);\r\n\r\n  const viewPortControl = React.useMemo(() => {\r\n\r\n    const node = <FloatingViewport\r\n      viewportRef={onViewportRef}\r\n      imodel={viewState.iModel}\r\n      viewState={viewState}\r\n      onContextMenu={props.onContextMenu}\r\n      controlId={contentId}\r\n    />;\r\n    let control = node;\r\n\r\n    if (!(node as React.ReactElement<any>).key) {\r\n      const additionalProps: any = { key:contentId };\r\n      control = React.cloneElement(node, additionalProps);\r\n    }\r\n    return control;\r\n\r\n  }, [onViewportRef, props.onContextMenu, viewState, contentId]);\r\n\r\n  React.useEffect(() => {\r\n    if (viewport && contentControl.current) {\r\n      contentControl.current.viewport = viewport;\r\n      if (null === contentControl.current.reactNode) {\r\n        contentControl.current.reactNode = viewPortControl;\r\n      }\r\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\r\n      contentControl.current.viewport.changeView(viewState);\r\n    }\r\n  }, [viewState, viewPortControl, viewport]);\r\n\r\n  React.useEffect(() => {\r\n    const onViewClose = (vp: ScreenViewport) => {\r\n      if (contentControl.current?.viewport === vp) {\r\n        ContentViewManager.dropFloatingContentControl(contentControl.current);\r\n        contentControl.current = undefined;\r\n      }\r\n    };\r\n    return IModelApp.viewManager.onViewClose.addListener(onViewClose);\r\n  }, []);\r\n\r\n  return (\r\n    <div onMouseMove={UiShowHideManager.handleContentMouseMove} className=\"uifw-dialog-imodel-content\" style={{ height: \"100%\", position: \"relative\" }}>\r\n      <ContentWrapper content={viewPortControl} style={{ height: \"100%\", position: \"relative\" }} />\r\n    </div>\r\n  );\r\n}\r\n"]}
+{"version":3,"file":"FloatingViewportContent.js","sourceRoot":"","sources":["../../../../src/appui-react/content/FloatingViewportContent.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module ContentView\r\n */\r\n\r\nimport * as React from \"react\";\r\nimport { IModelApp, ScreenViewport } from \"@itwin/core-frontend\";\r\nimport { ViewportComponent, ViewStateProp } from \"@itwin/imodel-components-react\";\r\nimport { FloatingViewportContentControl } from \"./ViewportContentControl\";\r\nimport { ContentWrapper } from \"./ContentLayout\";\r\nimport { useRefs } from \"@itwin/core-react\";\r\nimport { UiFramework } from \"../UiFramework\";\r\n\r\n/**\r\n * @beta\r\n */\r\nexport interface FloatingViewportContentProps {\r\n  /** callback used to construct context menu when user right-clicks on canvas/viewport */\r\n  onContextMenu?: (e: React.MouseEvent) => boolean;\r\n  /** viewport/content control uniqueId */\r\n  contentId: string;\r\n  /** The initial view state used to create the viewport, or a function that returns it (will refresh when the function changes) */\r\n  initialViewState: ViewStateProp;\r\n  /** Function to get a reference to the ScreenViewport */\r\n  viewportRef?: React.Ref<ScreenViewport>;\r\n}\r\n\r\n/** @beta */\r\nexport function FloatingViewportContent(props: FloatingViewportContentProps) {\r\n  const { contentId, initialViewState, viewportRef, onContextMenu } = props;\r\n  const { viewState, viewportRef: floatingViewportRef } = useFloatingViewport({\r\n    contentId,\r\n    initialViewState,\r\n  });\r\n  const refs = useRefs(viewportRef, floatingViewportRef);\r\n  return (\r\n    <FloatingViewportContentWrapper>\r\n      <ViewportComponent\r\n        key={contentId}\r\n        imodel={viewState.iModel}\r\n        viewState={viewState}\r\n        controlId={contentId}\r\n        onContextMenu={onContextMenu}\r\n        viewportRef={refs}\r\n      />\r\n    </FloatingViewportContentWrapper>\r\n  );\r\n}\r\n\r\n/** @alpha */\r\nexport interface FloatingViewportContentWrapperProps {\r\n  readonly children?: React.ReactNode;\r\n}\r\n\r\n/** @alpha */\r\nexport function FloatingViewportContentWrapper({ children }: FloatingViewportContentWrapperProps) {\r\n  return (\r\n    <div onMouseMove={UiFramework.visibility.handleContentMouseMove} className=\"uifw-dialog-imodel-content\" style={{ height: \"100%\", position: \"relative\" }}>\r\n      <ContentWrapper content={children} style={{ height: \"100%\", position: \"relative\" }} />\r\n    </div>\r\n  );\r\n}\r\n\r\n/** @alpha */\r\nexport interface UseFloatingViewportArgs {\r\n  /** viewport/content control uniqueId */\r\n  contentId: string;\r\n  /** The initial view state used to create the viewport, or a function that returns it (will refresh when the function changes) */\r\n  initialViewState: ViewStateProp;\r\n}\r\n\r\n/** @alpha */\r\nexport function useFloatingViewport(args: UseFloatingViewportArgs) {\r\n  const { contentId, initialViewState } = args;\r\n  const [viewport, setViewport] = React.useState<ScreenViewport | undefined>();\r\n  const contentControl = React.useRef<FloatingViewportContentControl | undefined>();\r\n\r\n  const viewState = React.useMemo(() => typeof initialViewState === \"function\" ? initialViewState() : initialViewState, [initialViewState]);\r\n  const viewportRef = React.useCallback((v: ScreenViewport) => {\r\n    setViewport(v);\r\n  }, []);\r\n\r\n  React.useEffect(() => {\r\n    if (!contentControl.current) {\r\n      contentControl.current = new FloatingViewportContentControl(contentId, contentId, null);\r\n      UiFramework.content.addFloatingContentControl(contentControl.current);\r\n    }\r\n    return () => {\r\n      if (contentControl.current) {\r\n        UiFramework.content.dropFloatingContentControl(contentControl.current);\r\n        contentControl.current = undefined;\r\n      }\r\n    };\r\n  }, [contentId]);\r\n\r\n  React.useEffect(() => {\r\n    if (viewport && contentControl.current) {\r\n      contentControl.current.viewport = viewport;\r\n      void contentControl.current.viewport.changeView(viewState);\r\n    }\r\n  }, [viewState, viewport]);\r\n\r\n  React.useEffect(() => {\r\n    const onViewClose = (vp: ScreenViewport) => {\r\n      if (contentControl.current?.viewport === vp) {\r\n        UiFramework.content.dropFloatingContentControl(contentControl.current);\r\n        contentControl.current = undefined;\r\n      }\r\n    };\r\n    return IModelApp.viewManager.onViewClose.addListener(onViewClose);\r\n  }, []);\r\n\r\n  return {\r\n    viewportRef,\r\n    viewState,\r\n  };\r\n}\r\n"]}

package/lib/esm/appui-react/content/IModelViewport.d.ts

@@ -4,13 +4,13 @@
 import * as React from "react";
 import { Id64String } from "@itwin/core-bentley";
 import { IModelConnection, ScreenViewport, ViewState } from "@itwin/core-frontend";
-import { ViewStateProp } from "@itwin/imodel-components-react";
+import { ViewportComponent, ViewStateProp } from "@itwin/imodel-components-react";
 import { ConfigurableCreateInfo } from "../configurableui/ConfigurableUiControl";
 import { ViewportContentControl } from "./ViewportContentControl";
 /** Viewport that is connected to the IModelConnection property in the Redux store. The application must set up the Redux store and include the FrameworkReducer.
  * @public
  */
-export declare const IModelConnectedViewport: import("react-redux").ConnectedComponent<React.ComponentType<import("@itwin/imodel-components-react").ViewportProps & import("@itwin/presentation-components").ViewWithUnifiedSelectionProps>, any>;
+export declare const IModelConnectedViewport: import("react-redux").ConnectedComponent<typeof ViewportComponent, any>;
 /** [[IModelViewportControl]] options. These options are set in the applicationData property of the [[ContentProps]].
  * @public
  */

package/lib/esm/appui-react/content/IModelViewport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IModelViewport.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/content/IModelViewport.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"IModelViewport.d.ts","sourceRoot":"","sources":["../../../../src/appui-react/content/IModelViewport.tsx"],"names":[],"mappings":"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"}

package/lib/esm/appui-react/content/IModelViewport.js

@@ -6,11 +6,8 @@
  * @module ContentView
  */
 import * as React from "react";
-import { viewWithUnifiedSelection } from "@itwin/presentation-components";
 import { ViewportComponent } from "@itwin/imodel-components-react";
 import { FillCentered } from "@itwin/core-react";
-import { FrontstageManager } from "../frontstage/FrontstageManager";
-import { ConfigurableUiManager } from "../configurableui/ConfigurableUiManager";
 import { connectIModelConnectionAndViewState } from "../redux/connectIModel";
 import { UiFramework } from "../UiFramework";
 import { DefaultViewOverlay } from "./DefaultViewOverlay";
@@ -18,13 +15,10 @@ import { ViewportContentControl } from "./ViewportContentControl";
 import { StandardRotationNavigationAidControl } from "../navigationaids/StandardRotationNavigationAid";
 import { UiError } from "@itwin/appui-abstract";
 import { useSelector } from "react-redux";
-// create a HOC viewport component that supports unified selection
-// eslint-disable-next-line @typescript-eslint/naming-convention
-const UnifiedSelectionViewport = viewWithUnifiedSelection(ViewportComponent);
 /** Viewport that is connected to the IModelConnection property in the Redux store. The application must set up the Redux store and include the FrameworkReducer.
  * @public
  */
-export const IModelConnectedViewport = connectIModelConnectionAndViewState(null, null)(UnifiedSelectionViewport); // eslint-disable-line @typescript-eslint/naming-convention
+export const IModelConnectedViewport = connectIModelConnectionAndViewState(null, null)(ViewportComponent); // eslint-disable-line @typescript-eslint/naming-convention
 /** View Overlay component -- exported for testing
  * @internal
  */
@@ -112,20 +106,20 @@ export class IModelViewportControl extends ViewportContentControl {
                 // for convenience, if window defined bind viewport to window
                 if (undefined !== window)
                     window.viewport = v;
-                if (!FrontstageManager.isLoading)
-                    (_a = FrontstageManager.activeFrontstageDef) === null || _a === void 0 ? void 0 : _a.setActiveViewFromViewport(v);
+                if (!UiFramework.frontstages.isLoading)
+                    (_a = UiFramework.frontstages.activeFrontstageDef) === null || _a === void 0 ? void 0 : _a.setActiveViewFromViewport(v);
             }, getViewOverlay: this._getViewOverlay });
     }
     /** Get the React component that will contain the Viewport */
     getImodelViewportReactElement(iModelConnection, viewState) {
-        return React.createElement(UnifiedSelectionViewport, { viewState: viewState, imodel: iModelConnection, controlId: this.controlId, viewportRef: (v) => {
+        return React.createElement(ViewportComponent, { viewState: viewState, imodel: iModelConnection, controlId: this.controlId, viewportRef: (v) => {
                 var _a;
                 this.viewport = v;
                 // for convenience, if window defined bind viewport to window
                 if (undefined !== window)
                     window.viewport = v;
-                if (!FrontstageManager.isLoading)
-                    (_a = FrontstageManager.activeFrontstageDef) === null || _a === void 0 ? void 0 : _a.setActiveViewFromViewport(v);
+                if (!UiFramework.frontstages.isLoading)
+                    (_a = UiFramework.frontstages.activeFrontstageDef) === null || _a === void 0 ? void 0 : _a.setActiveViewFromViewport(v);
             }, getViewOverlay: this._getViewOverlay });
     }
     /** Get the React component that will be shown when no iModel data is available */
@@ -148,5 +142,5 @@ export class IModelViewportControl extends ViewportContentControl {
             return StandardRotationNavigationAidControl.navigationAidId;
     }
 }
-ConfigurableUiManager.registerControl(IModelViewportControl.id, IModelViewportControl);
+UiFramework.controls.register(IModelViewportControl.id, IModelViewportControl);
 //# sourceMappingURL=IModelViewport.js.map