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

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

@@ -7,7 +7,7 @@
  * @module Frontstage
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useItemsManager = exports.useFrontstageManager = exports.getFrontstageStateSettingName = exports.FRONTSTAGE_SETTINGS_NAMESPACE = exports.useSaveFrontstageSettings = exports.useSavedFrontstageState = exports.setWidgetLabel = exports.expandWidget = exports.showWidget = exports.setWidgetState = exports.isPanelCollapsed = exports.packNineZoneState = exports.restoreNineZoneState = exports.initializeNineZoneState = exports.initializePanel = exports.isFrontstageStateSettingResult = exports.addPanelWidgets = exports.getPanelSectionWidgets = exports.getWidgetId = exports.removeMissingWidgets = exports.addMissingWidgets = exports.appendWidgets = exports.addWidgets = exports.useLabels = exports.ActiveFrontstageDefProvider = exports.WidgetPanelsFrontstage = exports.useNineZoneDispatch = exports.FrameworkStateReducer = exports.useUpdateNineZoneSize = exports.useLayoutStore = void 0;
+exports.useItemsManager = exports.useFrontstageManager = exports.getFrontstageStateSettingName = exports.FRONTSTAGE_SETTINGS_NAMESPACE = exports.useSaveFrontstageSettings = exports.useSavedFrontstageState = exports.setWidgetLabel = exports.expandWidget = exports.showWidget = exports.setWidgetState = exports.isPanelCollapsed = exports.packNineZoneState = exports.restoreNineZoneState = exports.initializeNineZoneState = exports.stateVersion = exports.initializePanel = exports.isFrontstageStateSettingResult = exports.addPanelWidgets = exports.getPanelSectionWidgets = exports.getWidgetId = exports.removeMissingWidgets = exports.addMissingWidgets = exports.appendWidgets = exports.addWidgets = exports.useLabels = exports.ActiveFrontstageDefProvider = exports.WidgetPanelsFrontstage = exports.useNineZoneDispatch = exports.FrameworkStateReducer = exports.useUpdateNineZoneSize = exports.useLayoutStore = void 0;
 // cSpell:ignore popout
 require("./Frontstage.scss");
 const immer_1 = require("immer");
@@ -126,14 +126,6 @@ function useNineZoneDispatch(frontstageDef) {
         if (action.type === "RESIZE") {
             InternalFrontstageManager_1.InternalFrontstageManager.nineZoneSize = core_react_1.Size.create(action.size);
         }
-        // istanbul ignore if
-        if (action.type === "TOOL_SETTINGS_DRAG_START") {
-            void UiFramework_1.UiFramework.postTelemetry("Tool Settings Undocking", "28B04E07-AE73-4533-A0BA-8E2A8DC99ADF");
-        }
-        // istanbul ignore if
-        if (action.type === "TOOL_SETTINGS_DOCK") {
-            void UiFramework_1.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);
@@ -214,6 +206,19 @@ function useLabels() {
     }), []);
 }
 exports.useLabels = useLabels;
