@itwin/components-react 4.0.0-dev.2 → 4.0.0-dev.21

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

@@ -1,92 +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-1);
-  }
-
-  .nested-border-middle {
-    height: 100%;
-    padding: 0 4px;
-    box-sizing: border-box;
-    border-left: 1px solid var(--iui-color-background-4);
-    border-right: 1px solid var(--iui-color-background-4);
-  }
-
-  .nested-border-bottom {
-    border-bottom: 1px solid var(--iui-color-background-4);
-    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: $buic-row-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: $buic-row-selection;
-    border: 1px solid $buic-foreground-primary;
-
-    &:hover {
-      background: $buic-row-hover;
-    }
-  }
-}
-
-.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

@@ -1,25 +1,26 @@
 /// <reference types="react" />
-import { HighlightingComponentProps } from "../../common/HighlightingComponentProps";
-import { FilteredType } from "../dataproviders/filterers/PropertyDataFiltererBase";
 import { PropertyCategoryRendererManager } from "../PropertyCategoryRendererManager";
 import { IPropertyDataProvider } from "../PropertyDataProvider";
-import { CommonPropertyGridProps } from "./PropertyGridCommons";
+import { CommonPropertyGridProps, PropertyGridContentHighlightProps } from "./PropertyGridCommons";
 /** Properties for [[VirtualizedPropertyGridWithDataProvider]] React component
- * @beta
+ * @public
  */
 export interface VirtualizedPropertyGridWithDataProviderProps extends CommonPropertyGridProps {
+    /** Property data provider used by the property grid */
     dataProvider: IPropertyDataProvider;
-    highlight?: HighlightingComponentProps & {
-        filteredTypes?: FilteredType[];
-    };
+    /** Properties for highlighting property data in the grid. */
+    highlight?: PropertyGridContentHighlightProps;
+    /** Custom property category renderer manager. Defaults to [[PropertyCategoryRendererManager.defaultManager]]. */
     propertyCategoryRendererManager?: PropertyCategoryRendererManager;
+    /** Width of the property grid component. */
     width: number;
+    /** Height of the property grid component. */
     height: number;
 }
 /**
- * VirtualizedPropertyGrid React Component which takes dataProvider and
- * sets up default implementations for IPropertyGridModelSource nad IPropertyGridEventHandler
- * @beta
+ * [[VirtualizedPropertyGrid]] React Component which takes a data provider and
+ * sets up default implementations for [[IPropertyGridModelSource]] and [[IPropertyGridEventHandler]]
+ * @public
  */
 export declare function VirtualizedPropertyGridWithDataProvider(props: VirtualizedPropertyGridWithDataProviderProps): JSX.Element;
 //# sourceMappingURL=VirtualizedPropertyGridWithDataProvider.d.ts.map

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":";AAWA,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AAEnF,OAAO,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAGhE;;GAEG;AACH,MAAM,WAAW,4CAA6C,SAAQ,uBAAuB;IAC3F,YAAY,EAAE,qBAAqB,CAAC;IACpC,SAAS,CAAC,EAAE,0BAA0B,GAAG;QACvC,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;KAChC,CAAC;IACF,+BAA+B,CAAC,EAAE,+BAA+B,CAAC;IAClE,KAAK,EAAE,MAAM,CAAC;IACd,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":";AAYA,OAAO,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAGnG;;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"}

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

@@ -16,9 +16,9 @@ const DelayedSpinner_1 = require("../../common/DelayedSpinner");
 const PropertyGridHooks_1 = require("../internal/PropertyGridHooks");
 const VirtualizedPropertyGrid_1 = require("./VirtualizedPropertyGrid");
 /**
- * VirtualizedPropertyGrid React Component which takes dataProvider and
- * sets up default implementations for IPropertyGridModelSource nad IPropertyGridEventHandler
- * @beta
+ * [[VirtualizedPropertyGrid]] React Component which takes a data provider and
+ * sets up default implementations for [[IPropertyGridModelSource]] and [[IPropertyGridEventHandler]]
+ * @public
  */
 function VirtualizedPropertyGridWithDataProvider(props) {
     const modelSource = (0, PropertyGridHooks_1.usePropertyGridModelSource)({ dataProvider: props.dataProvider });

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;AAG7D,qEAA8H;AAI9H,uEAAoE;AAepE;;;;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":["/*---------------------------------------------------------------------------------------------\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 { HighlightingComponentProps } from \"../../common/HighlightingComponentProps\";\nimport { FilteredType } from \"../dataproviders/filterers/PropertyDataFiltererBase\";\nimport { usePropertyGridEventHandler, usePropertyGridModel, usePropertyGridModelSource } from \"../internal/PropertyGridHooks\";\nimport { PropertyCategoryRendererManager } from \"../PropertyCategoryRendererManager\";\nimport { IPropertyDataProvider } from \"../PropertyDataProvider\";\nimport { CommonPropertyGridProps } from \"./PropertyGridCommons\";\nimport { VirtualizedPropertyGrid } from \"./VirtualizedPropertyGrid\";\n\n/** Properties for [[VirtualizedPropertyGridWithDataProvider]] React component\n * @beta\n */\nexport interface VirtualizedPropertyGridWithDataProviderProps extends CommonPropertyGridProps {\n  dataProvider: IPropertyDataProvider;\n  highlight?: HighlightingComponentProps & {\n    filteredTypes?: FilteredType[];\n  };\n  propertyCategoryRendererManager?: PropertyCategoryRendererManager;\n  width: number;\n  height: number;\n}\n\n/**\n * VirtualizedPropertyGrid React Component which takes dataProvider and\n * sets up default implementations for IPropertyGridModelSource nad IPropertyGridEventHandler\n * @beta\n */\nexport function VirtualizedPropertyGridWithDataProvider(props: VirtualizedPropertyGridWithDataProviderProps) {\n  const modelSource = usePropertyGridModelSource({ dataProvider: props.dataProvider });\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 (<VirtualizedPropertyGrid {...props} model={model} eventHandler={eventHandler} />);\n}\n"]}
+{"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 { PropertyCategoryRendererManager } from \"../PropertyCategoryRendererManager\";\r\nimport { IPropertyDataProvider } from \"../PropertyDataProvider\";\r\nimport { 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"]}

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

