@itwin/components-react 3.3.0-dev.8 → 3.3.0-dev.82

package/lib/esm/components-react/filter-builder/FilterBuilderState.js

@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+import { produce } from "immer";
+import * as React from "react";
+import { Guid } from "@itwin/core-bentley";
+import { isUnaryPropertyFilterOperator, PropertyFilterRuleGroupOperator } from "./Operators";
+/** @alpha */
+export class PropertyFilterBuilderActions {
+    constructor(setState) {
+        this.setState = setState;
+    }
+    updateState(updater) {
+        this.setState(produce(updater));
+    }
+    addItem(path, itemType) {
+        this.updateState((state) => {
+            const parentGroup = findRuleGroup(state.rootGroup, path);
+            if (!parentGroup)
+                return;
+            const item = itemType === "RULE_GROUP" ? createEmptyRuleGroup(parentGroup.id) : createEmptyRule(parentGroup.id);
+            parentGroup.items.push(item);
+        });
+    }
+    removeItem(path) {
+        function removeItemFromGroup(state, pathToItem) {
+            const pathToParent = pathToItem.slice(0, -1);
+            const parentGroup = findRuleGroup(state.rootGroup, pathToParent);
+            if (!parentGroup)
+                return;
+            const itemId = pathToItem[pathToItem.length - 1];
+            const itemIndex = parentGroup.items.findIndex((item) => item.id === itemId);
+            if (itemIndex === -1)
+                return;
+            parentGroup.items.splice(itemIndex, 1);
+            if (parentGroup.items.length === 0)
+                removeItemFromGroup(state, pathToParent);
+        }
+        this.updateState((state) => {
+            removeItemFromGroup(state, path);
+        });
+    }
+    setRuleGroupOperator(path, operator) {
+        this.updateState((state) => {
+            const group = findRuleGroup(state.rootGroup, path);
+            if (!group)
+                return;
+            group.operator = operator;
+        });
+    }
+    setRuleProperty(path, property) {
+        this.updateState((state) => {
+            const rule = findRule(state.rootGroup, path);
+            if (!rule)
+                return;
+            rule.property = property;
+            rule.value = undefined;
+        });
+    }
+    setRuleOperator(path, operator) {
+        this.updateState((state) => {
+            const rule = findRule(state.rootGroup, path);
+            if (!rule)
+                return;
+            if (isUnaryPropertyFilterOperator(operator))
+                rule.value = undefined;
+            rule.operator = operator;
+        });
+    }
+    setRuleValue(path, value) {
+        this.updateState((state) => {
+            const rule = findRule(state.rootGroup, path);
+            if (!rule)
+                return;
+            rule.value = value;
+        });
+    }
+}
+/** @alpha */
+export function isPropertyFilterBuilderRuleGroup(item) {
+    return item.items !== undefined;
+}
+/** @alpha */
+export function usePropertyFilterBuilderState() {
+    const [state, setState] = React.useState(() => ({
+        rootGroup: createEmptyRuleGroup(),
+    }));
+    const [actions] = React.useState(() => new PropertyFilterBuilderActions(setState));
+    return { state, actions };
+}
+function createEmptyRule(groupId) {
+    return {
+        id: Guid.createValue(),
+        groupId,
+    };
+}
+function createEmptyRuleGroup(groupId) {
+    const id = Guid.createValue();
+    return {
+        id,
+        groupId,
+        operator: PropertyFilterRuleGroupOperator.And,
+        items: [createEmptyRule(id)],
+    };
+}
+function findRuleGroup(rootGroup, path) {
+    if (path.length === 0)
+        return rootGroup;
+    const [currentItemId, ...rest] = path;
+    const currentItem = rootGroup.items.find((item) => item.id === currentItemId);
+    if (!currentItem || !isPropertyFilterBuilderRuleGroup(currentItem))
+        return undefined;
+    return findRuleGroup(currentItem, rest);
+}
+function findRule(rootGroup, path) {
+    if (path.length === 0)
+        return undefined;
+    const [currentItemId, ...rest] = path;
+    const currentItem = rootGroup.items.find((item) => item.id === currentItemId);
+    if (!currentItem)
+        return undefined;
+    if (isPropertyFilterBuilderRuleGroup(currentItem))
+        return findRule(currentItem, rest);
+    return currentItem;
+}
+//# sourceMappingURL=FilterBuilderState.js.map

