@itwin/appui-react 4.2.1 → 4.3.0-dev.1

package/lib/esm/appui-react/widget-panels/Frontstage.js

@@ -13,7 +13,7 @@ import { unstable_batchedUpdates } from "react-dom";
 import { assert, Logger, ProcessDetector } from "@itwin/core-bentley";
 import { Rectangle, Size, UiStateStorageStatus } from "@itwin/core-react";
 import { ToolbarPopupAutoHideContext } from "@itwin/components-react";
-import { addFloatingWidget, addPanelWidget, addTab, addTabToWidget, convertAllPopupWidgetContainersToFloating, createLayoutStore, createNineZoneState, floatingWidgetBringToFront, FloatingWidgets, getTabLocation, getUniqueId, getWidgetPanelSectionId, insertPanelWidget, insertTabToWidget, isFloatingTabLocation, isHorizontalPanelSide, isPanelTabLocation, isPopoutTabLocation, NineZone, NineZoneStateReducer, panelSides, removeTab, removeTabFromWidget, toolSettingsTabId, WidgetPanels, } from "@itwin/appui-layout-react";
+import { addDockedToolSettings, addFloatingWidget, addPanelWidget, addTab, addTabToWidget, addWidgetToolSettings, convertAllPopupWidgetContainersToFloating, createLayoutStore, createNineZoneState, floatingWidgetBringToFront, FloatingWidgets, getTabLocation, getUniqueId, getWidgetPanelSectionId, insertPanelWidget, insertTabToWidget, isFloatingTabLocation, isHorizontalPanelSide, isPanelTabLocation, isPopoutTabLocation, NineZone, NineZoneStateReducer, panelSides, removeTab, removeTabFromWidget, removeToolSettings, WidgetPanels, } from "@itwin/appui-layout-react";
 import { StagePanelState, toPanelSide } from "../stagepanels/StagePanelDef";
 import { UiFramework } from "../UiFramework";
 import { useUiStateStorageHandler } from "../uistate/useUiStateStorage";