@@ -73,32 +73,31 @@ 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 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 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,7 +105,7 @@ 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);
@@ -115,7 +114,6 @@ async function matchHierarchy(filterer, categories, records, newRecords, parentM
     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;
@@ -132,8 +130,8 @@ 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,

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":["/*---------------------------------------------------------------------------------------------\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 { PropertyRecord, PropertyValue, PropertyValueFormat } from \"@itwin/appui-abstract\";\nimport { IDisposable } from \"@itwin/core-bentley\";\nimport { HighlightInfo } from \"../../common/HighlightingComponentProps\";\nimport { CategoryRecordsDict } from \"../internal/flat-items/MutableGridCategory\";\nimport { IPropertyDataProvider, PropertyCategory, PropertyData, PropertyDataChangeEvent } from \"../PropertyDataProvider\";\nimport { FilteredType, IPropertyDataFilterer, PropertyDataFilterResult } 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 implements IPropertyDataProvider, IDisposable {\n  public onDataChanged = new PropertyDataChangeEvent();\n  private _filteredPropertyData: Promise<FilteredPropertyData> | undefined = undefined;\n  private _disposeFilterChangedListener: Function;\n  private _disposeDataChangedListener: Function;\n\n  public constructor(private _dataProvider: IPropertyDataProvider, private _filterer: IPropertyDataFilterer) {\n    this._disposeFilterChangedListener = this._filterer.onFilterChanged.addListener(() => { this._filteredPropertyData = undefined; this.onDataChanged.raiseEvent(); });\n    this._disposeDataChangedListener = this._dataProvider.onDataChanged.addListener(() => { this._filteredPropertyData = undefined; this.onDataChanged.raiseEvent(); });\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.getData().then(async (propertyData) => {\n      return ((this._filterer.isActive) ?\n        this.filterPropertyData(propertyData) : propertyData);\n    });\n\n    return this._filteredPropertyData;\n  }\n\n  private async filterPropertyData(propertyData: PropertyData) {\n    const { categories, records, label, description } = { ...propertyData };\n    const { filteredCategories, filteredRecords, matchesCount, filteredResultMatches, filteredTypes } = 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)\n        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(filterer: IPropertyDataFilterer, categories: PropertyCategory[], records: CategoryRecordsDict, newRecords?: CategoryRecordsDict, parentMatchInfo?: PropertyDataFilterResult) {\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({ id: category.name, matchesCount: matchInfo.matchesCount ?? 0 });\n      allFilteredTypes = allFilteredTypes.concat(matchInfo.filteredTypes ?? []);\n      matchesCount += matchInfo.matchesCount ?? 0;\n    }\n\n    const childRecords = records[category.name] ?? [];\n    const { filteredRecords, matchesCount: count, filteredResultMatches, filteredTypes } = await matchRecordHierarchy(filterer, childRecords, []);\n    allFilteredResultMatches = allFilteredResultMatches.concat(filteredResultMatches);\n    allFilteredTypes = allFilteredTypes.concat(filteredTypes);\n    matchesCount += count;\n\n    const parentInfo = parentMatchInfo?.matchesFilter ? parentMatchInfo : matchInfo;\n\n    const childCategories = category.childCategories ?? [];\n    const { filteredCategories, matchesCount: childCount, filteredResultMatches: childFilteredResultMatches, filteredTypes: childFilteredTypes } = await matchHierarchy(filterer, childCategories, records, newRecords, parentInfo);\n    allFilteredResultMatches = allFilteredResultMatches.concat(childFilteredResultMatches);\n    allFilteredTypes = allFilteredTypes.concat(childFilteredTypes);\n    matchesCount += childCount;\n\n    let expand = !(count === 0 && childCount === 0);\n    if (matchInfo.matchesFilter || (parentMatchInfo?.matchesFilter && parentMatchInfo.shouldForceIncludeDescendants)) {\n      newRecords[category.name] = records[category.name];\n      if (matchInfo.matchesFilter) {\n        expand = true;\n      }\n      const newCategory = copyPropertyCategory(category, filteredCategories, expand);\n      newCategories.push(newCategory);\n    }\n\n    if ((filteredRecords.length !== 0 || filteredCategories.length !== 0) && !matchInfo.matchesFilter && !(parentMatchInfo?.shouldExpandNodeParents && parentMatchInfo.matchesFilter)) {\n      const newCategory = copyPropertyCategory(category, filteredCategories, expand);\n      newRecords[newCategory.name] = filteredRecords;\n      newCategories.push(newCategory);\n    }\n  }\n\n  return { filteredCategories: newCategories, filteredRecords: newRecords, matchesCount, filteredResultMatches: allFilteredResultMatches, filteredTypes: allFilteredTypes };\n}\n\nasync function matchRecordHierarchy(filterer: IPropertyDataFilterer, records: PropertyRecord[], parents: PropertyRecord[], forceIncludeItem: boolean = false): 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 = forceIncludeItem || matchInfo.shouldForceIncludeDescendants;\n    const { filteredRecords: filteredChildren, shouldExpandNodeParents, matchesCount: childrenMatchesCount, filteredResultMatches: childrenResultMatches, filteredTypes: childrenFilteredTypes } = await matchRecordHierarchy(filterer, record.getChildrenRecords(), [...parents, record], shouldForceIncludeDescendants);\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(record, filteredChildren, shouldExpandNodeParents);\n      filteredResultMatches.push({ id: newRecord.property.name, matchesCount: recordMatchesCount });\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(record, filteredChildren, shouldExpandNodeParents);\n    }\n\n    if (newRecord)\n      newMatchedRecords.push(newRecord);\n  }\n\n  return { filteredRecords: newMatchedRecords, shouldExpandNodeParents: expandParent, matchesCount, filteredResultMatches, filteredTypes };\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(record: PropertyRecord, newChildren: PropertyRecord[], autoExpand: boolean) {\n  const r = record.copyWithNewValue(createNewPropertyValue(record.value, newChildren));\n  r.autoExpand = autoExpand;\n  return r;\n}\n\nfunction createNewPropertyValue(value: PropertyValue, newChildren: PropertyRecord[]): 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"]}
+{"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 { PropertyRecord, PropertyValue, PropertyValueFormat } from \"@itwin/appui-abstract\";\r\nimport { IDisposable } from \"@itwin/core-bentley\";\r\nimport { HighlightInfo } from \"../../common/HighlightingComponentProps\";\r\nimport { CategoryRecordsDict } from \"../internal/flat-items/MutableGridCategory\";\r\nimport { IPropertyDataProvider, PropertyCategory, PropertyData, PropertyDataChangeEvent } from \"../PropertyDataProvider\";\r\nimport { 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"]}

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

@@ -64,11 +64,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

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

@@ -1 +1 @@
-{"version":3,"file":"CompositePropertyDataFilterer.js","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/CompositePropertyDataFilterer.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 { PropertyRecord } from \"@itwin/appui-abstract\";\nimport { PropertyCategory } from \"../../PropertyDataProvider\";\nimport { FilteredType, IPropertyDataFilterer, PropertyDataFiltererBase, PropertyDataFilterResult } from \"./PropertyDataFiltererBase\";\n\n/**\n * Logical operator for composite filterer.\n * @public\n */\nexport enum CompositeFilterType {\n  And,\n  Or,\n}\n\n/**\n * Composite PropertyData filter which can join two filters using logic operators\n * @public\n */\nexport class CompositePropertyDataFilterer extends PropertyDataFiltererBase {\n  public constructor(private _leftFilterer: IPropertyDataFilterer, private _operator: CompositeFilterType, private _rightFilterer: IPropertyDataFilterer) {\n    super();\n    this._leftFilterer.onFilterChanged.addListener(() => this.onFilterChanged.raiseEvent());\n    this._rightFilterer.onFilterChanged.addListener(() => this.onFilterChanged.raiseEvent());\n  }\n\n  public get isActive() { return this._leftFilterer.isActive || this._rightFilterer.isActive; }\n\n  public async recordMatchesFilter(node: PropertyRecord, parents: PropertyRecord[]): Promise<PropertyDataFilterResult> {\n    const [lhs, rhs] = await Promise.all([\n      this._leftFilterer.recordMatchesFilter(node, parents),\n      this._rightFilterer.recordMatchesFilter(node, parents),\n    ]);\n\n    return this.getFiltererResult(lhs, rhs);\n  }\n\n  public async categoryMatchesFilter(node: PropertyCategory, parents: PropertyCategory[]): Promise<PropertyDataFilterResult> {\n    const [lhs, rhs] = await Promise.all([\n      this._leftFilterer.categoryMatchesFilter(node, parents),\n      this._rightFilterer.categoryMatchesFilter(node, parents),\n    ]);\n\n    return this.getFiltererResult(lhs, rhs);\n  }\n\n  private getFiltererResult(lhs: PropertyDataFilterResult, rhs: PropertyDataFilterResult) {\n    const matchesFilter = (this._operator === CompositeFilterType.And) ? (lhs.matchesFilter && rhs.matchesFilter) : (lhs.matchesFilter || rhs.matchesFilter);\n    if (!matchesFilter)\n      return { matchesFilter: false };\n\n    const filteredTypes = joinNullableArrays(lhs.matchesFilter ? lhs.filteredTypes : undefined, rhs.matchesFilter ? rhs.filteredTypes : undefined);\n\n    return {\n      matchesFilter: true,\n      shouldExpandNodeParents: lhs.shouldExpandNodeParents || rhs.shouldExpandNodeParents,\n      shouldForceIncludeDescendants: lhs.shouldForceIncludeDescendants || rhs.shouldForceIncludeDescendants,\n      matchesCount: (sumNullableNumbers(lhs.matchesCount, rhs.matchesCount)),\n      filteredTypes,\n    };\n  }\n}\n\nfunction sumNullableNumbers(lhs: number | undefined, rhs: number | undefined) {\n  if (undefined === lhs && undefined === rhs)\n    return undefined;\n  return (lhs ?? 0) + (rhs ?? 0);\n}\n\nfunction joinNullableArrays(lhs: FilteredType[] | undefined, rhs: FilteredType[] | undefined) {\n  if (undefined === lhs && undefined === rhs)\n    return undefined;\n  return [...lhs ?? [], ...rhs ?? []];\n}\n"]}
+{"version":3,"file":"CompositePropertyDataFilterer.js","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/CompositePropertyDataFilterer.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 { PropertyRecord } from \"@itwin/appui-abstract\";\r\nimport { PropertyCategory } from \"../../PropertyDataProvider\";\r\nimport { FilteredType, IPropertyDataFilterer, PropertyDataFiltererBase, PropertyDataFilterResult } from \"./PropertyDataFiltererBase\";\r\n\r\n/**\r\n * Logical operator for composite filterer.\r\n * @public\r\n */\r\nexport enum CompositeFilterType {\r\n  And,\r\n  Or,\r\n}\r\n\r\n/**\r\n * Composite PropertyData filter which can join two filters using logic operators\r\n * @public\r\n */\r\nexport class CompositePropertyDataFilterer extends PropertyDataFiltererBase {\r\n  public constructor(private _leftFilterer: IPropertyDataFilterer, private _operator: CompositeFilterType, private _rightFilterer: IPropertyDataFilterer) {\r\n    super();\r\n    this._leftFilterer.onFilterChanged.addListener(() => this.onFilterChanged.raiseEvent());\r\n    this._rightFilterer.onFilterChanged.addListener(() => this.onFilterChanged.raiseEvent());\r\n  }\r\n\r\n  public get isActive() { return this._leftFilterer.isActive || this._rightFilterer.isActive; }\r\n\r\n  public async recordMatchesFilter(node: PropertyRecord, parents: PropertyRecord[]): Promise<PropertyDataFilterResult> {\r\n    const [lhs, rhs] = await Promise.all([\r\n      this._leftFilterer.recordMatchesFilter(node, parents),\r\n      this._rightFilterer.recordMatchesFilter(node, parents),\r\n    ]);\r\n\r\n    return this.getFiltererResult(lhs, rhs);\r\n  }\r\n\r\n  public async categoryMatchesFilter(node: PropertyCategory, parents: PropertyCategory[]): Promise<PropertyDataFilterResult> {\r\n    const [lhs, rhs] = await Promise.all([\r\n      this._leftFilterer.categoryMatchesFilter(node, parents),\r\n      this._rightFilterer.categoryMatchesFilter(node, parents),\r\n    ]);\r\n\r\n    return this.getFiltererResult(lhs, rhs);\r\n  }\r\n\r\n  private getFiltererResult(lhs: PropertyDataFilterResult, rhs: PropertyDataFilterResult) {\r\n    const matchesFilter = (this._operator === CompositeFilterType.And) ? (lhs.matchesFilter && rhs.matchesFilter) : (lhs.matchesFilter || rhs.matchesFilter);\r\n    if (!matchesFilter)\r\n      return { matchesFilter: false };\r\n\r\n    const filteredTypes = joinNullableArrays(lhs.matchesFilter ? lhs.filteredTypes : undefined, rhs.matchesFilter ? rhs.filteredTypes : undefined);\r\n\r\n    return {\r\n      matchesFilter: true,\r\n      shouldExpandNodeParents: lhs.shouldExpandNodeParents || rhs.shouldExpandNodeParents,\r\n      shouldForceIncludeDescendants: lhs.shouldForceIncludeDescendants || rhs.shouldForceIncludeDescendants,\r\n      matchesCount: (sumNullableNumbers(lhs.matchesCount, rhs.matchesCount)),\r\n      filteredTypes,\r\n    };\r\n  }\r\n}\r\n\r\nfunction sumNullableNumbers(lhs: number | undefined, rhs: number | undefined) {\r\n  if (undefined === lhs && undefined === rhs)\r\n    return undefined;\r\n  return (lhs ?? 0) + (rhs ?? 0);\r\n}\r\n\r\nfunction joinNullableArrays(lhs: FilteredType[] | undefined, rhs: FilteredType[] | undefined) {\r\n  if (undefined === lhs && undefined === rhs)\r\n    return undefined;\r\n  return [...lhs ?? [], ...rhs ?? []];\r\n}\r\n"]}

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