package/lib/esm/components-react/filter-builder/FilterBuilderState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FilterBuilderState.js","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderState.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F,OAAO,EAAS,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,6BAA6B,EAAE,+BAA+B,EAA8B,MAAM,aAAa,CAAC;AA2BzH,aAAa;AACb,MAAM,OAAO,4BAA4B;IACvC,YAAoB,QAAiG;QAAjG,aAAQ,GAAR,QAAQ,CAAyF;IAAG,CAAC;IAEjH,WAAW,CAAC,OAA2D;QAC7E,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAClC,CAAC;IAEM,OAAO,CAAC,IAAc,EAAE,QAA+B;QAC5D,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACzD,IAAI,CAAC,WAAW;gBACd,OAAO;YACT,MAAM,IAAI,GAAG,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAChH,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,UAAU,CAAC,IAAc;QAC9B,SAAS,mBAAmB,CAAC,KAAwC,EAAE,UAAoB;YACzF,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC7C,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YACjE,IAAI,CAAC,WAAW;gBACd,OAAO;YACT,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACjD,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;YAC5E,IAAI,SAAS,KAAK,CAAC,CAAC;gBAClB,OAAO;YACT,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACvC,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;gBAChC,mBAAmB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,oBAAoB,CAAC,IAAc,EAAE,QAAyC;QACnF,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK;gBACR,OAAO;YACT,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,eAAe,CAAC,IAAc,EAAE,QAA8B;QACnE,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI;gBACP,OAAO;YACT,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,eAAe,CAAC,IAAc,EAAE,QAAoC;QACzE,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI;gBACP,OAAO;YACT,IAAI,6BAA6B,CAAC,QAAQ,CAAC;gBACzC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,YAAY,CAAC,IAAc,EAAE,KAAoB;QACtD,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI;gBACP,OAAO;YACT,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,aAAa;AACb,MAAM,UAAU,gCAAgC,CAAC,IAAwC;IACvF,OAAQ,IAAY,CAAC,KAAK,KAAK,SAAS,CAAC;AAC3C,CAAC;AAED,aAAa;AACb,MAAM,UAAU,6BAA6B;IAC3C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAA6B,GAAG,EAAE,CAAC,CAAC;QAC1E,SAAS,EAAE,oBAAoB,EAAE;KAClC,CAAC,CAAC,CAAC;IACJ,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,4BAA4B,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEnF,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC5B,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,OAAO;QACL,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE;QACtB,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB;IAC5C,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC9B,OAAO;QACL,EAAE;QACF,OAAO;QACP,QAAQ,EAAE,+BAA+B,CAAC,GAAG;QAC7C,KAAK,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,SAAyC,EAAE,IAAc;IAC9E,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QACnB,OAAO,SAAS,CAAC;IAEnB,MAAM,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IACtC,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,aAAa,CAAC,CAAC;IAC9E,IAAI,CAAC,WAAW,IAAI,CAAC,gCAAgC,CAAC,WAAW,CAAC;QAChE,OAAO,SAAS,CAAC;IAEnB,OAAO,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,QAAQ,CAAC,SAAyC,EAAE,IAAc;IACzE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QACnB,OAAO,SAAS,CAAC;IAEnB,MAAM,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IACtC,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,aAAa,CAAC,CAAC;IAC9E,IAAI,CAAC,WAAW;QACd,OAAO,SAAS,CAAC;IAEnB,IAAI,gCAAgC,CAAC,WAAW,CAAC;QAC/C,OAAO,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAErC,OAAO,WAAW,CAAC;AACrB,CAAC","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\nimport { Draft, produce } from \"immer\";\r\nimport * as React from \"react\";\r\nimport { PropertyDescription, PropertyValue } from \"@itwin/appui-abstract\";\r\nimport { Guid } from \"@itwin/core-bentley\";\r\nimport { isUnaryPropertyFilterOperator, PropertyFilterRuleGroupOperator, PropertyFilterRuleOperator } from \"./Operators\";\r\n\r\n/** @alpha */\r\nexport interface PropertyFilterBuilderState {\r\n  rootGroup: PropertyFilterBuilderRuleGroup;\r\n}\r\n\r\n/** @alpha */\r\nexport type PropertyFilterBuilderRuleGroupItem = PropertyFilterBuilderRuleGroup | PropertyFilterBuilderRule;\r\n\r\n/** @alpha */\r\nexport interface PropertyFilterBuilderRuleGroup {\r\n  id: string;\r\n  groupId?: string;\r\n  operator: PropertyFilterRuleGroupOperator;\r\n  items: PropertyFilterBuilderRuleGroupItem[];\r\n}\r\n\r\n/** @alpha */\r\nexport interface PropertyFilterBuilderRule {\r\n  id: string;\r\n  groupId: string;\r\n  property?: PropertyDescription;\r\n  operator?: PropertyFilterRuleOperator;\r\n  value?: PropertyValue;\r\n}\r\n\r\n/** @alpha */\r\nexport class PropertyFilterBuilderActions {\r\n  constructor(private setState: (setter: (prevState: PropertyFilterBuilderState) => PropertyFilterBuilderState) => void) {}\r\n\r\n  private updateState(updater: (state: Draft<PropertyFilterBuilderState>) => void) {\r\n    this.setState(produce(updater));\r\n  }\r\n\r\n  public addItem(path: string[], itemType: \"RULE_GROUP\" | \"RULE\") {\r\n    this.updateState((state) => {\r\n      const parentGroup = findRuleGroup(state.rootGroup, path);\r\n      if (!parentGroup)\r\n        return;\r\n      const item = itemType === \"RULE_GROUP\" ? createEmptyRuleGroup(parentGroup.id) : createEmptyRule(parentGroup.id);\r\n      parentGroup.items.push(item);\r\n    });\r\n  }\r\n\r\n  public removeItem(path: string[]) {\r\n    function removeItemFromGroup(state: Draft<PropertyFilterBuilderState>, pathToItem: string[]) {\r\n      const pathToParent = pathToItem.slice(0, -1);\r\n      const parentGroup = findRuleGroup(state.rootGroup, pathToParent);\r\n      if (!parentGroup)\r\n        return;\r\n      const itemId = pathToItem[pathToItem.length - 1];\r\n      const itemIndex = parentGroup.items.findIndex((item) => item.id === itemId);\r\n      if (itemIndex === -1)\r\n        return;\r\n      parentGroup.items.splice(itemIndex, 1);\r\n      if (parentGroup.items.length === 0)\r\n        removeItemFromGroup(state, pathToParent);\r\n    }\r\n\r\n    this.updateState((state) => {\r\n      removeItemFromGroup(state, path);\r\n    });\r\n  }\r\n\r\n  public setRuleGroupOperator(path: string[], operator: PropertyFilterRuleGroupOperator) {\r\n    this.updateState((state) => {\r\n      const group = findRuleGroup(state.rootGroup, path);\r\n      if (!group)\r\n        return;\r\n      group.operator = operator;\r\n    });\r\n  }\r\n\r\n  public setRuleProperty(path: string[], property?: PropertyDescription) {\r\n    this.updateState((state) => {\r\n      const rule = findRule(state.rootGroup, path);\r\n      if (!rule)\r\n        return;\r\n      rule.property = property;\r\n      rule.value = undefined;\r\n    });\r\n  }\r\n\r\n  public setRuleOperator(path: string[], operator: PropertyFilterRuleOperator) {\r\n    this.updateState((state) => {\r\n      const rule = findRule(state.rootGroup, path);\r\n      if (!rule)\r\n        return;\r\n      if (isUnaryPropertyFilterOperator(operator))\r\n        rule.value = undefined;\r\n      rule.operator = operator;\r\n    });\r\n  }\r\n\r\n  public setRuleValue(path: string[], value: PropertyValue) {\r\n    this.updateState((state) => {\r\n      const rule = findRule(state.rootGroup, path);\r\n      if (!rule)\r\n        return;\r\n      rule.value = value;\r\n    });\r\n  }\r\n}\r\n\r\n/** @alpha */\r\nexport function isPropertyFilterBuilderRuleGroup(item: PropertyFilterBuilderRuleGroupItem): item is PropertyFilterBuilderRuleGroup {\r\n  return (item as any).items !== undefined;\r\n}\r\n\r\n/** @alpha */\r\nexport function usePropertyFilterBuilderState() {\r\n  const [state, setState] = React.useState<PropertyFilterBuilderState>(() => ({\r\n    rootGroup: createEmptyRuleGroup(),\r\n  }));\r\n  const [actions] = React.useState(() => new PropertyFilterBuilderActions(setState));\r\n\r\n  return { state, actions };\r\n}\r\n\r\nfunction createEmptyRule(groupId: string): PropertyFilterBuilderRule {\r\n  return {\r\n    id: Guid.createValue(),\r\n    groupId,\r\n  };\r\n}\r\n\r\nfunction createEmptyRuleGroup(groupId?: string): PropertyFilterBuilderRuleGroup {\r\n  const id = Guid.createValue();\r\n  return {\r\n    id,\r\n    groupId,\r\n    operator: PropertyFilterRuleGroupOperator.And,\r\n    items: [createEmptyRule(id)],\r\n  };\r\n}\r\n\r\nfunction findRuleGroup(rootGroup: PropertyFilterBuilderRuleGroup, path: string[]): PropertyFilterBuilderRuleGroup | undefined {\r\n  if (path.length === 0)\r\n    return rootGroup;\r\n\r\n  const [currentItemId, ...rest] = path;\r\n  const currentItem = rootGroup.items.find((item) => item.id === currentItemId);\r\n  if (!currentItem || !isPropertyFilterBuilderRuleGroup(currentItem))\r\n    return undefined;\r\n\r\n  return findRuleGroup(currentItem, rest);\r\n}\r\n\r\nfunction findRule(rootGroup: PropertyFilterBuilderRuleGroup, path: string[]): PropertyFilterBuilderRule | undefined {\r\n  if (path.length === 0)\r\n    return undefined;\r\n\r\n  const [currentItemId, ...rest] = path;\r\n  const currentItem = rootGroup.items.find((item) => item.id === currentItemId);\r\n  if (!currentItem)\r\n    return undefined;\r\n\r\n  if (isPropertyFilterBuilderRuleGroup(currentItem))\r\n    return findRule(currentItem, rest);\r\n\r\n  return currentItem;\r\n}\r\n"]}

