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

package/lib/cjs/appui-react/frontstage/FrontstageDef.js

@@ -3,12 +3,11 @@
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
-/* eslint-disable deprecation/deprecation */
 /** @packageDocumentation
  * @module Frontstage
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FrontstageDef = void 0;
+exports.useSpecificWidgetDef = exports.useActiveFrontstageDef = exports.useActiveFrontstageId = exports.FrontstageDef = void 0;
 // cSpell:ignore popout
 const React = require("react");
 const core_frontend_1 = require("@itwin/core-frontend");
@@ -16,28 +15,24 @@ const appui_abstract_1 = require("@itwin/appui-abstract");
 const core_react_1 = require("@itwin/core-react");
 const appui_layout_react_1 = require("@itwin/appui-layout-react");
 const ContentGroup_1 = require("../content/ContentGroup");
-const ContentLayoutManager_1 = require("../content/ContentLayoutManager");
-const ContentViewManager_1 = require("../content/ContentViewManager");
 const StagePanelDef_1 = require("../stagepanels/StagePanelDef");
 const UiFramework_1 = require("../UiFramework");
-const Zone_1 = require("../zones/Zone");
-const Frontstage_1 = require("./Frontstage");
-const FrontstageManager_1 = require("./FrontstageManager");
+const WidgetDef_1 = require("../widgets/WidgetDef");
 const TimeTracker_1 = require("../configurableui/TimeTracker");
 const PopoutWidget_1 = require("../childwindow/PopoutWidget");
-const Frontstage_2 = require("../widget-panels/Frontstage");
+const Frontstage_1 = require("../widget-panels/Frontstage");
 const core_bentley_1 = require("@itwin/core-bentley");
-const ContentDialogManager_1 = require("../dialog/ContentDialogManager");
-const Widget_1 = require("../widgets/Widget");
-const StagePanel_1 = require("../stagepanels/StagePanel");
+const StageUsage_1 = require("./StageUsage");
+const StagePanelLocation_1 = require("../stagepanels/StagePanelLocation");
+const WidgetState_1 = require("../widgets/WidgetState");
+const InternalFrontstageManager_1 = require("./InternalFrontstageManager");
+const InternalContentDialogManager_1 = require("../dialog/InternalContentDialogManager");
 /** FrontstageDef class provides an API for a Frontstage.
  * @public
  */
 class FrontstageDef {
     constructor() {
         this._id = "";
-        this._defaultContentId = "";
-        this._isInFooterMode = true;
         this._isStageClosing = false;
         this._isReady = false;
         this._isApplicationClosing = false;
@@ -45,71 +40,31 @@ class FrontstageDef {
         this._timeTracker = new TimeTracker_1.TimeTracker();
     }
     get id() { return this._id; }
-    /** @deprecated in 3.6. */
-    get defaultTool() { return this._defaultTool; }
-    /** @deprecated in 3.6. */
-    get defaultContentId() { return this._defaultContentId; }
-    get isInFooterMode() { return this._isInFooterMode; }
-    /** @deprecated in 3.6. */
-    get applicationData() { return this._applicationData; }
-    get usage() { return this._usage !== undefined ? this._usage : appui_abstract_1.StageUsage.General; }
+    get usage() { return this._usage !== undefined ? this._usage : StageUsage_1.StageUsage.General; }
     get version() { return this._version; }
     get contentGroupProvider() { return this._contentGroupProvider; }
     get floatingContentControls() { return this._floatingContentControls; }
-    /** @deprecated in 3.6. Use [[FrontstageDef.contentManipulation]] instead. */
-    get topLeft() { return this._topLeft; }
-    /** @deprecated in 3.6. Use [[FrontstageDef.toolSettings]] instead. */
-    get topCenter() { return this._topCenter; }
-    /** @deprecated in 3.6. Use [[FrontstageDef.viewNavigation]] instead. */
-    get topRight() { return this._topRight; }
-    /** @deprecated in 3.6. Use [[FrontstageDef.leftPanel]] instead. */
-    get centerLeft() { return this._centerLeft; }
-    /** @deprecated in 3.6. Use [[FrontstageDef.rightPanel]] instead. */
-    get centerRight() { return this._centerRight; }
-    /** @deprecated in 3.6. Use [[FrontstageDef.leftPanel]] instead. */
-    get bottomLeft() { return this._bottomLeft; }
-    /** @deprecated in 3.6. Use [[FrontstageDef.statusBar]] instead. */
-    get bottomCenter() { return this._bottomCenter; }
-    /** @deprecated in 3.6. Use [[FrontstageDef.rightPanel]] instead. */
-    get bottomRight() { return this._bottomRight; }
-    /** @beta */
-    get toolSettings() { var _a; return (_a = this.topCenter) === null || _a === void 0 ? void 0 : _a.getSingleWidgetDef(); }
-    /** @beta */
-    get statusBar() { var _a; return (_a = this.bottomCenter) === null || _a === void 0 ? void 0 : _a.getSingleWidgetDef(); }
-    /** @beta */
-    get contentManipulation() { var _a; return (_a = this.topLeft) === null || _a === void 0 ? void 0 : _a.getSingleWidgetDef(); }
-    /** @beta */
-    get viewNavigation() { var _a; return (_a = this.topRight) === null || _a === void 0 ? void 0 : _a.getSingleWidgetDef(); }
-    /** @beta */
+    get toolSettings() { return this._toolSettings; }
+    get statusBar() { return this._statusBar; }
+    get contentManipulation() { return this._contentManipulation; }
+    get viewNavigation() { return this._viewNavigation; }
     get topPanel() { return this._topPanel; }
-    /** @beta
-     * @deprecated in 3.0. Only topPanel is supported in UI 2.0 */
-    get topMostPanel() { return this._topMostPanel; }
-    /** @beta */
     get leftPanel() { return this._leftPanel; }
-    /** @beta */
     get rightPanel() { return this._rightPanel; }
-    /** @beta */
     get bottomPanel() { return this._bottomPanel; }
-    /** @beta
-     * @deprecated in 3.0. Only bottomPanel is supported in UI 2.0  */
-    get bottomMostPanel() { return this._bottomMostPanel; }
     get contentLayoutDef() { return this._contentLayoutDef; }
     get contentGroup() { return this._contentGroup; }
     get frontstageProvider() { return this._frontstageProvider; }
-    /** @internal */
-    get nineZone() { return this._nineZone; } // istanbul ignore next
-    set nineZone(props) { this._nineZone = props; }
     toStagePanelLocation(side) {
         switch (side) {
             case "bottom":
-                return appui_abstract_1.StagePanelLocation.Bottom;
+                return StagePanelLocation_1.StagePanelLocation.Bottom;
             case "left":
-                return appui_abstract_1.StagePanelLocation.Left;
+                return StagePanelLocation_1.StagePanelLocation.Left;
             case "right":
-                return appui_abstract_1.StagePanelLocation.Right;
+                return StagePanelLocation_1.StagePanelLocation.Right;
             case "top":
-                return appui_abstract_1.StagePanelLocation.Top;
+                return StagePanelLocation_1.StagePanelLocation.Top;
         }
     }
     populateStateMaps(nineZone, panelMap, widgetMap) {
@@ -128,9 +83,9 @@ class FrontstageDef {
                     for (const tabId of widget.tabs) {
                         const widgetDef = this.findWidgetDef(tabId);
                         if (widgetDef) {
-                            let widgetState = appui_abstract_1.WidgetState.Open;
+                            let widgetState = WidgetState_1.WidgetState.Open;
                             if (widget.minimized || tabId !== widget.activeTabId)
-                                widgetState = appui_abstract_1.WidgetState.Closed;
+                                widgetState = WidgetState_1.WidgetState.Closed;
                             widgetMap.set(widgetDef, widgetState);
                         }
                     }
@@ -144,9 +99,9 @@ class FrontstageDef {
                 for (const tabId of widget.tabs) {
                     const widgetDef = this.findWidgetDef(tabId);
                     if (widgetDef) {
-                        let widgetState = appui_abstract_1.WidgetState.Open;
+                        let widgetState = WidgetState_1.WidgetState.Open;
                         if (widget.minimized || tabId !== widget.activeTabId)
-                            widgetState = appui_abstract_1.WidgetState.Closed;
+                            widgetState = WidgetState_1.WidgetState.Closed;
                         widgetMap.set(widgetDef, widgetState);
                     }
                 }
@@ -169,14 +124,14 @@ class FrontstageDef {
                 newWidgetStateMap.forEach((stateValue, widgetDef) => {
                     const originalState = originalWidgetStateMap.get(widgetDef);
                     if (originalState !== stateValue) {
-                        FrontstageManager_1.FrontstageManager.onWidgetStateChangedEvent.emit({ widgetDef, widgetState: stateValue });
+                        UiFramework_1.UiFramework.frontstages.onWidgetStateChangedEvent.emit({ widgetDef, widgetState: stateValue });
                         widgetDef.onWidgetStateChanged();
                     }
                 });
                 newPanelStateMap.forEach((stateValue, panelDef) => {
                     const originalState = originalPanelStateMap.get(panelDef);
                     if (originalState !== stateValue) {
-                        FrontstageManager_1.FrontstageManager.onPanelStateChangedEvent.emit({
+                        UiFramework_1.UiFramework.frontstages.onPanelStateChangedEvent.emit({
                             panelDef,
                             panelState: stateValue,
                         });
@@ -193,7 +148,7 @@ class FrontstageDef {
     set nineZoneState(state) {
         if (this._nineZoneState === state)
             return;
-        if ("1" === UiFramework_1.UiFramework.uiVersion || !this._nineZoneState) {
+        if (!this._nineZoneState) {
             this._nineZoneState = state;
         }
         else {
@@ -201,7 +156,7 @@ class FrontstageDef {
         }
         // istanbul ignore next - don't trigger any side effects until stage "isReady"
         if (!(this._isStageClosing || this._isApplicationClosing) || this.isReady) {
-            FrontstageManager_1.FrontstageManager.onFrontstageNineZoneStateChangedEvent.emit({
+            InternalFrontstageManager_1.InternalFrontstageManager.onFrontstageNineZoneStateChangedEvent.emit({
                 frontstageDef: this,
                 state,
             });
@@ -218,14 +173,8 @@ class FrontstageDef {
     static async create(provider) {
         const def = new FrontstageDef();
         def._frontstageProvider = provider;
-        if (provider.frontstageConfig) {
-            const config = provider.frontstageConfig();
-            const props = toFrontstageProps(config);
-            await def.initializeFromProps(props);
-        }
-        else {
-            await def.initializeFromProps(provider.frontstage.props);
-        }
+        const config = provider.frontstageConfig();
+        await def.initializeFromConfig(config);
         return def;
     }
     /** Handles when the Frontstage becomes activated */
@@ -234,20 +183,14 @@ class FrontstageDef {
     async onActivated() {
         this.updateWidgetDefs();
         const provider = this._contentGroupProvider;
-        if (provider && this._initialProps) {
-            if (provider.contentGroup) {
-                const config = toFrontstageConfig(this._initialProps);
-                this._contentGroup = await provider.contentGroup(config);
-            }
-            else {
-                this._contentGroup = await provider.provideContentGroup(this._initialProps);
-            }
+        if (provider && this._initialConfig) {
+            this._contentGroup = await provider.contentGroup(this._initialConfig);
         }
         // istanbul ignore next
         if (!this._contentGroup)
             throw new appui_abstract_1.UiError(UiFramework_1.UiFramework.loggerCategory(this), `onActivated: Content Group not defined`);
-        this._contentLayoutDef = ContentLayoutManager_1.ContentLayoutManager.getLayoutForGroup(this._contentGroup);
-        FrontstageManager_1.FrontstageManager.onContentLayoutActivatedEvent.emit({ contentLayout: this._contentLayoutDef, contentGroup: this._contentGroup });
+        this._contentLayoutDef = UiFramework_1.UiFramework.content.layouts.getForGroup(this._contentGroup);
+        UiFramework_1.UiFramework.frontstages.onContentLayoutActivatedEvent.emit({ contentLayout: this._contentLayoutDef, contentGroup: this._contentGroup });
         this._timeTracker.startTiming();
         await this._onActivated();
     }
@@ -269,9 +212,9 @@ class FrontstageDef {
             await this.contentGroupProvider.onFrontstageDeactivated();
         this._timeTracker.stopTiming();
         this._isStageClosing = true; // this keeps widgets in child windows from automatically re-docking
-        UiFramework_1.UiFramework.childWindowManager.closeAllChildWindows();
+        UiFramework_1.UiFramework.childWindows.closeAll();
         if (this._floatingContentControls) {
-            ContentDialogManager_1.ContentDialogManager.closeAll();
+            InternalContentDialogManager_1.InternalContentDialogManager.closeAll();
             this._floatingContentControls = undefined;
         }
         await this._onDeactivated();
@@ -317,22 +260,6 @@ class FrontstageDef {
             this.contentGroup.onFrontstageReady();
         this._onFrontstageReady();
     }
-    /** Starts the default tool for the Frontstage.
-     * @deprecated in 3.6.
-     */
-    startDefaultTool() {
-        // Start the default tool
-        // istanbul ignore next
-        if (core_frontend_1.IModelApp.toolAdmin && core_frontend_1.IModelApp.viewManager) {
-            if (this.defaultTool) {
-                core_frontend_1.IModelApp.toolAdmin.defaultToolId = this.defaultTool.toolId;
-                this.defaultTool.execute();
-            }
-            else {
-                core_frontend_1.IModelApp.toolAdmin.startDefaultTool(); // eslint-disable-line @typescript-eslint/no-floating-promises
-            }
-        }
-    }
     /** Sets the Content Layout and Content Group */
     setContentLayoutAndGroup(contentLayoutDef, contentGroup) {
         this._contentLayoutDef = contentLayoutDef;
@@ -342,15 +269,12 @@ class FrontstageDef {
     async setActiveContent() {
         let contentControl;
         let activated = false;
-        if (this.contentGroup && this.defaultContentId) {
-            contentControl = this.contentGroup.getContentControlById(this.defaultContentId);
-        }
         // istanbul ignore else
         if (!contentControl && this.contentControls.length >= 0) {
             contentControl = this.contentControls[0];
         }
         if (contentControl) {
-            ContentViewManager_1.ContentViewManager.setActiveContent(contentControl.reactNode, true);
+            UiFramework_1.UiFramework.content.setActive(contentControl.reactNode, true);
             if (contentControl.viewport) {
                 const status = await core_frontend_1.IModelApp.viewManager.setSelectedView(contentControl.viewport);
                 activated = status === core_bentley_1.BentleyStatus.SUCCESS;
@@ -363,96 +287,37 @@ class FrontstageDef {
         if (oldContent)
             oldContent.onDeactivated();
         newContent.onActivated();
-        FrontstageManager_1.FrontstageManager.onContentControlActivatedEvent.emit({ activeContentControl: newContent, oldContentControl: oldContent });
+        UiFramework_1.UiFramework.frontstages.onContentControlActivatedEvent.emit({ activeContentControl: newContent, oldContentControl: oldContent });
     }
     /** Sets the active view content control based on the selected viewport. */
     setActiveViewFromViewport(viewport) {
         const contentControl = this.contentControls.find((control) => control.viewport === viewport);
         // istanbul ignore else
         if (contentControl) {
-            ContentViewManager_1.ContentViewManager.setActiveContent(contentControl.reactNode, true);
+            UiFramework_1.UiFramework.content.setActive(contentControl.reactNode, true);
             return true;
         }
         // istanbul ignore next
         return false;
     }
-    /** Gets a [[ZoneDef]] based on a given zone id.
-     * @deprecated in 3.6. UI1.0 is deprecated.
-     */
-    getZoneDef(zoneId) {
-        let zoneDef;
-        switch (zoneId) {
-            case 1:
-                zoneDef = this.topLeft;
-                break;
-            case 2:
-                zoneDef = this.topCenter;
-                break;
-            case 3:
-                zoneDef = this.topRight;
-                break;
-            case 4:
-                zoneDef = this.centerLeft;
-                break;
-            case 6:
-                zoneDef = this.centerRight;
-                break;
-            case 7:
-                zoneDef = this.bottomLeft;
-                break;
-            case 8:
-                zoneDef = this.bottomCenter;
-                break;
-            case 9:
-                zoneDef = this.bottomRight;
-                break;
-            // istanbul ignore next
-            default:
-                throw new RangeError();
-        }
-        // Zones can be undefined in a Frontstage
-        return zoneDef;
-    }
-    /** Gets a list of [[ZoneDef]]s.
-     * @deprecated in 3.6. UI1.0 is deprecated.
-     */
-    get zoneDefs() {
-        const zones = [1, 2, 3, 4, 6, 7, 8, 9];
-        const zoneDefs = [];
-        zones.forEach((zoneId) => {
-            const zoneDef = this.getZoneDef(zoneId);
-            if (zoneDef)
-                zoneDefs.push(zoneDef);
-        });
-        return zoneDefs;
-    }
     /** Gets a [[StagePanelDef]] based on a given panel location
      * @beta
      */
     getStagePanelDef(location) {
         let panelDef;
         switch (location) {
-            case appui_abstract_1.StagePanelLocation.Top:
+            case StagePanelLocation_1.StagePanelLocation.Top:
                 panelDef = this.topPanel;
                 break;
-            case appui_abstract_1.StagePanelLocation.TopMost:
-                panelDef = this.topMostPanel; // eslint-disable-line deprecation/deprecation
-                break;
-            case appui_abstract_1.StagePanelLocation.Left:
+            case StagePanelLocation_1.StagePanelLocation.Left:
                 panelDef = this.leftPanel;
                 break;
-            case appui_abstract_1.StagePanelLocation.Right:
+            case StagePanelLocation_1.StagePanelLocation.Right:
                 panelDef = this.rightPanel;
                 break;
-            case appui_abstract_1.StagePanelLocation.Bottom:
+            case StagePanelLocation_1.StagePanelLocation.Bottom:
                 panelDef = this.bottomPanel;
                 break;
-            case appui_abstract_1.StagePanelLocation.BottomMost:
-                panelDef = this.bottomMostPanel; // eslint-disable-line deprecation/deprecation
-                break;
-            // istanbul ignore next
-            default:
-                throw new RangeError();
         }
         // Panels can be undefined in a Frontstage
         return panelDef;
@@ -461,44 +326,29 @@ class FrontstageDef {
      * @beta
      */
     get panelDefs() {
-        const panels = [
-            appui_abstract_1.StagePanelLocation.Left, appui_abstract_1.StagePanelLocation.Right,
-            appui_abstract_1.StagePanelLocation.Top, appui_abstract_1.StagePanelLocation.TopMost,
-            appui_abstract_1.StagePanelLocation.Bottom, appui_abstract_1.StagePanelLocation.BottomMost,
+        const locations = [
+            StagePanelLocation_1.StagePanelLocation.Left, StagePanelLocation_1.StagePanelLocation.Right,
+            StagePanelLocation_1.StagePanelLocation.Top, StagePanelLocation_1.StagePanelLocation.Bottom,
         ];
-        const panelDefs = [];
-        panels.forEach((location) => {
-            const panelDef = this.getStagePanelDef(location);
-            if (panelDef)
-                panelDefs.push(panelDef);
+        const panels = [];
+        locations.forEach((location) => {
+            const panel = this.getStagePanelDef(location);
+            if (panel)
+                panels.push(panel);
         });
-        return panelDefs;
+        return panels;
     }
     /** Finds a [[WidgetDef]] based on a given id */
     findWidgetDef(id) {
-        for (const zoneDef of this.zoneDefs) {
-            const widgetDef = zoneDef.findWidgetDef(id);
-            if (widgetDef)
-                return widgetDef;
-        }
-        for (const panelDef of this.panelDefs) {
-            const widgetDef = panelDef.findWidgetDef(id);
-            if (widgetDef)
+        for (const widgetDef of this.widgetDefs) {
+            if (widgetDef.id === id)
                 return widgetDef;
         }
-        // istanbul ignore next
         return undefined;
     }
     /** Gets the list of [[WidgetControl]]s */
     get _widgetControls() {
         const widgetControls = new Array();
-        this.zoneDefs.forEach((zoneDef) => {
-            zoneDef.widgetDefs.forEach((widgetDef) => {
-                const widgetControl = widgetDef.widgetControl;
-                if (widgetControl)
-                    widgetControls.push(widgetControl);
-            });
-        });
         this.panelDefs.forEach((panelDef) => {
             panelDef.widgetDefs.forEach((widgetDef) => {
                 const widgetControl = widgetDef.widgetControl;
@@ -516,7 +366,7 @@ class FrontstageDef {
         if (!this._floatingContentControls)
             this._floatingContentControls = new Array();
         this._floatingContentControls.push(contentControl);
-        ContentViewManager_1.ContentViewManager.onAvailableContentChangedEvent.emit({ contentId: contentControl.uniqueId });
+        UiFramework_1.UiFramework.content.onAvailableContentChangedEvent.emit({ contentId: contentControl.uniqueId });
     }
     dropFloatingContentControl(contentControl) {
         // istanbul ignore next
@@ -526,7 +376,7 @@ class FrontstageDef {
         // istanbul ignore else
         if (index > -1) {
             this._floatingContentControls.splice(index, 1);
-            ContentViewManager_1.ContentViewManager.onAvailableContentChangedEvent.emit({ contentId: contentControl.uniqueId });
+            UiFramework_1.UiFramework.content.onAvailableContentChangedEvent.emit({ contentId: contentControl.uniqueId });
         }
     }
     /** Gets the list of [[ContentControl]]s */
@@ -541,60 +391,36 @@ class FrontstageDef {
         }
         return contentControls;
     }
-    /** Initializes a FrontstageDef from FrontstageProps
+    /** Initializes a FrontstageDef from FrontstageConfig.
      * @internal
      */
-    async initializeFromProps(props) {
-        this._id = props.id;
-        this._initialProps = props;
-        this._defaultTool = props.defaultTool; // Might be `undefined`, see `toFrontstageProps`.
-        if (props.defaultContentId !== undefined)
-            this._defaultContentId = props.defaultContentId;
-        if (props.contentGroup instanceof ContentGroup_1.ContentGroupProvider) {
-            this._contentGroupProvider = props.contentGroup;
+    async initializeFromConfig(config) {
+        this._id = config.id;
+        this._initialConfig = config;
+        if (config.contentGroup instanceof ContentGroup_1.ContentGroupProvider) {
+            this._contentGroupProvider = config.contentGroup;
         }
         else {
-            this._contentGroup = props.contentGroup;
-        }
-        if (props.isInFooterMode !== undefined)
-            this._isInFooterMode = props.isInFooterMode;
-        this._applicationData = props.applicationData;
-        this._usage = props.usage;
-        this._version = props.version || 0;
-        // eslint-disable-next-line deprecation/deprecation
-        this._topLeft = Frontstage_1.Frontstage.createZoneDef(props.contentManipulationTools ? props.contentManipulationTools : props.topLeft, Zone_1.ZoneLocation.TopLeft, props);
-        // eslint-disable-next-line deprecation/deprecation
-        this._topCenter = Frontstage_1.Frontstage.createZoneDef(props.toolSettings ? props.toolSettings : props.topCenter, Zone_1.ZoneLocation.TopCenter, props);
-        // eslint-disable-next-line deprecation/deprecation
-        this._topRight = Frontstage_1.Frontstage.createZoneDef(props.viewNavigationTools ? /* istanbul ignore next */ props.viewNavigationTools : props.topRight, Zone_1.ZoneLocation.TopRight, props);
-        // eslint-disable-next-line deprecation/deprecation
-        this._centerLeft = Frontstage_1.Frontstage.createZoneDef(props.centerLeft, Zone_1.ZoneLocation.CenterLeft, props);
-        // eslint-disable-next-line deprecation/deprecation
-        this._centerRight = Frontstage_1.Frontstage.createZoneDef(props.centerRight, Zone_1.ZoneLocation.CenterRight, props);
-        // eslint-disable-next-line deprecation/deprecation
-        this._bottomLeft = Frontstage_1.Frontstage.createZoneDef(props.bottomLeft, Zone_1.ZoneLocation.BottomLeft, props);
-        // eslint-disable-next-line deprecation/deprecation
-        this._bottomCenter = Frontstage_1.Frontstage.createZoneDef(props.statusBar ? props.statusBar : props.bottomCenter, Zone_1.ZoneLocation.BottomCenter, props);
-        // eslint-disable-next-line deprecation/deprecation
-        this._bottomRight = Frontstage_1.Frontstage.createZoneDef(props.bottomRight, Zone_1.ZoneLocation.BottomRight, props);
-        // eslint-disable-next-line deprecation/deprecation
-        this._topPanel = Frontstage_1.Frontstage.createStagePanelDef(appui_abstract_1.StagePanelLocation.Top, props);
-        this._topMostPanel = Frontstage_1.Frontstage.createStagePanelDef(appui_abstract_1.StagePanelLocation.TopMost, props);
-        this._leftPanel = Frontstage_1.Frontstage.createStagePanelDef(appui_abstract_1.StagePanelLocation.Left, props);
-        this._rightPanel = Frontstage_1.Frontstage.createStagePanelDef(appui_abstract_1.StagePanelLocation.Right, props);
-        this._bottomPanel = Frontstage_1.Frontstage.createStagePanelDef(appui_abstract_1.StagePanelLocation.Bottom, props);
-        this._bottomMostPanel = Frontstage_1.Frontstage.createStagePanelDef(appui_abstract_1.StagePanelLocation.BottomMost, props);
+            this._contentGroup = config.contentGroup;
+        }
+        this._usage = config.usage;
+        this._version = config.version;
+        this._toolSettings = createWidgetDef(config.toolSettings, WidgetDef_1.WidgetType.ToolSettings);
+        this._statusBar = createWidgetDef(config.statusBar, WidgetDef_1.WidgetType.StatusBar);
+        this._contentManipulation = createWidgetDef(config.contentManipulation, WidgetDef_1.WidgetType.Tool);
+        this._viewNavigation = createWidgetDef(config.viewNavigation, WidgetDef_1.WidgetType.Navigation);
+        this._topPanel = createStagePanelDef(config, StagePanelLocation_1.StagePanelLocation.Top);
+        this._leftPanel = createStagePanelDef(config, StagePanelLocation_1.StagePanelLocation.Left);
+        this._rightPanel = createStagePanelDef(config, StagePanelLocation_1.StagePanelLocation.Right);
+        this._bottomPanel = createStagePanelDef(config, StagePanelLocation_1.StagePanelLocation.Bottom);
     }
     /** @internal */
     updateWidgetDefs() {
         // Tracks provided widgets to prevent duplicates.
         const allStageWidgetDefs = [];
-        // Process panels before zones so in uiVersion="2" extension can explicitly target a widget for a StagePanelSection
+        // Process panels before zones so extension can explicitly target a widget for a StagePanelSection
         this.panelDefs.forEach((stagePanelDef) => {
-            stagePanelDef.updateDynamicWidgetDefs(this.id, this.usage, stagePanelDef.location, undefined, allStageWidgetDefs, this.applicationData);
-        });
-        this.zoneDefs.forEach((zoneDef) => {
-            zoneDef.updateDynamicWidgetDefs(this.id, this.usage, zoneDef.zoneLocation, undefined, allStageWidgetDefs, this.applicationData);
+            stagePanelDef.updateDynamicWidgetDefs(this.id, this.usage, stagePanelDef.location, undefined, allStageWidgetDefs);
         });
     }
     /** @beta */
@@ -606,7 +432,7 @@ class FrontstageDef {
         for (const widgetDef of this.widgetDefs) {
             widgetDef.setWidgetState(widgetDef.defaultState);
         }
-        FrontstageManager_1.FrontstageManager.onFrontstageRestoreLayoutEvent.emit({ frontstageDef: this });
+        InternalFrontstageManager_1.InternalFrontstageManager.onFrontstageRestoreLayoutEvent.emit({ frontstageDef: this });
     }
     /** Used only in UI 2.0 to determine WidgetState from NinezoneState
      *  @internal
@@ -617,13 +443,13 @@ class FrontstageDef {
             const location = (0, appui_layout_react_1.getTabLocation)(this.nineZoneState, widgetDef.id);
             // istanbul ignore next
             if (!location)
-                return appui_abstract_1.WidgetState.Hidden;
+                return WidgetState_1.WidgetState.Hidden;
             if ((0, appui_layout_react_1.isFloatingTabLocation)(location)) {
                 const floatingWidget = this.nineZoneState.floatingWidgets.byId[location.floatingWidgetId];
                 if (floatingWidget && floatingWidget.hidden)
-                    return appui_abstract_1.WidgetState.Hidden;
+                    return WidgetState_1.WidgetState.Hidden;
                 else
-                    return appui_abstract_1.WidgetState.Floating;
+                    return WidgetState_1.WidgetState.Floating;
             }
             let collapsedPanel = false;
             // istanbul ignore else
@@ -633,9 +459,9 @@ class FrontstageDef {
             }
             const widgetContainer = this.nineZoneState.widgets[location.widgetId];
             if (widgetDef.id === widgetContainer.activeTabId && !collapsedPanel)
-                return appui_abstract_1.WidgetState.Open;
+                return WidgetState_1.WidgetState.Open;
             else
-                return appui_abstract_1.WidgetState.Closed;
+                return WidgetState_1.WidgetState.Closed;
         }
         return widgetDef.defaultState;
     }
@@ -696,7 +522,7 @@ class FrontstageDef {
                 if (state) {
                     this.nineZoneState = state;
                     setTimeout(() => {
-                        popoutWidgetContainerId && UiFramework_1.UiFramework.childWindowManager.closeChildWindow(popoutWidgetContainerId, true);
+                        popoutWidgetContainerId && UiFramework_1.UiFramework.childWindows.close(popoutWidgetContainerId, true);
                     }, 600);
                 }
             }
@@ -727,7 +553,7 @@ class FrontstageDef {
                     if ((0, appui_layout_react_1.isPanelTabLocation)(tabLocation)) {
                         const panel = this.nineZoneState.panels[tabLocation.side];
                         const widgetDef = this.findWidgetDef(widgetId);
-                        if (widgetDef && widgetDef.state === appui_abstract_1.WidgetState.Open && !panel.collapsed)
+                        if (widgetDef && widgetDef.state === WidgetState_1.WidgetState.Open && !panel.collapsed)
                             widgetIsVisible = true;
                     }
                 }
@@ -764,7 +590,7 @@ class FrontstageDef {
             left: bounds.left,
             top: bounds.top,
         };
-        UiFramework_1.UiFramework.childWindowManager.openChildWindow(widgetContainerId, widgetDef.label, popoutContent, position, UiFramework_1.UiFramework.useDefaultPopoutUrl);
+        UiFramework_1.UiFramework.childWindows.open(widgetContainerId, widgetDef.label, popoutContent, position, UiFramework_1.UiFramework.useDefaultPopoutUrl);
     }
     /** Create a new popout/child window that contains the widget specified by its Id. Supported only when in
      *  UI 2.0 or higher.
@@ -810,7 +636,7 @@ class FrontstageDef {
                 left: bounds.left,
                 top: bounds.top,
             };
-            UiFramework_1.UiFramework.childWindowManager.openChildWindow(widgetContainerId, widgetDef.label, popoutContent, position, UiFramework_1.UiFramework.useDefaultPopoutUrl);
+            UiFramework_1.UiFramework.childWindows.open(widgetContainerId, widgetDef.label, popoutContent, position, UiFramework_1.UiFramework.useDefaultPopoutUrl);
         });
     }
     get isStageClosing() {
@@ -842,7 +668,7 @@ class FrontstageDef {
         widgetDef.popoutBounds = bounds;
     }
     /** Method used to possibly change a Popout Widget back to a docked widget if the user was the one closing the popout's child
-     * window (i.e. UiFramework.childWindowManager.isClosingChildWindow === false).
+     * window.
      *  @internal
      */
     dockPopoutWidgetContainer(widgetContainerId) {
@@ -872,7 +698,7 @@ class FrontstageDef {
                 const state = (0, appui_layout_react_1.dockWidgetContainer)(this.nineZoneState, widgetContainerId, true);
                 state && (this.nineZoneState = state);
                 if ((0, appui_layout_react_1.isPopoutTabLocation)(location)) {
-                    UiFramework_1.UiFramework.childWindowManager.closeChildWindow(location.widgetId, true);
+                    UiFramework_1.UiFramework.childWindows.close(location.widgetId, true);
                 }
             }
         }
@@ -880,12 +706,12 @@ class FrontstageDef {
     setFloatingWidgetContainerBounds(floatingWidgetId, bounds) {
         if (!this.nineZoneState || !(floatingWidgetId in this.nineZoneState.floatingWidgets.byId))
             return false;
-        let state = (0, Frontstage_2.FrameworkStateReducer)(this.nineZoneState, {
+        let state = (0, Frontstage_1.FrameworkStateReducer)(this.nineZoneState, {
             type: "FLOATING_WIDGET_SET_BOUNDS",
             id: floatingWidgetId,
             bounds,
         }, this);
-        state = (0, Frontstage_2.FrameworkStateReducer)(state, {
+        state = (0, Frontstage_1.FrameworkStateReducer)(state, {
             type: "FLOATING_WIDGET_SET_USER_SIZED",
             id: floatingWidgetId,
             userSized: true,
@@ -925,11 +751,6 @@ class FrontstageDef {
         return undefined;
     }
     *_widgetDefs() {
-        for (const zoneDef of this.zoneDefs) {
-            for (const widgetDef of zoneDef.widgetDefs) {
-                yield widgetDef;
-            }
-        }
         for (const panelDef of this.panelDefs) {
             for (const widgetDef of panelDef.widgetDefs) {
                 yield widgetDef;
@@ -950,90 +771,56 @@ class FrontstageDef {
     }
 }
 exports.FrontstageDef = FrontstageDef;
-function toFrontstageProps(config) {
-    const { contentManipulation, viewNavigation, toolSettings, statusBar, topPanel, leftPanel, bottomPanel, rightPanel, ...other } = config;
-    const props = {
-        ...other,
-        defaultTool: undefined,
-        toolSettings: toolSettings ? toZoneElement(toolSettings) : undefined,
-        statusBar: statusBar ? toZoneElement(statusBar) : undefined,
-        contentManipulationTools: contentManipulation ? toZoneElement(contentManipulation) : undefined,
-        viewNavigationTools: viewNavigation ? toZoneElement(viewNavigation) : undefined,
-        topPanel: topPanel ? toStagePanelElement(topPanel) : undefined,
-        leftPanel: leftPanel ? toStagePanelElement(leftPanel) : undefined,
-        bottomPanel: bottomPanel ? toStagePanelElement(bottomPanel) : undefined,
-        rightPanel: rightPanel ? toStagePanelElement(rightPanel) : undefined,
-    };
-    return props;
-}
-function toWidgetElement(config) {
-    return (React.createElement(Widget_1.Widget, { key: config.id, ...config }));
-}
-function toZoneElement(config) {
-    return (React.createElement(Zone_1.Zone, { widgets: [
-            toWidgetElement(config),
-        ] }));
-}
-function toStagePanelElement(config) {
-    var _a, _b;
-    const { sections, ...other } = config;
-    const startWidgets = (_a = sections === null || sections === void 0 ? void 0 : sections.start) === null || _a === void 0 ? void 0 : _a.map((widget) => toWidgetElement(widget));
-    const endWidgets = (_b = sections === null || sections === void 0 ? void 0 : sections.end) === null || _b === void 0 ? void 0 : _b.map((widget) => toWidgetElement(widget));
-    const panelZones = {};
-    if (startWidgets)
-        panelZones.start = {
-            widgets: startWidgets,
-        };
-    if (endWidgets)
-        panelZones.end = {
-            widgets: endWidgets,
-        };
-    return (React.createElement(StagePanel_1.StagePanel, { panelZones: panelZones, ...other }));
+function createWidgetDef(config, type) {
+    if (!config)
+        return undefined;
+    const widgetDef = WidgetDef_1.WidgetDef.create(config, type);
+    return widgetDef;
 }
-let widgetConfigId = 0;
-function toWidgetConfig(widget) {
-    const props = widget.props;
-    return {
-        ...props,
-        id: props.id ? props.id : `widget-config-${++widgetConfigId}`,
-    };
+function createStagePanelDef(frontstageConfig, location) {
+    const config = getStagePanel(location, frontstageConfig);
+    const panelDef = new StagePanelDef_1.StagePanelDef();
+    panelDef.initializeFromConfig(config, location);
+    return panelDef;
 }
-function toWidgetConfigFromZone(zone) {
-    const widgets = zone.props.widgets;
-    if (!widgets || widgets.length === 0)
-        return undefined;
-    const widget = widgets[0];
-    return toWidgetConfig(widget);
+function getStagePanel(location, config) {
+    switch (location) {
+        case StagePanelLocation_1.StagePanelLocation.Top:
+            return config.topPanel;
+        case StagePanelLocation_1.StagePanelLocation.Left:
+            return config.leftPanel;
+        case StagePanelLocation_1.StagePanelLocation.Right:
+            return config.rightPanel;
+        case StagePanelLocation_1.StagePanelLocation.Bottom:
+            return config.bottomPanel;
+    }
 }
-function toPanelConfig(panel) {
-    var _a, _b, _c, _d;
-    const props = panel.props;
-    const { panelZones, ...other } = props;
-    const start = (_b = (_a = panelZones === null || panelZones === void 0 ? void 0 : panelZones.start) === null || _a === void 0 ? void 0 : _a.widgets) === null || _b === void 0 ? void 0 : _b.map((w) => toWidgetConfig(w));
-    const end = (_d = (_c = panelZones === null || panelZones === void 0 ? void 0 : panelZones.end) === null || _c === void 0 ? void 0 : _c.widgets) === null || _d === void 0 ? void 0 : _d.map((w) => toWidgetConfig(w));
-    const config = {
-        ...other,
-        sections: {
-            start,
-            end,
-        },
-    };
-    return config;
+/** Hook that returns active frontstage id.
+ * @public
+ */
+const useActiveFrontstageId = () => {
+    const def = useActiveFrontstageDef();
+    const id = React.useMemo(() => def ? /* istanbul ignore next */ def.id : "", [def]);
+    return id;
+};
+exports.useActiveFrontstageId = useActiveFrontstageId;
+/** @internal */
+function useActiveFrontstageDef() {
+    const [def, setDef] = React.useState(UiFramework_1.UiFramework.frontstages.activeFrontstageDef);
+    React.useEffect(() => {
+        return UiFramework_1.UiFramework.frontstages.onFrontstageActivatedEvent.addListener((args) => {
+            setDef(args.activatedFrontstageDef);
+        });
+    }, []);
+    return def;
 }
-function toFrontstageConfig(props) {
-    const { contentManipulationTools, viewNavigationTools, toolSettings, statusBar, topPanel, leftPanel, bottomPanel, rightPanel, ...other } = props;
-    const config = {
-        ...other,
-        version: props.version || 0,
-        contentManipulation: contentManipulationTools ? toWidgetConfigFromZone(contentManipulationTools) : undefined,
-        viewNavigation: viewNavigationTools ? toWidgetConfigFromZone(viewNavigationTools) : undefined,
-        toolSettings: toolSettings ? toWidgetConfigFromZone(toolSettings) : undefined,
-        statusBar: statusBar ? toWidgetConfigFromZone(statusBar) : undefined,
-        topPanel: topPanel ? toPanelConfig(topPanel) : undefined,
-        leftPanel: leftPanel ? toPanelConfig(leftPanel) : undefined,
-        bottomPanel: bottomPanel ? toPanelConfig(bottomPanel) : undefined,
-        rightPanel: rightPanel ? toPanelConfig(rightPanel) : undefined,
-    };
-    return config;
+exports.useActiveFrontstageDef = useActiveFrontstageDef;
+/** Hook that returns the widgetDef for a specific widgetId within the active frontstage.
+ * @public
+ */
+function useSpecificWidgetDef(widgetId) {
+    const frontstageDef = useActiveFrontstageDef();
+    return frontstageDef === null || frontstageDef === void 0 ? void 0 : frontstageDef.findWidgetDef(widgetId);
 }
+exports.useSpecificWidgetDef = useSpecificWidgetDef;
 //# sourceMappingURL=FrontstageDef.js.map