@itwin/components-react 4.1.0 → 4.2.0

package/lib/cjs/components-react/propertygrid/component/VirtualizedPropertyGrid.scss

@@ -1,101 +1,101 @@
-/*---------------------------------------------------------------------------------------------
-* 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/expandable/list";
-@import "~@itwin/core-react/lib/cjs/core-react/scrollbar";
-
-.components-virtualized-property-grid-loader {
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.components-virtualized-property-grid {
-  user-select: none;
-}
-
-.components-property-grid-wrapper {
-  @include uicore-touch-scrolling;
-  @include uicore-scrollbar();
-}
-
-.virtualized-grid-node {
-  > :not(.virtualized-grid-node-category) {
-    background: var(--iui-color-background);
-  }
-
-  .nested-border-middle {
-    height: 100%;
-    padding: 0 4px;
-    box-sizing: border-box;
-    border-left: 1px solid var(--iui-color-border);
-    border-right: 1px solid var(--iui-color-border);
-  }
-
-  .nested-border-bottom {
-    border-bottom: 1px solid var(--iui-color-border);
-    padding-bottom: 4px;
-  }
-
-  .components--clickable {
-    cursor: pointer;
-    box-sizing: border-box;
-
-    &:not(.components--selected) {
-      &:hover {
-        // Highlight the whole row of inner-most expandable block
-        margin: 0 -4px;
-        // Compensate the negative margin by adding padding
-        padding: 0 12px;
-
-        background: var(--iui-color-background-hover);
-      }
-    }
-  }
-
-  .components--selected {
-    // Highlight the whole row of inner-most expandable block
-    margin: 0 -4px;
-    // Compensate the negative margin by adding padding (minus one for border)
-    padding: 0px 11px;
-
-    background-color: var(--iui-color-background-accent-muted);
-    border: 1px solid var(--iui-color-border-accent);
-  }
-
-  .components--hoverable {
-    &:hover {
-      background: var(--iui-color-background-hover);
-
-      &:not(.components--selected) {
-        // Highlight the whole row of inner-most expandable block
-        margin: 0 -4px;
-        // Compensate the negative margin by adding padding
-        padding: 0 12px;
-      }
-    }
-  }
-}
-
-.virtualized-grid-node-category {
-  padding-top: 4px;
-
-  .iui-expandable-content {
-    // We are rendering virtualized content below the expandable block
-    display: none;
-  }
-}
-
-.virtualized-grid-node-custom-category {
-  padding-top: 4px;
-
-  .iui-expandable-content > div {
-    padding: 0 4px 4px 4px;
-  }
-}
-
-.virtualized-grid-node-content {
-  height: 100%;
-}
+/*---------------------------------------------------------------------------------------------
+* 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/expandable/list";
+@import "~@itwin/core-react/lib/cjs/core-react/scrollbar";
+
+.components-virtualized-property-grid-loader {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.components-virtualized-property-grid {
+  user-select: none;
+}
+
+.components-property-grid-wrapper {
+  @include uicore-touch-scrolling;
+  @include uicore-scrollbar();
+}
+
+.virtualized-grid-node {
+  > :not(.virtualized-grid-node-category) {
+    background: var(--iui-color-background);
+  }
+
+  .nested-border-middle {
+    height: 100%;
+    padding: 0 4px;
+    box-sizing: border-box;
+    border-left: 1px solid var(--iui-color-border);
+    border-right: 1px solid var(--iui-color-border);
+  }
+
+  .nested-border-bottom {
+    border-bottom: 1px solid var(--iui-color-border);
+    padding-bottom: 4px;
+  }
+
+  .components--clickable {
+    cursor: pointer;
+    box-sizing: border-box;
+
+    &:not(.components--selected) {
+      &:hover {
+        // Highlight the whole row of inner-most expandable block
+        margin: 0 -4px;
+        // Compensate the negative margin by adding padding
+        padding: 0 12px;
+
+        background: var(--iui-color-background-hover);
+      }
+    }
+  }
+
+  .components--selected {
+    // Highlight the whole row of inner-most expandable block
+    margin: 0 -4px;
+    // Compensate the negative margin by adding padding (minus one for border)
+    padding: 0px 11px;
+
+    background-color: var(--iui-color-background-accent-muted);
+    border: 1px solid var(--iui-color-border-accent);
+  }
+
+  .components--hoverable {
+    &:hover {
+      background: var(--iui-color-background-hover);
+
+      &:not(.components--selected) {
+        // Highlight the whole row of inner-most expandable block
+        margin: 0 -4px;
+        // Compensate the negative margin by adding padding
+        padding: 0 12px;
+      }
+    }
+  }
+}
+
+.virtualized-grid-node-category {
+  padding-top: 4px;
+
+  .iui-expandable-content {
+    // We are rendering virtualized content below the expandable block
+    display: none;
+  }
+}
+
+.virtualized-grid-node-custom-category {
+  padding-top: 4px;
+
+  .iui-expandable-content > div {
+    padding: 0 4px 4px 4px;
+  }
+}
+
+.virtualized-grid-node-content {
+  height: 100%;
+}

package/lib/cjs/components-react/propertygrid/component/VirtualizedPropertyGridWithDataProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VirtualizedPropertyGridWithDataProvider.d.ts","sourceRoot":"","sources":["../../../../../src/components-react/propertygrid/component/VirtualizedPropertyGridWithDataProvider.tsx"],"names":[],"mappings":";AAYA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AAC1F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAGxG;;GAEG;AACH,MAAM,WAAW,4CAA6C,SAAQ,uBAAuB;IAC3F,uDAAuD;IACvD,YAAY,EAAE,qBAAqB,CAAC;IACpC,6DAA6D;IAC7D,SAAS,CAAC,EAAE,iCAAiC,CAAC;IAC9C,iHAAiH;IACjH,+BAA+B,CAAC,EAAE,+BAA+B,CAAC;IAClE,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,4CAA4C,eAc1G"}
+{"version":3,"file":"VirtualizedPropertyGridWithDataProvider.d.ts","sourceRoot":"","sources":["../../../../../src/components-react/propertygrid/component/VirtualizedPropertyGridWithDataProvider.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AAC1F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,KAAK,EACV,uBAAuB,EACvB,iCAAiC,EAClC,MAAM,uBAAuB,CAAC;AAG/B;;GAEG;AACH,MAAM,WAAW,4CACf,SAAQ,uBAAuB;IAC/B,uDAAuD;IACvD,YAAY,EAAE,qBAAqB,CAAC;IACpC,6DAA6D;IAC7D,SAAS,CAAC,EAAE,iCAAiC,CAAC;IAC9C,iHAAiH;IACjH,+BAA+B,CAAC,EAAE,+BAA+B,CAAC;IAClE,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,4CAA4C,eAuBpD"}

package/lib/cjs/components-react/propertygrid/component/VirtualizedPropertyGridWithDataProvider.js

@@ -1,8 +1,8 @@
 "use strict";
 /*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -21,7 +21,9 @@ const VirtualizedPropertyGrid_1 = require("./VirtualizedPropertyGrid");
  * @public
  */
 function VirtualizedPropertyGridWithDataProvider(props) {
-    const modelSource = (0, PropertyGridHooks_1.usePropertyGridModelSource)({ dataProvider: props.dataProvider });
+    const modelSource = (0, PropertyGridHooks_1.usePropertyGridModelSource)({
+        dataProvider: props.dataProvider,
+    });
     const model = (0, PropertyGridHooks_1.usePropertyGridModel)({ modelSource });
     const eventHandler = (0, PropertyGridHooks_1.usePropertyGridEventHandler)({ modelSource });
     if (!model) {

package/lib/cjs/components-react/propertygrid/component/VirtualizedPropertyGridWithDataProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"VirtualizedPropertyGridWithDataProvider.js","sourceRoot":"","sources":["../../../../../src/components-react/propertygrid/component/VirtualizedPropertyGridWithDataProvider.tsx"],"names":[],"mappings":";AAAA;;;+FAG+F;;;;;;AAE/F;;GAEG;AAEH,kDAA0B;AAC1B,gEAA6D;AAC7D,qEAA8H;AAI9H,uEAAoE;AAkBpE;;;;GAIG;AACH,SAAgB,uCAAuC,CAAC,KAAmD;IACzG,MAAM,WAAW,GAAG,IAAA,8CAA0B,EAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;IACrF,MAAM,KAAK,GAAG,IAAA,wCAAoB,EAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,IAAA,+CAA2B,EAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAElE,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,CACL,uCAAK,SAAS,EAAC,6CAA6C;YAC1D,8BAAC,+BAAc,IAAC,IAAI,EAAC,OAAO,GAAG,CAC3B,CACP,CAAC;KACH;IAED,OAAO,CAAC,8BAAC,iDAAuB,OAAK,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,GAAI,CAAC,CAAC;AAC5F,CAAC;AAdD,0FAcC","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\r\n/** @packageDocumentation\r\n * @module PropertyGrid\r\n */\r\n\r\nimport React from \"react\";\r\nimport { DelayedSpinner } from \"../../common/DelayedSpinner\";\r\nimport { usePropertyGridEventHandler, usePropertyGridModel, usePropertyGridModelSource } from \"../internal/PropertyGridHooks\";\r\nimport type { PropertyCategoryRendererManager } from \"../PropertyCategoryRendererManager\";\r\nimport type { IPropertyDataProvider } from \"../PropertyDataProvider\";\r\nimport type { CommonPropertyGridProps, PropertyGridContentHighlightProps } from \"./PropertyGridCommons\";\r\nimport { VirtualizedPropertyGrid } from \"./VirtualizedPropertyGrid\";\r\n\r\n/** Properties for [[VirtualizedPropertyGridWithDataProvider]] React component\r\n * @public\r\n */\r\nexport interface VirtualizedPropertyGridWithDataProviderProps extends CommonPropertyGridProps {\r\n  /** Property data provider used by the property grid */\r\n  dataProvider: IPropertyDataProvider;\r\n  /** Properties for highlighting property data in the grid. */\r\n  highlight?: PropertyGridContentHighlightProps;\r\n  /** Custom property category renderer manager. Defaults to [[PropertyCategoryRendererManager.defaultManager]]. */\r\n  propertyCategoryRendererManager?: PropertyCategoryRendererManager;\r\n  /** Width of the property grid component. */\r\n  width: number;\r\n  /** Height of the property grid component. */\r\n  height: number;\r\n}\r\n\r\n/**\r\n * [[VirtualizedPropertyGrid]] React Component which takes a data provider and\r\n * sets up default implementations for [[IPropertyGridModelSource]] and [[IPropertyGridEventHandler]]\r\n * @public\r\n */\r\nexport function VirtualizedPropertyGridWithDataProvider(props: VirtualizedPropertyGridWithDataProviderProps) {\r\n  const modelSource = usePropertyGridModelSource({ dataProvider: props.dataProvider });\r\n  const model = usePropertyGridModel({ modelSource });\r\n  const eventHandler = usePropertyGridEventHandler({ modelSource });\r\n\r\n  if (!model) {\r\n    return (\r\n      <div className=\"components-virtualized-property-grid-loader\">\r\n        <DelayedSpinner size=\"large\" />\r\n      </div>\r\n    );\r\n  }\r\n\r\n  return (<VirtualizedPropertyGrid {...props} model={model} eventHandler={eventHandler} />);\r\n}\r\n"]}
+{"version":3,"file":"VirtualizedPropertyGridWithDataProvider.js","sourceRoot":"","sources":["../../../../../src/components-react/propertygrid/component/VirtualizedPropertyGridWithDataProvider.tsx"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;;;AAEhG;;GAEG;AAEH,kDAA0B;AAC1B,gEAA6D;AAC7D,qEAIuC;AAOvC,uEAAoE;AAmBpE;;;;GAIG;AACH,SAAgB,uCAAuC,CACrD,KAAmD;IAEnD,MAAM,WAAW,GAAG,IAAA,8CAA0B,EAAC;QAC7C,YAAY,EAAE,KAAK,CAAC,YAAY;KACjC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,IAAA,wCAAoB,EAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,IAAA,+CAA2B,EAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAElE,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,CACL,uCAAK,SAAS,EAAC,6CAA6C;YAC1D,8BAAC,+BAAc,IAAC,IAAI,EAAC,OAAO,GAAG,CAC3B,CACP,CAAC;KACH;IAED,OAAO,CACL,8BAAC,iDAAuB,OAClB,KAAK,EACT,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,GAC1B,CACH,CAAC;AACJ,CAAC;AAxBD,0FAwBC","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\n/** @packageDocumentation\n * @module PropertyGrid\n */\n\nimport React from \"react\";\nimport { DelayedSpinner } from \"../../common/DelayedSpinner\";\nimport {\n  usePropertyGridEventHandler,\n  usePropertyGridModel,\n  usePropertyGridModelSource,\n} from \"../internal/PropertyGridHooks\";\nimport type { PropertyCategoryRendererManager } from \"../PropertyCategoryRendererManager\";\nimport type { IPropertyDataProvider } from \"../PropertyDataProvider\";\nimport type {\n  CommonPropertyGridProps,\n  PropertyGridContentHighlightProps,\n} from \"./PropertyGridCommons\";\nimport { VirtualizedPropertyGrid } from \"./VirtualizedPropertyGrid\";\n\n/** Properties for [[VirtualizedPropertyGridWithDataProvider]] React component\n * @public\n */\nexport interface VirtualizedPropertyGridWithDataProviderProps\n  extends CommonPropertyGridProps {\n  /** Property data provider used by the property grid */\n  dataProvider: IPropertyDataProvider;\n  /** Properties for highlighting property data in the grid. */\n  highlight?: PropertyGridContentHighlightProps;\n  /** Custom property category renderer manager. Defaults to [[PropertyCategoryRendererManager.defaultManager]]. */\n  propertyCategoryRendererManager?: PropertyCategoryRendererManager;\n  /** Width of the property grid component. */\n  width: number;\n  /** Height of the property grid component. */\n  height: number;\n}\n\n/**\n * [[VirtualizedPropertyGrid]] React Component which takes a data provider and\n * sets up default implementations for [[IPropertyGridModelSource]] and [[IPropertyGridEventHandler]]\n * @public\n */\nexport function VirtualizedPropertyGridWithDataProvider(\n  props: VirtualizedPropertyGridWithDataProviderProps\n) {\n  const modelSource = usePropertyGridModelSource({\n    dataProvider: props.dataProvider,\n  });\n  const model = usePropertyGridModel({ modelSource });\n  const eventHandler = usePropertyGridEventHandler({ modelSource });\n\n  if (!model) {\n    return (\n      <div className=\"components-virtualized-property-grid-loader\">\n        <DelayedSpinner size=\"large\" />\n      </div>\n    );\n  }\n\n  return (\n    <VirtualizedPropertyGrid\n      {...props}\n      model={model}\n      eventHandler={eventHandler}\n    />\n  );\n}\n"]}