package/lib/esm/components-react/filter-builder/Operators.d.ts

@@ -0,0 +1,27 @@
+import { PropertyDescription } from "@itwin/appui-abstract";
+/** @alpha */
+export declare enum PropertyFilterRuleGroupOperator {
+    And = 0,
+    Or = 1
+}
+/** @alpha */
+export declare enum PropertyFilterRuleOperator {
+    IsTrue = 0,
+    IsFalse = 1,
+    IsEqual = 2,
+    IsNotEqual = 3,
+    Greater = 4,
+    GreaterOrEqual = 5,
+    Less = 6,
+    LessOrEqual = 7,
+    Like = 8,
+    IsNull = 9,
+    IsNotNull = 10
+}
+/** @alpha */
+export declare function getPropertyFilterOperators(property: PropertyDescription): PropertyFilterRuleOperator[];
+/** @alpha */
+export declare function getPropertyFilterOperatorLabel(operator: PropertyFilterRuleOperator): string;
+/** @alpha */
+export declare function isUnaryPropertyFilterOperator(operator: PropertyFilterRuleOperator): boolean;
+//# sourceMappingURL=Operators.d.ts.map

package/lib/esm/components-react/filter-builder/Operators.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Operators.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/Operators.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAqB,MAAM,uBAAuB,CAAC;AAG/E,aAAa;AACb,oBAAY,+BAA+B;IACzC,GAAG,IAAA;IACH,EAAE,IAAA;CACH;AAED,aAAa;AACb,oBAAY,0BAA0B;IACpC,MAAM,IAAA;IACN,OAAO,IAAA;IAEP,OAAO,IAAA;IACP,UAAU,IAAA;IAEV,OAAO,IAAA;IACP,cAAc,IAAA;IACd,IAAI,IAAA;IACJ,WAAW,IAAA;IAEX,IAAI,IAAA;IAEJ,MAAM,IAAA;IACN,SAAS,KAAA;CACV;AAED,aAAa;AACb,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,mBAAmB,gCA2CvE;AAGD,aAAa;AACb,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,0BAA0B,UAyBlF;AAED,aAAa;AACb,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,0BAA0B,WASjF"}

package/lib/esm/components-react/filter-builder/Operators.js

@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+import { StandardTypeNames } from "@itwin/appui-abstract";
+import { UiComponents } from "../UiComponents";
+/** @alpha */
+export var PropertyFilterRuleGroupOperator;
+(function (PropertyFilterRuleGroupOperator) {
+    PropertyFilterRuleGroupOperator[PropertyFilterRuleGroupOperator["And"] = 0] = "And";
+    PropertyFilterRuleGroupOperator[PropertyFilterRuleGroupOperator["Or"] = 1] = "Or";
+})(PropertyFilterRuleGroupOperator || (PropertyFilterRuleGroupOperator = {}));
+/** @alpha */
+export var PropertyFilterRuleOperator;
+(function (PropertyFilterRuleOperator) {
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["IsTrue"] = 0] = "IsTrue";
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["IsFalse"] = 1] = "IsFalse";
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["IsEqual"] = 2] = "IsEqual";
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["IsNotEqual"] = 3] = "IsNotEqual";
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["Greater"] = 4] = "Greater";
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["GreaterOrEqual"] = 5] = "GreaterOrEqual";
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["Less"] = 6] = "Less";
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["LessOrEqual"] = 7] = "LessOrEqual";
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["Like"] = 8] = "Like";
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["IsNull"] = 9] = "IsNull";
+    PropertyFilterRuleOperator[PropertyFilterRuleOperator["IsNotNull"] = 10] = "IsNotNull";
+})(PropertyFilterRuleOperator || (PropertyFilterRuleOperator = {}));
+/** @alpha */
+export function getPropertyFilterOperators(property) {
+    const typename = property.typename;
+    if (typename === StandardTypeNames.Bool || typename === StandardTypeNames.Boolean) {
+        return [
+            PropertyFilterRuleOperator.IsTrue,
+            PropertyFilterRuleOperator.IsFalse,
+        ];
+    }
+    const operators = [
+        PropertyFilterRuleOperator.IsEqual,
+        PropertyFilterRuleOperator.IsNotEqual,
+        PropertyFilterRuleOperator.IsNull,
+        PropertyFilterRuleOperator.IsNotNull,
+    ];
+    if (typename === StandardTypeNames.Number
+        || typename === StandardTypeNames.Int
+        || typename === StandardTypeNames.Integer
+        || typename === StandardTypeNames.Double
+        || typename === StandardTypeNames.Float
+        || typename === StandardTypeNames.Hex
+        || typename === StandardTypeNames.Hexadecimal
+        || typename === StandardTypeNames.ShortDate
+        || typename === StandardTypeNames.DateTime) {
+        return [
+            ...operators,
+            PropertyFilterRuleOperator.Greater,
+            PropertyFilterRuleOperator.GreaterOrEqual,
+            PropertyFilterRuleOperator.Less,
+            PropertyFilterRuleOperator.LessOrEqual,
+        ];
+    }
+    if (typename === StandardTypeNames.String || typename === StandardTypeNames.Text) {
+        return [
+            ...operators,
+            PropertyFilterRuleOperator.Like,
+        ];
+    }
+    return operators;
+}
+/* istanbul ignore next */
+/** @alpha */
+export function getPropertyFilterOperatorLabel(operator) {
+    switch (operator) {
+        case PropertyFilterRuleOperator.IsTrue:
+            return UiComponents.translate("filterBuilder.operators.isTrue");
+        case PropertyFilterRuleOperator.IsFalse:
+            return UiComponents.translate("filterBuilder.operators.isFalse");
+        case PropertyFilterRuleOperator.IsEqual:
+            return UiComponents.translate("filterBuilder.operators.equal");
+        case PropertyFilterRuleOperator.IsNotEqual:
+            return UiComponents.translate("filterBuilder.operators.notEqual");
+        case PropertyFilterRuleOperator.Greater:
+            return ">";
+        case PropertyFilterRuleOperator.GreaterOrEqual:
+            return ">=";
+        case PropertyFilterRuleOperator.Less:
+            return "<";
+        case PropertyFilterRuleOperator.LessOrEqual:
+            return "<=";
+        case PropertyFilterRuleOperator.Like:
+            return UiComponents.translate("filterBuilder.operators.contains");
+        case PropertyFilterRuleOperator.IsNull:
+            return UiComponents.translate("filterBuilder.operators.isNull");
+        case PropertyFilterRuleOperator.IsNotNull:
+            return UiComponents.translate("filterBuilder.operators.isNotNull");
+    }
+}
+/** @alpha */
+export function isUnaryPropertyFilterOperator(operator) {
+    switch (operator) {
+        case PropertyFilterRuleOperator.IsTrue:
+        case PropertyFilterRuleOperator.IsFalse:
+        case PropertyFilterRuleOperator.IsNull:
+        case PropertyFilterRuleOperator.IsNotNull:
+            return true;
+    }
+    return false;
+}
+//# sourceMappingURL=Operators.js.map

