@itwin/appui-react 4.0.0 → 4.0.1

package/lib/cjs/appui-react/content/ContentLayout.scss

@@ -1,99 +1,99 @@
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-@import "~@itwin/core-react/lib/cjs/core-react/base/base";
-@import "~@itwin/core-react/lib/cjs/core-react/style/breakpoints";
-
-$resizer-size: 6px;
-$resizer-size-large: 14px;
-
-#uifw-contentlayout-div {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 100%;
-  pointer-events: auto;
-
-  .Pane2 {
-    height: 100%;
-  }
-
-  .Resizer {
-    background-color: var(--iui-color-border);
-    box-sizing: border-box;
-    background-clip: padding-box;
-    margin: 0;
-    transition: all var(--iui-duration-1) ease;
-
-    &:hover {
-      background-color: var(--iui-color-border-accent);
-    }
-
-    &.horizontal {
-      height: $resizer-size;
-      min-height: $resizer-size;
-      cursor: ns-resize;
-      width: 100%;
-
-      @include for-tablet-landscape-down {
-        height: $resizer-size-large;
-        min-height: $resizer-size-large;
-      }
-    }
-
-    &.vertical {
-      width: $resizer-size;
-      min-width: $resizer-size;
-      cursor: ew-resize;
-
-      @include for-tablet-landscape-down {
-        width: $resizer-size-large;
-        min-width: $resizer-size-large;
-      }
-    }
-
-    &.disabled {
-      cursor: not-allowed;
-
-      &:hover {
-        border-color: transparent;
-      }
-    }
-  }
-
-  .uifw-contentlayout-full-size {
-    @include uicore-full-size;
-  }
-}
-
-div.uifw-contentlayout-full-size div.SplitPane div.Pane {
-  overflow: hidden;
-}
-
-.uifw-contentlayout-wrapper {
-  position: relative;
-  width: 100%;
-  height: 100%;
-
-  .uifw-contentlayout-overlay-div {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    border-style: solid;
-    border-width: 4px 0 0 0;
-    box-sizing: border-box;
-    pointer-events: none;
-
-    &.uifw-contentlayout-overlay-active {
-      border-color: var(--iui-color-border-warning);
-    }
-
-    &.uifw-contentlayout-overlay-inactive {
-      border-color: transparent;
-    }
-  }
-}
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+@import "~@itwin/core-react/lib/cjs/core-react/base/base";
+@import "~@itwin/core-react/lib/cjs/core-react/style/breakpoints";
+
+$resizer-size: 6px;
+$resizer-size-large: 14px;
+
+#uifw-contentlayout-div {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 100%;
+  pointer-events: auto;
+
+  .Pane2 {
+    height: 100%;
+  }
+
+  .Resizer {
+    background-color: var(--iui-color-border);
+    box-sizing: border-box;
+    background-clip: padding-box;
+    margin: 0;
+    transition: all var(--iui-duration-1) ease;
+
+    &:hover {
+      background-color: var(--iui-color-border-accent);
+    }
+
+    &.horizontal {
+      height: $resizer-size;
+      min-height: $resizer-size;
+      cursor: ns-resize;
+      width: 100%;
+
+      @include for-tablet-landscape-down {
+        height: $resizer-size-large;
+        min-height: $resizer-size-large;
+      }
+    }
+
+    &.vertical {
+      width: $resizer-size;
+      min-width: $resizer-size;
+      cursor: ew-resize;
+
+      @include for-tablet-landscape-down {
+        width: $resizer-size-large;
+        min-width: $resizer-size-large;
+      }
+    }
+
+    &.disabled {
+      cursor: not-allowed;
+
+      &:hover {
+        border-color: transparent;
+      }
+    }
+  }
+
+  .uifw-contentlayout-full-size {
+    @include uicore-full-size;
+  }
+}
+
+div.uifw-contentlayout-full-size div.SplitPane div.Pane {
+  overflow: hidden;
+}
+
+.uifw-contentlayout-wrapper {
+  position: relative;
+  width: 100%;
+  height: 100%;
+
+  .uifw-contentlayout-overlay-div {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border-style: solid;
+    border-width: 4px 0 0 0;
+    box-sizing: border-box;
+    pointer-events: none;
+
+    &.uifw-contentlayout-overlay-active {
+      border-color: var(--iui-color-border-warning);
+    }
+
+    &.uifw-contentlayout-overlay-inactive {
+      border-color: transparent;
+    }
+  }
+}

package/lib/cjs/appui-react/content/DefaultViewOverlay.js

