@itwin/appui-react 3.0.1 → 3.0.2

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log - @itwin/appui-react
 
-This log was last generated on Thu, 24 Feb 2022 15:26:55 GMT and should not be manually modified.
+This log was last generated on Thu, 10 Mar 2022 21:18:13 GMT and should not be manually modified.
+
+## 3.0.2
+Thu, 10 Mar 2022 21:18:13 GMT
+
+### Updates
+
+- Optimize ModelsTree search ruleset
+- Make fix to displaying a custom view overlay.
 
 ## 3.0.1
 Thu, 24 Feb 2022 15:26:55 GMT

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

@@ -39,7 +39,7 @@ function ViewOverlayHost({ viewport, featureOptions, userSuppliedOverlay }) {
     });
     if (!displayViewOverlay)
         return null;
-    return userSuppliedOverlay ? React.createElement(React.Fragment, null, "userSuppliedOverlay(viewport)") : React.createElement(DefaultViewOverlay_1.DefaultViewOverlay, { viewport: viewport, featureOptions: featureOptions });
+    return userSuppliedOverlay ? React.createElement(React.Fragment, null, userSuppliedOverlay(viewport)) : React.createElement(DefaultViewOverlay_1.DefaultViewOverlay, { viewport: viewport, featureOptions: featureOptions });
 }
 exports.ViewOverlayHost = ViewOverlayHost;
 /** iModel Viewport Control

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 { viewWithUnifiedSelection } from \"@itwin/presentation-components\";\r\nimport { ViewportComponent, ViewStateProp } from \"@itwin/imodel-components-react\";\r\nimport { FillCentered } from \"@itwin/core-react\";\r\n\r\nimport { FrontstageManager } from \"../frontstage/FrontstageManager\";\r\nimport { ConfigurableCreateInfo } from \"../configurableui/ConfigurableUiControl\";\r\nimport { ConfigurableUiManager } from \"../configurableui/ConfigurableUiManager\";\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// create a HOC viewport component that supports unified selection\r\n// eslint-disable-next-line @typescript-eslint/naming-convention\r\nconst UnifiedSelectionViewport = viewWithUnifiedSelection(ViewportComponent);\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)(UnifiedSelectionViewport); // 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 in 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 (!FrontstageManager.isLoading)\r\n          FrontstageManager.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 <UnifiedSelectionViewport\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 (!FrontstageManager.isLoading)\r\n          FrontstageManager.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\nConfigurableUiManager.registerControl(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":["/*---------------------------------------------------------------------------------------------\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 { viewWithUnifiedSelection } from \"@itwin/presentation-components\";\r\nimport { ViewportComponent, ViewStateProp } from \"@itwin/imodel-components-react\";\r\nimport { FillCentered } from \"@itwin/core-react\";\r\n\r\nimport { FrontstageManager } from \"../frontstage/FrontstageManager\";\r\nimport { ConfigurableCreateInfo } from \"../configurableui/ConfigurableUiControl\";\r\nimport { ConfigurableUiManager } from \"../configurableui/ConfigurableUiManager\";\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// create a HOC viewport component that supports unified selection\r\n// eslint-disable-next-line @typescript-eslint/naming-convention\r\nconst UnifiedSelectionViewport = viewWithUnifiedSelection(ViewportComponent);\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)(UnifiedSelectionViewport); // 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 in 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 (!FrontstageManager.isLoading)\r\n          FrontstageManager.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 <UnifiedSelectionViewport\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 (!FrontstageManager.isLoading)\r\n          FrontstageManager.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\nConfigurableUiManager.registerControl(IModelViewportControl.id, IModelViewportControl);\r\n"]}

package/lib/cjs/appui-react/imodel-components/models-tree/ModelsTreeSearch.json

@@ -127,7 +127,7 @@
               "isRequired": true
             }
           ],
-          "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") = NULL AND json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") = NULL AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") = NULL AND json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") = NULL AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:Element\")",
           "groupByClass": false,
           "groupByLabel": false
         }
@@ -171,7 +171,7 @@
               "isRequired": true
             }
           ],
-          "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND (json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") <> NULL OR json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") <> NULL) AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND (json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") <> NULL OR json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") <> NULL) AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:Element\")",
           "hideNodesInHierarchy": true,
           "groupByClass": false,
           "groupByLabel": false
@@ -211,7 +211,7 @@
               }
             }
           ],
-          "instanceFilter": "NOT this.IsPrivate AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "instanceFilter": "NOT this.IsPrivate AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:Element\")",
           "groupByClass": false,
           "groupByLabel": false
         }

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

@@ -36,7 +36,7 @@ export function ViewOverlayHost({ viewport, featureOptions, userSuppliedOverlay
     });
     if (!displayViewOverlay)
         return null;
-    return userSuppliedOverlay ? React.createElement(React.Fragment, null, "userSuppliedOverlay(viewport)") : React.createElement(DefaultViewOverlay, { viewport: viewport, featureOptions: featureOptions });
+    return userSuppliedOverlay ? React.createElement(React.Fragment, null, userSuppliedOverlay(viewport)) : React.createElement(DefaultViewOverlay, { viewport: viewport, featureOptions: featureOptions });
 }
 /** iModel Viewport Control
  * @public

package/lib/esm/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 { viewWithUnifiedSelection } from \"@itwin/presentation-components\";\r\nimport { ViewportComponent, ViewStateProp } from \"@itwin/imodel-components-react\";\r\nimport { FillCentered } from \"@itwin/core-react\";\r\n\r\nimport { FrontstageManager } from \"../frontstage/FrontstageManager\";\r\nimport { ConfigurableCreateInfo } from \"../configurableui/ConfigurableUiControl\";\r\nimport { ConfigurableUiManager } from \"../configurableui/ConfigurableUiManager\";\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// create a HOC viewport component that supports unified selection\r\n// eslint-disable-next-line @typescript-eslint/naming-convention\r\nconst UnifiedSelectionViewport = viewWithUnifiedSelection(ViewportComponent);\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)(UnifiedSelectionViewport); // 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 in 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 (!FrontstageManager.isLoading)\r\n          FrontstageManager.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 <UnifiedSelectionViewport\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 (!FrontstageManager.isLoading)\r\n          FrontstageManager.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\nConfigurableUiManager.registerControl(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":["/*---------------------------------------------------------------------------------------------\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 { viewWithUnifiedSelection } from \"@itwin/presentation-components\";\r\nimport { ViewportComponent, ViewStateProp } from \"@itwin/imodel-components-react\";\r\nimport { FillCentered } from \"@itwin/core-react\";\r\n\r\nimport { FrontstageManager } from \"../frontstage/FrontstageManager\";\r\nimport { ConfigurableCreateInfo } from \"../configurableui/ConfigurableUiControl\";\r\nimport { ConfigurableUiManager } from \"../configurableui/ConfigurableUiManager\";\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// create a HOC viewport component that supports unified selection\r\n// eslint-disable-next-line @typescript-eslint/naming-convention\r\nconst UnifiedSelectionViewport = viewWithUnifiedSelection(ViewportComponent);\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)(UnifiedSelectionViewport); // 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 in 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 (!FrontstageManager.isLoading)\r\n          FrontstageManager.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 <UnifiedSelectionViewport\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 (!FrontstageManager.isLoading)\r\n          FrontstageManager.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\nConfigurableUiManager.registerControl(IModelViewportControl.id, IModelViewportControl);\r\n"]}

package/lib/esm/appui-react/imodel-components/models-tree/ModelsTreeSearch.json

@@ -127,7 +127,7 @@
               "isRequired": true
             }
           ],
-          "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") = NULL AND json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") = NULL AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") = NULL AND json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") = NULL AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:Element\")",
           "groupByClass": false,
           "groupByLabel": false
         }
@@ -171,7 +171,7 @@
               "isRequired": true
             }
           ],
-          "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND (json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") <> NULL OR json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") <> NULL) AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND (json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") <> NULL OR json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") <> NULL) AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:Element\")",
           "hideNodesInHierarchy": true,
           "groupByClass": false,
           "groupByLabel": false
@@ -211,7 +211,7 @@
               }
             }
           ],
-          "instanceFilter": "NOT this.IsPrivate AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "instanceFilter": "NOT this.IsPrivate AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:Element\")",
           "groupByClass": false,
           "groupByLabel": false
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/appui-react",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "UI framework",
   "main": "lib/cjs/appui-react.js",
   "module": "lib/esm/appui-react.js",
@@ -21,19 +21,19 @@
     "url": "http://www.bentley.com"
   },
   "peerDependencies": {
-    "@itwin/appui-abstract": "^3.0.1",
-    "@itwin/appui-layout-react": "^3.0.1",
-    "@itwin/components-react": "^3.0.1",
-    "@itwin/core-bentley": "^3.0.1",
-    "@itwin/core-common": "^3.0.1",
-    "@itwin/core-frontend": "^3.0.1",
-    "@itwin/core-geometry": "^3.0.1",
-    "@itwin/core-markup": "^3.0.1",
-    "@itwin/core-quantity": "^3.0.1",
-    "@itwin/core-react": "^3.0.1",
-    "@itwin/imodel-components-react": "^3.0.1",
-    "@itwin/presentation-common": "^3.0.1",
-    "@itwin/presentation-frontend": "^3.0.1",
+    "@itwin/appui-abstract": "^3.0.2",
+    "@itwin/appui-layout-react": "^3.0.2",
+    "@itwin/components-react": "^3.0.2",
+    "@itwin/core-bentley": "^3.0.2",
+    "@itwin/core-common": "^3.0.2",
+    "@itwin/core-frontend": "^3.0.2",
+    "@itwin/core-geometry": "^3.0.2",
+    "@itwin/core-markup": "^3.0.2",
+    "@itwin/core-quantity": "^3.0.2",
+    "@itwin/core-react": "^3.0.2",
+    "@itwin/imodel-components-react": "^3.0.2",
+    "@itwin/presentation-common": "^3.0.2",
+    "@itwin/presentation-frontend": "^3.0.2",
     "react": "^17.0.0",
     "react-dom": "^17.0.0",
     "react-redux": "^7.2.2",
@@ -44,22 +44,22 @@
     "NOTE: All tools used by scripts in this package must be listed as devDependencies"
   ],
   "devDependencies": {
-    "@itwin/appui-abstract": "3.0.1",
-    "@itwin/appui-layout-react": "3.0.1",
-    "@itwin/build-tools": "3.0.1",
-    "@itwin/components-react": "3.0.1",
-    "@itwin/core-bentley": "3.0.1",
-    "@itwin/core-common": "3.0.1",
-    "@itwin/core-frontend": "3.0.1",
-    "@itwin/core-geometry": "3.0.1",
-    "@itwin/core-markup": "3.0.1",
-    "@itwin/core-quantity": "3.0.1",
-    "@itwin/core-react": "3.0.1",
-    "@itwin/eslint-plugin": "3.0.1",
-    "@itwin/imodel-components-react": "3.0.1",
-    "@itwin/presentation-common": "3.0.1",
-    "@itwin/presentation-frontend": "3.0.1",
-    "@itwin/presentation-testing": "3.0.1",
+    "@itwin/appui-abstract": "3.0.2",
+    "@itwin/appui-layout-react": "3.0.2",
+    "@itwin/build-tools": "3.0.2",
+    "@itwin/components-react": "3.0.2",
+    "@itwin/core-bentley": "3.0.2",
+    "@itwin/core-common": "3.0.2",
+    "@itwin/core-frontend": "3.0.2",
+    "@itwin/core-geometry": "3.0.2",
+    "@itwin/core-markup": "3.0.2",
+    "@itwin/core-quantity": "3.0.2",
+    "@itwin/core-react": "3.0.2",
+    "@itwin/eslint-plugin": "3.0.2",
+    "@itwin/imodel-components-react": "3.0.2",
+    "@itwin/presentation-common": "3.0.2",
+    "@itwin/presentation-frontend": "3.0.2",
+    "@itwin/presentation-testing": "3.0.2",
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/chai": "^4.1.4",
@@ -114,8 +114,8 @@
   "dependencies": {
     "@bentley/icons-generic": "^1.0.15",
     "@bentley/icons-generic-webfont": "^1.0.15",
-    "@itwin/core-telemetry": "3.0.1",
-    "@itwin/presentation-components": "3.0.1",
+    "@itwin/core-telemetry": "3.0.2",
+    "@itwin/presentation-components": "3.0.2",
     "@itwin/itwinui-css": "^0.37.0",
     "@itwin/itwinui-react": "~1.28.0",
     "classnames": "^2.3.1",