package/lib/esm/components-react/filter-builder/Operators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Operators.js","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/Operators.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\nimport { PropertyDescription, StandardTypeNames } from \"@itwin/appui-abstract\";\r\nimport { UiComponents } from \"../UiComponents\";\r\n\r\n/** @alpha */\r\nexport enum PropertyFilterRuleGroupOperator {\r\n  And,\r\n  Or,\r\n}\r\n\r\n/** @alpha */\r\nexport enum PropertyFilterRuleOperator {\r\n  IsTrue,\r\n  IsFalse,\r\n\r\n  IsEqual,\r\n  IsNotEqual,\r\n\r\n  Greater,\r\n  GreaterOrEqual,\r\n  Less,\r\n  LessOrEqual,\r\n\r\n  Like,\r\n\r\n  IsNull,\r\n  IsNotNull,\r\n}\r\n\r\n/** @alpha */\r\nexport function getPropertyFilterOperators(property: PropertyDescription) {\r\n  const typename = property.typename;\r\n\r\n  if (typename === StandardTypeNames.Bool || typename === StandardTypeNames.Boolean) {\r\n    return [\r\n      PropertyFilterRuleOperator.IsTrue,\r\n      PropertyFilterRuleOperator.IsFalse,\r\n    ];\r\n  }\r\n\r\n  const operators = [\r\n    PropertyFilterRuleOperator.IsEqual,\r\n    PropertyFilterRuleOperator.IsNotEqual,\r\n    PropertyFilterRuleOperator.IsNull,\r\n    PropertyFilterRuleOperator.IsNotNull,\r\n  ];\r\n\r\n  if (typename === StandardTypeNames.Number\r\n    || typename === StandardTypeNames.Int\r\n    || typename === StandardTypeNames.Integer\r\n    || typename === StandardTypeNames.Double\r\n    || typename === StandardTypeNames.Float\r\n    || typename === StandardTypeNames.Hex\r\n    || typename === StandardTypeNames.Hexadecimal\r\n    || typename === StandardTypeNames.ShortDate\r\n    || typename === StandardTypeNames.DateTime) {\r\n    return [\r\n      ...operators,\r\n      PropertyFilterRuleOperator.Greater,\r\n      PropertyFilterRuleOperator.GreaterOrEqual,\r\n      PropertyFilterRuleOperator.Less,\r\n      PropertyFilterRuleOperator.LessOrEqual,\r\n    ];\r\n  }\r\n\r\n  if (typename === StandardTypeNames.String || typename === StandardTypeNames.Text) {\r\n    return [\r\n      ...operators,\r\n      PropertyFilterRuleOperator.Like,\r\n    ];\r\n  }\r\n\r\n  return operators;\r\n}\r\n\r\n/* istanbul ignore next */\r\n/** @alpha */\r\nexport function getPropertyFilterOperatorLabel(operator: PropertyFilterRuleOperator) {\r\n  switch(operator) {\r\n    case PropertyFilterRuleOperator.IsTrue:\r\n      return UiComponents.translate(\"filterBuilder.operators.isTrue\");\r\n    case PropertyFilterRuleOperator.IsFalse:\r\n      return UiComponents.translate(\"filterBuilder.operators.isFalse\");\r\n    case PropertyFilterRuleOperator.IsEqual:\r\n      return UiComponents.translate(\"filterBuilder.operators.equal\");\r\n    case PropertyFilterRuleOperator.IsNotEqual:\r\n      return UiComponents.translate(\"filterBuilder.operators.notEqual\");\r\n    case PropertyFilterRuleOperator.Greater:\r\n      return \">\";\r\n    case PropertyFilterRuleOperator.GreaterOrEqual:\r\n      return \">=\";\r\n    case PropertyFilterRuleOperator.Less:\r\n      return \"<\";\r\n    case PropertyFilterRuleOperator.LessOrEqual:\r\n      return \"<=\";\r\n    case PropertyFilterRuleOperator.Like:\r\n      return UiComponents.translate(\"filterBuilder.operators.contains\");\r\n    case PropertyFilterRuleOperator.IsNull:\r\n      return UiComponents.translate(\"filterBuilder.operators.isNull\");\r\n    case PropertyFilterRuleOperator.IsNotNull:\r\n      return UiComponents.translate(\"filterBuilder.operators.isNotNull\");\r\n  }\r\n}\r\n\r\n/** @alpha */\r\nexport function isUnaryPropertyFilterOperator(operator: PropertyFilterRuleOperator) {\r\n  switch (operator) {\r\n    case PropertyFilterRuleOperator.IsTrue:\r\n    case PropertyFilterRuleOperator.IsFalse:\r\n    case PropertyFilterRuleOperator.IsNull:\r\n    case PropertyFilterRuleOperator.IsNotNull:\r\n      return true;\r\n  }\r\n  return false;\r\n}\r\n"]}