+function toTabArgs(widget) {
+    const label = getWidgetLabel(widget.label);
+    return {
+        allowedPanelTargets: widget.allowedPanelTargets?.map((location) => (0, StagePanelDef_1.toPanelSide)(location)),
+        hideWithUiWhenFloating: !!widget.hideWithUiWhenFloating,
+        canPopout: widget.canPopout,
+        iconSpec: widget.iconSpec,
+        isFloatingStateWindowResizable: widget.isFloatingStateWindowResizable,
+        label,
+        preferredFloatingWidgetSize: widget.defaultFloatingSize,
+        preferredPanelWidgetSize: widget.preferredPanelSize,
+    };
+}
 /** @internal */
 function addWidgets(state, widgets, side, widgetId) {
     const visibleWidgets = widgets.filter((w) => w.isVisible && w.defaultState !== WidgetState_1.WidgetState.Floating);
@@ -221,17 +226,7 @@ function addWidgets(state, widgets, side, widgetId) {
         return state;
     const tabs = new Array();
     for (const widget of visibleWidgets) {
-        const label = getWidgetLabel(widget.label);
-        state = (0, appui_layout_react_1.addTab)(state, widget.id, {
-            label,
-            iconSpec: widget.iconSpec,
-            preferredPanelWidgetSize: widget.preferredPanelSize,
-            preferredFloatingWidgetSize: widget.defaultFloatingSize,
-            canPopout: widget.canPopout,
-            isFloatingStateWindowResizable: widget.isFloatingStateWindowResizable,
-            hideWithUiWhenFloating: !!widget.hideWithUiWhenFloating,
-            allowedPanelTargets: widget.allowedPanelTargets?.map((location) => (0, StagePanelDef_1.toPanelSide)(location)),
-        });
+        state = (0, appui_layout_react_1.addTab)(state, widget.id, toTabArgs(widget));
         tabs.push(widget.id);
     }
     const activeWidget = visibleWidgets.find((widget) => widget.isActive);
@@ -249,12 +244,9 @@ exports.addWidgets = addWidgets;
 /** @internal */
 // istanbul ignore next
 function appendWidgets(state, widgetDefs, location, section) {
-    if (widgetDefs.length === 0)
-        return state;
     const side = (0, StagePanelDef_1.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
@@ -269,15 +261,10 @@ function appendWidgets(state, widgetDefs, location, section) {
                     !!saveTab.preferredFloatingWidgetSize)
             : !!widgetDef.defaultFloatingSize;
         state = (0, appui_layout_react_1.addTab)(state, widgetDef.id, {
-            label,
-            iconSpec: widgetDef.iconSpec,
-            canPopout: widgetDef.canPopout,
-            preferredPanelWidgetSize,
+            ...toTabArgs(widgetDef),
             preferredFloatingWidgetSize,
+            preferredPanelWidgetSize,
             userSized,
-            isFloatingStateWindowResizable: widgetDef.isFloatingStateWindowResizable,
-            hideWithUiWhenFloating: !!widgetDef.hideWithUiWhenFloating,
-            allowedPanelTargets: widgetDef.allowedPanelTargets?.map((l) => (0, StagePanelDef_1.toPanelSide)(l)),
         });
         if (widgetDef.isFloatingStateSupported &&
             widgetDef.defaultState === WidgetState_1.WidgetState.Floating) {
@@ -376,6 +363,12 @@ function addMissingWidgets(frontstageDef, initialState) {
         .widgetDefs, state), StagePanelLocation_1.StagePanelLocation.Bottom, StagePanelSection_1.StagePanelSection.Start);
     state = appendWidgets(state, determineNewWidgets(frontstageDef.bottomPanel?.getPanelSectionDef(StagePanelSection_1.StagePanelSection.End)
         .widgetDefs, state), StagePanelLocation_1.StagePanelLocation.Bottom, StagePanelSection_1.StagePanelSection.End);
+    if (frontstageDef.toolSettings) {
+        const newToolSettingsWidgets = determineNewWidgets([frontstageDef.toolSettings], state);
+        for (const newToolSettingsWidget of newToolSettingsWidgets) {
+            state = (0, appui_layout_react_1.addTab)(state, newToolSettingsWidget.id, toTabArgs(newToolSettingsWidget));
+        }
+    }
     return state;
 }
 exports.addMissingWidgets = addMissingWidgets;
@@ -395,10 +388,10 @@ function hideWidgets(state, frontstageDef) {
 /** Removes NineZoneState widgets that are missing in frontstageDef.
  * @internal
  */
-function removeMissingWidgets(frontstageDef, initialState) {
-    let state = initialState;
+function removeMissingWidgets(frontstageDef, state) {
+    const toolSettingsTabId = state.toolSettings?.tabId;
     for (const [, tab] of Object.entries(state.tabs)) {
-        if (tab.id === appui_layout_react_1.toolSettingsTabId)
+        if (tab.id === toolSettingsTabId)
             continue;
         const widgetDef = frontstageDef.findWidgetDef(tab.id);
         if (widgetDef)
@@ -506,7 +499,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 */
+exports.stateVersion = 14; // this needs to be bumped when NineZoneState is changed (to recreate the layout).
 /** @internal */
 function initializeNineZoneState(frontstageDef) {
     let nineZone = defaultNineZone;
@@ -523,29 +517,26 @@ function initializeNineZoneState(frontstageDef) {
     nineZone = initializePanel(nineZone, frontstageDef, StagePanelLocation_1.StagePanelLocation.Right);
     nineZone = initializePanel(nineZone, frontstageDef, StagePanelLocation_1.StagePanelLocation.Top);
     nineZone = initializePanel(nineZone, frontstageDef, StagePanelLocation_1.StagePanelLocation.Bottom);
-    nineZone = (0, immer_1.default)(nineZone, (stateDraft) => {
-        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 = (0, immer_1.default)(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(frontstageDef.leftPanel?.panelState);
-        stateDraft.panels.right.collapsed = isPanelCollapsed(frontstageDef.rightPanel?.panelState);
-        stateDraft.panels.top.collapsed = isPanelCollapsed(frontstageDef.topPanel?.panelState);
-        stateDraft.panels.bottom.collapsed = isPanelCollapsed(frontstageDef.bottomPanel?.panelState);
-        const toolSettingsWidgetDef = frontstageDef.toolSettings;
-        if (toolSettingsWidgetDef) {
-            const toolSettingsTab = stateDraft.tabs[appui_layout_react_1.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 = (0, appui_layout_react_1.addDockedToolSettings)(nineZone, toolSettingsTabId);
+    }
     nineZone = hideWidgets(nineZone, frontstageDef);
     nineZone = processPopoutWidgets(nineZone, frontstageDef);
     return nineZone;
@@ -559,7 +550,7 @@ exports.initializeNineZoneState = initializeNineZoneState;
 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.
@@ -576,12 +567,9 @@ function restoreNineZoneState(frontstageDef, saved) {
         restored = (0, immer_1.default)(restored, (draft) => {
             draft.tabs[tab.id] = {
                 ...tab,
-                label: getWidgetLabel(widgetDef.label),
-                hideWithUiWhenFloating: widgetDef.hideWithUiWhenFloating,
-                iconSpec: widgetDef.iconSpec,
-                canPopout: widgetDef.canPopout,
-                isFloatingStateWindowResizable: widgetDef.isFloatingStateWindowResizable,
-                allowedPanelTargets: widgetDef.allowedPanelTargets?.map((location) => (0, StagePanelDef_1.toPanelSide)(location)),
+                ...toTabArgs(widgetDef),
+                preferredFloatingWidgetSize: tab.preferredFloatingWidgetSize,
+                preferredPanelWidgetSize: tab.preferredPanelWidgetSize,
             };
         });
     }
@@ -639,12 +627,9 @@ function packNineZoneState(state) {
     };
     packed = (0, immer_1.default)(packed, (draft) => {
         for (const [, tab] of Object.entries(state.tabs)) {
-            if (tab.id === appui_layout_react_1.toolSettingsTabId)
-                continue;
             draft.tabs[tab.id] = {
                 id: tab.id,
                 preferredFloatingWidgetSize: tab.preferredFloatingWidgetSize,
-                allowedPanelTargets: tab.allowedPanelTargets,
                 userSized: tab.userSized,
             };
         }
@@ -744,10 +729,20 @@ function setWidgetState(state, widgetDef, widgetState) {
     }
     else if (widgetState === WidgetState_1.WidgetState.Open) {
         const id = widgetDef.id;
+        if (widgetDef.isToolSettings) {
+            if (!state.toolSettings && !widgetDef.tabLocation) {
+                state = (0, appui_layout_react_1.addDockedToolSettings)(state, id);
+            }
+            if (state.toolSettings?.type === "docked")
+                return state;
+        }
         let location = (0, appui_layout_react_1.getTabLocation)(state, id);
         if (!location) {
             state = addHiddenWidget(state, widgetDef);
             location = (0, appui_layout_react_1.getTabLocation)(state, id);
+            if (widgetDef.isToolSettings) {
+                state = (0, appui_layout_react_1.addWidgetToolSettings)(state, id);
+            }
         }
         return (0, immer_1.default)(state, (draft) => {
             (0, core_bentley_1.assert)(!!location);
@@ -771,6 +766,9 @@ function setWidgetState(state, widgetDef, widgetState) {
     }
     else if (widgetState === WidgetState_1.WidgetState.Closed) {
         const id = widgetDef.id;
+        if (widgetDef.isToolSettings && state.toolSettings?.type !== "widget") {
+            return state;
+        }
         let location = (0, appui_layout_react_1.getTabLocation)(state, id);
         if (!location) {
             state = addHiddenWidget(state, widgetDef);
@@ -801,12 +799,29 @@ function setWidgetState(state, widgetDef, widgetState) {
         state = (0, appui_layout_react_1.removeTabFromWidget)(state, id);
         const bounds = widgetDef.tabLocation?.floatingWidget?.bounds;
         state = (0, appui_layout_react_1.addFloatingWidget)(state, (0, appui_layout_react_1.getUniqueId)(), [id], { bounds });
+        if (widgetDef.isToolSettings) {
+            if (state.toolSettings?.type === "docked") {
+                state = (0, appui_layout_react_1.removeToolSettings)(state);
+            }
+            if (!state.toolSettings) {
+                state = (0, appui_layout_react_1.addWidgetToolSettings)(state, id);
+            }
+        }
     }
     return state;
 }
 exports.setWidgetState = setWidgetState;
 /** 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 = (0, immer_1.default)(state, (draft) => {
+            draft.toolSettings = undefined;
+        });
+        if (state.toolSettings?.type === "docked")
+            return state;
+    }
     const location = (0, appui_layout_react_1.getTabLocation)(state, widgetDef.id);
     if (!location)
         return state;
@@ -913,8 +928,8 @@ function useSavedFrontstageState(frontstageDef) {
                 return;
             if (isFrontstageStateSettingResult(settingResult)) {
                 const setting = settingResult.setting;
-                if (setting.version >= version &&
-                    setting.stateVersion >= stateVersion) {
+                if (setting.version === version &&
+                    setting.stateVersion === exports.stateVersion) {
                     const restored = restoreNineZoneState(frontstageDef, setting.nineZone);
                     frontstageDef.savedWidgetDefs = setting.widgets;
                     restoreSavedWidgets(frontstageDef);
@@ -942,7 +957,7 @@ function useSaveFrontstageSettings(frontstageDef, store) {
             const setting = {
                 id,
                 version: frontstage.version,
-                stateVersion,
+                stateVersion: exports.stateVersion,
                 nineZone: packNineZoneState(state),
                 widgets,
             };
@@ -1004,14 +1019,11 @@ const createListener = (frontstageDef, listener) => {
 /** @internal */
 function useFrontstageManager(frontstageDef, useToolAsToolSettingsLabel) {
     React.useEffect(() => {
-        const listener = createListener(frontstageDef, ({ widgetDef, widgetState }) => {
-            (0, core_bentley_1.assert)(!!frontstageDef.nineZoneState);
+        return UiFramework_1.UiFramework.frontstages.onWidgetStateChangedEvent.addListener(({ widgetDef, widgetState }) => {
+            if (!frontstageDef.nineZoneState)
+                return;
             frontstageDef.nineZoneState = setWidgetState(frontstageDef.nineZoneState, widgetDef, widgetState);
         });
-        UiFramework_1.UiFramework.frontstages.onWidgetStateChangedEvent.addListener(listener);
-        return () => {
-            UiFramework_1.UiFramework.frontstages.onWidgetStateChangedEvent.removeListener(listener);
-        };
     }, [frontstageDef]);
     React.useEffect(() => {
         const listener = createListener(frontstageDef, ({ widgetDef }) => {
@@ -1074,7 +1086,10 @@ function useFrontstageManager(frontstageDef, useToolAsToolSettingsLabel) {
             const label = useToolAsToolSettingsLabel
                 ? core_frontend_1.IModelApp.tools.find(toolId)?.flyover || defaultLabel
                 : defaultLabel;
-            frontstageDef.nineZoneState = setWidgetLabel(frontstageDef.nineZoneState, appui_layout_react_1.toolSettingsTabId, label);
+            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.
         updateLabel();