@@ -31,12 +31,11 @@ class DisplayValuePropertyDataFilterer extends PropertyDataFiltererBase_1.Proper
     }
     get isActive() { return this.filterText !== ""; }
     async recordMatchesFilter(node) {
-        var _a, _b;
         if (!this.isActive)
             return { matchesFilter: true };
         if (node.value.valueFormat !== appui_abstract_1.PropertyValueFormat.Primitive)
             return { matchesFilter: false };
-        const displayValue = (_b = (_a = node.value.displayValue) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : "";
+        const displayValue = node.value.displayValue?.toLowerCase() ?? "";
         const matchesCount = (0, countMatchesInString_1.countMatchesInString)(displayValue, this.filterText);
         if (matchesCount === 0)
             return { matchesFilter: false };

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

@@ -1 +1 @@
-{"version":3,"file":"DisplayValuePropertyDataFilterer.js","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/DisplayValuePropertyDataFilterer.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,0DAA4E;AAC5E,+EAA4E;AAC5E,yEAAoH;AAEpH;;;GAGG;AACH,MAAa,gCAAiC,SAAQ,yDAA8B;IAGlF,YAAmB,aAAqB,EAAE;QACxC,KAAK,EAAE,CAAC;QAHF,gBAAW,GAAW,EAAE,CAAC;QAI/B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED,IAAW,UAAU,KAAa,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,IAAW,UAAU,CAAC,KAAa;QACjC,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;YAC9B,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;SACnC;IACH,CAAC;IAED,IAAW,QAAQ,KAAK,OAAO,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC;IAEjD,KAAK,CAAC,mBAAmB,CAAC,IAAoB;;QACnD,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QAEjC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,KAAK,oCAAmB,CAAC,SAAS;YAC1D,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;QAElC,MAAM,YAAY,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,YAAY,0CAAE,WAAW,EAAE,mCAAI,EAAE,CAAC;QAClE,MAAM,YAAY,GAAG,IAAA,2CAAoB,EAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAEzE,IAAI,YAAY,KAAK,CAAC;YACpB,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;QAElC,OAAO;YACL,aAAa,EAAE,IAAI;YACnB,uBAAuB,EAAE,IAAI;YAC7B,YAAY;YACZ,aAAa,EAAE,CAAC,uCAAY,CAAC,KAAK,CAAC;SACpC,CAAC;IACJ,CAAC;CACF;AAvCD,4EAuCC","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 { PropertyRecord, PropertyValueFormat } from \"@itwin/appui-abstract\";\nimport { countMatchesInString } from \"../../../common/countMatchesInString\";\nimport { FilteredType, PropertyDataFilterResult, PropertyRecordDataFiltererBase } from \"./PropertyDataFiltererBase\";\n\n/**\n * Property data filterer which matches on Primitive Property Record display value text.\n * @public\n */\nexport class DisplayValuePropertyDataFilterer extends PropertyRecordDataFiltererBase {\n  private _filterText: string = \"\";\n\n  public constructor(filterText: string = \"\") {\n    super();\n    this._filterText = filterText;\n  }\n\n  public get filterText(): string { return this._filterText; }\n  public set filterText(value: string) {\n    const lowerValue = value.toLowerCase().trim();\n    if (lowerValue !== this.filterText) {\n      this._filterText = lowerValue;\n      this.onFilterChanged.raiseEvent();\n    }\n  }\n\n  public get isActive() { return this.filterText !== \"\"; }\n\n  public async recordMatchesFilter(node: PropertyRecord): Promise<PropertyDataFilterResult> {\n    if (!this.isActive)\n      return { matchesFilter: true };\n\n    if (node.value.valueFormat !== PropertyValueFormat.Primitive)\n      return { matchesFilter: false };\n\n    const displayValue = node.value.displayValue?.toLowerCase() ?? \"\";\n    const matchesCount = countMatchesInString(displayValue, this.filterText);\n\n    if (matchesCount === 0)\n      return { matchesFilter: false };\n\n    return {\n      matchesFilter: true,\n      shouldExpandNodeParents: true,\n      matchesCount,\n      filteredTypes: [FilteredType.Value],\n    };\n  }\n}\n"]}
+{"version":3,"file":"DisplayValuePropertyDataFilterer.js","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/DisplayValuePropertyDataFilterer.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,0DAA4E;AAC5E,+EAA4E;AAC5E,yEAAoH;AAEpH;;;GAGG;AACH,MAAa,gCAAiC,SAAQ,yDAA8B;IAGlF,YAAmB,aAAqB,EAAE;QACxC,KAAK,EAAE,CAAC;QAHF,gBAAW,GAAW,EAAE,CAAC;QAI/B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED,IAAW,UAAU,KAAa,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,IAAW,UAAU,CAAC,KAAa;QACjC,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;YAC9B,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;SACnC;IACH,CAAC;IAED,IAAW,QAAQ,KAAK,OAAO,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC;IAEjD,KAAK,CAAC,mBAAmB,CAAC,IAAoB;QACnD,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QAEjC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,KAAK,oCAAmB,CAAC,SAAS;YAC1D,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;QAElC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QAClE,MAAM,YAAY,GAAG,IAAA,2CAAoB,EAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAEzE,IAAI,YAAY,KAAK,CAAC;YACpB,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;QAElC,OAAO;YACL,aAAa,EAAE,IAAI;YACnB,uBAAuB,EAAE,IAAI;YAC7B,YAAY;YACZ,aAAa,EAAE,CAAC,uCAAY,CAAC,KAAK,CAAC;SACpC,CAAC;IACJ,CAAC;CACF;AAvCD,4EAuCC","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 { PropertyRecord, PropertyValueFormat } from \"@itwin/appui-abstract\";\r\nimport { countMatchesInString } from \"../../../common/countMatchesInString\";\r\nimport { FilteredType, PropertyDataFilterResult, PropertyRecordDataFiltererBase } from \"./PropertyDataFiltererBase\";\r\n\r\n/**\r\n * Property data filterer which matches on Primitive Property Record display value text.\r\n * @public\r\n */\r\nexport class DisplayValuePropertyDataFilterer extends PropertyRecordDataFiltererBase {\r\n  private _filterText: string = \"\";\r\n\r\n  public constructor(filterText: string = \"\") {\r\n    super();\r\n    this._filterText = filterText;\r\n  }\r\n\r\n  public get filterText(): string { return this._filterText; }\r\n  public set filterText(value: string) {\r\n    const lowerValue = value.toLowerCase().trim();\r\n    if (lowerValue !== this.filterText) {\r\n      this._filterText = lowerValue;\r\n      this.onFilterChanged.raiseEvent();\r\n    }\r\n  }\r\n\r\n  public get isActive() { return this.filterText !== \"\"; }\r\n\r\n  public async recordMatchesFilter(node: PropertyRecord): Promise<PropertyDataFilterResult> {\r\n    if (!this.isActive)\r\n      return { matchesFilter: true };\r\n\r\n    if (node.value.valueFormat !== PropertyValueFormat.Primitive)\r\n      return { matchesFilter: false };\r\n\r\n    const displayValue = node.value.displayValue?.toLowerCase() ?? \"\";\r\n    const matchesCount = countMatchesInString(displayValue, this.filterText);\r\n\r\n    if (matchesCount === 0)\r\n      return { matchesFilter: false };\r\n\r\n    return {\r\n      matchesFilter: true,\r\n      shouldExpandNodeParents: true,\r\n      matchesCount,\r\n      filteredTypes: [FilteredType.Value],\r\n    };\r\n  }\r\n}\r\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"LabelPropertyDataFilterer.js","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/LabelPropertyDataFilterer.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAGH,+EAA4E;AAC5E,yEAAoH;AAEpH;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,yDAA8B;IAG3E,YAAmB,aAAqB,EAAE;QACxC,KAAK,EAAE,CAAC;QAHF,gBAAW,GAAW,EAAE,CAAC;QAI/B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED,IAAW,UAAU,KAAa,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,IAAW,UAAU,CAAC,KAAa;QACjC,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;YAC9B,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;SACnC;IACH,CAAC;IAED,IAAW,QAAQ,KAAK,OAAO,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC;IAEjD,KAAK,CAAC,mBAAmB,CAAC,IAAoB;QACnD,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QAEjC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAC9D,MAAM,YAAY,GAAG,IAAA,2CAAoB,EAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACzE,IAAI,YAAY,KAAK,CAAC;YACpB,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;QAElC,OAAO;YACL,aAAa,EAAE,IAAI;YACnB,uBAAuB,EAAE,IAAI;YAC7B,6BAA6B,EAAE,IAAI;YACnC,YAAY;YACZ,aAAa,EAAE,CAAC,uCAAY,CAAC,KAAK,CAAC;SACpC,CAAC;IACJ,CAAC;CACF;AApCD,8DAoCC","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 { PropertyRecord } from \"@itwin/appui-abstract\";\nimport { countMatchesInString } from \"../../../common/countMatchesInString\";\nimport { FilteredType, PropertyDataFilterResult, PropertyRecordDataFiltererBase } from \"./PropertyDataFiltererBase\";\n\n/**\n * PropertyData filter which matches on any record type label and includes descendant nodes on match\n * @public\n */\nexport class LabelPropertyDataFilterer extends PropertyRecordDataFiltererBase {\n  private _filterText: string = \"\";\n\n  public constructor(filterText: string = \"\") {\n    super();\n    this._filterText = filterText;\n  }\n\n  public get filterText(): string { return this._filterText; }\n  public set filterText(value: string) {\n    const lowerValue = value.toLowerCase().trim();\n    if (lowerValue !== this.filterText) {\n      this._filterText = lowerValue;\n      this.onFilterChanged.raiseEvent();\n    }\n  }\n\n  public get isActive() { return this.filterText !== \"\"; }\n\n  public async recordMatchesFilter(node: PropertyRecord): Promise<PropertyDataFilterResult> {\n    if (!this.isActive)\n      return { matchesFilter: true };\n\n    const displayLabel = node.property.displayLabel.toLowerCase();\n    const matchesCount = countMatchesInString(displayLabel, this.filterText);\n    if (matchesCount === 0)\n      return { matchesFilter: false };\n\n    return {\n      matchesFilter: true,\n      shouldExpandNodeParents: true,\n      shouldForceIncludeDescendants: true,\n      matchesCount,\n      filteredTypes: [FilteredType.Label],\n    };\n  }\n}\n"]}
+{"version":3,"file":"LabelPropertyDataFilterer.js","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/LabelPropertyDataFilterer.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAGH,+EAA4E;AAC5E,yEAAoH;AAEpH;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,yDAA8B;IAG3E,YAAmB,aAAqB,EAAE;QACxC,KAAK,EAAE,CAAC;QAHF,gBAAW,GAAW,EAAE,CAAC;QAI/B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED,IAAW,UAAU,KAAa,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,IAAW,UAAU,CAAC,KAAa;QACjC,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;YAC9B,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;SACnC;IACH,CAAC;IAED,IAAW,QAAQ,KAAK,OAAO,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC;IAEjD,KAAK,CAAC,mBAAmB,CAAC,IAAoB;QACnD,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QAEjC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAC9D,MAAM,YAAY,GAAG,IAAA,2CAAoB,EAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACzE,IAAI,YAAY,KAAK,CAAC;YACpB,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;QAElC,OAAO;YACL,aAAa,EAAE,IAAI;YACnB,uBAAuB,EAAE,IAAI;YAC7B,6BAA6B,EAAE,IAAI;YACnC,YAAY;YACZ,aAAa,EAAE,CAAC,uCAAY,CAAC,KAAK,CAAC;SACpC,CAAC;IACJ,CAAC;CACF;AApCD,8DAoCC","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 { PropertyRecord } from \"@itwin/appui-abstract\";\r\nimport { countMatchesInString } from \"../../../common/countMatchesInString\";\r\nimport { FilteredType, PropertyDataFilterResult, PropertyRecordDataFiltererBase } from \"./PropertyDataFiltererBase\";\r\n\r\n/**\r\n * PropertyData filter which matches on any record type label and includes descendant nodes on match\r\n * @public\r\n */\r\nexport class LabelPropertyDataFilterer extends PropertyRecordDataFiltererBase {\r\n  private _filterText: string = \"\";\r\n\r\n  public constructor(filterText: string = \"\") {\r\n    super();\r\n    this._filterText = filterText;\r\n  }\r\n\r\n  public get filterText(): string { return this._filterText; }\r\n  public set filterText(value: string) {\r\n    const lowerValue = value.toLowerCase().trim();\r\n    if (lowerValue !== this.filterText) {\r\n      this._filterText = lowerValue;\r\n      this.onFilterChanged.raiseEvent();\r\n    }\r\n  }\r\n\r\n  public get isActive() { return this.filterText !== \"\"; }\r\n\r\n  public async recordMatchesFilter(node: PropertyRecord): Promise<PropertyDataFilterResult> {\r\n    if (!this.isActive)\r\n      return { matchesFilter: true };\r\n\r\n    const displayLabel = node.property.displayLabel.toLowerCase();\r\n    const matchesCount = countMatchesInString(displayLabel, this.filterText);\r\n    if (matchesCount === 0)\r\n      return { matchesFilter: false };\r\n\r\n    return {\r\n      matchesFilter: true,\r\n      shouldExpandNodeParents: true,\r\n      shouldForceIncludeDescendants: true,\r\n      matchesCount,\r\n      filteredTypes: [FilteredType.Label],\r\n    };\r\n  }\r\n}\r\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"PropertyCategoryLabelFilterer.js","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/PropertyCategoryLabelFilterer.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,+EAA4E;AAE5E,yEAAsH;AAEtH;;;GAGG;AACH,MAAa,6BAA8B,SAAQ,2DAAgC;IAGjF,YAAmB,aAAqB,EAAE;QACxC,KAAK,EAAE,CAAC;QAHF,gBAAW,GAAW,EAAE,CAAC;QAI/B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED,IAAW,UAAU,KAAa,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,IAAW,UAAU,CAAC,KAAa;QACjC,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;YAC9B,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;SACnC;IACH,CAAC;IAED,IAAW,QAAQ,KAAK,OAAO,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC;IAEjD,KAAK,CAAC,qBAAqB,CAAC,IAAsB;QACvD,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QAEjC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,YAAY,GAAG,IAAA,2CAAoB,EAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAEzE,IAAI,YAAY,KAAK,CAAC;YACpB,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;QAElC,OAAO;YACL,aAAa,EAAE,IAAI;YACnB,uBAAuB,EAAE,IAAI;YAC7B,6BAA6B,EAAE,IAAI;YACnC,YAAY;YACZ,aAAa,EAAE,CAAC,uCAAY,CAAC,QAAQ,CAAC;SACvC,CAAC;IACJ,CAAC;CACF;AArCD,sEAqCC","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 { countMatchesInString } from \"../../../common/countMatchesInString\";\nimport { PropertyCategory } from \"../../PropertyDataProvider\";\nimport { FilteredType, PropertyCategoryDataFiltererBase, PropertyDataFilterResult } from \"./PropertyDataFiltererBase\";\n\n/**\n * PropertyData filterer which matches on PropertyCategory's label.\n * @public\n */\nexport class PropertyCategoryLabelFilterer extends PropertyCategoryDataFiltererBase {\n  private _filterText: string = \"\";\n\n  public constructor(filterText: string = \"\") {\n    super();\n    this._filterText = filterText;\n  }\n\n  public get filterText(): string { return this._filterText; }\n  public set filterText(value: string) {\n    const lowerValue = value.toLowerCase().trim();\n    if (lowerValue !== this.filterText) {\n      this._filterText = lowerValue;\n      this.onFilterChanged.raiseEvent();\n    }\n  }\n\n  public get isActive() { return this.filterText !== \"\"; }\n\n  public async categoryMatchesFilter(node: PropertyCategory): Promise<PropertyDataFilterResult> {\n    if (!this.isActive)\n      return { matchesFilter: true };\n\n    const displayLabel = node.label.toLowerCase();\n    const matchesCount = countMatchesInString(displayLabel, this.filterText);\n\n    if (matchesCount === 0)\n      return { matchesFilter: false };\n\n    return {\n      matchesFilter: true,\n      shouldExpandNodeParents: true,\n      shouldForceIncludeDescendants: true,\n      matchesCount,\n      filteredTypes: [FilteredType.Category],\n    };\n  }\n}\n"]}
+{"version":3,"file":"PropertyCategoryLabelFilterer.js","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/PropertyCategoryLabelFilterer.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,+EAA4E;AAE5E,yEAAsH;AAEtH;;;GAGG;AACH,MAAa,6BAA8B,SAAQ,2DAAgC;IAGjF,YAAmB,aAAqB,EAAE;QACxC,KAAK,EAAE,CAAC;QAHF,gBAAW,GAAW,EAAE,CAAC;QAI/B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED,IAAW,UAAU,KAAa,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,IAAW,UAAU,CAAC,KAAa;QACjC,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;YAC9B,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;SACnC;IACH,CAAC;IAED,IAAW,QAAQ,KAAK,OAAO,IAAI,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC;IAEjD,KAAK,CAAC,qBAAqB,CAAC,IAAsB;QACvD,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChB,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QAEjC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,YAAY,GAAG,IAAA,2CAAoB,EAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAEzE,IAAI,YAAY,KAAK,CAAC;YACpB,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;QAElC,OAAO;YACL,aAAa,EAAE,IAAI;YACnB,uBAAuB,EAAE,IAAI;YAC7B,6BAA6B,EAAE,IAAI;YACnC,YAAY;YACZ,aAAa,EAAE,CAAC,uCAAY,CAAC,QAAQ,CAAC;SACvC,CAAC;IACJ,CAAC;CACF;AArCD,sEAqCC","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 { countMatchesInString } from \"../../../common/countMatchesInString\";\r\nimport { PropertyCategory } from \"../../PropertyDataProvider\";\r\nimport { FilteredType, PropertyCategoryDataFiltererBase, PropertyDataFilterResult } from \"./PropertyDataFiltererBase\";\r\n\r\n/**\r\n * PropertyData filterer which matches on PropertyCategory's label.\r\n * @public\r\n */\r\nexport class PropertyCategoryLabelFilterer extends PropertyCategoryDataFiltererBase {\r\n  private _filterText: string = \"\";\r\n\r\n  public constructor(filterText: string = \"\") {\r\n    super();\r\n    this._filterText = filterText;\r\n  }\r\n\r\n  public get filterText(): string { return this._filterText; }\r\n  public set filterText(value: string) {\r\n    const lowerValue = value.toLowerCase().trim();\r\n    if (lowerValue !== this.filterText) {\r\n      this._filterText = lowerValue;\r\n      this.onFilterChanged.raiseEvent();\r\n    }\r\n  }\r\n\r\n  public get isActive() { return this.filterText !== \"\"; }\r\n\r\n  public async categoryMatchesFilter(node: PropertyCategory): Promise<PropertyDataFilterResult> {\r\n    if (!this.isActive)\r\n      return { matchesFilter: true };\r\n\r\n    const displayLabel = node.label.toLowerCase();\r\n    const matchesCount = countMatchesInString(displayLabel, this.filterText);\r\n\r\n    if (matchesCount === 0)\r\n      return { matchesFilter: false };\r\n\r\n    return {\r\n      matchesFilter: true,\r\n      shouldExpandNodeParents: true,\r\n      shouldForceIncludeDescendants: true,\r\n      matchesCount,\r\n      filteredTypes: [FilteredType.Category],\r\n    };\r\n  }\r\n}\r\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"PropertyDataFiltererBase.js","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/PropertyDataFiltererBase.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAGH,sDAA8C;AAG9C;;;GAGG;AACH,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,uDAAQ,CAAA;IACR,iDAAK,CAAA;IACL,iDAAK,CAAA;AACP,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB;AAuCD;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,sBAAsC;CAAI;AAAzF,8DAAyF;AAczF;;;GAGG;AACH,MAAsB,wBAAwB;IAA9C;QACS,oBAAe,GAA8B,IAAI,yBAAyB,EAAE,CAAC;IAItF,CAAC;CAAA;AALD,4DAKC;AAED;;;;GAIG;AACH,MAAsB,gCAAiC,SAAQ,wBAAwB;IAC9E,KAAK,CAAC,mBAAmB;QAC9B,OAAO,EAAE,aAAa,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;CACF;AAJD,4EAIC;AAED;;;;GAIG;AACH,MAAsB,8BAA+B,SAAQ,wBAAwB;IAC5E,KAAK,CAAC,qBAAqB;QAChC,OAAO,EAAE,aAAa,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;CACF;AAJD,wEAIC","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 { PropertyRecord } from \"@itwin/appui-abstract\";\nimport { BeEvent } from \"@itwin/core-bentley\";\nimport { PropertyCategory } from \"../../PropertyDataProvider\";\n\n/**\n * Enumeration of possible component filtered types\n * @public\n */\nexport enum FilteredType {\n  Category,\n  Label,\n  Value\n}\n\n/**\n * Data structure for storing [[IPropertyDataFilterer]] matching results\n * @public\n */\nexport interface PropertyDataFilterResult {\n  /** Indicates whether provided item matched filter */\n  matchesFilter: boolean;\n\n  /**\n   * Indicates whether descendants nodes should be forcefully included in filtered results.\n   * Can only be true for nodes that have `matchesFilter` set to true.\n   */\n  shouldForceIncludeDescendants?: boolean;\n\n  /**\n   * Indicates whether parents of node should be expanded up to this match node.\n   * Can only be true for nodes that have `matchesFilter` set to true.\n   */\n  shouldExpandNodeParents?: boolean;\n\n  /**\n   * Indicates how many times filter was matched in the provided item.\n   */\n  matchesCount?: number;\n\n  /**\n   * Indicates what item types were matched.\n   */\n  filteredTypes?: FilteredType[];\n}\n\n/**\n * A signature for property data change listeners\n * @public\n */\nexport declare type PropertyFilterChangesListener = () => void;\n\n/**\n * An event broadcasted when property filter changes\n * @public\n */\nexport class PropertyFilterChangeEvent extends BeEvent<PropertyFilterChangesListener> { }\n\n/**\n * An interface for a filterer that filters [[PropertyData]] based on content of [[PropertyRecord]]\n * and [[PropertyCategory]] objects.\n * @public\n */\nexport interface IPropertyDataFilterer {\n  readonly isActive: boolean;\n  recordMatchesFilter: (node: PropertyRecord, parents: PropertyRecord[]) => Promise<PropertyDataFilterResult>;\n  categoryMatchesFilter: (node: PropertyCategory, parents: PropertyCategory[]) => Promise<PropertyDataFilterResult>;\n  onFilterChanged: PropertyFilterChangeEvent;\n}\n\n/**\n * An abstract implementation of [[IPropertyDataFilterer]] to share common behavior between different implementations.\n * @public\n */\nexport abstract class PropertyDataFiltererBase implements IPropertyDataFilterer {\n  public onFilterChanged: PropertyFilterChangeEvent = new PropertyFilterChangeEvent();\n  public abstract get isActive(): boolean;\n  public abstract recordMatchesFilter(node: PropertyRecord, parents: PropertyRecord[]): Promise<PropertyDataFilterResult>;\n  public abstract categoryMatchesFilter(node: PropertyCategory, parents: PropertyCategory[]): Promise<PropertyDataFilterResult>;\n}\n\n/**\n * An abstract implementation of [[IPropertyDataFilterer]] that can be used as base for all\n * filterers that filter based on [[PropertyCategory]] content.\n * @public\n */\nexport abstract class PropertyCategoryDataFiltererBase extends PropertyDataFiltererBase {\n  public async recordMatchesFilter(): Promise<PropertyDataFilterResult> {\n    return { matchesFilter: !this.isActive };\n  }\n}\n\n/**\n * An abstract implementation of [[IPropertyDataFilterer]] that can be used as base for all\n * filterers that filter based on [[PropertyRecord]] content.\n * @public\n */\nexport abstract class PropertyRecordDataFiltererBase extends PropertyDataFiltererBase {\n  public async categoryMatchesFilter(): Promise<PropertyDataFilterResult> {\n    return { matchesFilter: !this.isActive };\n  }\n}\n"]}
+{"version":3,"file":"PropertyDataFiltererBase.js","sourceRoot":"","sources":["../../../../../../src/components-react/propertygrid/dataproviders/filterers/PropertyDataFiltererBase.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAGH,sDAA8C;AAG9C;;;GAGG;AACH,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,uDAAQ,CAAA;IACR,iDAAK,CAAA;IACL,iDAAK,CAAA;AACP,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB;AAuCD;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,sBAAsC;CAAI;AAAzF,8DAAyF;AAczF;;;GAGG;AACH,MAAsB,wBAAwB;IAA9C;QACS,oBAAe,GAA8B,IAAI,yBAAyB,EAAE,CAAC;IAItF,CAAC;CAAA;AALD,4DAKC;AAED;;;;GAIG;AACH,MAAsB,gCAAiC,SAAQ,wBAAwB;IAC9E,KAAK,CAAC,mBAAmB;QAC9B,OAAO,EAAE,aAAa,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;CACF;AAJD,4EAIC;AAED;;;;GAIG;AACH,MAAsB,8BAA+B,SAAQ,wBAAwB;IAC5E,KAAK,CAAC,qBAAqB;QAChC,OAAO,EAAE,aAAa,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;CACF;AAJD,wEAIC","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 { PropertyRecord } from \"@itwin/appui-abstract\";\r\nimport { BeEvent } from \"@itwin/core-bentley\";\r\nimport { PropertyCategory } from \"../../PropertyDataProvider\";\r\n\r\n/**\r\n * Enumeration of possible component filtered types\r\n * @public\r\n */\r\nexport enum FilteredType {\r\n  Category,\r\n  Label,\r\n  Value\r\n}\r\n\r\n/**\r\n * Data structure for storing [[IPropertyDataFilterer]] matching results\r\n * @public\r\n */\r\nexport interface PropertyDataFilterResult {\r\n  /** Indicates whether provided item matched filter */\r\n  matchesFilter: boolean;\r\n\r\n  /**\r\n   * Indicates whether descendants nodes should be forcefully included in filtered results.\r\n   * Can only be true for nodes that have `matchesFilter` set to true.\r\n   */\r\n  shouldForceIncludeDescendants?: boolean;\r\n\r\n  /**\r\n   * Indicates whether parents of node should be expanded up to this match node.\r\n   * Can only be true for nodes that have `matchesFilter` set to true.\r\n   */\r\n  shouldExpandNodeParents?: boolean;\r\n\r\n  /**\r\n   * Indicates how many times filter was matched in the provided item.\r\n   */\r\n  matchesCount?: number;\r\n\r\n  /**\r\n   * Indicates what item types were matched.\r\n   */\r\n  filteredTypes?: FilteredType[];\r\n}\r\n\r\n/**\r\n * A signature for property data change listeners\r\n * @public\r\n */\r\nexport declare type PropertyFilterChangesListener = () => void;\r\n\r\n/**\r\n * An event broadcasted when property filter changes\r\n * @public\r\n */\r\nexport class PropertyFilterChangeEvent extends BeEvent<PropertyFilterChangesListener> { }\r\n\r\n/**\r\n * An interface for a filterer that filters [[PropertyData]] based on content of [[PropertyRecord]]\r\n * and [[PropertyCategory]] objects.\r\n * @public\r\n */\r\nexport interface IPropertyDataFilterer {\r\n  readonly isActive: boolean;\r\n  recordMatchesFilter: (node: PropertyRecord, parents: PropertyRecord[]) => Promise<PropertyDataFilterResult>;\r\n  categoryMatchesFilter: (node: PropertyCategory, parents: PropertyCategory[]) => Promise<PropertyDataFilterResult>;\r\n  onFilterChanged: PropertyFilterChangeEvent;\r\n}\r\n\r\n/**\r\n * An abstract implementation of [[IPropertyDataFilterer]] to share common behavior between different implementations.\r\n * @public\r\n */\r\nexport abstract class PropertyDataFiltererBase implements IPropertyDataFilterer {\r\n  public onFilterChanged: PropertyFilterChangeEvent = new PropertyFilterChangeEvent();\r\n  public abstract get isActive(): boolean;\r\n  public abstract recordMatchesFilter(node: PropertyRecord, parents: PropertyRecord[]): Promise<PropertyDataFilterResult>;\r\n  public abstract categoryMatchesFilter(node: PropertyCategory, parents: PropertyCategory[]): Promise<PropertyDataFilterResult>;\r\n}\r\n\r\n/**\r\n * An abstract implementation of [[IPropertyDataFilterer]] that can be used as base for all\r\n * filterers that filter based on [[PropertyCategory]] content.\r\n * @public\r\n */\r\nexport abstract class PropertyCategoryDataFiltererBase extends PropertyDataFiltererBase {\r\n  public async recordMatchesFilter(): Promise<PropertyDataFilterResult> {\r\n    return { matchesFilter: !this.isActive };\r\n  }\r\n}\r\n\r\n/**\r\n * An abstract implementation of [[IPropertyDataFilterer]] that can be used as base for all\r\n * filterers that filter based on [[PropertyRecord]] content.\r\n * @public\r\n */\r\nexport abstract class PropertyRecordDataFiltererBase extends PropertyDataFiltererBase {\r\n  public async categoryMatchesFilter(): Promise<PropertyDataFilterResult> {\r\n    return { matchesFilter: !this.isActive };\r\n  }\r\n}\r\n"]}

package/lib/cjs/components-react/propertygrid/internal/PropertyGridEventHandler.d.ts

@@ -4,14 +4,14 @@
 import { IPropertyGridModelSource } from "./PropertyGridModelSource";
 /**
  * Handles events and changes on PropertyGridModel data.
- * @beta
+ * @public
  */
 export interface IPropertyGridEventHandler {
     onExpansionToggled: (selectionKey: string) => void;
 }
 /**
  * Handles events and changes on PropertyGridModel data.
- * @beta
+ * @public
  */
 export declare class PropertyGridEventHandler {
     private _modelSource;