package/lib/esm/components-react/filter-builder/Types.d.ts

@@ -0,0 +1,18 @@
+import { PropertyDescription, PropertyValue } from "@itwin/appui-abstract";
+import { PropertyFilterRuleGroupOperator, PropertyFilterRuleOperator } from "./Operators";
+/** @alpha */
+export declare type PropertyFilter = PropertyFilterRule | PropertyFilterRuleGroup;
+/** @alpha */
+export interface PropertyFilterRuleGroup {
+    operator: PropertyFilterRuleGroupOperator;
+    rules: Array<PropertyFilter>;
+}
+/** @alpha */
+export interface PropertyFilterRule {
+    property: PropertyDescription;
+    operator: PropertyFilterRuleOperator;
+    value?: PropertyValue;
+}
+/** @alpha */
+export declare function isPropertyFilterRuleGroup(filter: PropertyFilter): filter is PropertyFilterRuleGroup;
+//# sourceMappingURL=Types.d.ts.map

package/lib/esm/components-react/filter-builder/Types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/Types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,+BAA+B,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAE1F,aAAa;AACb,oBAAY,cAAc,GAAG,kBAAkB,GAAG,uBAAuB,CAAC;AAE1E,aAAa;AACb,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,+BAA+B,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;CAC9B;AAED,aAAa;AACb,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,QAAQ,EAAE,0BAA0B,CAAC;IACrC,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED,aAAa;AACb,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,IAAI,uBAAuB,CAEnG"}

package/lib/esm/components-react/filter-builder/Types.js

@@ -0,0 +1,5 @@
+/** @alpha */
+export function isPropertyFilterRuleGroup(filter) {
+    return filter.rules !== undefined;
+}
+//# sourceMappingURL=Types.js.map

package/lib/esm/components-react/filter-builder/Types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Types.js","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/Types.ts"],"names":[],"mappings":"AAuBA,aAAa;AACb,MAAM,UAAU,yBAAyB,CAAC,MAAsB;IAC9D,OAAQ,MAAc,CAAC,KAAK,KAAK,SAAS,CAAC;AAC7C,CAAC","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\nimport { PropertyDescription, PropertyValue } from \"@itwin/appui-abstract\";\r\nimport { PropertyFilterRuleGroupOperator, PropertyFilterRuleOperator } from \"./Operators\";\r\n\r\n/** @alpha */\r\nexport type PropertyFilter = PropertyFilterRule | PropertyFilterRuleGroup;\r\n\r\n/** @alpha */\r\nexport interface PropertyFilterRuleGroup {\r\n  operator: PropertyFilterRuleGroupOperator;\r\n  rules: Array<PropertyFilter>;\r\n}\r\n\r\n/** @alpha */\r\nexport interface PropertyFilterRule {\r\n  property: PropertyDescription;\r\n  operator: PropertyFilterRuleOperator;\r\n  value?: PropertyValue;\r\n}\r\n\r\n/** @alpha */\r\nexport function isPropertyFilterRuleGroup(filter: PropertyFilter): filter is PropertyFilterRuleGroup {\r\n  return (filter as any).rules !== undefined;\r\n}\r\n"]}

package/lib/esm/components-react/tree/controlled/TreeHooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TreeHooks.d.ts","sourceRoot":"","sources":["../../../../../src/components-react/tree/controlled/TreeHooks.ts"],"names":[],"mappings":"AAIA;;GAEG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvE;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,eAAe,GAAG,SAAS,CAYpE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,SAAS,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,iCAGlI;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,SAAS,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,sCAGzJ;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,mBAGhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,SAAS,gBAAgB,EAAE,eAAe,EAAE,CAAC,MAAM,cAAc,CAAC,GAAG,sBAAsB,oBAO7I"}
+{"version":3,"file":"TreeHooks.d.ts","sourceRoot":"","sources":["../../../../../src/components-react/tree/controlled/TreeHooks.ts"],"names":[],"mappings":"AAIA;;GAEG;AAKH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvE;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,eAAe,GAAG,SAAS,CAMpE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,SAAS,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,iCAGlI;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,SAAS,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,sCAGzJ;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,mBAGhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,SAAS,gBAAgB,EAAE,eAAe,EAAE,CAAC,MAAM,cAAc,CAAC,GAAG,sBAAsB,oBAO7I"}

package/lib/esm/components-react/tree/controlled/TreeHooks.js

@@ -5,8 +5,9 @@
 /** @packageDocumentation
  * @module Tree
  */
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo } from "react";
 import { useDisposable } from "@itwin/core-react";
+import { useRerender } from "../../common/UseRerender";
 import { TreeEventHandler } from "./TreeEventHandler";
 import { TreeModelSource } from "./TreeModelSource";
 import { PagedTreeNodeLoader, TreeNodeLoader } from "./TreeNodeLoader";