package/lib/cjs/components-react/propertygrid/dataproviders/FilteringDataProvider.d.ts

@@ -12,14 +12,14 @@ import type { FilteredType, IPropertyDataFilterer } from "./filterers/PropertyDa
  */
 export interface FilteredPropertyData extends PropertyData {
     /**
-    * Shows how many matches were found when filtering data.
-    * `undefined` when filterer is not active
-    */
+     * Shows how many matches were found when filtering data.
+     * `undefined` when filterer is not active
+     */
     matchesCount?: number;
     /**
-    * Function used for getting [[HighlightInfo]] by index from all the filtered matches.
-    * `undefined` when filterer is not active
-    */
+     * Function used for getting [[HighlightInfo]] by index from all the filtered matches.
+     * `undefined` when filterer is not active
+     */
     getMatchByIndex?: (index: number) => HighlightInfo | undefined;
     /** Types of objects that were used for filtering. */
     filteredTypes?: FilteredType[];

package/lib/cjs/components-react/propertygrid/dataproviders/FilteringDataProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilteringDataProvider.d.ts","sourceRoot":"","sources":["../../../../../src/components-react/propertygrid/dataproviders/FilteringDataProvider.ts"],"names":[],"mappings":"AAIA;;GAEG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAE7E,OAAO,KAAK,EAAE,qBAAqB,EAAoB,YAAY,EAAC,MAAM,yBAAyB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAA4B,MAAM,sCAAsC,CAAC;AAW1H;;;GAGG;AACH,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD;;;MAGE;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;MAGE;IACF,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,aAAa,GAAG,SAAS,CAAC;IAE/D,qDAAqD;IACrD,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;CAChC;AAED;;;GAGG;AACH,qBAAa,6BAA8B,YAAW,qBAAqB,EAAE,WAAW;IAMnE,OAAO,CAAC,aAAa;IAAyB,OAAO,CAAC,SAAS;IAL3E,aAAa,0BAAiC;IACrD,OAAO,CAAC,qBAAqB,CAAwD;IACrF,OAAO,CAAC,6BAA6B,CAAW;IAChD,OAAO,CAAC,2BAA2B,CAAW;gBAEnB,aAAa,EAAE,qBAAqB,EAAU,SAAS,EAAE,qBAAqB;IAKlG,OAAO,IAAI,IAAI;IAKT,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;YAavC,kBAAkB;CAqCjC"}
+{"version":3,"file":"FilteringDataProvider.d.ts","sourceRoot":"","sources":["../../../../../src/components-react/propertygrid/dataproviders/FilteringDataProvider.ts"],"names":[],"mappings":"AAIA;;GAEG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAE7E,OAAO,KAAK,EACV,qBAAqB,EAErB,YAAY,EACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EACV,YAAY,EACZ,qBAAqB,EAEtB,MAAM,sCAAsC,CAAC;AAW9C;;;GAGG;AACH,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,aAAa,GAAG,SAAS,CAAC;IAE/D,qDAAqD;IACrD,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;CAChC;AAED;;;GAGG;AACH,qBAAa,6BACX,YAAW,qBAAqB,EAAE,WAAW;IAS3C,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IARZ,aAAa,0BAAiC;IACrD,OAAO,CAAC,qBAAqB,CACjB;IACZ,OAAO,CAAC,6BAA6B,CAAW;IAChD,OAAO,CAAC,2BAA2B,CAAW;gBAGpC,aAAa,EAAE,qBAAqB,EACpC,SAAS,EAAE,qBAAqB;IAcnC,OAAO,IAAI,IAAI;IAKT,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;YAgBvC,kBAAkB;CA0CjC"}

package/lib/cjs/components-react/propertygrid/dataproviders/FilteringDataProvider.js

@@ -1,8 +1,8 @@
 "use strict";
 /*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
 /** @packageDocumentation
  * @module PropertyGrid
  */
@@ -20,8 +20,16 @@ class FilteringPropertyDataProvider {
         this._filterer = _filterer;
         this.onDataChanged = new PropertyDataProvider_1.PropertyDataChangeEvent();
         this._filteredPropertyData = undefined;
-        this._disposeFilterChangedListener = this._filterer.onFilterChanged.addListener(() => { this._filteredPropertyData = undefined; this.onDataChanged.raiseEvent(); });
-        this._disposeDataChangedListener = this._dataProvider.onDataChanged.addListener(() => { this._filteredPropertyData = undefined; this.onDataChanged.raiseEvent(); });
+        this._disposeFilterChangedListener =
+            this._filterer.onFilterChanged.addListener(() => {
+                this._filteredPropertyData = undefined;
+                this.onDataChanged.raiseEvent();
+            });
+        this._disposeDataChangedListener =
+            this._dataProvider.onDataChanged.addListener(() => {
+                this._filteredPropertyData = undefined;
+                this.onDataChanged.raiseEvent();
+            });
     }
     dispose() {
         this._disposeDataChangedListener();
@@ -31,15 +39,18 @@ class FilteringPropertyDataProvider {
         if (this._filteredPropertyData) {
             return this._filteredPropertyData;
         }
-        this._filteredPropertyData = this._dataProvider.getData().then(async (propertyData) => {
-            return ((this._filterer.isActive) ?
-                this.filterPropertyData(propertyData) : propertyData);
+        this._filteredPropertyData = this._dataProvider
+            .getData()
+            .then(async (propertyData) => {
+            return this._filterer.isActive
+                ? this.filterPropertyData(propertyData)
+                : propertyData;
         });
         return this._filteredPropertyData;
     }
     async filterPropertyData(propertyData) {
         const { categories, records, label, description } = { ...propertyData };
-        const { filteredCategories, filteredRecords, matchesCount, filteredResultMatches, filteredTypes } = await matchHierarchy(this._filterer, categories, records, undefined);
+        const { filteredCategories, filteredRecords, matchesCount, filteredResultMatches, filteredTypes, } = await matchHierarchy(this._filterer, categories, records, undefined);
         const uniqueTypes = [...new Set(filteredTypes)];
         const getMatchByIndex = (index) => {
             let activeMatch;
@@ -73,32 +84,38 @@ class FilteringPropertyDataProvider {
 }
 exports.FilteringPropertyDataProvider = FilteringPropertyDataProvider;
 async function matchHierarchy(filterer, categories, records, newRecords, parentMatchInfo) {
-    var _a, _b, _c, _d, _e;
     const newCategories = [];
-    newRecords = newRecords !== null && newRecords !== void 0 ? newRecords : {};
+    newRecords = newRecords ?? {};
     let matchesCount = 0;
     let allFilteredResultMatches = [];
     let allFilteredTypes = [];
     for (const category of categories) {
         const matchInfo = await filterer.categoryMatchesFilter(category, []);
         if (matchInfo.matchesFilter) {
-            allFilteredResultMatches.push({ id: category.name, matchesCount: (_a = matchInfo.matchesCount) !== null && _a !== void 0 ? _a : 0 });
-            allFilteredTypes = allFilteredTypes.concat((_b = matchInfo.filteredTypes) !== null && _b !== void 0 ? _b : []);
-            matchesCount += (_c = matchInfo.matchesCount) !== null && _c !== void 0 ? _c : 0;
+            allFilteredResultMatches.push({
+                id: category.name,
+                matchesCount: matchInfo.matchesCount ?? 0,
+            });
+            allFilteredTypes = allFilteredTypes.concat(matchInfo.filteredTypes ?? []);
+            matchesCount += matchInfo.matchesCount ?? 0;
         }
-        const childRecords = (_d = records[category.name]) !== null && _d !== void 0 ? _d : [];
-        const { filteredRecords, matchesCount: count, filteredResultMatches, filteredTypes } = await matchRecordHierarchy(filterer, childRecords, []);
+        const childRecords = records[category.name] ?? [];
+        const { filteredRecords, matchesCount: count, filteredResultMatches, filteredTypes, } = await matchRecordHierarchy(filterer, childRecords, []);
         allFilteredResultMatches = allFilteredResultMatches.concat(filteredResultMatches);
         allFilteredTypes = allFilteredTypes.concat(filteredTypes);
         matchesCount += count;
-        const parentInfo = (parentMatchInfo === null || parentMatchInfo === void 0 ? void 0 : parentMatchInfo.matchesFilter) ? parentMatchInfo : matchInfo;
-        const childCategories = (_e = category.childCategories) !== null && _e !== void 0 ? _e : [];
-        const { filteredCategories, matchesCount: childCount, filteredResultMatches: childFilteredResultMatches, filteredTypes: childFilteredTypes } = await matchHierarchy(filterer, childCategories, records, newRecords, parentInfo);
+        const parentInfo = parentMatchInfo?.matchesFilter
+            ? parentMatchInfo
+            : matchInfo;
+        const childCategories = category.childCategories ?? [];
+        const { filteredCategories, matchesCount: childCount, filteredResultMatches: childFilteredResultMatches, filteredTypes: childFilteredTypes, } = await matchHierarchy(filterer, childCategories, records, newRecords, parentInfo);
         allFilteredResultMatches = allFilteredResultMatches.concat(childFilteredResultMatches);
         allFilteredTypes = allFilteredTypes.concat(childFilteredTypes);
         matchesCount += childCount;
         let expand = !(count === 0 && childCount === 0);
-        if (matchInfo.matchesFilter || ((parentMatchInfo === null || parentMatchInfo === void 0 ? void 0 : parentMatchInfo.matchesFilter) && parentMatchInfo.shouldForceIncludeDescendants)) {
+        if (matchInfo.matchesFilter ||
+            (parentMatchInfo?.matchesFilter &&
+                parentMatchInfo.shouldForceIncludeDescendants)) {
             newRecords[category.name] = records[category.name];
             if (matchInfo.matchesFilter) {
                 expand = true;
@@ -106,16 +123,24 @@ async function matchHierarchy(filterer, categories, records, newRecords, parentM
             const newCategory = copyPropertyCategory(category, filteredCategories, expand);
             newCategories.push(newCategory);
         }
-        if ((filteredRecords.length !== 0 || filteredCategories.length !== 0) && !matchInfo.matchesFilter && !((parentMatchInfo === null || parentMatchInfo === void 0 ? void 0 : parentMatchInfo.shouldExpandNodeParents) && parentMatchInfo.matchesFilter)) {
+        if ((filteredRecords.length !== 0 || filteredCategories.length !== 0) &&
+            !matchInfo.matchesFilter &&
+            !(parentMatchInfo?.shouldExpandNodeParents &&
+                parentMatchInfo.matchesFilter)) {
             const newCategory = copyPropertyCategory(category, filteredCategories, expand);
             newRecords[newCategory.name] = filteredRecords;
             newCategories.push(newCategory);
         }
     }
-    return { filteredCategories: newCategories, filteredRecords: newRecords, matchesCount, filteredResultMatches: allFilteredResultMatches, filteredTypes: allFilteredTypes };
+    return {
+        filteredCategories: newCategories,
+        filteredRecords: newRecords,
+        matchesCount,
+        filteredResultMatches: allFilteredResultMatches,
+        filteredTypes: allFilteredTypes,
+    };
 }
 async function matchRecordHierarchy(filterer, records, parents, forceIncludeItem = false) {
-    var _a, _b;
     const newMatchedRecords = [];
     let expandParent = false; // property passed back to parent to indicate whether it should be expanded
     let matchesCount = 0;
@@ -124,7 +149,7 @@ async function matchRecordHierarchy(filterer, records, parents, forceIncludeItem
     for (const record of records) {
         const matchInfo = await filterer.recordMatchesFilter(record, parents);
         const shouldForceIncludeDescendants = forceIncludeItem || matchInfo.shouldForceIncludeDescendants;
-        const { filteredRecords: filteredChildren, shouldExpandNodeParents, matchesCount: childrenMatchesCount, filteredResultMatches: childrenResultMatches, filteredTypes: childrenFilteredTypes } = await matchRecordHierarchy(filterer, record.getChildrenRecords(), [...parents, record], shouldForceIncludeDescendants);
+        const { filteredRecords: filteredChildren, shouldExpandNodeParents, matchesCount: childrenMatchesCount, filteredResultMatches: childrenResultMatches, filteredTypes: childrenFilteredTypes, } = await matchRecordHierarchy(filterer, record.getChildrenRecords(), [...parents, record], shouldForceIncludeDescendants);
         filteredResultMatches = filteredResultMatches.concat(childrenResultMatches);
         filteredTypes = [...filteredTypes, ...childrenFilteredTypes];
         matchesCount += childrenMatchesCount;
@@ -132,15 +157,18 @@ async function matchRecordHierarchy(filterer, records, parents, forceIncludeItem
         expandParent = expandParent || shouldExpandNodeParents;
         let newRecord;
         if (matchInfo.matchesFilter) {
-            filteredTypes = [...filteredTypes, ...((_a = matchInfo.filteredTypes) !== null && _a !== void 0 ? _a : [])];
-            const recordMatchesCount = (_b = matchInfo.matchesCount) !== null && _b !== void 0 ? _b : 0;
+            filteredTypes = [...filteredTypes, ...(matchInfo.filteredTypes ?? [])];
+            const recordMatchesCount = matchInfo.matchesCount ?? 0;
             matchesCount += recordMatchesCount;
             // Item is included if it matches filter
             // If at least one matched record from records list needs its parent expanded,
             // then `expandParent` should be set to true
             expandParent = expandParent || !!matchInfo.shouldExpandNodeParents;
             newRecord = copyPropertyRecord(record, filteredChildren, shouldExpandNodeParents);
-            filteredResultMatches.push({ id: newRecord.property.name, matchesCount: recordMatchesCount });
+            filteredResultMatches.push({
+                id: newRecord.property.name,
+                matchesCount: recordMatchesCount,
+            });
         }
         else if (filteredChildren.length !== 0 || forceIncludeItem) {
             // Item is also included if it has at least one matched child or is forcefully included by its parent
@@ -149,7 +177,13 @@ async function matchRecordHierarchy(filterer, records, parents, forceIncludeItem
         if (newRecord)
             newMatchedRecords.push(newRecord);
     }
-    return { filteredRecords: newMatchedRecords, shouldExpandNodeParents: expandParent, matchesCount, filteredResultMatches, filteredTypes };
+    return {
+        filteredRecords: newMatchedRecords,
+        shouldExpandNodeParents: expandParent,
+        matchesCount,
+        filteredResultMatches,
+        filteredTypes,
+    };
 }
 function copyPropertyCategory(propertyCategory, newChildren, expand) {
     return {
@@ -175,7 +209,7 @@ function createNewPropertyValue(value, newChildren) {
             };
         case appui_abstract_1.PropertyValueFormat.Struct:
             const members = {};
-            newChildren.forEach((child) => members[child.property.name] = child);
+            newChildren.forEach((child) => (members[child.property.name] = child));
             return {
                 valueFormat: appui_abstract_1.PropertyValueFormat.Struct,
                 members,

package/lib/cjs/components-react/propertygrid/dataproviders/FilteringDataProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"FilteringDataProvider.js","sourceRoot":"","sources":["../../../../../src/components-react/propertygrid/dataproviders/FilteringDataProvider.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 PropertyGrid\r\n */\r\n\r\nimport type { PropertyRecord, PropertyValue} from \"@itwin/appui-abstract\";\r\nimport { PropertyValueFormat } from \"@itwin/appui-abstract\";\r\nimport type { IDisposable } from \"@itwin/core-bentley\";\r\nimport type { HighlightInfo } from \"../../common/HighlightingComponentProps\";\r\nimport type { CategoryRecordsDict } from \"../internal/flat-items/MutableGridCategory\";\r\nimport type { IPropertyDataProvider, PropertyCategory, PropertyData} from \"../PropertyDataProvider\";\r\nimport { PropertyDataChangeEvent } from \"../PropertyDataProvider\";\r\nimport type { FilteredType, IPropertyDataFilterer, PropertyDataFilterResult } from \"./filterers/PropertyDataFiltererBase\";\r\n\r\ninterface FilteredRecords {\r\n  filteredRecords: PropertyRecord[];\r\n  shouldExpandNodeParents: boolean;\r\n  matchesCount: number;\r\n  activeMatch?: HighlightInfo;\r\n  filteredResultMatches: { id: string, matchesCount: number }[];\r\n  filteredTypes: FilteredType[];\r\n}\r\n\r\n/**\r\n * Data returned by [[FilteringPropertyDataProvider]]\r\n * @public\r\n */\r\nexport interface FilteredPropertyData extends PropertyData {\r\n  /**\r\n  * Shows how many matches were found when filtering data.\r\n  * `undefined` when filterer is not active\r\n  */\r\n  matchesCount?: number;\r\n\r\n  /**\r\n  * Function used for getting [[HighlightInfo]] by index from all the filtered matches.\r\n  * `undefined` when filterer is not active\r\n  */\r\n  getMatchByIndex?: (index: number) => HighlightInfo | undefined;\r\n\r\n  /** Types of objects that were used for filtering. */\r\n  filteredTypes?: FilteredType[];\r\n}\r\n\r\n/**\r\n * [[IPropertyDataProvider]] implementation which filters wrapped provider [[PropertyData]] using passed [[IPropertyDataFilterer]].\r\n * @public\r\n */\r\nexport class FilteringPropertyDataProvider implements IPropertyDataProvider, IDisposable {\r\n  public onDataChanged = new PropertyDataChangeEvent();\r\n  private _filteredPropertyData: Promise<FilteredPropertyData> | undefined = undefined;\r\n  private _disposeFilterChangedListener: Function;\r\n  private _disposeDataChangedListener: Function;\r\n\r\n  public constructor(private _dataProvider: IPropertyDataProvider, private _filterer: IPropertyDataFilterer) {\r\n    this._disposeFilterChangedListener = this._filterer.onFilterChanged.addListener(() => { this._filteredPropertyData = undefined; this.onDataChanged.raiseEvent(); });\r\n    this._disposeDataChangedListener = this._dataProvider.onDataChanged.addListener(() => { this._filteredPropertyData = undefined; this.onDataChanged.raiseEvent(); });\r\n  }\r\n\r\n  public dispose(): void {\r\n    this._disposeDataChangedListener();\r\n    this._disposeFilterChangedListener();\r\n  }\r\n\r\n  public async getData(): Promise<FilteredPropertyData> {\r\n    if (this._filteredPropertyData) {\r\n      return this._filteredPropertyData;\r\n    }\r\n\r\n    this._filteredPropertyData = this._dataProvider.getData().then(async (propertyData) => {\r\n      return ((this._filterer.isActive) ?\r\n        this.filterPropertyData(propertyData) : propertyData);\r\n    });\r\n\r\n    return this._filteredPropertyData;\r\n  }\r\n\r\n  private async filterPropertyData(propertyData: PropertyData) {\r\n    const { categories, records, label, description } = { ...propertyData };\r\n    const { filteredCategories, filteredRecords, matchesCount, filteredResultMatches, filteredTypes } = await matchHierarchy(this._filterer, categories, records, undefined);\r\n\r\n    const uniqueTypes = [...new Set(filteredTypes)];\r\n    const getMatchByIndex = (index: number) => {\r\n      let activeMatch: HighlightInfo | undefined;\r\n      if (index <= 0)\r\n        return undefined;\r\n\r\n      let i = 1;\r\n      for (const record of filteredResultMatches) {\r\n        const fullMatchesCount = record.matchesCount;\r\n        if (index < i + fullMatchesCount) {\r\n          activeMatch = {\r\n            highlightedItemIdentifier: record.id,\r\n            highlightIndex: index - i,\r\n          };\r\n          break;\r\n        }\r\n\r\n        i += fullMatchesCount;\r\n      }\r\n      return activeMatch;\r\n    };\r\n\r\n    return {\r\n      label,\r\n      description,\r\n      categories: filteredCategories,\r\n      records: filteredRecords,\r\n      reusePropertyDataState: false,\r\n      matchesCount,\r\n      getMatchByIndex,\r\n      filteredTypes: uniqueTypes,\r\n    };\r\n  }\r\n}\r\n\r\nasync function matchHierarchy(filterer: IPropertyDataFilterer, categories: PropertyCategory[], records: CategoryRecordsDict, newRecords?: CategoryRecordsDict, parentMatchInfo?: PropertyDataFilterResult) {\r\n  const newCategories: PropertyCategory[] = [];\r\n  newRecords = newRecords ?? {};\r\n  let matchesCount = 0;\r\n  let allFilteredResultMatches: { id: string, matchesCount: number }[] = [];\r\n  let allFilteredTypes: FilteredType[] = [];\r\n\r\n  for (const category of categories) {\r\n    const matchInfo = await filterer.categoryMatchesFilter(category, []);\r\n\r\n    if (matchInfo.matchesFilter) {\r\n      allFilteredResultMatches.push({ id: category.name, matchesCount: matchInfo.matchesCount ?? 0 });\r\n      allFilteredTypes = allFilteredTypes.concat(matchInfo.filteredTypes ?? []);\r\n      matchesCount += matchInfo.matchesCount ?? 0;\r\n    }\r\n\r\n    const childRecords = records[category.name] ?? [];\r\n    const { filteredRecords, matchesCount: count, filteredResultMatches, filteredTypes } = await matchRecordHierarchy(filterer, childRecords, []);\r\n    allFilteredResultMatches = allFilteredResultMatches.concat(filteredResultMatches);\r\n    allFilteredTypes = allFilteredTypes.concat(filteredTypes);\r\n    matchesCount += count;\r\n\r\n    const parentInfo = parentMatchInfo?.matchesFilter ? parentMatchInfo : matchInfo;\r\n\r\n    const childCategories = category.childCategories ?? [];\r\n    const { filteredCategories, matchesCount: childCount, filteredResultMatches: childFilteredResultMatches, filteredTypes: childFilteredTypes } = await matchHierarchy(filterer, childCategories, records, newRecords, parentInfo);\r\n    allFilteredResultMatches = allFilteredResultMatches.concat(childFilteredResultMatches);\r\n    allFilteredTypes = allFilteredTypes.concat(childFilteredTypes);\r\n    matchesCount += childCount;\r\n\r\n    let expand = !(count === 0 && childCount === 0);\r\n    if (matchInfo.matchesFilter || (parentMatchInfo?.matchesFilter && parentMatchInfo.shouldForceIncludeDescendants)) {\r\n      newRecords[category.name] = records[category.name];\r\n      if (matchInfo.matchesFilter) {\r\n        expand = true;\r\n      }\r\n      const newCategory = copyPropertyCategory(category, filteredCategories, expand);\r\n      newCategories.push(newCategory);\r\n    }\r\n\r\n    if ((filteredRecords.length !== 0 || filteredCategories.length !== 0) && !matchInfo.matchesFilter && !(parentMatchInfo?.shouldExpandNodeParents && parentMatchInfo.matchesFilter)) {\r\n      const newCategory = copyPropertyCategory(category, filteredCategories, expand);\r\n      newRecords[newCategory.name] = filteredRecords;\r\n      newCategories.push(newCategory);\r\n    }\r\n  }\r\n\r\n  return { filteredCategories: newCategories, filteredRecords: newRecords, matchesCount, filteredResultMatches: allFilteredResultMatches, filteredTypes: allFilteredTypes };\r\n}\r\n\r\nasync function matchRecordHierarchy(filterer: IPropertyDataFilterer, records: PropertyRecord[], parents: PropertyRecord[], forceIncludeItem: boolean = false): Promise<FilteredRecords> {\r\n  const newMatchedRecords: PropertyRecord[] = [];\r\n  let expandParent = false; // property passed back to parent to indicate whether it should be expanded\r\n  let matchesCount = 0;\r\n  let filteredResultMatches: { id: string, matchesCount: number }[] = [];\r\n  let filteredTypes: FilteredType[] = [];\r\n\r\n  for (const record of records) {\r\n    const matchInfo = await filterer.recordMatchesFilter(record, parents);\r\n    const shouldForceIncludeDescendants = forceIncludeItem || matchInfo.shouldForceIncludeDescendants;\r\n    const { filteredRecords: filteredChildren, shouldExpandNodeParents, matchesCount: childrenMatchesCount, filteredResultMatches: childrenResultMatches, filteredTypes: childrenFilteredTypes } = await matchRecordHierarchy(filterer, record.getChildrenRecords(), [...parents, record], shouldForceIncludeDescendants);\r\n    filteredResultMatches = filteredResultMatches.concat(childrenResultMatches);\r\n    filteredTypes = [...filteredTypes, ...childrenFilteredTypes];\r\n    matchesCount += childrenMatchesCount;\r\n    // if child hierarchy indicates parents should be expanded, then it should be passed back up to the top parent\r\n    expandParent = expandParent || shouldExpandNodeParents;\r\n\r\n    let newRecord: PropertyRecord | undefined;\r\n    if (matchInfo.matchesFilter) {\r\n      filteredTypes = [...filteredTypes, ...(matchInfo.filteredTypes ?? [])];\r\n      const recordMatchesCount = matchInfo.matchesCount ?? 0;\r\n      matchesCount += recordMatchesCount;\r\n      // Item is included if it matches filter\r\n      // If at least one matched record from records list needs its parent expanded,\r\n      // then `expandParent` should be set to true\r\n      expandParent = expandParent || !!matchInfo.shouldExpandNodeParents;\r\n      newRecord = copyPropertyRecord(record, filteredChildren, shouldExpandNodeParents);\r\n      filteredResultMatches.push({ id: newRecord.property.name, matchesCount: recordMatchesCount });\r\n    } else if (filteredChildren.length !== 0 || forceIncludeItem) {\r\n      // Item is also included if it has at least one matched child or is forcefully included by its parent\r\n      newRecord = copyPropertyRecord(record, filteredChildren, shouldExpandNodeParents);\r\n    }\r\n\r\n    if (newRecord)\r\n      newMatchedRecords.push(newRecord);\r\n  }\r\n\r\n  return { filteredRecords: newMatchedRecords, shouldExpandNodeParents: expandParent, matchesCount, filteredResultMatches, filteredTypes };\r\n}\r\n\r\nfunction copyPropertyCategory(\r\n  propertyCategory: PropertyCategory,\r\n  newChildren: PropertyCategory[],\r\n  expand: boolean,\r\n): PropertyCategory {\r\n  return {\r\n    ...propertyCategory,\r\n    childCategories: newChildren,\r\n    expand,\r\n  };\r\n}\r\n\r\nfunction copyPropertyRecord(record: PropertyRecord, newChildren: PropertyRecord[], autoExpand: boolean) {\r\n  const r = record.copyWithNewValue(createNewPropertyValue(record.value, newChildren));\r\n  r.autoExpand = autoExpand;\r\n  return r;\r\n}\r\n\r\nfunction createNewPropertyValue(value: PropertyValue, newChildren: PropertyRecord[]): PropertyValue {\r\n  switch (value.valueFormat) {\r\n    case PropertyValueFormat.Primitive:\r\n      return { ...value };\r\n    case PropertyValueFormat.Array:\r\n      return {\r\n        valueFormat: PropertyValueFormat.Array,\r\n        itemsTypeName: value.itemsTypeName,\r\n        items: newChildren,\r\n      };\r\n    case PropertyValueFormat.Struct:\r\n      const members: { [name: string]: PropertyRecord } = {};\r\n      newChildren.forEach((child) => members[child.property.name] = child);\r\n      return {\r\n        valueFormat: PropertyValueFormat.Struct,\r\n        members,\r\n      };\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"FilteringDataProvider.js","sourceRoot":"","sources":["../../../../../src/components-react/propertygrid/dataproviders/FilteringDataProvider.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 PropertyGrid\n */\n\nimport type { PropertyRecord, PropertyValue } from \"@itwin/appui-abstract\";\nimport { PropertyValueFormat } from \"@itwin/appui-abstract\";\nimport type { IDisposable } from \"@itwin/core-bentley\";\nimport type { HighlightInfo } from \"../../common/HighlightingComponentProps\";\nimport type { CategoryRecordsDict } from \"../internal/flat-items/MutableGridCategory\";\nimport type {\n  IPropertyDataProvider,\n  PropertyCategory,\n  PropertyData,\n} from \"../PropertyDataProvider\";\nimport { PropertyDataChangeEvent } from \"../PropertyDataProvider\";\nimport type {\n  FilteredType,\n  IPropertyDataFilterer,\n  PropertyDataFilterResult,\n} from \"./filterers/PropertyDataFiltererBase\";\n\ninterface FilteredRecords {\n  filteredRecords: PropertyRecord[];\n  shouldExpandNodeParents: boolean;\n  matchesCount: number;\n  activeMatch?: HighlightInfo;\n  filteredResultMatches: { id: string; matchesCount: number }[];\n  filteredTypes: FilteredType[];\n}\n\n/**\n * Data returned by [[FilteringPropertyDataProvider]]\n * @public\n */\nexport interface FilteredPropertyData extends PropertyData {\n  /**\n   * Shows how many matches were found when filtering data.\n   * `undefined` when filterer is not active\n   */\n  matchesCount?: number;\n\n  /**\n   * Function used for getting [[HighlightInfo]] by index from all the filtered matches.\n   * `undefined` when filterer is not active\n   */\n  getMatchByIndex?: (index: number) => HighlightInfo | undefined;\n\n  /** Types of objects that were used for filtering. */\n  filteredTypes?: FilteredType[];\n}\n\n/**\n * [[IPropertyDataProvider]] implementation which filters wrapped provider [[PropertyData]] using passed [[IPropertyDataFilterer]].\n * @public\n */\nexport class FilteringPropertyDataProvider\n  implements IPropertyDataProvider, IDisposable\n{\n  public onDataChanged = new PropertyDataChangeEvent();\n  private _filteredPropertyData: Promise<FilteredPropertyData> | undefined =\n    undefined;\n  private _disposeFilterChangedListener: Function;\n  private _disposeDataChangedListener: Function;\n\n  public constructor(\n    private _dataProvider: IPropertyDataProvider,\n    private _filterer: IPropertyDataFilterer\n  ) {\n    this._disposeFilterChangedListener =\n      this._filterer.onFilterChanged.addListener(() => {\n        this._filteredPropertyData = undefined;\n        this.onDataChanged.raiseEvent();\n      });\n    this._disposeDataChangedListener =\n      this._dataProvider.onDataChanged.addListener(() => {\n        this._filteredPropertyData = undefined;\n        this.onDataChanged.raiseEvent();\n      });\n  }\n\n  public dispose(): void {\n    this._disposeDataChangedListener();\n    this._disposeFilterChangedListener();\n  }\n\n  public async getData(): Promise<FilteredPropertyData> {\n    if (this._filteredPropertyData) {\n      return this._filteredPropertyData;\n    }\n\n    this._filteredPropertyData = this._dataProvider\n      .getData()\n      .then(async (propertyData) => {\n        return this._filterer.isActive\n          ? this.filterPropertyData(propertyData)\n          : propertyData;\n      });\n\n    return this._filteredPropertyData;\n  }\n\n  private async filterPropertyData(propertyData: PropertyData) {\n    const { categories, records, label, description } = { ...propertyData };\n    const {\n      filteredCategories,\n      filteredRecords,\n      matchesCount,\n      filteredResultMatches,\n      filteredTypes,\n    } = await matchHierarchy(this._filterer, categories, records, undefined);\n\n    const uniqueTypes = [...new Set(filteredTypes)];\n    const getMatchByIndex = (index: number) => {\n      let activeMatch: HighlightInfo | undefined;\n      if (index <= 0) return undefined;\n\n      let i = 1;\n      for (const record of filteredResultMatches) {\n        const fullMatchesCount = record.matchesCount;\n        if (index < i + fullMatchesCount) {\n          activeMatch = {\n            highlightedItemIdentifier: record.id,\n            highlightIndex: index - i,\n          };\n          break;\n        }\n\n        i += fullMatchesCount;\n      }\n      return activeMatch;\n    };\n\n    return {\n      label,\n      description,\n      categories: filteredCategories,\n      records: filteredRecords,\n      reusePropertyDataState: false,\n      matchesCount,\n      getMatchByIndex,\n      filteredTypes: uniqueTypes,\n    };\n  }\n}\n\nasync function matchHierarchy(\n  filterer: IPropertyDataFilterer,\n  categories: PropertyCategory[],\n  records: CategoryRecordsDict,\n  newRecords?: CategoryRecordsDict,\n  parentMatchInfo?: PropertyDataFilterResult\n) {\n  const newCategories: PropertyCategory[] = [];\n  newRecords = newRecords ?? {};\n  let matchesCount = 0;\n  let allFilteredResultMatches: { id: string; matchesCount: number }[] = [];\n  let allFilteredTypes: FilteredType[] = [];\n\n  for (const category of categories) {\n    const matchInfo = await filterer.categoryMatchesFilter(category, []);\n\n    if (matchInfo.matchesFilter) {\n      allFilteredResultMatches.push({\n        id: category.name,\n        matchesCount: matchInfo.matchesCount ?? 0,\n      });\n      allFilteredTypes = allFilteredTypes.concat(matchInfo.filteredTypes ?? []);\n      matchesCount += matchInfo.matchesCount ?? 0;\n    }\n\n    const childRecords = records[category.name] ?? [];\n    const {\n      filteredRecords,\n      matchesCount: count,\n      filteredResultMatches,\n      filteredTypes,\n    } = await matchRecordHierarchy(filterer, childRecords, []);\n    allFilteredResultMatches = allFilteredResultMatches.concat(\n      filteredResultMatches\n    );\n    allFilteredTypes = allFilteredTypes.concat(filteredTypes);\n    matchesCount += count;\n\n    const parentInfo = parentMatchInfo?.matchesFilter\n      ? parentMatchInfo\n      : matchInfo;\n\n    const childCategories = category.childCategories ?? [];\n    const {\n      filteredCategories,\n      matchesCount: childCount,\n      filteredResultMatches: childFilteredResultMatches,\n      filteredTypes: childFilteredTypes,\n    } = await matchHierarchy(\n      filterer,\n      childCategories,\n      records,\n      newRecords,\n      parentInfo\n    );\n    allFilteredResultMatches = allFilteredResultMatches.concat(\n      childFilteredResultMatches\n    );\n    allFilteredTypes = allFilteredTypes.concat(childFilteredTypes);\n    matchesCount += childCount;\n\n    let expand = !(count === 0 && childCount === 0);\n    if (\n      matchInfo.matchesFilter ||\n      (parentMatchInfo?.matchesFilter &&\n        parentMatchInfo.shouldForceIncludeDescendants)\n    ) {\n      newRecords[category.name] = records[category.name];\n      if (matchInfo.matchesFilter) {\n        expand = true;\n      }\n      const newCategory = copyPropertyCategory(\n        category,\n        filteredCategories,\n        expand\n      );\n      newCategories.push(newCategory);\n    }\n\n    if (\n      (filteredRecords.length !== 0 || filteredCategories.length !== 0) &&\n      !matchInfo.matchesFilter &&\n      !(\n        parentMatchInfo?.shouldExpandNodeParents &&\n        parentMatchInfo.matchesFilter\n      )\n    ) {\n      const newCategory = copyPropertyCategory(\n        category,\n        filteredCategories,\n        expand\n      );\n      newRecords[newCategory.name] = filteredRecords;\n      newCategories.push(newCategory);\n    }\n  }\n\n  return {\n    filteredCategories: newCategories,\n    filteredRecords: newRecords,\n    matchesCount,\n    filteredResultMatches: allFilteredResultMatches,\n    filteredTypes: allFilteredTypes,\n  };\n}\n\nasync function matchRecordHierarchy(\n  filterer: IPropertyDataFilterer,\n  records: PropertyRecord[],\n  parents: PropertyRecord[],\n  forceIncludeItem: boolean = false\n): Promise<FilteredRecords> {\n  const newMatchedRecords: PropertyRecord[] = [];\n  let expandParent = false; // property passed back to parent to indicate whether it should be expanded\n  let matchesCount = 0;\n  let filteredResultMatches: { id: string; matchesCount: number }[] = [];\n  let filteredTypes: FilteredType[] = [];\n\n  for (const record of records) {\n    const matchInfo = await filterer.recordMatchesFilter(record, parents);\n    const shouldForceIncludeDescendants =\n      forceIncludeItem || matchInfo.shouldForceIncludeDescendants;\n    const {\n      filteredRecords: filteredChildren,\n      shouldExpandNodeParents,\n      matchesCount: childrenMatchesCount,\n      filteredResultMatches: childrenResultMatches,\n      filteredTypes: childrenFilteredTypes,\n    } = await matchRecordHierarchy(\n      filterer,\n      record.getChildrenRecords(),\n      [...parents, record],\n      shouldForceIncludeDescendants\n    );\n    filteredResultMatches = filteredResultMatches.concat(childrenResultMatches);\n    filteredTypes = [...filteredTypes, ...childrenFilteredTypes];\n    matchesCount += childrenMatchesCount;\n    // if child hierarchy indicates parents should be expanded, then it should be passed back up to the top parent\n    expandParent = expandParent || shouldExpandNodeParents;\n\n    let newRecord: PropertyRecord | undefined;\n    if (matchInfo.matchesFilter) {\n      filteredTypes = [...filteredTypes, ...(matchInfo.filteredTypes ?? [])];\n      const recordMatchesCount = matchInfo.matchesCount ?? 0;\n      matchesCount += recordMatchesCount;\n      // Item is included if it matches filter\n      // If at least one matched record from records list needs its parent expanded,\n      // then `expandParent` should be set to true\n      expandParent = expandParent || !!matchInfo.shouldExpandNodeParents;\n      newRecord = copyPropertyRecord(\n        record,\n        filteredChildren,\n        shouldExpandNodeParents\n      );\n      filteredResultMatches.push({\n        id: newRecord.property.name,\n        matchesCount: recordMatchesCount,\n      });\n    } else if (filteredChildren.length !== 0 || forceIncludeItem) {\n      // Item is also included if it has at least one matched child or is forcefully included by its parent\n      newRecord = copyPropertyRecord(\n        record,\n        filteredChildren,\n        shouldExpandNodeParents\n      );\n    }\n\n    if (newRecord) newMatchedRecords.push(newRecord);\n  }\n\n  return {\n    filteredRecords: newMatchedRecords,\n    shouldExpandNodeParents: expandParent,\n    matchesCount,\n    filteredResultMatches,\n    filteredTypes,\n  };\n}\n\nfunction copyPropertyCategory(\n  propertyCategory: PropertyCategory,\n  newChildren: PropertyCategory[],\n  expand: boolean\n): PropertyCategory {\n  return {\n    ...propertyCategory,\n    childCategories: newChildren,\n    expand,\n  };\n}\n\nfunction copyPropertyRecord(\n  record: PropertyRecord,\n  newChildren: PropertyRecord[],\n  autoExpand: boolean\n) {\n  const r = record.copyWithNewValue(\n    createNewPropertyValue(record.value, newChildren)\n  );\n  r.autoExpand = autoExpand;\n  return r;\n}\n\nfunction createNewPropertyValue(\n  value: PropertyValue,\n  newChildren: PropertyRecord[]\n): PropertyValue {\n  switch (value.valueFormat) {\n    case PropertyValueFormat.Primitive:\n      return { ...value };\n    case PropertyValueFormat.Array:\n      return {\n        valueFormat: PropertyValueFormat.Array,\n        itemsTypeName: value.itemsTypeName,\n        items: newChildren,\n      };\n    case PropertyValueFormat.Struct:\n      const members: { [name: string]: PropertyRecord } = {};\n      newChildren.forEach((child) => (members[child.property.name] = child));\n      return {\n        valueFormat: PropertyValueFormat.Struct,\n        members,\n      };\n  }\n}\n"]}

package/lib/cjs/components-react/propertygrid/dataproviders/filterers/CompositePropertyDataFilterer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompositePropertyDataFilterer.d.ts","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/CompositePropertyDataFilterer.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAgB,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAChH,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE;;;GAGG;AACH,oBAAY,mBAAmB;IAC7B,GAAG,IAAA;IACH,EAAE,IAAA;CACH;AAED;;;GAGG;AACH,qBAAa,6BAA8B,SAAQ,wBAAwB;IACtD,OAAO,CAAC,aAAa;IAAyB,OAAO,CAAC,SAAS;IAAuB,OAAO,CAAC,cAAc;gBAApG,aAAa,EAAE,qBAAqB,EAAU,SAAS,EAAE,mBAAmB,EAAU,cAAc,EAAE,qBAAqB;IAMtJ,IAAW,QAAQ,YAA0E;IAEhF,mBAAmB,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC;IASvG,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAS1H,OAAO,CAAC,iBAAiB;CAe1B"}
+{"version":3,"file":"CompositePropertyDataFilterer.d.ts","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/CompositePropertyDataFilterer.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAEV,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE;;;GAGG;AACH,oBAAY,mBAAmB;IAC7B,GAAG,IAAA;IACH,EAAE,IAAA;CACH;AAED;;;GAGG;AACH,qBAAa,6BAA8B,SAAQ,wBAAwB;IAEvE,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc;gBAFd,aAAa,EAAE,qBAAqB,EACpC,SAAS,EAAE,mBAAmB,EAC9B,cAAc,EAAE,qBAAqB;IAW/C,IAAW,QAAQ,YAElB;IAEY,mBAAmB,CAC9B,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,cAAc,EAAE,GACxB,OAAO,CAAC,wBAAwB,CAAC;IASvB,qBAAqB,CAChC,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,gBAAgB,EAAE,GAC1B,OAAO,CAAC,wBAAwB,CAAC;IASpC,OAAO,CAAC,iBAAiB;CAyB1B"}

package/lib/cjs/components-react/propertygrid/dataproviders/filterers/CompositePropertyDataFilterer.js

@@ -1,8 +1,8 @@
 "use strict";
 /*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
 /** @packageDocumentation
  * @module PropertyGrid
  */
@@ -31,7 +31,9 @@ class CompositePropertyDataFilterer extends PropertyDataFiltererBase_1.PropertyD
         this._leftFilterer.onFilterChanged.addListener(() => this.onFilterChanged.raiseEvent());
         this._rightFilterer.onFilterChanged.addListener(() => this.onFilterChanged.raiseEvent());
     }
-    get isActive() { return this._leftFilterer.isActive || this._rightFilterer.isActive; }
+    get isActive() {
+        return this._leftFilterer.isActive || this._rightFilterer.isActive;
+    }
     async recordMatchesFilter(node, parents) {
         const [lhs, rhs] = await Promise.all([
             this._leftFilterer.recordMatchesFilter(node, parents),
@@ -47,7 +49,9 @@ class CompositePropertyDataFilterer extends PropertyDataFiltererBase_1.PropertyD
         return this.getFiltererResult(lhs, rhs);
     }
     getFiltererResult(lhs, rhs) {
-        const matchesFilter = (this._operator === CompositeFilterType.And) ? (lhs.matchesFilter && rhs.matchesFilter) : (lhs.matchesFilter || rhs.matchesFilter);
+        const matchesFilter = this._operator === CompositeFilterType.And
+            ? lhs.matchesFilter && rhs.matchesFilter
+            : lhs.matchesFilter || rhs.matchesFilter;
         if (!matchesFilter)
             return { matchesFilter: false };
         const filteredTypes = joinNullableArrays(lhs.matchesFilter ? lhs.filteredTypes : undefined, rhs.matchesFilter ? rhs.filteredTypes : undefined);
@@ -55,7 +59,7 @@ class CompositePropertyDataFilterer extends PropertyDataFiltererBase_1.PropertyD
             matchesFilter: true,
             shouldExpandNodeParents: lhs.shouldExpandNodeParents || rhs.shouldExpandNodeParents,
             shouldForceIncludeDescendants: lhs.shouldForceIncludeDescendants || rhs.shouldForceIncludeDescendants,
-            matchesCount: (sumNullableNumbers(lhs.matchesCount, rhs.matchesCount)),
+            matchesCount: sumNullableNumbers(lhs.matchesCount, rhs.matchesCount),
             filteredTypes,
         };
     }
@@ -64,11 +68,11 @@ exports.CompositePropertyDataFilterer = CompositePropertyDataFilterer;
 function sumNullableNumbers(lhs, rhs) {
     if (undefined === lhs && undefined === rhs)
         return undefined;
-    return (lhs !== null && lhs !== void 0 ? lhs : 0) + (rhs !== null && rhs !== void 0 ? rhs : 0);
+    return (lhs ?? 0) + (rhs ?? 0);
 }
 function joinNullableArrays(lhs, rhs) {
     if (undefined === lhs && undefined === rhs)
         return undefined;
-    return [...lhs !== null && lhs !== void 0 ? lhs : [], ...rhs !== null && rhs !== void 0 ? rhs : []];
+    return [...(lhs ?? []), ...(rhs ?? [])];
 }
 //# sourceMappingURL=CompositePropertyDataFilterer.js.map