@@ -52,7 +52,7 @@ const widgetPanelsFrontstage = React.createElement(WidgetPanelsFrontstageCompone
 /** @internal */
 export function useLayoutStore() {
     const [def, setDef] = React.useState(UiFramework.frontstages.activeFrontstageDef);
-    const [layout, setLayout] = React.useState(() => createLayoutStore(def === null || def === void 0 ? void 0 : def.nineZoneState));
+    const [layout, setLayout] = React.useState(() => createLayoutStore(def?.nineZoneState));
     React.useEffect(() => {
         return UiFramework.frontstages.onFrontstageActivatedEvent.addListener((args) => {
             unstable_batchedUpdates(() => {
@@ -103,7 +103,7 @@ export function FrameworkStateReducer(state, action, frontstageDef) {
                 const panel = draft.panels[panelSide];
                 const location = toStagePanelLocation(panelSide);
                 const panelDef = frontstageDef.getStagePanelDef(location);
-                if (panelDef === null || panelDef === void 0 ? void 0 : panelDef.maxSizeSpec) {
+                if (panelDef?.maxSizeSpec) {
                     panel.maxSize = getPanelMaxSize(panelDef.maxSizeSpec, panelSide, action.size);
                     if (panel.size) {
                         panel.size = Math.min(Math.max(panel.size, panel.minSize), panel.maxSize);
@@ -120,14 +120,6 @@ export function useNineZoneDispatch(frontstageDef) {
         if (action.type === "RESIZE") {
             InternalFrontstageManager.nineZoneSize = Size.create(action.size);
         }
-        // istanbul ignore if
-        if (action.type === "TOOL_SETTINGS_DRAG_START") {
-            void UiFramework.postTelemetry("Tool Settings Undocking", "28B04E07-AE73-4533-A0BA-8E2A8DC99ADF");
-        }
-        // istanbul ignore if
-        if (action.type === "TOOL_SETTINGS_DOCK") {
-            void UiFramework.postTelemetry("Tool Settings Docking to Settings Bar", "BEDE684B-B3DB-4637-B3AF-DC3CBA223F94");
-        }
         if (action.type === "WIDGET_TAB_POPOUT") {
             const tabId = action.id;
             frontstageDef.popoutWidget(tabId);
@@ -204,31 +196,33 @@ export function useLabels() {
         popoutActiveTab: UiFramework.translate("widget.tooltips.popoutActiveTab"),
     }), []);
 }
+function toTabArgs(widget) {
+    const label = getWidgetLabel(widget.label);
+    return {
+        allowedPanelTargets: widget.allowedPanelTargets?.map((location) => toPanelSide(location)),
+        hideWithUiWhenFloating: !!widget.hideWithUiWhenFloating,
+        canPopout: widget.canPopout,
+        iconSpec: widget.iconSpec,
+        isFloatingStateWindowResizable: widget.isFloatingStateWindowResizable,
+        label,
+        preferredFloatingWidgetSize: widget.defaultFloatingSize,
+        preferredPanelWidgetSize: widget.preferredPanelSize,
+    };
+}
 /** @internal */
 export function addWidgets(state, widgets, side, widgetId) {
-    var _a;
     const visibleWidgets = widgets.filter((w) => w.isVisible && w.defaultState !== WidgetState.Floating);
     if (visibleWidgets.length === 0)
         return state;
     const tabs = new Array();
     for (const widget of visibleWidgets) {
-        const label = getWidgetLabel(widget.label);
-        state = addTab(state, widget.id, {
-            label,
-            iconSpec: widget.iconSpec,
-            preferredPanelWidgetSize: widget.preferredPanelSize,
-            preferredFloatingWidgetSize: widget.defaultFloatingSize,
-            canPopout: widget.canPopout,
-            isFloatingStateWindowResizable: widget.isFloatingStateWindowResizable,
-            hideWithUiWhenFloating: !!widget.hideWithUiWhenFloating,
-            allowedPanelTargets: (_a = widget.allowedPanelTargets) === null || _a === void 0 ? void 0 : _a.map((location) => toPanelSide(location)),
-        });
+        state = addTab(state, widget.id, toTabArgs(widget));
         tabs.push(widget.id);
     }
     const activeWidget = visibleWidgets.find((widget) => widget.isActive);
     const minimized = false;
     // istanbul ignore else
-    if ((activeWidget === null || activeWidget === void 0 ? void 0 : activeWidget.defaultState) !== WidgetState.Floating) {
+    if (activeWidget?.defaultState !== WidgetState.Floating) {
         state = addPanelWidget(state, side, widgetId, tabs, {
             activeTabId: activeWidget ? activeWidget.id : tabs[0],
             minimized,
@@ -239,13 +233,9 @@ export function addWidgets(state, widgets, side, widgetId) {
 /** @internal */
 // istanbul ignore next
 export function appendWidgets(state, widgetDefs, location, section) {
-    var _a, _b;
-    if (widgetDefs.length === 0)
-        return state;
     const side = toPanelSide(location);
     // Add missing widget tabs.
     for (const widgetDef of widgetDefs) {
-        const label = getWidgetLabel(widgetDef.label);
         const saveTab = state.tabs[widgetDef.id];
         const preferredPanelWidgetSize = saveTab
             ? saveTab.preferredPanelWidgetSize
@@ -260,19 +250,14 @@ export function appendWidgets(state, widgetDefs, location, section) {
                     !!saveTab.preferredFloatingWidgetSize)
             : !!widgetDef.defaultFloatingSize;
         state = addTab(state, widgetDef.id, {
-            label,
-            iconSpec: widgetDef.iconSpec,
-            canPopout: widgetDef.canPopout,
-            preferredPanelWidgetSize,
+            ...toTabArgs(widgetDef),
             preferredFloatingWidgetSize,
+            preferredPanelWidgetSize,
             userSized,
-            isFloatingStateWindowResizable: widgetDef.isFloatingStateWindowResizable,
-            hideWithUiWhenFloating: !!widgetDef.hideWithUiWhenFloating,
-            allowedPanelTargets: (_a = widgetDef.allowedPanelTargets) === null || _a === void 0 ? void 0 : _a.map((l) => toPanelSide(l)),
         });
         if (widgetDef.isFloatingStateSupported &&
             widgetDef.defaultState === WidgetState.Floating) {
-            const floatingContainerId = (_b = widgetDef.floatingContainerId) !== null && _b !== void 0 ? _b : getUniqueId();
+            const floatingContainerId = widgetDef.floatingContainerId ?? getUniqueId();
             const widgetContainerId = getWidgetId(location, section);
             const home = {
                 side,
@@ -290,7 +275,7 @@ export function appendWidgets(state, widgetDefs, location, section) {
                     width: 300,
                     ...tab.preferredFloatingWidgetSize,
                 };
-                const preferredPoint = preferredPosition !== null && preferredPosition !== void 0 ? preferredPosition : {
+                const preferredPoint = preferredPosition ?? {
                     x: (state.size.width - size.width) / 2,
                     y: (state.size.height - size.height) / 2,
                 };
@@ -349,16 +334,29 @@ function processPopoutWidgets(initialState, frontstageDef) {
  * @internal
  */
 export function addMissingWidgets(frontstageDef, initialState) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     let state = initialState;
-    state = appendWidgets(state, determineNewWidgets((_a = frontstageDef.leftPanel) === null || _a === void 0 ? void 0 : _a.getPanelSectionDef(StagePanelSection.Start).widgetDefs, state), StagePanelLocation.Left, StagePanelSection.Start);
-    state = appendWidgets(state, determineNewWidgets((_b = frontstageDef.leftPanel) === null || _b === void 0 ? void 0 : _b.getPanelSectionDef(StagePanelSection.End).widgetDefs, state), StagePanelLocation.Left, StagePanelSection.End);
-    state = appendWidgets(state, determineNewWidgets((_c = frontstageDef.rightPanel) === null || _c === void 0 ? void 0 : _c.getPanelSectionDef(StagePanelSection.Start).widgetDefs, state), StagePanelLocation.Right, StagePanelSection.Start);
-    state = appendWidgets(state, determineNewWidgets((_d = frontstageDef.rightPanel) === null || _d === void 0 ? void 0 : _d.getPanelSectionDef(StagePanelSection.End).widgetDefs, state), StagePanelLocation.Right, StagePanelSection.End);
-    state = appendWidgets(state, determineNewWidgets((_e = frontstageDef.topPanel) === null || _e === void 0 ? void 0 : _e.getPanelSectionDef(StagePanelSection.Start).widgetDefs, state), StagePanelLocation.Top, StagePanelSection.Start);
-    state = appendWidgets(state, determineNewWidgets((_f = frontstageDef.topPanel) === null || _f === void 0 ? void 0 : _f.getPanelSectionDef(StagePanelSection.End).widgetDefs, state), StagePanelLocation.Top, StagePanelSection.End);
-    state = appendWidgets(state, determineNewWidgets((_g = frontstageDef.bottomPanel) === null || _g === void 0 ? void 0 : _g.getPanelSectionDef(StagePanelSection.Start).widgetDefs, state), StagePanelLocation.Bottom, StagePanelSection.Start);
-    state = appendWidgets(state, determineNewWidgets((_h = frontstageDef.bottomPanel) === null || _h === void 0 ? void 0 : _h.getPanelSectionDef(StagePanelSection.End).widgetDefs, state), StagePanelLocation.Bottom, StagePanelSection.End);
+    state = appendWidgets(state, determineNewWidgets(frontstageDef.leftPanel?.getPanelSectionDef(StagePanelSection.Start)
+        .widgetDefs, state), StagePanelLocation.Left, StagePanelSection.Start);
+    state = appendWidgets(state, determineNewWidgets(frontstageDef.leftPanel?.getPanelSectionDef(StagePanelSection.End)
+        .widgetDefs, state), StagePanelLocation.Left, StagePanelSection.End);
+    state = appendWidgets(state, determineNewWidgets(frontstageDef.rightPanel?.getPanelSectionDef(StagePanelSection.Start)
+        .widgetDefs, state), StagePanelLocation.Right, StagePanelSection.Start);
+    state = appendWidgets(state, determineNewWidgets(frontstageDef.rightPanel?.getPanelSectionDef(StagePanelSection.End)
+        .widgetDefs, state), StagePanelLocation.Right, StagePanelSection.End);
+    state = appendWidgets(state, determineNewWidgets(frontstageDef.topPanel?.getPanelSectionDef(StagePanelSection.Start)
+        .widgetDefs, state), StagePanelLocation.Top, StagePanelSection.Start);
+    state = appendWidgets(state, determineNewWidgets(frontstageDef.topPanel?.getPanelSectionDef(StagePanelSection.End)
+        .widgetDefs, state), StagePanelLocation.Top, StagePanelSection.End);
+    state = appendWidgets(state, determineNewWidgets(frontstageDef.bottomPanel?.getPanelSectionDef(StagePanelSection.Start)
+        .widgetDefs, state), StagePanelLocation.Bottom, StagePanelSection.Start);
+    state = appendWidgets(state, determineNewWidgets(frontstageDef.bottomPanel?.getPanelSectionDef(StagePanelSection.End)
+        .widgetDefs, state), StagePanelLocation.Bottom, StagePanelSection.End);
+    if (frontstageDef.toolSettings) {
+        const newToolSettingsWidgets = determineNewWidgets([frontstageDef.toolSettings], state);
+        for (const newToolSettingsWidget of newToolSettingsWidgets) {
+            state = addTab(state, newToolSettingsWidget.id, toTabArgs(newToolSettingsWidget));
+        }
+    }
     return state;
 }
 /** Hide widgets with Hidden defaultState. */
@@ -377,8 +375,8 @@ function hideWidgets(state, frontstageDef) {
 /** Removes NineZoneState widgets that are missing in frontstageDef.
  * @internal
  */
-export function removeMissingWidgets(frontstageDef, initialState) {
-    let state = initialState;
+export function removeMissingWidgets(frontstageDef, state) {
+    const toolSettingsTabId = state.toolSettings?.tabId;
     for (const [, tab] of Object.entries(state.tabs)) {
         if (tab.id === toolSettingsTabId)
             continue;
@@ -432,8 +430,8 @@ export function getWidgetId(location, section) {
 /** @internal */
 export function getPanelSectionWidgets(frontstageDef, location, section) {
     const stagePanel = frontstageDef.getStagePanelDef(location);
-    const panelSection = stagePanel === null || stagePanel === void 0 ? void 0 : stagePanel.getPanelSectionDef(section);
-    return (panelSection === null || panelSection === void 0 ? void 0 : panelSection.widgetDefs) || [];
+    const panelSection = stagePanel?.getPanelSectionDef(section);
+    return panelSection?.widgetDefs || [];
 }
 /** @internal */
 export function addPanelWidgets(state, frontstageDef, location) {
@@ -458,15 +456,14 @@ export function initializePanel(state, frontstageDef, location) {
     state = addPanelWidgets(state, frontstageDef, location);
     const panelDef = frontstageDef.getStagePanelDef(location);
     state = produce(state, (draft) => {
-        var _a, _b, _c;
         const panel = draft.panels[panelSide];
-        panel.minSize = (_a = panelDef === null || panelDef === void 0 ? void 0 : panelDef.minSize) !== null && _a !== void 0 ? _a : panel.minSize;
-        panel.pinned = (_b = panelDef === null || panelDef === void 0 ? void 0 : panelDef.pinned) !== null && _b !== void 0 ? _b : panel.pinned;
-        panel.resizable = (_c = panelDef === null || panelDef === void 0 ? void 0 : panelDef.resizable) !== null && _c !== void 0 ? _c : panel.resizable;
-        if (panelDef === null || panelDef === void 0 ? void 0 : panelDef.maxSizeSpec) {
+        panel.minSize = panelDef?.minSize ?? panel.minSize;
+        panel.pinned = panelDef?.pinned ?? panel.pinned;
+        panel.resizable = panelDef?.resizable ?? panel.resizable;
+        if (panelDef?.maxSizeSpec) {
             panel.maxSize = getPanelMaxSize(panelDef.maxSizeSpec, panelSide, state.size);
         }
-        const size = panelDef === null || panelDef === void 0 ? void 0 : panelDef.size;
+        const size = panelDef?.size;
         panel.size =
             size === undefined
                 ? size
@@ -483,7 +480,8 @@ function getPanelMaxSize(maxSizeSpec, panel, nineZoneSize) {
         : nineZoneSize.width;
     return (maxSizeSpec.percentage / 100) * size;
 }
-const stateVersion = 13; // this needs to be bumped when NineZoneState is changed (to recreate the layout).
+/** @internal */
+export const stateVersion = 14; // this needs to be bumped when NineZoneState is changed (to recreate the layout).
 /** @internal */
 export function initializeNineZoneState(frontstageDef) {
     let nineZone = defaultNineZone;
@@ -500,30 +498,26 @@ export function initializeNineZoneState(frontstageDef) {
     nineZone = initializePanel(nineZone, frontstageDef, StagePanelLocation.Right);
     nineZone = initializePanel(nineZone, frontstageDef, StagePanelLocation.Top);
     nineZone = initializePanel(nineZone, frontstageDef, StagePanelLocation.Bottom);
-    nineZone = produce(nineZone, (stateDraft) => {
-        var _a, _b, _c, _d;
-        for (const [, panel] of Object.entries(stateDraft.panels)) {
-            const expanded = panel.widgets.find((widgetId) => stateDraft.widgets[widgetId].minimized === false);
-            const firstWidget = panel.widgets.length > 0
-                ? stateDraft.widgets[panel.widgets[0]]
-                : undefined;
+    nineZone = produce(nineZone, (draft) => {
+        for (const [, panel] of Object.entries(draft.panels)) {
+            const expanded = panel.widgets.find((widgetId) => draft.widgets[widgetId].minimized === false);
+            const firstWidget = panel.widgets.length > 0 ? draft.widgets[panel.widgets[0]] : undefined;
             // istanbul ignore next
             if (!expanded && firstWidget) {
                 firstWidget.minimized = false;
             }
         }
-        stateDraft.panels.left.collapsed = isPanelCollapsed((_a = frontstageDef.leftPanel) === null || _a === void 0 ? void 0 : _a.panelState);
-        stateDraft.panels.right.collapsed = isPanelCollapsed((_b = frontstageDef.rightPanel) === null || _b === void 0 ? void 0 : _b.panelState);
-        stateDraft.panels.top.collapsed = isPanelCollapsed((_c = frontstageDef.topPanel) === null || _c === void 0 ? void 0 : _c.panelState);
-        stateDraft.panels.bottom.collapsed = isPanelCollapsed((_d = frontstageDef.bottomPanel) === null || _d === void 0 ? void 0 : _d.panelState);
-        const toolSettingsWidgetDef = frontstageDef.toolSettings;
-        if (toolSettingsWidgetDef) {
-            const toolSettingsTab = stateDraft.tabs[toolSettingsTabId];
-            toolSettingsTab.preferredPanelWidgetSize =
-                toolSettingsWidgetDef.preferredPanelSize;
-        }
+        draft.panels.left.collapsed = isPanelCollapsed(frontstageDef.leftPanel?.panelState);
+        draft.panels.right.collapsed = isPanelCollapsed(frontstageDef.rightPanel?.panelState);
+        draft.panels.top.collapsed = isPanelCollapsed(frontstageDef.topPanel?.panelState);
+        draft.panels.bottom.collapsed = isPanelCollapsed(frontstageDef.bottomPanel?.panelState);
     });
     nineZone = addMissingWidgets(frontstageDef, nineZone);
+    const toolSettingsWidgetDef = frontstageDef.toolSettings;
+    if (toolSettingsWidgetDef) {
+        const toolSettingsTabId = toolSettingsWidgetDef.id;
+        nineZone = addDockedToolSettings(nineZone, toolSettingsTabId);
+    }
     nineZone = hideWidgets(nineZone, frontstageDef);
     nineZone = processPopoutWidgets(nineZone, frontstageDef);
     return nineZone;
@@ -536,7 +530,7 @@ export function initializeNineZoneState(frontstageDef) {
 export function restoreNineZoneState(frontstageDef, saved) {
     let restored = {
         ...saved,
-        tabs: defaultNineZone.tabs,
+        tabs: {},
     };
     for (const [, tab] of Object.entries(saved.tabs)) {
         // Re-add the placeholder tab in order to correctly remove it from the state if WidgetDef is not found.
@@ -551,15 +545,11 @@ export function restoreNineZoneState(frontstageDef, saved) {
             continue;
         }
         restored = produce(restored, (draft) => {
-            var _a;
             draft.tabs[tab.id] = {
                 ...tab,
-                label: getWidgetLabel(widgetDef.label),
-                hideWithUiWhenFloating: widgetDef.hideWithUiWhenFloating,
-                iconSpec: widgetDef.iconSpec,
-                canPopout: widgetDef.canPopout,
-                isFloatingStateWindowResizable: widgetDef.isFloatingStateWindowResizable,
-                allowedPanelTargets: (_a = widgetDef.allowedPanelTargets) === null || _a === void 0 ? void 0 : _a.map((location) => toPanelSide(location)),
+                ...toTabArgs(widgetDef),
+                preferredFloatingWidgetSize: tab.preferredFloatingWidgetSize,
+                preferredPanelWidgetSize: tab.preferredPanelWidgetSize,
             };
         });
     }
@@ -616,12 +606,9 @@ export function packNineZoneState(state) {
     };
     packed = produce(packed, (draft) => {
         for (const [, tab] of Object.entries(state.tabs)) {
-            if (tab.id === toolSettingsTabId)
-                continue;
             draft.tabs[tab.id] = {
                 id: tab.id,
                 preferredFloatingWidgetSize: tab.preferredFloatingWidgetSize,
-                allowedPanelTargets: tab.allowedPanelTargets,
                 userSized: tab.userSized,
             };
         }
@@ -714,19 +701,27 @@ function addHiddenWidget(state, widgetDef) {
 }
 /** @internal */
 export function setWidgetState(state, widgetDef, widgetState) {
-    var _a, _b;
     if (widgetState === WidgetState.Hidden) {
         return hideWidget(state, widgetDef);
     }
     else if (widgetState === WidgetState.Open) {
         const id = widgetDef.id;
+        if (widgetDef.isToolSettings) {
+            if (!state.toolSettings && !widgetDef.tabLocation) {
+                state = addDockedToolSettings(state, id);
+            }
+            if (state.toolSettings?.type === "docked")
+                return state;
+        }
         let location = getTabLocation(state, id);
         if (!location) {
             state = addHiddenWidget(state, widgetDef);
             location = getTabLocation(state, id);
+            if (widgetDef.isToolSettings) {
+                state = addWidgetToolSettings(state, id);
+            }
         }
         return produce(state, (draft) => {
-            var _a;
             assert(!!location);
             const widget = draft.widgets[location.widgetId];
             widget.minimized = false;
@@ -741,13 +736,16 @@ export function setWidgetState(state, widgetDef, widgetState) {
                 panel.collapsed = false;
                 if (undefined === panel.size || 0 === panel.size) {
                     // istanbul ignore next
-                    panel.size = (_a = panel.minSize) !== null && _a !== void 0 ? _a : 200;
+                    panel.size = panel.minSize ?? 200;
                 }
             }
         });
     }
     else if (widgetState === WidgetState.Closed) {
         const id = widgetDef.id;
+        if (widgetDef.isToolSettings && state.toolSettings?.type !== "widget") {
+            return state;
+        }
         let location = getTabLocation(state, id);
         if (!location) {
             state = addHiddenWidget(state, widgetDef);
@@ -776,13 +774,30 @@ export function setWidgetState(state, widgetDef, widgetState) {
             return state;
         // Widget is not floating.
         state = removeTabFromWidget(state, id);
-        const bounds = (_b = (_a = widgetDef.tabLocation) === null || _a === void 0 ? void 0 : _a.floatingWidget) === null || _b === void 0 ? void 0 : _b.bounds;
+        const bounds = widgetDef.tabLocation?.floatingWidget?.bounds;
         state = addFloatingWidget(state, getUniqueId(), [id], { bounds });
+        if (widgetDef.isToolSettings) {
+            if (state.toolSettings?.type === "docked") {
+                state = removeToolSettings(state);
+            }
+            if (!state.toolSettings) {
+                state = addWidgetToolSettings(state, id);
+            }
+        }
     }
     return state;
 }
 /** Stores widget location and hides it in the UI. */
 function hideWidget(state, widgetDef) {
+    const toolSettingsTabId = state.toolSettings?.tabId;
+    if (widgetDef.id === toolSettingsTabId) {
+        widgetDef.tabLocation = undefined;
+        state = produce(state, (draft) => {
+            draft.toolSettings = undefined;
+        });
+        if (state.toolSettings?.type === "docked")
+            return state;
+    }
     const location = getTabLocation(state, widgetDef.id);
     if (!location)
         return state;
@@ -886,8 +901,8 @@ export function useSavedFrontstageState(frontstageDef) {
                 return;
             if (isFrontstageStateSettingResult(settingResult)) {
                 const setting = settingResult.setting;
-                if (setting.version >= version &&
-                    setting.stateVersion >= stateVersion) {
+                if (setting.version === version &&
+                    setting.stateVersion === stateVersion) {
                     const restored = restoreNineZoneState(frontstageDef, setting.nineZone);
                     frontstageDef.savedWidgetDefs = setting.widgets;
                     restoreSavedWidgets(frontstageDef);
@@ -974,14 +989,11 @@ const createListener = (frontstageDef, listener) => {
 /** @internal */
 export function useFrontstageManager(frontstageDef, useToolAsToolSettingsLabel) {
     React.useEffect(() => {
-        const listener = createListener(frontstageDef, ({ widgetDef, widgetState }) => {
-            assert(!!frontstageDef.nineZoneState);
+        return UiFramework.frontstages.onWidgetStateChangedEvent.addListener(({ widgetDef, widgetState }) => {
+            if (!frontstageDef.nineZoneState)
+                return;
             frontstageDef.nineZoneState = setWidgetState(frontstageDef.nineZoneState, widgetDef, widgetState);
         });
-        UiFramework.frontstages.onWidgetStateChangedEvent.addListener(listener);
-        return () => {
-            UiFramework.frontstages.onWidgetStateChangedEvent.removeListener(listener);
-        };
     }, [frontstageDef]);
     React.useEffect(() => {
         const listener = createListener(frontstageDef, ({ widgetDef }) => {
@@ -1039,12 +1051,14 @@ export function useFrontstageManager(frontstageDef, useToolAsToolSettingsLabel)
     const defaultLabel = React.useMemo(() => UiFramework.translate("widget.labels.toolSettings"), []);
     React.useEffect(() => {
         const updateLabel = createListener(frontstageDef, () => {
-            var _a;
             const toolId = UiFramework.frontstages.activeToolId;
             assert(!!frontstageDef.nineZoneState);
             const label = useToolAsToolSettingsLabel
-                ? ((_a = IModelApp.tools.find(toolId)) === null || _a === void 0 ? void 0 : _a.flyover) || defaultLabel
+                ? IModelApp.tools.find(toolId)?.flyover || defaultLabel
                 : defaultLabel;
+            const toolSettingsTabId = frontstageDef.nineZoneState.toolSettings?.tabId;
+            if (!toolSettingsTabId)
+                return;
             frontstageDef.nineZoneState = setWidgetLabel(frontstageDef.nineZoneState, toolSettingsTabId, label);
         });
         // Whenever the frontstageDef or the useTool... changes, keep the label up to date.