@@ -17,15 +18,11 @@ import { PagedTreeNodeLoader, TreeNodeLoader } from "./TreeNodeLoader";
  * @public
  */
 export function useTreeModel(modelSource) {
-    const [model, setModel] = useState(modelSource.getModel());
+    const { rerender } = useRerender();
     useEffect(() => {
-        const onModelChanged = () => {
-            setModel(modelSource.getModel());
-        };
-        onModelChanged();
-        return modelSource.onModelChanged.addListener(onModelChanged);
-    }, [modelSource]);
-    return model;
+        return modelSource.onModelChanged.addListener(rerender);
+    }, [modelSource, rerender]);
+    return modelSource.getModel();
 }
 /**
  * Custom hook which creates a nodes' loader using the supplied data provider and model source. The

package/lib/esm/components-react/tree/controlled/TreeHooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"TreeHooks.js","sourceRoot":"","sources":["../../../../../src/components-react/tree/controlled/TreeHooks.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAA0B,MAAM,oBAAoB,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvE;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,WAA4B;IACvD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE3D,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,cAAc,GAAG,GAAG,EAAE;YAC1B,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnC,CAAC,CAAC;QACF,cAAc,EAAE,CAAC;QACjB,OAAO,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAChE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAyC,YAA2B,EAAE,WAA4B;IACjI,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;IACnH,OAAO,aAAa,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAyC,YAA2B,EAAE,QAAgB,EAAE,WAA4B;IACxJ,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,mBAAmB,CAAC,YAAY,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5I,OAAO,aAAa,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,YAA8B;IAC/D,0HAA0H;IAC1H,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,kDAAkD;AACjH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAA0C,eAAgE;IAC5I,MAAM,OAAO,GAAG,WAAW,CAAC,GAAqB,EAAE;QACjD,IAAI,OAAO,eAAe,KAAK,UAAU;YACvC,OAAO,eAAe,EAAE,CAAC;QAC3B,OAAO,IAAI,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IACtB,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC","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 Tree\r\n */\r\n\r\nimport { useCallback, useEffect, useMemo, useState } from \"react\";\r\nimport { useDisposable } from \"@itwin/core-react\";\r\nimport { TreeDataProvider } from \"../TreeDataProvider\";\r\nimport { TreeEventHandler, TreeEventHandlerParams } from \"./TreeEventHandler\";\r\nimport { TreeModel } from \"./TreeModel\";\r\nimport { TreeModelSource } from \"./TreeModelSource\";\r\nimport { PagedTreeNodeLoader, TreeNodeLoader } from \"./TreeNodeLoader\";\r\n\r\n/**\r\n * React hook that returns an immutable `TreeModel` whenever it changes in the given\r\n * `TreeModelSource`.\r\n *\r\n * @public\r\n */\r\nexport function useTreeModel(modelSource: TreeModelSource): TreeModel {\r\n  const [model, setModel] = useState(modelSource.getModel());\r\n\r\n  useEffect(() => {\r\n    const onModelChanged = () => {\r\n      setModel(modelSource.getModel());\r\n    };\r\n    onModelChanged();\r\n    return modelSource.onModelChanged.addListener(onModelChanged);\r\n  }, [modelSource]);\r\n\r\n  return model;\r\n}\r\n\r\n/**\r\n * Custom hook which creates a nodes' loader using the supplied data provider and model source. The\r\n * loader pulls nodes from the data provider and puts them into the model source.\r\n *\r\n * @public\r\n */\r\nexport function useTreeNodeLoader<TDataProvider extends TreeDataProvider>(dataProvider: TDataProvider, modelSource: TreeModelSource) {\r\n  const createLoader = useCallback(() => new TreeNodeLoader(dataProvider, modelSource), [dataProvider, modelSource]);\r\n  return useDisposable(createLoader);\r\n}\r\n\r\n/**\r\n * Custom hook which creates a paging nodes' loader using the supplied data provider and model source. The loader pulls\r\n * nodes from the data provider and puts them into the model source.\r\n * @public\r\n */\r\nexport function usePagedTreeNodeLoader<TDataProvider extends TreeDataProvider>(dataProvider: TDataProvider, pageSize: number, modelSource: TreeModelSource) {\r\n  const createLoader = useCallback(() => new PagedTreeNodeLoader(dataProvider, modelSource, pageSize), [dataProvider, modelSource, pageSize]);\r\n  return useDisposable(createLoader);\r\n}\r\n\r\n/**\r\n * Custom hook which creates a `TreeModelSource`.\r\n *\r\n * @note The model source has no direct dependency on the data provider, but we want a fresh model\r\n * source whenever the data provider changes - that's the reason the hook takes a data provider.\r\n *\r\n * @public\r\n */\r\nexport function useTreeModelSource(dataProvider: TreeDataProvider) {\r\n  // need to create new model source every time data provider changes although it does not need data provider to be created.\r\n  return useMemo(() => new TreeModelSource(), [dataProvider]); // eslint-disable-line react-hooks/exhaustive-deps\r\n}\r\n\r\n/**\r\n * Custom hook which creates and takes care of disposing a TreeEventsHandler. The input is either a factory method\r\n * for a custom `TreeEventHandler` implementation or parameters for the default implementation.\r\n *\r\n * @note Caller must ensure `factoryOrParams` changes only when a new handler needs to be created. `useCallback` or `useMemo` can\r\n * be used for that purpose based on whether the input is a factory function or params object.\r\n *\r\n * @public\r\n */\r\nexport function useTreeEventsHandler<TEventsHandler extends TreeEventHandler>(factoryOrParams: (() => TEventsHandler) | TreeEventHandlerParams) {\r\n  const factory = useCallback((): TreeEventHandler => {\r\n    if (typeof factoryOrParams === \"function\")\r\n      return factoryOrParams();\r\n    return new TreeEventHandler(factoryOrParams);\r\n  }, [factoryOrParams]);\r\n  return useDisposable(factory);\r\n}\r\n"]}
+{"version":3,"file":"TreeHooks.js","sourceRoot":"","sources":["../../../../../src/components-react/tree/controlled/TreeHooks.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAA0B,MAAM,oBAAoB,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvE;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,WAA4B;IACvD,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5B,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC;AAChC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAyC,YAA2B,EAAE,WAA4B;IACjI,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;IACnH,OAAO,aAAa,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAyC,YAA2B,EAAE,QAAgB,EAAE,WAA4B;IACxJ,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,mBAAmB,CAAC,YAAY,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5I,OAAO,aAAa,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,YAA8B;IAC/D,0HAA0H;IAC1H,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,kDAAkD;AACjH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAA0C,eAAgE;IAC5I,MAAM,OAAO,GAAG,WAAW,CAAC,GAAqB,EAAE;QACjD,IAAI,OAAO,eAAe,KAAK,UAAU;YACvC,OAAO,eAAe,EAAE,CAAC;QAC3B,OAAO,IAAI,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IACtB,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC","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 Tree\r\n */\r\n\r\nimport { useCallback, useEffect, useMemo } from \"react\";\r\nimport { useDisposable } from \"@itwin/core-react\";\r\nimport { useRerender } from \"../../common/UseRerender\";\r\nimport { TreeDataProvider } from \"../TreeDataProvider\";\r\nimport { TreeEventHandler, TreeEventHandlerParams } from \"./TreeEventHandler\";\r\nimport { TreeModel } from \"./TreeModel\";\r\nimport { TreeModelSource } from \"./TreeModelSource\";\r\nimport { PagedTreeNodeLoader, TreeNodeLoader } from \"./TreeNodeLoader\";\r\n\r\n/**\r\n * React hook that returns an immutable `TreeModel` whenever it changes in the given\r\n * `TreeModelSource`.\r\n *\r\n * @public\r\n */\r\nexport function useTreeModel(modelSource: TreeModelSource): TreeModel {\r\n  const { rerender } = useRerender();\r\n  useEffect(() => {\r\n    return modelSource.onModelChanged.addListener(rerender);\r\n  }, [modelSource, rerender]);\r\n  return modelSource.getModel();\r\n}\r\n\r\n/**\r\n * Custom hook which creates a nodes' loader using the supplied data provider and model source. The\r\n * loader pulls nodes from the data provider and puts them into the model source.\r\n *\r\n * @public\r\n */\r\nexport function useTreeNodeLoader<TDataProvider extends TreeDataProvider>(dataProvider: TDataProvider, modelSource: TreeModelSource) {\r\n  const createLoader = useCallback(() => new TreeNodeLoader(dataProvider, modelSource), [dataProvider, modelSource]);\r\n  return useDisposable(createLoader);\r\n}\r\n\r\n/**\r\n * Custom hook which creates a paging nodes' loader using the supplied data provider and model source. The loader pulls\r\n * nodes from the data provider and puts them into the model source.\r\n * @public\r\n */\r\nexport function usePagedTreeNodeLoader<TDataProvider extends TreeDataProvider>(dataProvider: TDataProvider, pageSize: number, modelSource: TreeModelSource) {\r\n  const createLoader = useCallback(() => new PagedTreeNodeLoader(dataProvider, modelSource, pageSize), [dataProvider, modelSource, pageSize]);\r\n  return useDisposable(createLoader);\r\n}\r\n\r\n/**\r\n * Custom hook which creates a `TreeModelSource`.\r\n *\r\n * @note The model source has no direct dependency on the data provider, but we want a fresh model\r\n * source whenever the data provider changes - that's the reason the hook takes a data provider.\r\n *\r\n * @public\r\n */\r\nexport function useTreeModelSource(dataProvider: TreeDataProvider) {\r\n  // need to create new model source every time data provider changes although it does not need data provider to be created.\r\n  return useMemo(() => new TreeModelSource(), [dataProvider]); // eslint-disable-line react-hooks/exhaustive-deps\r\n}\r\n\r\n/**\r\n * Custom hook which creates and takes care of disposing a TreeEventsHandler. The input is either a factory method\r\n * for a custom `TreeEventHandler` implementation or parameters for the default implementation.\r\n *\r\n * @note Caller must ensure `factoryOrParams` changes only when a new handler needs to be created. `useCallback` or `useMemo` can\r\n * be used for that purpose based on whether the input is a factory function or params object.\r\n *\r\n * @public\r\n */\r\nexport function useTreeEventsHandler<TEventsHandler extends TreeEventHandler>(factoryOrParams: (() => TEventsHandler) | TreeEventHandlerParams) {\r\n  const factory = useCallback((): TreeEventHandler => {\r\n    if (typeof factoryOrParams === \"function\")\r\n      return factoryOrParams();\r\n    return new TreeEventHandler(factoryOrParams);\r\n  }, [factoryOrParams]);\r\n  return useDisposable(factory);\r\n}\r\n"]}