@@ -22,7 +22,6 @@ const useAnalysisAnimationDataProvider_1 = require("../hooks/useAnalysisAnimatio
  */
 // istanbul ignore next
 function DefaultViewOverlay({ viewport, onPlayPause, featureOptions }) {
-    var _a, _b, _c;
     const solarDataTimelineProvider = (0, useSolarDataProvider_1.useSolarDataProvider)(viewport);
     const analysisAnimationTimelineDataProvider = (0, useAnalysisAnimationDataProvider_1.useAnalysisAnimationDataProvider)(viewport);
     const scheduleTimelineDataProvider = (0, useScheduleAnimationDataProvider_1.useScheduleAnimationDataProvider)(viewport);
@@ -30,17 +29,17 @@ function DefaultViewOverlay({ viewport, onPlayPause, featureOptions }) {
     if (!currentViewport)
         return null;
     // Solar gets first shot
-    if (solarDataTimelineProvider && !!((_a = featureOptions === null || featureOptions === void 0 ? void 0 : featureOptions.defaultViewOverlay) === null || _a === void 0 ? void 0 : _a.enableSolarTimelineViewOverlay)) {
+    if (solarDataTimelineProvider && !!featureOptions?.defaultViewOverlay?.enableSolarTimelineViewOverlay) {
         return (React.createElement("div", { className: "uifw-view-overlay" },
             React.createElement("div", { className: "uifw-animation-overlay" },
                 React.createElement(imodel_components_react_1.SolarTimeline, { dataProvider: solarDataTimelineProvider }))));
     }
-    if (analysisAnimationTimelineDataProvider && !!((_b = featureOptions === null || featureOptions === void 0 ? void 0 : featureOptions.defaultViewOverlay) === null || _b === void 0 ? void 0 : _b.enableAnalysisTimelineViewOverlay)) {
+    if (analysisAnimationTimelineDataProvider && !!featureOptions?.defaultViewOverlay?.enableAnalysisTimelineViewOverlay) {
         return (React.createElement("div", { className: "uifw-view-overlay" },
             React.createElement("div", { className: "uifw-animation-overlay" },
                 React.createElement(imodel_components_react_1.TimelineComponent, { startDate: analysisAnimationTimelineDataProvider.start, endDate: analysisAnimationTimelineDataProvider.end, initialDuration: analysisAnimationTimelineDataProvider.initialDuration, totalDuration: analysisAnimationTimelineDataProvider.duration, minimized: true, onChange: analysisAnimationTimelineDataProvider.onAnimationFractionChanged, onPlayPause: onPlayPause }))));
     }
-    if (scheduleTimelineDataProvider && !!((_c = featureOptions === null || featureOptions === void 0 ? void 0 : featureOptions.defaultViewOverlay) === null || _c === void 0 ? void 0 : _c.enableScheduleAnimationViewOverlay)) {
+    if (scheduleTimelineDataProvider && !!featureOptions?.defaultViewOverlay?.enableScheduleAnimationViewOverlay) {
         return (React.createElement("div", { className: "uifw-view-overlay" },
             React.createElement("div", { className: "uifw-animation-overlay" },
                 React.createElement(imodel_components_react_1.TimelineComponent, { startDate: scheduleTimelineDataProvider.start, endDate: scheduleTimelineDataProvider.end, initialDuration: scheduleTimelineDataProvider.initialDuration, totalDuration: scheduleTimelineDataProvider.duration, minimized: true, onChange: scheduleTimelineDataProvider.onAnimationFractionChanged, onPlayPause: onPlayPause }))));

package/lib/cjs/appui-react/content/DefaultViewOverlay.js.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultViewOverlay.js","sourceRoot":"","sources":["../../../../src/appui-react/content/DefaultViewOverlay.tsx"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,qCAAmC;AACnC,+BAA+B;AAE/B,4EAAkF;AAClF,gGAA6F;AAC7F,kEAA+D;AAC/D,wEAAqE;AACrE,gGAA6F;AAW7F;;;;GAIG;AACH,uBAAuB;AACvB,SAAgB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAoB;;IAC5F,MAAM,yBAAyB,GAAG,IAAA,2CAAoB,EAAC,QAAQ,CAAC,CAAC;IACjE,MAAM,qCAAqC,GAAG,IAAA,mEAAgC,EAAC,QAAQ,CAAC,CAAC;IACzF,MAAM,4BAA4B,GAAG,IAAA,mEAAgC,EAAC,QAAQ,CAAC,CAAC;IAChF,MAAM,eAAe,GAAG,IAAA,qCAAiB,GAAE,CAAC;IAE5C,IAAI,CAAC,eAAe;QAClB,OAAO,IAAI,CAAC;IAEd,wBAAwB;IACxB,IAAI,yBAAyB,IAAI,CAAC,CAAC,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,kBAAkB,0CAAE,8BAA8B,CAAA,EAAE;QACrG,OAAO,CACL,6BAAK,SAAS,EAAC,mBAAmB;YAChC,6BAAK,SAAS,EAAC,wBAAwB;gBACrC,oBAAC,uCAAa,IAAC,YAAY,EAAE,yBAAyB,GAAI,CACtD,CACF,CACP,CAAC;KACH;IAED,IAAI,qCAAqC,IAAI,CAAC,CAAC,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,kBAAkB,0CAAE,iCAAiC,CAAA,EAAE;QACpH,OAAO,CACL,6BAAK,SAAS,EAAC,mBAAmB;YAChC,6BAAK,SAAS,EAAC,wBAAwB;gBACrC,oBAAC,2CAAiB,IAChB,SAAS,EAAE,qCAAqC,CAAC,KAAK,EACtD,OAAO,EAAE,qCAAqC,CAAC,GAAG,EAClD,eAAe,EAAE,qCAAqC,CAAC,eAAe,EACtE,aAAa,EAAE,qCAAqC,CAAC,QAAQ,EAC7D,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,qCAAqC,CAAC,0BAA0B,EAC1E,WAAW,EAAE,WAAW,GACxB,CACE,CACF,CACP,CAAC;KACH;IAED,IAAI,4BAA4B,IAAI,CAAC,CAAC,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,kBAAkB,0CAAE,kCAAkC,CAAA,EAAE;QAC5G,OAAO,CACL,6BAAK,SAAS,EAAC,mBAAmB;YAChC,6BAAK,SAAS,EAAC,wBAAwB;gBACrC,oBAAC,2CAAiB,IAChB,SAAS,EAAE,4BAA4B,CAAC,KAAK,EAC7C,OAAO,EAAE,4BAA4B,CAAC,GAAG,EACzC,eAAe,EAAE,4BAA4B,CAAC,eAAe,EAC7D,aAAa,EAAE,4BAA4B,CAAC,QAAQ,EACpD,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,4BAA4B,CAAC,0BAA0B,EACjE,WAAW,EAAE,WAAW,GACxB,CACE,CACF,CACP,CAAC;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAzDD,gDAyDC","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 \"./DefaultViewOverlay.scss\";\r\nimport * as React from \"react\";\r\nimport { ScreenViewport } from \"@itwin/core-frontend\";\r\nimport { SolarTimeline, TimelineComponent } from \"@itwin/imodel-components-react\";\r\nimport { useScheduleAnimationDataProvider } from \"../hooks/useScheduleAnimationDataProvider\";\r\nimport { useActiveViewport } from \"../hooks/useActiveViewport\";\r\nimport { useSolarDataProvider } from \"../hooks/useSolarDataProvider\";\r\nimport { useAnalysisAnimationDataProvider } from \"../hooks/useAnalysisAnimationDataProvider\";\r\n\r\n/** Props of Viewport Overlay Control that show timelines\r\n * @public\r\n */\r\nexport interface ViewOverlayProps {\r\n  viewport: ScreenViewport;\r\n  onPlayPause?: (playing: boolean) => void; // callback with play/pause button is pressed\r\n  featureOptions?: { [key: string]: any };\r\n}\r\n\r\n/**\r\n * Default viewport overlay that examines ViewState of the active view for a schedule script, analysis data, or solar data. If one of these is detected, the corresponding\r\n * data provider is attached to the TimelineComponent and the overlay is made visible.\r\n * @public\r\n */\r\n// istanbul ignore next\r\nexport function DefaultViewOverlay({ viewport, onPlayPause, featureOptions }: ViewOverlayProps) {\r\n  const solarDataTimelineProvider = useSolarDataProvider(viewport);\r\n  const analysisAnimationTimelineDataProvider = useAnalysisAnimationDataProvider(viewport);\r\n  const scheduleTimelineDataProvider = useScheduleAnimationDataProvider(viewport);\r\n  const currentViewport = useActiveViewport();\r\n\r\n  if (!currentViewport)\r\n    return null;\r\n\r\n  // Solar gets first shot\r\n  if (solarDataTimelineProvider && !!featureOptions?.defaultViewOverlay?.enableSolarTimelineViewOverlay) {\r\n    return (\r\n      <div className=\"uifw-view-overlay\">\r\n        <div className=\"uifw-animation-overlay\">\r\n          <SolarTimeline dataProvider={solarDataTimelineProvider} />\r\n        </div>\r\n      </div>\r\n    );\r\n  }\r\n\r\n  if (analysisAnimationTimelineDataProvider && !!featureOptions?.defaultViewOverlay?.enableAnalysisTimelineViewOverlay) {\r\n    return (\r\n      <div className=\"uifw-view-overlay\">\r\n        <div className=\"uifw-animation-overlay\">\r\n          <TimelineComponent\r\n            startDate={analysisAnimationTimelineDataProvider.start}\r\n            endDate={analysisAnimationTimelineDataProvider.end}\r\n            initialDuration={analysisAnimationTimelineDataProvider.initialDuration}\r\n            totalDuration={analysisAnimationTimelineDataProvider.duration}\r\n            minimized={true}\r\n            onChange={analysisAnimationTimelineDataProvider.onAnimationFractionChanged}\r\n            onPlayPause={onPlayPause}\r\n          />\r\n        </div>\r\n      </div>\r\n    );\r\n  }\r\n\r\n  if (scheduleTimelineDataProvider && !!featureOptions?.defaultViewOverlay?.enableScheduleAnimationViewOverlay) {\r\n    return (\r\n      <div className=\"uifw-view-overlay\">\r\n        <div className=\"uifw-animation-overlay\">\r\n          <TimelineComponent\r\n            startDate={scheduleTimelineDataProvider.start}\r\n            endDate={scheduleTimelineDataProvider.end}\r\n            initialDuration={scheduleTimelineDataProvider.initialDuration}\r\n            totalDuration={scheduleTimelineDataProvider.duration}\r\n            minimized={true}\r\n            onChange={scheduleTimelineDataProvider.onAnimationFractionChanged}\r\n            onPlayPause={onPlayPause}\r\n          />\r\n        </div>\r\n      </div>\r\n    );\r\n  }\r\n\r\n  return null;\r\n}\r\n"]}
+{"version":3,"file":"DefaultViewOverlay.js","sourceRoot":"","sources":["../../../../src/appui-react/content/DefaultViewOverlay.tsx"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,qCAAmC;AACnC,+BAA+B;AAE/B,4EAAkF;AAClF,gGAA6F;AAC7F,kEAA+D;AAC/D,wEAAqE;AACrE,gGAA6F;AAW7F;;;;GAIG;AACH,uBAAuB;AACvB,SAAgB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAoB;IAC5F,MAAM,yBAAyB,GAAG,IAAA,2CAAoB,EAAC,QAAQ,CAAC,CAAC;IACjE,MAAM,qCAAqC,GAAG,IAAA,mEAAgC,EAAC,QAAQ,CAAC,CAAC;IACzF,MAAM,4BAA4B,GAAG,IAAA,mEAAgC,EAAC,QAAQ,CAAC,CAAC;IAChF,MAAM,eAAe,GAAG,IAAA,qCAAiB,GAAE,CAAC;IAE5C,IAAI,CAAC,eAAe;QAClB,OAAO,IAAI,CAAC;IAEd,wBAAwB;IACxB,IAAI,yBAAyB,IAAI,CAAC,CAAC,cAAc,EAAE,kBAAkB,EAAE,8BAA8B,EAAE;QACrG,OAAO,CACL,6BAAK,SAAS,EAAC,mBAAmB;YAChC,6BAAK,SAAS,EAAC,wBAAwB;gBACrC,oBAAC,uCAAa,IAAC,YAAY,EAAE,yBAAyB,GAAI,CACtD,CACF,CACP,CAAC;KACH;IAED,IAAI,qCAAqC,IAAI,CAAC,CAAC,cAAc,EAAE,kBAAkB,EAAE,iCAAiC,EAAE;QACpH,OAAO,CACL,6BAAK,SAAS,EAAC,mBAAmB;YAChC,6BAAK,SAAS,EAAC,wBAAwB;gBACrC,oBAAC,2CAAiB,IAChB,SAAS,EAAE,qCAAqC,CAAC,KAAK,EACtD,OAAO,EAAE,qCAAqC,CAAC,GAAG,EAClD,eAAe,EAAE,qCAAqC,CAAC,eAAe,EACtE,aAAa,EAAE,qCAAqC,CAAC,QAAQ,EAC7D,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,qCAAqC,CAAC,0BAA0B,EAC1E,WAAW,EAAE,WAAW,GACxB,CACE,CACF,CACP,CAAC;KACH;IAED,IAAI,4BAA4B,IAAI,CAAC,CAAC,cAAc,EAAE,kBAAkB,EAAE,kCAAkC,EAAE;QAC5G,OAAO,CACL,6BAAK,SAAS,EAAC,mBAAmB;YAChC,6BAAK,SAAS,EAAC,wBAAwB;gBACrC,oBAAC,2CAAiB,IAChB,SAAS,EAAE,4BAA4B,CAAC,KAAK,EAC7C,OAAO,EAAE,4BAA4B,CAAC,GAAG,EACzC,eAAe,EAAE,4BAA4B,CAAC,eAAe,EAC7D,aAAa,EAAE,4BAA4B,CAAC,QAAQ,EACpD,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,4BAA4B,CAAC,0BAA0B,EACjE,WAAW,EAAE,WAAW,GACxB,CACE,CACF,CACP,CAAC;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAzDD,gDAyDC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module ContentView\n */\n\nimport \"./DefaultViewOverlay.scss\";\nimport * as React from \"react\";\nimport { ScreenViewport } from \"@itwin/core-frontend\";\nimport { SolarTimeline, TimelineComponent } from \"@itwin/imodel-components-react\";\nimport { useScheduleAnimationDataProvider } from \"../hooks/useScheduleAnimationDataProvider\";\nimport { useActiveViewport } from \"../hooks/useActiveViewport\";\nimport { useSolarDataProvider } from \"../hooks/useSolarDataProvider\";\nimport { useAnalysisAnimationDataProvider } from \"../hooks/useAnalysisAnimationDataProvider\";\n\n/** Props of Viewport Overlay Control that show timelines\n * @public\n */\nexport interface ViewOverlayProps {\n  viewport: ScreenViewport;\n  onPlayPause?: (playing: boolean) => void; // callback with play/pause button is pressed\n  featureOptions?: { [key: string]: any };\n}\n\n/**\n * Default viewport overlay that examines ViewState of the active view for a schedule script, analysis data, or solar data. If one of these is detected, the corresponding\n * data provider is attached to the TimelineComponent and the overlay is made visible.\n * @public\n */\n// istanbul ignore next\nexport function DefaultViewOverlay({ viewport, onPlayPause, featureOptions }: ViewOverlayProps) {\n  const solarDataTimelineProvider = useSolarDataProvider(viewport);\n  const analysisAnimationTimelineDataProvider = useAnalysisAnimationDataProvider(viewport);\n  const scheduleTimelineDataProvider = useScheduleAnimationDataProvider(viewport);\n  const currentViewport = useActiveViewport();\n\n  if (!currentViewport)\n    return null;\n\n  // Solar gets first shot\n  if (solarDataTimelineProvider && !!featureOptions?.defaultViewOverlay?.enableSolarTimelineViewOverlay) {\n    return (\n      <div className=\"uifw-view-overlay\">\n        <div className=\"uifw-animation-overlay\">\n          <SolarTimeline dataProvider={solarDataTimelineProvider} />\n        </div>\n      </div>\n    );\n  }\n\n  if (analysisAnimationTimelineDataProvider && !!featureOptions?.defaultViewOverlay?.enableAnalysisTimelineViewOverlay) {\n    return (\n      <div className=\"uifw-view-overlay\">\n        <div className=\"uifw-animation-overlay\">\n          <TimelineComponent\n            startDate={analysisAnimationTimelineDataProvider.start}\n            endDate={analysisAnimationTimelineDataProvider.end}\n            initialDuration={analysisAnimationTimelineDataProvider.initialDuration}\n            totalDuration={analysisAnimationTimelineDataProvider.duration}\n            minimized={true}\n            onChange={analysisAnimationTimelineDataProvider.onAnimationFractionChanged}\n            onPlayPause={onPlayPause}\n          />\n        </div>\n      </div>\n    );\n  }\n\n  if (scheduleTimelineDataProvider && !!featureOptions?.defaultViewOverlay?.enableScheduleAnimationViewOverlay) {\n    return (\n      <div className=\"uifw-view-overlay\">\n        <div className=\"uifw-animation-overlay\">\n          <TimelineComponent\n            startDate={scheduleTimelineDataProvider.start}\n            endDate={scheduleTimelineDataProvider.end}\n            initialDuration={scheduleTimelineDataProvider.initialDuration}\n            totalDuration={scheduleTimelineDataProvider.duration}\n            minimized={true}\n            onChange={scheduleTimelineDataProvider.onAnimationFractionChanged}\n            onPlayPause={onPlayPause}\n          />\n        </div>\n      </div>\n    );\n  }\n\n  return null;\n}\n"]}

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

@@ -1,46 +1,46 @@
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-@import "~@itwin/core-react/lib/cjs/core-react/z-index";
-
-// 40px is used to ensure scrubber is not drawn behind a widget tab
-
-$uifw-view-overlay-indent: calc(var(--iui-size-l) * 2);
-
-.uifw-view-overlay {
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  width: calc(100% - #{$uifw-view-overlay-indent} * 2);
-  height: auto;
-  position: absolute;
-  bottom: var(--iui-size-s);
-  left: $uifw-view-overlay-indent;
-  right: $uifw-view-overlay-indent;
-  pointer-events: none;
-  @include uicore-z-index(view-overlay);
-}
-
-$widget-transparency: 0.9;
-
-.uifw-animation-overlay {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 80%;
-  max-width: 1000px;
-  height: auto;
-  background: var(--iui-color-background);
-  border: 1px solid var(--iui-color-border);
-  border-radius: var(--iui-border-radius-1);
-  // overflow: hidden;
-  opacity: $widget-transparency;
-  transition: opacity var(--iui-duration-1) ease;
-  pointer-events: auto;
-
-  &:hover {
-    opacity: 1;
-  }
-}
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+@import "~@itwin/core-react/lib/cjs/core-react/z-index";
+
+// 40px is used to ensure scrubber is not drawn behind a widget tab
+
+$uifw-view-overlay-indent: calc(var(--iui-size-l) * 2);
+
+.uifw-view-overlay {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  width: calc(100% - #{$uifw-view-overlay-indent} * 2);
+  height: auto;
+  position: absolute;
+  bottom: var(--iui-size-s);
+  left: $uifw-view-overlay-indent;
+  right: $uifw-view-overlay-indent;
+  pointer-events: none;
+  @include uicore-z-index(view-overlay);
+}
+
+$widget-transparency: 0.9;
+
+.uifw-animation-overlay {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 80%;
+  max-width: 1000px;
+  height: auto;
+  background: var(--iui-color-background);
+  border: 1px solid var(--iui-color-border);
+  border-radius: var(--iui-border-radius-1);
+  // overflow: hidden;
+  opacity: $widget-transparency;
+  transition: opacity var(--iui-duration-1) ease;
+  pointer-events: auto;
+
+  &:hover {
+    opacity: 1;
+  }
+}

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

@@ -64,8 +64,7 @@ function useFloatingViewport(args) {
     }, [viewState, viewport, viewportControl]);
     React.useEffect(() => {
         const onViewClose = (vp) => {
-            var _a;
-            if (((_a = contentControl.current) === null || _a === void 0 ? void 0 : _a.viewport) === vp) {
+            if (contentControl.current?.viewport === vp) {
                 UiFramework_1.UiFramework.content.dropFloatingContentControl(contentControl.current);
                 contentControl.current = undefined;
             }

package/lib/cjs/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 * 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 { UiFramework } from \"../UiFramework\";\r\nimport { useRefs } from \"@itwin/core-react\";\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 { viewportControl } = useFloatingViewport(props);\r\n  return (\r\n    <FloatingViewportContentWrapper>\r\n      {viewportControl}\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 function useFloatingViewport(args: FloatingViewportContentProps) {\r\n  const { contentId, initialViewState, onContextMenu, viewportRef } = 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 ref = React.useCallback((v: ScreenViewport) => {\r\n    setViewport(v);\r\n  }, []);\r\n\r\n  const refs = useRefs(ref, viewportRef);\r\n  const viewportControl = React.useMemo(() => {\r\n    const node = <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    return node;\r\n  }, [refs, onContextMenu, viewState, contentId]);\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      if (null === contentControl.current.reactNode) {\r\n        contentControl.current.reactNode = viewportControl;\r\n      }\r\n      void contentControl.current.viewport.changeView(viewState);\r\n    }\r\n  }, [viewState, viewport, viewportControl]);\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    viewportControl,\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":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module ContentView\n */\n\nimport * as React from \"react\";\nimport { IModelApp, ScreenViewport } from \"@itwin/core-frontend\";\nimport { ViewportComponent, ViewStateProp } from \"@itwin/imodel-components-react\";\nimport { FloatingViewportContentControl } from \"./ViewportContentControl\";\nimport { ContentWrapper } from \"./ContentLayout\";\nimport { UiFramework } from \"../UiFramework\";\nimport { useRefs } from \"@itwin/core-react\";\n\n/**\n * @beta\n */\nexport interface FloatingViewportContentProps {\n  /** callback used to construct context menu when user right-clicks on canvas/viewport */\n  onContextMenu?: (e: React.MouseEvent) => boolean;\n  /** viewport/content control uniqueId */\n  contentId: string;\n  /** The initial view state used to create the viewport, or a function that returns it (will refresh when the function changes) */\n  initialViewState: ViewStateProp;\n  /** Function to get a reference to the ScreenViewport */\n  viewportRef?: React.Ref<ScreenViewport>;\n}\n\n/** @beta */\nexport function FloatingViewportContent(props: FloatingViewportContentProps) {\n  const { viewportControl } = useFloatingViewport(props);\n  return (\n    <FloatingViewportContentWrapper>\n      {viewportControl}\n    </FloatingViewportContentWrapper>\n  );\n}\n\n/** @alpha */\nexport interface FloatingViewportContentWrapperProps {\n  readonly children?: React.ReactNode;\n}\n\n/** @alpha */\nexport function FloatingViewportContentWrapper({ children }: FloatingViewportContentWrapperProps) {\n  return (\n    <div onMouseMove={UiFramework.visibility.handleContentMouseMove} className=\"uifw-dialog-imodel-content\" style={{ height: \"100%\", position: \"relative\" }}>\n      <ContentWrapper content={children} style={{ height: \"100%\", position: \"relative\" }} />\n    </div>\n  );\n}\n\n/** @alpha */\nexport function useFloatingViewport(args: FloatingViewportContentProps) {\n  const { contentId, initialViewState, onContextMenu, viewportRef } = args;\n  const [viewport, setViewport] = React.useState<ScreenViewport | undefined>();\n  const contentControl = React.useRef<FloatingViewportContentControl | undefined>();\n\n  const viewState = React.useMemo(() => typeof initialViewState === \"function\" ? initialViewState() : initialViewState, [initialViewState]);\n  const ref = React.useCallback((v: ScreenViewport) => {\n    setViewport(v);\n  }, []);\n\n  const refs = useRefs(ref, viewportRef);\n  const viewportControl = React.useMemo(() => {\n    const node = <ViewportComponent\n      key={contentId}\n      imodel={viewState.iModel}\n      viewState={viewState}\n      controlId={contentId}\n      onContextMenu={onContextMenu}\n      viewportRef={refs}\n    />;\n    return node;\n  }, [refs, onContextMenu, viewState, contentId]);\n\n  React.useEffect(() => {\n    if (!contentControl.current) {\n      contentControl.current = new FloatingViewportContentControl(contentId, contentId, null);\n      UiFramework.content.addFloatingContentControl(contentControl.current);\n    }\n    return () => {\n      if (contentControl.current) {\n        UiFramework.content.dropFloatingContentControl(contentControl.current);\n        contentControl.current = undefined;\n      }\n    };\n  }, [contentId]);\n\n  React.useEffect(() => {\n    if (viewport && contentControl.current) {\n      contentControl.current.viewport = viewport;\n      if (null === contentControl.current.reactNode) {\n        contentControl.current.reactNode = viewportControl;\n      }\n      void contentControl.current.viewport.changeView(viewState);\n    }\n  }, [viewState, viewport, viewportControl]);\n\n  React.useEffect(() => {\n    const onViewClose = (vp: ScreenViewport) => {\n      if (contentControl.current?.viewport === vp) {\n        UiFramework.content.dropFloatingContentControl(contentControl.current);\n        contentControl.current = undefined;\n      }\n    };\n    return IModelApp.viewManager.onViewClose.addListener(onViewClose);\n  }, []);\n\n  return {\n    viewportControl,\n  };\n}\n"]}

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

@@ -45,7 +45,6 @@ class IModelViewportControl extends ViewportContentControl_1.ViewportContentCont
         return "UiFramework.IModelViewportControl";
     }
     constructor(info, _options) {
-        var _a;
         super(info, _options);
         this._options = _options;
         this._featureOptions = {};
@@ -73,7 +72,7 @@ class IModelViewportControl extends ViewportContentControl_1.ViewportContentCont
         };
         if (_options.featureOptions)
             this._featureOptions = _options.featureOptions;
-        this._alwaysUseSuppliedViewState = (_a = _options.alwaysUseSuppliedViewState) !== null && _a !== void 0 ? _a : false;
+        this._alwaysUseSuppliedViewState = _options.alwaysUseSuppliedViewState ?? false;
         this._userSuppliedViewOverlay = _options.supplyViewOverlay;
         if (!_options.deferNodeInitialization)
             this.initializeReactNode();
@@ -105,25 +104,23 @@ class IModelViewportControl extends ViewportContentControl_1.ViewportContentCont
     /** Get the React component that will contain the Viewport */
     getImodelConnectedViewportReactElement() {
         return React.createElement(exports.IModelConnectedViewport, { viewportRef: (v) => {
-                var _a;
                 this.viewport = v;
                 // for convenience, if window defined bind viewport to window
                 if (undefined !== window)
                     window.viewport = v;
                 if (!UiFramework_1.UiFramework.frontstages.isLoading)
-                    (_a = UiFramework_1.UiFramework.frontstages.activeFrontstageDef) === null || _a === void 0 ? void 0 : _a.setActiveViewFromViewport(v);
+                    UiFramework_1.UiFramework.frontstages.activeFrontstageDef?.setActiveViewFromViewport(v);
             }, getViewOverlay: this._getViewOverlay });
     }
     /** Get the React component that will contain the Viewport */
     getImodelViewportReactElement(iModelConnection, viewState) {
         return React.createElement(imodel_components_react_1.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 (!UiFramework_1.UiFramework.frontstages.isLoading)
-                    (_a = UiFramework_1.UiFramework.frontstages.activeFrontstageDef) === null || _a === void 0 ? void 0 : _a.setActiveViewFromViewport(v);
+                    UiFramework_1.UiFramework.frontstages.activeFrontstageDef?.setActiveViewFromViewport(v);
             }, getViewOverlay: this._getViewOverlay });
     }
     /** Get the React component that will be shown when no iModel data is available */

package/lib/cjs/appui-react/content/IModelViewport.js.map

@@ -1 +1 @@
-{"version":3,"file":"IModelViewport.js","sourceRoot":"","sources":["../../../../src/appui-react/content/IModelViewport.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 { Id64String } from \"@itwin/core-bentley\";\r\nimport { IModelConnection, ScreenViewport, ViewState } from \"@itwin/core-frontend\";\r\nimport { ViewportComponent, ViewStateProp } from \"@itwin/imodel-components-react\";\r\nimport { FillCentered } from \"@itwin/core-react\";\r\n\r\nimport { ConfigurableCreateInfo } from \"../configurableui/ConfigurableUiControl\";\r\nimport { connectIModelConnectionAndViewState } from \"../redux/connectIModel\";\r\nimport { UiFramework } from \"../UiFramework\";\r\nimport { DefaultViewOverlay } from \"./DefaultViewOverlay\";\r\nimport { ViewportContentControl } from \"./ViewportContentControl\";\r\nimport { StandardRotationNavigationAidControl } from \"../navigationaids/StandardRotationNavigationAid\";\r\nimport { UiError } from \"@itwin/appui-abstract\";\r\nimport { useSelector } from \"react-redux\";\r\nimport { FrameworkState } from \"../redux/FrameworkState\";\r\n\r\n/** Viewport that is connected to the IModelConnection property in the Redux store. The application must set up the Redux store and include the FrameworkReducer.\r\n * @public\r\n */\r\nexport const IModelConnectedViewport = connectIModelConnectionAndViewState(null, null)(ViewportComponent); // eslint-disable-line @typescript-eslint/naming-convention\r\n\r\n/** [[IModelViewportControl]] options. These options are set in the applicationData property of the [[ContentProps]].\r\n * @public\r\n */\r\nexport interface IModelViewportControlOptions {\r\n  /** ViewState or a function to return a ViewState */\r\n  viewState?: ViewStateProp;\r\n  /** IModelConnection of data in Viewport */\r\n  iModelConnection?: IModelConnection | (() => IModelConnection);\r\n  /** Map of options that can be used to enable/disable features within the view */\r\n  featureOptions?: { [key: string]: any };\r\n  /** Optional background color which may be used if viewState and iModelConnection are undefined */\r\n  bgColor?: string;\r\n  /** Optional property to always use the supplied `viewState` property instead of using viewport.view when set */\r\n  alwaysUseSuppliedViewState?: boolean;\r\n  /** Optional property to supply custom view overlay. Uses when caller want to supply custom overlay component. */\r\n  supplyViewOverlay?: (_viewport: ScreenViewport) => React.ReactNode;\r\n  /** Optional property to defer reactNode initialization until first reactNode property is needed. Useful when subclassing the `IModelViewportControl`. */\r\n  deferNodeInitialization?: boolean;\r\n}\r\n\r\ninterface ViewOverlayHostProps {\r\n  viewport: ScreenViewport;\r\n  featureOptions?: { [key: string]: any };\r\n  userSuppliedOverlay?: (_viewport: ScreenViewport) => React.ReactNode;\r\n}\r\n/** View Overlay component -- exported for testing\r\n * @internal\r\n */\r\n// istanbul ignore next\r\nexport function ViewOverlayHost({ viewport, featureOptions, userSuppliedOverlay }: ViewOverlayHostProps) {\r\n  const displayViewOverlay = useSelector((state: FrameworkState) => {\r\n    const frameworkState = (state as any)[UiFramework.frameworkStateKey];\r\n    return frameworkState ? frameworkState.configurableUiState.viewOverlayDisplay : true;\r\n  });\r\n  if (!displayViewOverlay)\r\n    return null;\r\n  return userSuppliedOverlay ? <React.Fragment>{userSuppliedOverlay(viewport)}</React.Fragment> : <DefaultViewOverlay viewport={viewport} featureOptions={featureOptions} />;\r\n}\r\n/** iModel Viewport Control\r\n * @public\r\n */\r\n// istanbul ignore next\r\nexport class IModelViewportControl extends ViewportContentControl {\r\n  public static get id() {\r\n    return \"UiFramework.IModelViewportControl\";\r\n  }\r\n  protected _featureOptions: { [key: string]: boolean | string } = {};\r\n  protected _viewState: ViewStateProp | undefined;\r\n  protected _iModelConnection: IModelConnection | undefined;\r\n  protected _alwaysUseSuppliedViewState: boolean;\r\n  private _userSuppliedViewOverlay?: (_viewport: ScreenViewport) => React.ReactNode;\r\n\r\n  constructor(info: ConfigurableCreateInfo, protected _options: IModelViewportControlOptions) {\r\n    super(info, _options);\r\n\r\n    if (_options.featureOptions)\r\n      this._featureOptions = _options.featureOptions;\r\n    this._alwaysUseSuppliedViewState = _options.alwaysUseSuppliedViewState ?? false;\r\n    this._userSuppliedViewOverlay = _options.supplyViewOverlay;\r\n\r\n    if (!_options.deferNodeInitialization)\r\n      this.initializeReactNode();\r\n  }\r\n\r\n  protected initializeReactNode() {\r\n    const options = this._options;\r\n\r\n    if (options.viewState)\r\n      this._viewState = options.viewState;\r\n\r\n    const iModelConnection = (typeof options.iModelConnection === \"function\") ? options.iModelConnection() : options.iModelConnection;\r\n\r\n    if (this._viewState && iModelConnection) {\r\n      /** Passing _determineViewState as a function reference; it is not called here. */\r\n      this._reactNode = this.getImodelViewportReactElement(iModelConnection, this._determineViewState);\r\n    } else {\r\n      if (UiFramework.getIModelConnection() && UiFramework.getDefaultViewState()) {\r\n        this._reactNode = this.getImodelConnectedViewportReactElement();\r\n      } else {\r\n        this._reactNode = this.getNoContentReactElement(options);\r\n        this.setIsReady();\r\n      }\r\n    }\r\n  }\r\n\r\n  protected override getReactNode(): React.ReactNode {\r\n    if (!React.isValidElement(this._reactNode) && this._options.deferNodeInitialization)\r\n      this.initializeReactNode();\r\n\r\n    return this.getKeyedReactNode();\r\n  }\r\n\r\n  /**\r\n   * This is passed as a function to the ViewportComponent as the `viewState` prop in getImodelViewportReactElement().\r\n   * It is called by ViewportComponent on a mount to resolve the viewState.\r\n   */\r\n  private _determineViewState = (): ViewState => {\r\n    let viewState: ViewState;\r\n\r\n    if (this.viewport && !this._alwaysUseSuppliedViewState)\r\n      viewState = this.viewport.view;\r\n    else if (this._viewState) {\r\n      if (typeof this._viewState === \"function\")\r\n        viewState = this._viewState();\r\n      else\r\n        viewState = this._viewState;\r\n    } else\r\n      throw new UiError(UiFramework.loggerCategory(this), \"No ViewState could be determined\");\r\n\r\n    return viewState!;\r\n  };\r\n\r\n  /** Get the React component that will contain the Viewport */\r\n  protected getImodelConnectedViewportReactElement(): React.ReactNode {\r\n    return <IModelConnectedViewport\r\n      viewportRef={(v: ScreenViewport) => {\r\n        this.viewport = v;\r\n        // for convenience, if window defined bind viewport to window\r\n        if (undefined !== window)\r\n          (window as any).viewport = v;\r\n        if (!UiFramework.frontstages.isLoading)\r\n          UiFramework.frontstages.activeFrontstageDef?.setActiveViewFromViewport(v);\r\n      }}\r\n      getViewOverlay={this._getViewOverlay}\r\n    />;\r\n  }\r\n\r\n  /** Get the React component that will contain the Viewport */\r\n  protected getImodelViewportReactElement(iModelConnection: IModelConnection, viewState: ViewStateProp): React.ReactNode {\r\n    return <ViewportComponent\r\n      viewState={viewState}\r\n      imodel={iModelConnection}\r\n      controlId={this.controlId}\r\n      viewportRef={(v: ScreenViewport) => {\r\n        this.viewport = v;\r\n        // for convenience, if window defined bind viewport to window\r\n        if (undefined !== window)\r\n          (window as any).viewport = v;\r\n        if (!UiFramework.frontstages.isLoading)\r\n          UiFramework.frontstages.activeFrontstageDef?.setActiveViewFromViewport(v);\r\n      }}\r\n      getViewOverlay={this._getViewOverlay}\r\n    />;\r\n  }\r\n\r\n  /** Get the React component that will be shown when no iModel data is available */\r\n  protected getNoContentReactElement(_options: IModelViewportControlOptions): React.ReactNode {\r\n    const noContent = UiFramework.translate(\"general.no-content\");\r\n    return <FillCentered> {noContent} </FillCentered>;\r\n  }\r\n\r\n  /** Get the React.Element for a ViewSelector change. */\r\n  public override getReactElementForViewSelectorChange(iModelConnection: IModelConnection, _unusedViewDefinitionId: Id64String, viewState: ViewState, _name: string): React.ReactNode {\r\n    return this.getImodelViewportReactElement(iModelConnection, viewState);\r\n  }\r\n\r\n  /** Get the default ViewOverlay unless parameter is set to not use it. May be override in an application specific sub-class  */\r\n  protected _getViewOverlay = (vp: ScreenViewport): React.ReactNode => {\r\n    return <ViewOverlayHost viewport={vp} featureOptions={this._featureOptions} userSuppliedOverlay={this._userSuppliedViewOverlay} data-testid=\"ViewOverlay\" />;\r\n  };\r\n\r\n  /** Get the NavigationAidControl associated with this ContentControl */\r\n  public override get navigationAidControl(): string {\r\n    if (this.viewport)\r\n      return super.navigationAidControl;\r\n    else\r\n      return StandardRotationNavigationAidControl.navigationAidId;\r\n  }\r\n}\r\n\r\nUiFramework.controls.register(IModelViewportControl.id, IModelViewportControl);\r\n"]}
+{"version":3,"file":"IModelViewport.js","sourceRoot":"","sources":["../../../../src/appui-react/content/IModelViewport.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module ContentView\n */\n\nimport * as React from \"react\";\nimport { Id64String } from \"@itwin/core-bentley\";\nimport { IModelConnection, ScreenViewport, ViewState } from \"@itwin/core-frontend\";\nimport { ViewportComponent, ViewStateProp } from \"@itwin/imodel-components-react\";\nimport { FillCentered } from \"@itwin/core-react\";\n\nimport { ConfigurableCreateInfo } from \"../configurableui/ConfigurableUiControl\";\nimport { connectIModelConnectionAndViewState } from \"../redux/connectIModel\";\nimport { UiFramework } from \"../UiFramework\";\nimport { DefaultViewOverlay } from \"./DefaultViewOverlay\";\nimport { ViewportContentControl } from \"./ViewportContentControl\";\nimport { StandardRotationNavigationAidControl } from \"../navigationaids/StandardRotationNavigationAid\";\nimport { UiError } from \"@itwin/appui-abstract\";\nimport { useSelector } from \"react-redux\";\nimport { FrameworkState } from \"../redux/FrameworkState\";\n\n/** Viewport that is connected to the IModelConnection property in the Redux store. The application must set up the Redux store and include the FrameworkReducer.\n * @public\n */\nexport const IModelConnectedViewport = connectIModelConnectionAndViewState(null, null)(ViewportComponent); // eslint-disable-line @typescript-eslint/naming-convention\n\n/** [[IModelViewportControl]] options. These options are set in the applicationData property of the [[ContentProps]].\n * @public\n */\nexport interface IModelViewportControlOptions {\n  /** ViewState or a function to return a ViewState */\n  viewState?: ViewStateProp;\n  /** IModelConnection of data in Viewport */\n  iModelConnection?: IModelConnection | (() => IModelConnection);\n  /** Map of options that can be used to enable/disable features within the view */\n  featureOptions?: { [key: string]: any };\n  /** Optional background color which may be used if viewState and iModelConnection are undefined */\n  bgColor?: string;\n  /** Optional property to always use the supplied `viewState` property instead of using viewport.view when set */\n  alwaysUseSuppliedViewState?: boolean;\n  /** Optional property to supply custom view overlay. Uses when caller want to supply custom overlay component. */\n  supplyViewOverlay?: (_viewport: ScreenViewport) => React.ReactNode;\n  /** Optional property to defer reactNode initialization until first reactNode property is needed. Useful when subclassing the `IModelViewportControl`. */\n  deferNodeInitialization?: boolean;\n}\n\ninterface ViewOverlayHostProps {\n  viewport: ScreenViewport;\n  featureOptions?: { [key: string]: any };\n  userSuppliedOverlay?: (_viewport: ScreenViewport) => React.ReactNode;\n}\n/** View Overlay component -- exported for testing\n * @internal\n */\n// istanbul ignore next\nexport function ViewOverlayHost({ viewport, featureOptions, userSuppliedOverlay }: ViewOverlayHostProps) {\n  const displayViewOverlay = useSelector((state: FrameworkState) => {\n    const frameworkState = (state as any)[UiFramework.frameworkStateKey];\n    return frameworkState ? frameworkState.configurableUiState.viewOverlayDisplay : true;\n  });\n  if (!displayViewOverlay)\n    return null;\n  return userSuppliedOverlay ? <React.Fragment>{userSuppliedOverlay(viewport)}</React.Fragment> : <DefaultViewOverlay viewport={viewport} featureOptions={featureOptions} />;\n}\n/** iModel Viewport Control\n * @public\n */\n// istanbul ignore next\nexport class IModelViewportControl extends ViewportContentControl {\n  public static get id() {\n    return \"UiFramework.IModelViewportControl\";\n  }\n  protected _featureOptions: { [key: string]: boolean | string } = {};\n  protected _viewState: ViewStateProp | undefined;\n  protected _iModelConnection: IModelConnection | undefined;\n  protected _alwaysUseSuppliedViewState: boolean;\n  private _userSuppliedViewOverlay?: (_viewport: ScreenViewport) => React.ReactNode;\n\n  constructor(info: ConfigurableCreateInfo, protected _options: IModelViewportControlOptions) {\n    super(info, _options);\n\n    if (_options.featureOptions)\n      this._featureOptions = _options.featureOptions;\n    this._alwaysUseSuppliedViewState = _options.alwaysUseSuppliedViewState ?? false;\n    this._userSuppliedViewOverlay = _options.supplyViewOverlay;\n\n    if (!_options.deferNodeInitialization)\n      this.initializeReactNode();\n  }\n\n  protected initializeReactNode() {\n    const options = this._options;\n\n    if (options.viewState)\n      this._viewState = options.viewState;\n\n    const iModelConnection = (typeof options.iModelConnection === \"function\") ? options.iModelConnection() : options.iModelConnection;\n\n    if (this._viewState && iModelConnection) {\n      /** Passing _determineViewState as a function reference; it is not called here. */\n      this._reactNode = this.getImodelViewportReactElement(iModelConnection, this._determineViewState);\n    } else {\n      if (UiFramework.getIModelConnection() && UiFramework.getDefaultViewState()) {\n        this._reactNode = this.getImodelConnectedViewportReactElement();\n      } else {\n        this._reactNode = this.getNoContentReactElement(options);\n        this.setIsReady();\n      }\n    }\n  }\n\n  protected override getReactNode(): React.ReactNode {\n    if (!React.isValidElement(this._reactNode) && this._options.deferNodeInitialization)\n      this.initializeReactNode();\n\n    return this.getKeyedReactNode();\n  }\n\n  /**\n   * This is passed as a function to the ViewportComponent as the `viewState` prop in getImodelViewportReactElement().\n   * It is called by ViewportComponent on a mount to resolve the viewState.\n   */\n  private _determineViewState = (): ViewState => {\n    let viewState: ViewState;\n\n    if (this.viewport && !this._alwaysUseSuppliedViewState)\n      viewState = this.viewport.view;\n    else if (this._viewState) {\n      if (typeof this._viewState === \"function\")\n        viewState = this._viewState();\n      else\n        viewState = this._viewState;\n    } else\n      throw new UiError(UiFramework.loggerCategory(this), \"No ViewState could be determined\");\n\n    return viewState!;\n  };\n\n  /** Get the React component that will contain the Viewport */\n  protected getImodelConnectedViewportReactElement(): React.ReactNode {\n    return <IModelConnectedViewport\n      viewportRef={(v: ScreenViewport) => {\n        this.viewport = v;\n        // for convenience, if window defined bind viewport to window\n        if (undefined !== window)\n          (window as any).viewport = v;\n        if (!UiFramework.frontstages.isLoading)\n          UiFramework.frontstages.activeFrontstageDef?.setActiveViewFromViewport(v);\n      }}\n      getViewOverlay={this._getViewOverlay}\n    />;\n  }\n\n  /** Get the React component that will contain the Viewport */\n  protected getImodelViewportReactElement(iModelConnection: IModelConnection, viewState: ViewStateProp): React.ReactNode {\n    return <ViewportComponent\n      viewState={viewState}\n      imodel={iModelConnection}\n      controlId={this.controlId}\n      viewportRef={(v: ScreenViewport) => {\n        this.viewport = v;\n        // for convenience, if window defined bind viewport to window\n        if (undefined !== window)\n          (window as any).viewport = v;\n        if (!UiFramework.frontstages.isLoading)\n          UiFramework.frontstages.activeFrontstageDef?.setActiveViewFromViewport(v);\n      }}\n      getViewOverlay={this._getViewOverlay}\n    />;\n  }\n\n  /** Get the React component that will be shown when no iModel data is available */\n  protected getNoContentReactElement(_options: IModelViewportControlOptions): React.ReactNode {\n    const noContent = UiFramework.translate(\"general.no-content\");\n    return <FillCentered> {noContent} </FillCentered>;\n  }\n\n  /** Get the React.Element for a ViewSelector change. */\n  public override getReactElementForViewSelectorChange(iModelConnection: IModelConnection, _unusedViewDefinitionId: Id64String, viewState: ViewState, _name: string): React.ReactNode {\n    return this.getImodelViewportReactElement(iModelConnection, viewState);\n  }\n\n  /** Get the default ViewOverlay unless parameter is set to not use it. May be override in an application specific sub-class  */\n  protected _getViewOverlay = (vp: ScreenViewport): React.ReactNode => {\n    return <ViewOverlayHost viewport={vp} featureOptions={this._featureOptions} userSuppliedOverlay={this._userSuppliedViewOverlay} data-testid=\"ViewOverlay\" />;\n  };\n\n  /** Get the NavigationAidControl associated with this ContentControl */\n  public override get navigationAidControl(): string {\n    if (this.viewport)\n      return super.navigationAidControl;\n    else\n      return StandardRotationNavigationAidControl.navigationAidId;\n  }\n}\n\nUiFramework.controls.register(IModelViewportControl.id, IModelViewportControl);\n"]}

package/lib/cjs/appui-react/content/InternalContentLayoutManager.js

@@ -23,8 +23,7 @@ class InternalContentLayoutManager {
      * @returns the [[ContentLayoutDef]] if found, or undefined otherwise
      */
     static getForGroup(contentGroupProps, overrideContentLayout) {
-        var _a;
-        const layoutId = (_a = overrideContentLayout === null || overrideContentLayout === void 0 ? void 0 : overrideContentLayout.id) !== null && _a !== void 0 ? _a : contentGroupProps.layout.id;
+        const layoutId = overrideContentLayout?.id ?? contentGroupProps.layout.id;
         const layoutKey = this.getKey({ contentGroupId: contentGroupProps.id, layoutId });
         if (!overrideContentLayout && InternalContentLayoutManager._layoutDefs.has(layoutKey)) {
             return InternalContentLayoutManager._layoutDefs.get(layoutKey);

package/lib/cjs/appui-react/content/InternalContentLayoutManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"InternalContentLayoutManager.js","sourceRoot":"","sources":["../../../../src/appui-react/content/InternalContentLayoutManager.ts"],"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 { ContentLayoutProps } from \"@itwin/appui-abstract\";\r\nimport { InternalFrontstageManager } from \"../frontstage/InternalFrontstageManager\";\r\nimport { UiFramework } from \"../UiFramework\";\r\nimport { ContentGroup, ContentGroupProps } from \"./ContentGroup\";\r\nimport { ContentLayoutDef } from \"./ContentLayout\";\r\n\r\n/** ContentLayout Manager class.\r\n * @internal\r\n */\r\nexport class InternalContentLayoutManager {\r\n  private static _layoutDefs: Map<string, ContentLayoutDef> = new Map<string, ContentLayoutDef>();\r\n\r\n  /** build a layout key that is unique for group layout combination */\r\n  public static getKey(props: { contentGroupId: string, layoutId: string }): string {\r\n    return `${props.contentGroupId}-${props.layoutId}`;\r\n  }\r\n\r\n  /** Return a LayoutDef that is specific to a content group.\r\n   * @returns the [[ContentLayoutDef]] if found, or undefined otherwise\r\n   */\r\n  public static getForGroup(contentGroupProps: ContentGroupProps | ContentGroup, overrideContentLayout?: ContentLayoutProps): ContentLayoutDef {\r\n    const layoutId = overrideContentLayout?.id ?? contentGroupProps.layout.id;\r\n    const layoutKey = this.getKey({ contentGroupId: contentGroupProps.id, layoutId });\r\n\r\n    if (!overrideContentLayout && InternalContentLayoutManager._layoutDefs.has(layoutKey)) {\r\n      return InternalContentLayoutManager._layoutDefs.get(layoutKey)!;\r\n    }\r\n\r\n    const newContentLayoutProps = { ...contentGroupProps.layout, ...overrideContentLayout };\r\n    const newLayoutDef = new ContentLayoutDef(newContentLayoutProps);\r\n    this.add(layoutKey, newLayoutDef);\r\n    return newLayoutDef;\r\n  }\r\n\r\n  /** Finds a Content Layout with a given id.\r\n   * @param layoutKey  group specific layout id, see `getLayoutKey`\r\n   * @returns the [[ContentLayoutDef]] if found, or undefined otherwise\r\n   */\r\n  public static find(layoutKey: string): ContentLayoutDef | undefined {\r\n    return InternalContentLayoutManager._layoutDefs.get(layoutKey)!;\r\n  }\r\n\r\n  /** Adds a Content Layout.\r\n   * @param layoutId  the id of the Content Layout to add\r\n   * @param layoutDef  the Content Layout definition to add\r\n   */\r\n  public static add(layoutId: string, layoutDef: ContentLayoutDef): void {\r\n    InternalContentLayoutManager._layoutDefs.set(layoutId, layoutDef);\r\n  }\r\n\r\n  /** Gets the active Content Layout */\r\n  public static get activeLayout(): ContentLayoutDef | undefined {\r\n    let layoutDef: ContentLayoutDef | undefined;\r\n    const activeFrontstageDef = UiFramework.frontstages.activeFrontstageDef;\r\n\r\n    if (activeFrontstageDef)\r\n      layoutDef = activeFrontstageDef.contentLayoutDef;\r\n\r\n    return layoutDef;\r\n  }\r\n\r\n  /** Gets the active Content Group */\r\n  public static get activeContentGroup(): ContentGroup | undefined {\r\n    let contentGroup: ContentGroup | undefined;\r\n    const activeFrontstageDef = UiFramework.frontstages.activeFrontstageDef;\r\n\r\n    if (activeFrontstageDef)\r\n      contentGroup = activeFrontstageDef.contentGroup;\r\n\r\n    return contentGroup;\r\n  }\r\n\r\n  /** Sets the active Content Layout, Content Group and Content Control.\r\n   * @param contentLayoutDef  Content layout to make active\r\n   * @param contentGroup  Content Group to make active\r\n   */\r\n  public static async setActive(contentLayoutDef: ContentLayoutDef, contentGroup: ContentGroup): Promise<void> {\r\n    await InternalFrontstageManager.setActiveLayout(contentLayoutDef, contentGroup);\r\n  }\r\n\r\n  /** Sets the active Content Group.\r\n   * @param contentGroup  Content Group to make active\r\n   */\r\n  public static async setActiveContentGroup(contentGroup: ContentGroup): Promise<void> {\r\n    await InternalFrontstageManager.setActiveContentGroup(contentGroup);\r\n  }\r\n\r\n  /** Refreshes the active layout and content group.\r\n   */\r\n  public static refreshActive(): void {\r\n    // istanbul ignore else\r\n    const activeFrontstageDef = UiFramework.frontstages.activeFrontstageDef;\r\n    if (activeFrontstageDef && activeFrontstageDef.contentLayoutDef && activeFrontstageDef.contentGroup) {\r\n      UiFramework.frontstages.onContentLayoutActivatedEvent.emit({\r\n        contentLayout: activeFrontstageDef.contentLayoutDef,\r\n        contentGroup: activeFrontstageDef.contentGroup,\r\n      });\r\n\r\n      activeFrontstageDef.contentGroup.refreshContentNodes();\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"InternalContentLayoutManager.js","sourceRoot":"","sources":["../../../../src/appui-react/content/InternalContentLayoutManager.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module ContentView\n */\n\nimport { ContentLayoutProps } from \"@itwin/appui-abstract\";\nimport { InternalFrontstageManager } from \"../frontstage/InternalFrontstageManager\";\nimport { UiFramework } from \"../UiFramework\";\nimport { ContentGroup, ContentGroupProps } from \"./ContentGroup\";\nimport { ContentLayoutDef } from \"./ContentLayout\";\n\n/** ContentLayout Manager class.\n * @internal\n */\nexport class InternalContentLayoutManager {\n  private static _layoutDefs: Map<string, ContentLayoutDef> = new Map<string, ContentLayoutDef>();\n\n  /** build a layout key that is unique for group layout combination */\n  public static getKey(props: { contentGroupId: string, layoutId: string }): string {\n    return `${props.contentGroupId}-${props.layoutId}`;\n  }\n\n  /** Return a LayoutDef that is specific to a content group.\n   * @returns the [[ContentLayoutDef]] if found, or undefined otherwise\n   */\n  public static getForGroup(contentGroupProps: ContentGroupProps | ContentGroup, overrideContentLayout?: ContentLayoutProps): ContentLayoutDef {\n    const layoutId = overrideContentLayout?.id ?? contentGroupProps.layout.id;\n    const layoutKey = this.getKey({ contentGroupId: contentGroupProps.id, layoutId });\n\n    if (!overrideContentLayout && InternalContentLayoutManager._layoutDefs.has(layoutKey)) {\n      return InternalContentLayoutManager._layoutDefs.get(layoutKey)!;\n    }\n\n    const newContentLayoutProps = { ...contentGroupProps.layout, ...overrideContentLayout };\n    const newLayoutDef = new ContentLayoutDef(newContentLayoutProps);\n    this.add(layoutKey, newLayoutDef);\n    return newLayoutDef;\n  }\n\n  /** Finds a Content Layout with a given id.\n   * @param layoutKey  group specific layout id, see `getLayoutKey`\n   * @returns the [[ContentLayoutDef]] if found, or undefined otherwise\n   */\n  public static find(layoutKey: string): ContentLayoutDef | undefined {\n    return InternalContentLayoutManager._layoutDefs.get(layoutKey)!;\n  }\n\n  /** Adds a Content Layout.\n   * @param layoutId  the id of the Content Layout to add\n   * @param layoutDef  the Content Layout definition to add\n   */\n  public static add(layoutId: string, layoutDef: ContentLayoutDef): void {\n    InternalContentLayoutManager._layoutDefs.set(layoutId, layoutDef);\n  }\n\n  /** Gets the active Content Layout */\n  public static get activeLayout(): ContentLayoutDef | undefined {\n    let layoutDef: ContentLayoutDef | undefined;\n    const activeFrontstageDef = UiFramework.frontstages.activeFrontstageDef;\n\n    if (activeFrontstageDef)\n      layoutDef = activeFrontstageDef.contentLayoutDef;\n\n    return layoutDef;\n  }\n\n  /** Gets the active Content Group */\n  public static get activeContentGroup(): ContentGroup | undefined {\n    let contentGroup: ContentGroup | undefined;\n    const activeFrontstageDef = UiFramework.frontstages.activeFrontstageDef;\n\n    if (activeFrontstageDef)\n      contentGroup = activeFrontstageDef.contentGroup;\n\n    return contentGroup;\n  }\n\n  /** Sets the active Content Layout, Content Group and Content Control.\n   * @param contentLayoutDef  Content layout to make active\n   * @param contentGroup  Content Group to make active\n   */\n  public static async setActive(contentLayoutDef: ContentLayoutDef, contentGroup: ContentGroup): Promise<void> {\n    await InternalFrontstageManager.setActiveLayout(contentLayoutDef, contentGroup);\n  }\n\n  /** Sets the active Content Group.\n   * @param contentGroup  Content Group to make active\n   */\n  public static async setActiveContentGroup(contentGroup: ContentGroup): Promise<void> {\n    await InternalFrontstageManager.setActiveContentGroup(contentGroup);\n  }\n\n  /** Refreshes the active layout and content group.\n   */\n  public static refreshActive(): void {\n    // istanbul ignore else\n    const activeFrontstageDef = UiFramework.frontstages.activeFrontstageDef;\n    if (activeFrontstageDef && activeFrontstageDef.contentLayoutDef && activeFrontstageDef.contentGroup) {\n      UiFramework.frontstages.onContentLayoutActivatedEvent.emit({\n        contentLayout: activeFrontstageDef.contentLayoutDef,\n        contentGroup: activeFrontstageDef.contentGroup,\n      });\n\n      activeFrontstageDef.contentGroup.refreshContentNodes();\n    }\n  }\n}\n"]}

package/lib/cjs/appui-react/content/InternalContentViewManager.js

@@ -34,7 +34,7 @@ class InternalContentViewManager {
         return this._activeContent;
     }
     static getControlFromElement(content, activeContentGroup, floatingControls, logIfNotFound = false) {
-        if (floatingControls === null || floatingControls === void 0 ? void 0 : floatingControls.length) {
+        if (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)