package/lib/esm/components-react/tree/controlled/TreeNodeLoader.d.ts

@@ -71,6 +71,7 @@ export declare abstract class AbstractTreeNodeLoaderWithProvider<TDataProvider e
 export declare class TreeNodeLoader<TDataProvider extends TreeDataProvider> extends AbstractTreeNodeLoaderWithProvider<TDataProvider> implements IDisposable {
     private _treeDataSource;
     private _activeRequests;
+    private _scheduler;
     constructor(dataProvider: TDataProvider, modelSource: TreeModelSource);
     /** Disposes data source */
     dispose(): void;
@@ -78,16 +79,18 @@ export declare class TreeNodeLoader<TDataProvider extends TreeDataProvider> exte
      * Schedules to load children of node and returns an Observable.
      * @note It does not start loading node until '.subscribe()' is called on returned Observable.
      */
-    protected load(parentNode: TreeModelNode | TreeModelRootNode): Observable<LoadedNodeHierarchy>;
-    private loadForParent;
+    loadNode(parent: TreeModelNode | TreeModelRootNode, _childIndex?: number): Observable<TreeNodeLoadResult>;
+    protected load(): Observable<LoadedNodeHierarchy>;
 }
 /**
  * Default paged tree node loader with `TreeDataProvider` implementation.
  * @public
  */
 export declare class PagedTreeNodeLoader<TDataProvider extends TreeDataProvider> extends AbstractTreeNodeLoaderWithProvider<TDataProvider> implements IDisposable {
-    private _pageLoader;
+    private _treeDataSource;
     private _pageSize;
+    private _activePageRequests;
+    private _scheduler;
     constructor(dataProvider: TDataProvider, modelSource: TreeModelSource, pageSize: number);
     /** Disposes data source */
     dispose(): void;
@@ -97,7 +100,8 @@ export declare class PagedTreeNodeLoader<TDataProvider extends TreeDataProvider>
      * Schedules to load one page of node children and returns an Observable.
      * @note It does not start loading node page until '.subscribe()' is called on returned Observable.
      */
-    protected load(parentNode: TreeModelNode | TreeModelRootNode, childIndex: number): Observable<LoadedNodeHierarchy>;
+    loadNode(parent: TreeModelNode | TreeModelRootNode, childIndex: number): Observable<TreeNodeLoadResult>;
+    protected load(): Observable<LoadedNodeHierarchy>;
 }
 /**
  * Data structure that describes hierarchy loaded for parent node.

package/lib/esm/components-react/tree/controlled/TreeNodeLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TreeNodeLoader.d.ts","sourceRoot":"","sources":["../../../../../src/components-react/tree/controlled/TreeNodeLoader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TreeNodeLoader.d.ts","sourceRoot":"","sources":["../../../../../src/components-react/tree/controlled/TreeNodeLoader.ts"],"names":[],"mappings":"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"}

package/lib/esm/components-react/tree/controlled/TreeNodeLoader.js

@@ -68,6 +68,7 @@ export class TreeNodeLoader extends AbstractTreeNodeLoaderWithProvider {
     constructor(dataProvider, modelSource) {
         super(modelSource, dataProvider);
         this._activeRequests = new Map();
+        this._scheduler = new SubscriptionScheduler();
         this._treeDataSource = new TreeDataSource(dataProvider);
     }
     /** Disposes data source */
@@ -76,19 +77,26 @@ export class TreeNodeLoader extends AbstractTreeNodeLoaderWithProvider {
      * Schedules to load children of node and returns an Observable.
      * @note It does not start loading node until '.subscribe()' is called on returned Observable.
      */
-    load(parentNode) {
-        const parentItem = isTreeModelNode(parentNode) ? parentNode.item : undefined;
-        return this.loadForParent(parentItem, parentNode.numChildren === undefined);
+    loadNode(parent, _childIndex) {
+        return defer(() => {
+            const parentItem = isTreeModelNode(parent) ? parent.item : undefined;
+            const parentId = parentItem === null || parentItem === void 0 ? void 0 : parentItem.id;
+            const activeRequest = this._activeRequests.get(parentId);
+            if (activeRequest) {
+                return activeRequest;
+            }
+            const newRequest = requestLoadedHierarchy(parentItem, this._treeDataSource, 0, 0, parent.numChildren === undefined)
+                .pipe(map((loadedHierarchy) => {
+                this.updateModel(loadedHierarchy);
+                return { loadedNodes: collectTreeNodeItems(loadedHierarchy.hierarchyItems) };
+            }), scheduleSubscription(this._scheduler), finalize(() => this._activeRequests.delete(parentId)));
+            this._activeRequests.set(parentId, newRequest);
+            return newRequest;
+        });
     }
-    loadForParent(parentItem, requestNumChildren) {
-        const parentId = parentItem && parentItem.id;
-        const activeRequest = this._activeRequests.get(parentId);
-        if (activeRequest) {
-            return activeRequest;
-        }
-        const newRequest = requestLoadedHierarchy(parentItem, this._treeDataSource, 0, 0, requestNumChildren, () => { this._activeRequests.delete(parentId); });
-        this._activeRequests.set(parentId, newRequest);
-        return newRequest;
+    // istanbul ignore next
+    load() {
+        throw new Error("Method not implemented.");
     }
 }
 /**
@@ -98,50 +106,51 @@ export class TreeNodeLoader extends AbstractTreeNodeLoaderWithProvider {
 export class PagedTreeNodeLoader extends AbstractTreeNodeLoaderWithProvider {
     constructor(dataProvider, modelSource, pageSize) {
         super(modelSource, dataProvider);
-        this._pageLoader = new PageLoader(new TreeDataSource(dataProvider), pageSize);
+        this._treeDataSource = new TreeDataSource(dataProvider);
         this._pageSize = pageSize;
+        this._activePageRequests = new Map();
+        this._scheduler = new SubscriptionScheduler();
     }
     /** Disposes data source */
-    dispose() { this._pageLoader.dispose(); }
+    dispose() { this._treeDataSource.dispose(); }
     /** Returns page size used by tree node loader. */
     get pageSize() { return this._pageSize; }
     /**
      * Schedules to load one page of node children and returns an Observable.
      * @note It does not start loading node page until '.subscribe()' is called on returned Observable.
      */
-    load(parentNode, childIndex) {
-        const parentItem = isTreeModelNode(parentNode) ? parentNode.item : undefined;
-        return this._pageLoader.loadPageWithItem(parentItem, childIndex, parentNode.numChildren === undefined);
-    }
-}
-class PageLoader {
-    constructor(dataSource, pageSize) {
-        this._activePageRequests = new Map();
-        this._dataSource = dataSource;
-        this._pageSize = pageSize;
-    }
-    dispose() { this._dataSource.dispose(); }
-    loadPageWithItem(parentItem, itemIndex, requestNumChildren) {
-        const parentId = parentItem && parentItem.id;
-        const parentPageRequests = this._activePageRequests.get(parentId) || new Map();
-        const page = Math.trunc(itemIndex / this._pageSize);
-        const activeRequest = parentPageRequests.get(page);
-        if (activeRequest) {
-            return activeRequest;
-        }
-        const startIndex = page * this._pageSize;
-        const newRequest = requestLoadedHierarchy(parentItem, this._dataSource, startIndex, this._pageSize, requestNumChildren, () => {
-            parentPageRequests.delete(page);
-            if (parentPageRequests.size === 0) {
-                this._activePageRequests.delete(parentId);
+    loadNode(parent, childIndex) {
+        return defer(() => {
+            var _a;
+            const parentItem = isTreeModelNode(parent) ? parent.item : undefined;
+            const parentId = parentItem === null || parentItem === void 0 ? void 0 : parentItem.id;
+            const parentPageRequests = (_a = this._activePageRequests.get(parentId)) !== null && _a !== void 0 ? _a : new Map();
+            const page = Math.trunc(childIndex / this._pageSize);
+            const activeRequest = parentPageRequests.get(page);
+            if (activeRequest) {
+                return activeRequest;
             }
+            const startIndex = page * this._pageSize;
+            const newRequest = requestLoadedHierarchy(parentItem, this._treeDataSource, startIndex, this._pageSize, parent.numChildren === undefined).pipe(map((loadedHierarchy) => {
+                this.updateModel(loadedHierarchy);
+                return { loadedNodes: collectTreeNodeItems(loadedHierarchy.hierarchyItems) };
+            }), scheduleSubscription(this._scheduler), finalize(() => {
+                parentPageRequests.delete(page);
+                if (parentPageRequests.size === 0) {
+                    this._activePageRequests.delete(parentId);
+                }
+            }));
+            parentPageRequests.set(page, newRequest);
+            this._activePageRequests.set(parentId, parentPageRequests);
+            return newRequest;
         });
-        parentPageRequests.set(page, newRequest);
-        this._activePageRequests.set(parentId, parentPageRequests);
-        return newRequest;
+    }
+    // istanbul ignore next
+    load() {
+        throw new Error("Method not implemented.");
     }
 }
-function requestLoadedHierarchy(parentItem, dataSource, start, take, requestNumChildren, finalizeCallback) {
+function requestLoadedHierarchy(parentItem, dataSource, start, take, requestNumChildren) {
     const parentId = parentItem && parentItem.id;
     return dataSource.requestItems(parentItem, start, take, requestNumChildren)
         .pipe(concatMap(({ numChildren, loadedItems }) => loadHierarchy(loadedItems, dataSource, take)
@@ -150,7 +159,7 @@ function requestLoadedHierarchy(parentItem, dataSource, start, take, requestNumC
         offset: start,
         hierarchyItems,
         numChildren,
-    })))), finalize(finalizeCallback), publish(), refCount());
+    })))));
 }
 function loadHierarchy(rootItems, dataSource, take) {
     return from(rootItems)