@itwin/components-react 4.9.0-dev.1 → 4.10.0-dev.1

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleGroup.d.ts

@@ -1,10 +1,10 @@
 /** @packageDocumentation
  * @module PropertyFilterBuilder
  */
-/// <reference types="react" />
 import "./FilterBuilderRuleGroup.scss";
+import * as React from "react";
 import type { PropertyFilterBuilderRuleGroup } from "./FilterBuilderState";
-import { PropertyFilterRuleGroupOperator } from "./Operators";
+import type { PropertyFilterRuleGroupOperator } from "./Operators";
 /**
  * Props for [[PropertyFilterBuilderRuleGroupRenderer]] component.
  * @internal
@@ -14,25 +14,29 @@ export interface PropertyFilterBuilderRuleGroupRendererProps {
     path: string[];
     /** Rule group to render. */
     group: PropertyFilterBuilderRuleGroup;
+    /** Controls whether the group operator is toggle-able. */
+    isGroupOperatorDisabled?: boolean;
 }
 /**
  * Component that renders group of rules in [[PropertyFilterBuilder]] component.
  * @internal
  */
-export declare function PropertyFilterBuilderRuleGroupRenderer(props: PropertyFilterBuilderRuleGroupRendererProps): JSX.Element;
+export declare function PropertyFilterBuilderRuleGroupRenderer(props: PropertyFilterBuilderRuleGroupRendererProps): React.JSX.Element;
 /**
  * Props for [[PropertyFilterBuilderRuleGroupOperator]] component.
  * @internal
  */
 export interface PropertyFilterBuilderRuleGroupOperatorProps {
     /** Currently selected operator. */
-    operator: PropertyFilterRuleGroupOperator;
+    operator: `${PropertyFilterRuleGroupOperator}`;
     /** Callback that is invoked when selected operator changes. */
-    onChange: (operator: PropertyFilterRuleGroupOperator) => void;
+    onChange: (operator: `${PropertyFilterRuleGroupOperator}`) => void;
+    /** Controls whether the group operator is toggle-able. */
+    isGroupOperatorDisabled?: boolean;
 }
 /**
  * Component that renders [[PropertyFilterBuilderRuleGroup]] operator selector.
  * @internal
  */
-export declare function PropertyFilterBuilderRuleGroupOperator(props: PropertyFilterBuilderRuleGroupOperatorProps): JSX.Element;
+export declare function PropertyFilterBuilderRuleGroupOperator(props: PropertyFilterBuilderRuleGroupOperatorProps): React.JSX.Element;
 //# sourceMappingURL=FilterBuilderRuleGroup.d.ts.map

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleGroup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilderRuleGroup.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleGroup.tsx"],"names":[],"mappings":"AAIA;;GAEG;;AAEH,OAAO,+BAA+B,CAAC;AAWvC,OAAO,KAAK,EACV,8BAA8B,EAE/B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAE9D;;;GAGG;AACH,MAAM,WAAW,2CAA2C;IAC1D,mEAAmE;IACnE,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,4BAA4B;IAC5B,KAAK,EAAE,8BAA8B,CAAC;CACvC;AAED;;;GAGG;AACH,wBAAgB,sCAAsC,CACpD,KAAK,EAAE,2CAA2C,eAiGnD;AAED;;;GAGG;AACH,MAAM,WAAW,2CAA2C;IAC1D,mCAAmC;IACnC,QAAQ,EAAE,+BAA+B,CAAC;IAC1C,+DAA+D;IAC/D,QAAQ,EAAE,CAAC,QAAQ,EAAE,+BAA+B,KAAK,IAAI,CAAC;CAC/D;AAED;;;GAGG;AACH,wBAAgB,sCAAsC,CACpD,KAAK,EAAE,2CAA2C,eA8BnD"}
+{"version":3,"file":"FilterBuilderRuleGroup.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleGroup.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,+BAA+B,CAAC;AACvC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EACV,8BAA8B,EAE/B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAGnE;;;GAGG;AACH,MAAM,WAAW,2CAA2C;IAC1D,mEAAmE;IACnE,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,4BAA4B;IAC5B,KAAK,EAAE,8BAA8B,CAAC;IACtC,0DAA0D;IAC1D,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED;;;GAGG;AACH,wBAAgB,sCAAsC,CACpD,KAAK,EAAE,2CAA2C,qBA0CnD;AAED;;;GAGG;AACH,MAAM,WAAW,2CAA2C;IAC1D,mCAAmC;IACnC,QAAQ,EAAE,GAAG,+BAA+B,EAAE,CAAC;IAC/C,+DAA+D;IAC/D,QAAQ,EAAE,CAAC,QAAQ,EAAE,GAAG,+BAA+B,EAAE,KAAK,IAAI,CAAC;IACnE,0DAA0D;IAC1D,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED;;;GAGG;AACH,wBAAgB,sCAAsC,CACpD,KAAK,EAAE,2CAA2C,qBAcnD"}

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleGroup.js

@@ -33,42 +33,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropertyFilterBuilderRuleGroupOperator = exports.PropertyFilterBuilderRuleGroupRenderer = void 0;
 require("./FilterBuilderRuleGroup.scss");
 const React = __importStar(require("react"));
-const itwinui_icons_react_1 = require("@itwin/itwinui-icons-react");
 const itwinui_react_1 = require("@itwin/itwinui-react");
-const UiComponents_1 = require("../UiComponents");
 const FilterBuilderContext_1 = require("./FilterBuilderContext");
 const FilterBuilderRule_1 = require("./FilterBuilderRule");
 const FilterBuilderState_1 = require("./FilterBuilderState");
-const Operators_1 = require("./Operators");
+const FilterBuilderLogicalOperator_1 = require("./FilterBuilderLogicalOperator");
 /**
  * Component that renders group of rules in [[PropertyFilterBuilder]] component.
  * @internal
  */
 function PropertyFilterBuilderRuleGroupRenderer(props) {
-    const { path, group } = props;
-    const { actions, ruleGroupDepthLimit } = React.useContext(FilterBuilderContext_1.PropertyFilterBuilderContext);
-    const { onNewRuleAdded, groupRef } = useRulePropertyFocus(group.items.length);
-    const handleAddRule = (ruleType) => {
-        actions.addItem(path, ruleType);
-        onNewRuleAdded();
-    };
-    const removeGroup = () => actions.removeItem(path);
+    const { path, group, isGroupOperatorDisabled } = props;
+    const { actions } = React.useContext(FilterBuilderContext_1.PropertyFilterBuilderContext);
+    const { onRuleAdded, groupRef } = useRulePropertyFocus(group.items.length);
     const onOperatorChange = React.useCallback((operator) => {
         actions.setRuleGroupOperator(path, operator);
     }, [path, actions]);
-    const allowToAddGroup = ruleGroupDepthLimit === undefined || path.length < ruleGroupDepthLimit;
-    const { focusedElement, hoveredElement, ...eventHandlers } = React.useContext(FilterBuilderContext_1.ActiveRuleGroupContext);
     const showOperator = group.items.length > 1;
-    return (React.createElement("div", { ref: groupRef, className: "rule-group", "data-isactive": groupRef.current === focusedElement ||
-            groupRef.current === hoveredElement, ...eventHandlers },
-        React.createElement("div", { className: "rule-group-remove-action" }, group.groupId !== undefined && (React.createElement(itwinui_react_1.IconButton, { "data-testid": "rule-group-remove", onClick: removeGroup, styleType: "borderless", size: "small" },
-            React.createElement(itwinui_icons_react_1.SvgDelete, null)))),
-        React.createElement("div", { className: "rule-group-content" },
-            showOperator ? (React.createElement(PropertyFilterBuilderRuleGroupOperator, { operator: group.operator, onChange: onOperatorChange })) : null,
-            React.createElement("div", { className: "rule-group-items" }, group.items.map((item) => (React.createElement(PropertyFilterBuilderGroupOrRule, { key: item.id, path: path, item: item, isRemovable: group.items.length > 1 })))),
-            React.createElement("div", { className: "rule-group-actions" },
-                React.createElement(itwinui_react_1.Button, { className: "rule-group-button", key: "add-rule-button", "data-testid": "rule-group-add-rule", onClick: () => handleAddRule("RULE"), styleType: "borderless", size: "small", startIcon: React.createElement(itwinui_icons_react_1.SvgAdd, null) }, UiComponents_1.UiComponents.translate("filterBuilder.rule")),
-                allowToAddGroup && (React.createElement(itwinui_react_1.Button, { className: "rule-group-button", key: "add-rule-group-button", "data-testid": "rule-group-add-rule-group", onClick: () => handleAddRule("RULE_GROUP"), styleType: "borderless", size: "small", startIcon: React.createElement(itwinui_icons_react_1.SvgAdd, null) }, UiComponents_1.UiComponents.translate("filterBuilder.ruleGroup")))))));
+    return (React.createElement(itwinui_react_1.Flex, { ref: groupRef, style: { alignSelf: "flex-start" }, className: "fb-group", gap: "0px" },
+        showOperator ? (React.createElement(PropertyFilterBuilderRuleGroupOperator, { operator: group.operator, onChange: onOperatorChange, isGroupOperatorDisabled: isGroupOperatorDisabled })) : null,
+        React.createElement("div", { className: "fb-wrapper" }, group.items.map((item) => (React.createElement("div", { className: "fb-row", key: item.id },
+            React.createElement(PropertyFilterBuilderGroupOrRule, { path: path, item: item, onRuleAdded: onRuleAdded })))))));
 }
 exports.PropertyFilterBuilderRuleGroupRenderer = PropertyFilterBuilderRuleGroupRenderer;
 /**
@@ -76,26 +61,16 @@ exports.PropertyFilterBuilderRuleGroupRenderer = PropertyFilterBuilderRuleGroupR
  * @internal
  */
 function PropertyFilterBuilderRuleGroupOperator(props) {
-    const { operator, onChange } = props;
-    const options = React.useMemo(() => [
-        {
-            value: Operators_1.PropertyFilterRuleGroupOperator.And,
-            label: UiComponents_1.UiComponents.translate("filterBuilder.operators.and"),
-        },
-        {
-            value: Operators_1.PropertyFilterRuleGroupOperator.Or,
-            label: UiComponents_1.UiComponents.translate("filterBuilder.operators.or"),
-        },
-    ], []);
-    return (React.createElement("div", { className: "rule-group-operator" },
-        React.createElement(itwinui_react_1.Select, { options: options, value: operator, onChange: onChange, size: "small" })));
+    const { operator, isGroupOperatorDisabled, onChange } = props;
+    return (React.createElement(itwinui_react_1.Flex.Item, { alignSelf: "stretch" },
+        React.createElement(FilterBuilderLogicalOperator_1.PropertyFilterBuilderLogicalOperator, { className: "fb-group-operator", operator: operator, onOperatorChange: onChange, isDisabled: isGroupOperatorDisabled })));
 }
 exports.PropertyFilterBuilderRuleGroupOperator = PropertyFilterBuilderRuleGroupOperator;
-const PropertyFilterBuilderGroupOrRule = React.memo(function PropertyFilterBuilderGroupOrRule({ path, item, isRemovable, }) {
+const PropertyFilterBuilderGroupOrRule = React.memo(function PropertyFilterBuilderGroupOrRule({ path, item, onRuleAdded, }) {
     const itemPath = [...path, item.id];
     if ((0, FilterBuilderState_1.isPropertyFilterBuilderRuleGroup)(item))
         return (React.createElement(PropertyFilterBuilderRuleGroupRenderer, { path: itemPath, group: item }));
-    return (React.createElement(FilterBuilderRule_1.PropertyFilterBuilderRuleRenderer, { path: itemPath, rule: item, isRemovable: isRemovable }));
+    return (React.createElement(FilterBuilderRule_1.PropertyFilterBuilderRuleRenderer, { path: itemPath, rule: item, onRuleAdded: onRuleAdded }));
 });
 const useRulePropertyFocus = (currentGroupItemsLength) => {
     const previousGroupItemsLength = React.useRef(0);
@@ -105,12 +80,12 @@ const useRulePropertyFocus = (currentGroupItemsLength) => {
         if (isNewRuleAdded.current &&
             previousGroupItemsLength.current < currentGroupItemsLength &&
             groupRef.current) {
-            const ruleProperties = groupRef.current.querySelectorAll(".rule-property input");
+            const ruleProperties = groupRef.current.querySelectorAll(".fb-property-name input");
             ruleProperties[ruleProperties.length - 1].focus();
             isNewRuleAdded.current = false;
         }
         previousGroupItemsLength.current = currentGroupItemsLength;
     }, [currentGroupItemsLength]);
-    return { onNewRuleAdded: () => (isNewRuleAdded.current = true), groupRef };
+    return { onRuleAdded: () => (isNewRuleAdded.current = true), groupRef };
 };
 //# sourceMappingURL=FilterBuilderRuleGroup.js.map

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilderRuleGroup.js","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleGroup.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module PropertyFilterBuilder\n */\n\nimport \"./FilterBuilderRuleGroup.scss\";\nimport * as React from \"react\";\nimport { SvgAdd, SvgDelete } from \"@itwin/itwinui-icons-react\";\nimport type { SelectOption } from \"@itwin/itwinui-react\";\nimport { Button, IconButton, Select } from \"@itwin/itwinui-react\";\nimport { UiComponents } from \"../UiComponents\";\nimport {\n  ActiveRuleGroupContext,\n  PropertyFilterBuilderContext,\n} from \"./FilterBuilderContext\";\nimport { PropertyFilterBuilderRuleRenderer } from \"./FilterBuilderRule\";\nimport type {\n  PropertyFilterBuilderRuleGroup,\n  PropertyFilterBuilderRuleGroupItem,\n} from \"./FilterBuilderState\";\nimport { isPropertyFilterBuilderRuleGroup } from \"./FilterBuilderState\";\nimport { PropertyFilterRuleGroupOperator } from \"./Operators\";\n\n/**\n * Props for [[PropertyFilterBuilderRuleGroupRenderer]] component.\n * @internal\n */\nexport interface PropertyFilterBuilderRuleGroupRendererProps {\n  /** Path from [[PropertyFilterBuilder]] root to this rule group. */\n  path: string[];\n  /** Rule group to render. */\n  group: PropertyFilterBuilderRuleGroup;\n}\n\n/**\n * Component that renders group of rules in [[PropertyFilterBuilder]] component.\n * @internal\n */\nexport function PropertyFilterBuilderRuleGroupRenderer(\n  props: PropertyFilterBuilderRuleGroupRendererProps\n) {\n  const { path, group } = props;\n  const { actions, ruleGroupDepthLimit } = React.useContext(\n    PropertyFilterBuilderContext\n  );\n  const { onNewRuleAdded, groupRef } = useRulePropertyFocus(group.items.length);\n\n  const handleAddRule = (ruleType: \"RULE\" | \"RULE_GROUP\") => {\n    actions.addItem(path, ruleType);\n    onNewRuleAdded();\n  };\n  const removeGroup = () => actions.removeItem(path);\n\n  const onOperatorChange = React.useCallback(\n    (operator: PropertyFilterRuleGroupOperator) => {\n      actions.setRuleGroupOperator(path, operator);\n    },\n    [path, actions]\n  );\n\n  const allowToAddGroup =\n    ruleGroupDepthLimit === undefined || path.length < ruleGroupDepthLimit;\n  const { focusedElement, hoveredElement, ...eventHandlers } = React.useContext(\n    ActiveRuleGroupContext\n  );\n\n  const showOperator = group.items.length > 1;\n\n  return (\n    <div\n      ref={groupRef}\n      className=\"rule-group\"\n      data-isactive={\n        groupRef.current === focusedElement ||\n        groupRef.current === hoveredElement\n      }\n      {...eventHandlers}\n    >\n      <div className=\"rule-group-remove-action\">\n        {group.groupId !== undefined && (\n          <IconButton\n            data-testid=\"rule-group-remove\"\n            onClick={removeGroup}\n            styleType=\"borderless\"\n            size=\"small\"\n          >\n            <SvgDelete />\n          </IconButton>\n        )}\n      </div>\n      <div className=\"rule-group-content\">\n        {showOperator ? (\n          <PropertyFilterBuilderRuleGroupOperator\n            operator={group.operator}\n            onChange={onOperatorChange}\n          />\n        ) : null}\n        <div className=\"rule-group-items\">\n          {group.items.map((item) => (\n            <PropertyFilterBuilderGroupOrRule\n              key={item.id}\n              path={path}\n              item={item}\n              isRemovable={group.items.length > 1}\n            />\n          ))}\n        </div>\n        <div className=\"rule-group-actions\">\n          <Button\n            className=\"rule-group-button\"\n            key=\"add-rule-button\"\n            data-testid=\"rule-group-add-rule\"\n            onClick={() => handleAddRule(\"RULE\")}\n            styleType=\"borderless\"\n            size=\"small\"\n            startIcon={<SvgAdd />}\n          >\n            {UiComponents.translate(\"filterBuilder.rule\")}\n          </Button>\n          {allowToAddGroup && (\n            <Button\n              className=\"rule-group-button\"\n              key=\"add-rule-group-button\"\n              data-testid=\"rule-group-add-rule-group\"\n              onClick={() => handleAddRule(\"RULE_GROUP\")}\n              styleType=\"borderless\"\n              size=\"small\"\n              startIcon={<SvgAdd />}\n            >\n              {UiComponents.translate(\"filterBuilder.ruleGroup\")}\n            </Button>\n          )}\n        </div>\n      </div>\n    </div>\n  );\n}\n\n/**\n * Props for [[PropertyFilterBuilderRuleGroupOperator]] component.\n * @internal\n */\nexport interface PropertyFilterBuilderRuleGroupOperatorProps {\n  /** Currently selected operator. */\n  operator: PropertyFilterRuleGroupOperator;\n  /** Callback that is invoked when selected operator changes. */\n  onChange: (operator: PropertyFilterRuleGroupOperator) => void;\n}\n\n/**\n * Component that renders [[PropertyFilterBuilderRuleGroup]] operator selector.\n * @internal\n */\nexport function PropertyFilterBuilderRuleGroupOperator(\n  props: PropertyFilterBuilderRuleGroupOperatorProps\n) {\n  const { operator, onChange } = props;\n\n  const options = React.useMemo<\n    Array<SelectOption<PropertyFilterRuleGroupOperator>>\n  >(\n    () => [\n      {\n        value: PropertyFilterRuleGroupOperator.And,\n        label: UiComponents.translate(\"filterBuilder.operators.and\"),\n      },\n      {\n        value: PropertyFilterRuleGroupOperator.Or,\n        label: UiComponents.translate(\"filterBuilder.operators.or\"),\n      },\n    ],\n    []\n  );\n\n  return (\n    <div className=\"rule-group-operator\">\n      <Select\n        options={options}\n        value={operator}\n        onChange={onChange}\n        size=\"small\"\n      />\n    </div>\n  );\n}\ninterface PropertyFilterBuilderGroupOrRuleProps {\n  path: string[];\n  item: PropertyFilterBuilderRuleGroupItem;\n  isRemovable?: boolean;\n}\n\nconst PropertyFilterBuilderGroupOrRule = React.memo(\n  function PropertyFilterBuilderGroupOrRule({\n    path,\n    item,\n    isRemovable,\n  }: PropertyFilterBuilderGroupOrRuleProps) {\n    const itemPath = [...path, item.id];\n\n    if (isPropertyFilterBuilderRuleGroup(item))\n      return (\n        <PropertyFilterBuilderRuleGroupRenderer path={itemPath} group={item} />\n      );\n    return (\n      <PropertyFilterBuilderRuleRenderer\n        path={itemPath}\n        rule={item}\n        isRemovable={isRemovable}\n      />\n    );\n  }\n);\n\nconst useRulePropertyFocus = (currentGroupItemsLength: number) => {\n  const previousGroupItemsLength = React.useRef<number>(0);\n  const isNewRuleAdded = React.useRef<boolean>(false);\n  const groupRef = React.useRef<HTMLDivElement>(null);\n  React.useEffect(() => {\n    if (\n      isNewRuleAdded.current &&\n      previousGroupItemsLength.current < currentGroupItemsLength &&\n      groupRef.current\n    ) {\n      const ruleProperties =\n        groupRef.current.querySelectorAll<HTMLInputElement>(\n          \".rule-property input\"\n        );\n      ruleProperties[ruleProperties.length - 1].focus();\n      isNewRuleAdded.current = false;\n    }\n    previousGroupItemsLength.current = currentGroupItemsLength;\n  }, [currentGroupItemsLength]);\n\n  return { onNewRuleAdded: () => (isNewRuleAdded.current = true), groupRef };\n};\n"]}
+{"version":3,"file":"FilterBuilderRuleGroup.js","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleGroup.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module PropertyFilterBuilder\n */\n\nimport \"./FilterBuilderRuleGroup.scss\";\nimport * as React from \"react\";\nimport { Flex } from \"@itwin/itwinui-react\";\nimport { PropertyFilterBuilderContext } from \"./FilterBuilderContext\";\nimport { PropertyFilterBuilderRuleRenderer } from \"./FilterBuilderRule\";\nimport type {\n  PropertyFilterBuilderRuleGroup,\n  PropertyFilterBuilderRuleGroupItem,\n} from \"./FilterBuilderState\";\nimport { isPropertyFilterBuilderRuleGroup } from \"./FilterBuilderState\";\nimport type { PropertyFilterRuleGroupOperator } from \"./Operators\";\nimport { PropertyFilterBuilderLogicalOperator } from \"./FilterBuilderLogicalOperator\";\n\n/**\n * Props for [[PropertyFilterBuilderRuleGroupRenderer]] component.\n * @internal\n */\nexport interface PropertyFilterBuilderRuleGroupRendererProps {\n  /** Path from [[PropertyFilterBuilder]] root to this rule group. */\n  path: string[];\n  /** Rule group to render. */\n  group: PropertyFilterBuilderRuleGroup;\n  /** Controls whether the group operator is toggle-able. */\n  isGroupOperatorDisabled?: boolean;\n}\n\n/**\n * Component that renders group of rules in [[PropertyFilterBuilder]] component.\n * @internal\n */\nexport function PropertyFilterBuilderRuleGroupRenderer(\n  props: PropertyFilterBuilderRuleGroupRendererProps\n) {\n  const { path, group, isGroupOperatorDisabled } = props;\n  const { actions } = React.useContext(PropertyFilterBuilderContext);\n  const { onRuleAdded, groupRef } = useRulePropertyFocus(group.items.length);\n\n  const onOperatorChange = React.useCallback(\n    (operator: `${PropertyFilterRuleGroupOperator}`) => {\n      actions.setRuleGroupOperator(path, operator);\n    },\n    [path, actions]\n  );\n\n  const showOperator = group.items.length > 1;\n\n  return (\n    <Flex\n      ref={groupRef}\n      style={{ alignSelf: \"flex-start\" }}\n      className=\"fb-group\"\n      gap=\"0px\"\n    >\n      {showOperator ? (\n        <PropertyFilterBuilderRuleGroupOperator\n          operator={group.operator}\n          onChange={onOperatorChange}\n          isGroupOperatorDisabled={isGroupOperatorDisabled}\n        />\n      ) : null}\n      <div className=\"fb-wrapper\">\n        {group.items.map((item) => (\n          <div className=\"fb-row\" key={item.id}>\n            <PropertyFilterBuilderGroupOrRule\n              path={path}\n              item={item}\n              onRuleAdded={onRuleAdded}\n            />\n          </div>\n        ))}\n      </div>\n    </Flex>\n  );\n}\n\n/**\n * Props for [[PropertyFilterBuilderRuleGroupOperator]] component.\n * @internal\n */\nexport interface PropertyFilterBuilderRuleGroupOperatorProps {\n  /** Currently selected operator. */\n  operator: `${PropertyFilterRuleGroupOperator}`;\n  /** Callback that is invoked when selected operator changes. */\n  onChange: (operator: `${PropertyFilterRuleGroupOperator}`) => void;\n  /** Controls whether the group operator is toggle-able. */\n  isGroupOperatorDisabled?: boolean;\n}\n\n/**\n * Component that renders [[PropertyFilterBuilderRuleGroup]] operator selector.\n * @internal\n */\nexport function PropertyFilterBuilderRuleGroupOperator(\n  props: PropertyFilterBuilderRuleGroupOperatorProps\n) {\n  const { operator, isGroupOperatorDisabled, onChange } = props;\n\n  return (\n    <Flex.Item alignSelf=\"stretch\">\n      <PropertyFilterBuilderLogicalOperator\n        className=\"fb-group-operator\"\n        operator={operator}\n        onOperatorChange={onChange}\n        isDisabled={isGroupOperatorDisabled}\n      />\n    </Flex.Item>\n  );\n}\ninterface PropertyFilterBuilderGroupOrRuleProps {\n  path: string[];\n  item: PropertyFilterBuilderRuleGroupItem;\n  onRuleAdded: () => void;\n}\n\nconst PropertyFilterBuilderGroupOrRule = React.memo(\n  function PropertyFilterBuilderGroupOrRule({\n    path,\n    item,\n    onRuleAdded,\n  }: PropertyFilterBuilderGroupOrRuleProps) {\n    const itemPath = [...path, item.id];\n\n    if (isPropertyFilterBuilderRuleGroup(item))\n      return (\n        <PropertyFilterBuilderRuleGroupRenderer path={itemPath} group={item} />\n      );\n    return (\n      <PropertyFilterBuilderRuleRenderer\n        path={itemPath}\n        rule={item}\n        onRuleAdded={onRuleAdded}\n      />\n    );\n  }\n);\n\nconst useRulePropertyFocus = (currentGroupItemsLength: number) => {\n  const previousGroupItemsLength = React.useRef<number>(0);\n  const isNewRuleAdded = React.useRef<boolean>(false);\n  const groupRef = React.useRef<HTMLDivElement>(null);\n  React.useEffect(() => {\n    if (\n      isNewRuleAdded.current &&\n      previousGroupItemsLength.current < currentGroupItemsLength &&\n      groupRef.current\n    ) {\n      const ruleProperties =\n        groupRef.current.querySelectorAll<HTMLInputElement>(\n          \".fb-property-name input\"\n        );\n      ruleProperties[ruleProperties.length - 1].focus();\n      isNewRuleAdded.current = false;\n    }\n    previousGroupItemsLength.current = currentGroupItemsLength;\n  }, [currentGroupItemsLength]);\n\n  return { onRuleAdded: () => (isNewRuleAdded.current = true), groupRef };\n};\n"]}

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleGroup.scss

@@ -2,67 +2,33 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
-
-.filter-builder > .rule-group {
-  & > .rule-group-content {
-    border-left: 0;
-    padding-left: 0;
-  }
-
-  & > .rule-group-remove-action {
-    padding-right: 0;
-  }
-}
-
-.rule-group {
-  display: grid;
-  grid-template-columns: min-content auto;
-  padding: 11px 0;
-
-  &[data-isactive="true"] > .rule-group-remove-action {
-    visibility: visible;
-  }
-
-  &[data-isactive="true"] > .rule-group-content {
-    border-color: var(--iui-color-border-foreground-hover);
-  }
-
-  &[data-isactive="false"]
-    > .rule-group-content
-    > .rule-group-actions
-    .rule-group-button {
-    color: var(--iui-color-icon);
-  }
-
-  .rule-group-remove-action {
-    padding: 3px var(--iui-size-s) 3px 0;
-    visibility: hidden;
-  }
-
-  .rule-group-content {
-    padding-left: var(--iui-size-s);
-    border-left: 1px solid;
+.fb-group {
+  --border-color: var(--iui-color-border);
+  --fb-operator-width: 110px;
+  --divider-width: var(--iui-size-2xs);
+  --divider-background-color: var(--iui-color-border-subtle);
+
+  .fb-wrapper {
+    width: 100%;
+  }
+
+  .fb-logical-operator {
+    width: var(--fb-operator-width);
+    height: 100%;
+    text-align: center;
+    background-color: var(--iui-color-background-hover);
+    user-select: none;
+    display: grid;
+    place-items: center;
     box-sizing: border-box;
-    border-color: var(--iui-color-border-subtle);
-
-    .rule-group-operator {
-      padding: 3px 0;
-      width: max-content;
-    }
-
-    .rule-group-actions {
-      padding: 3px 0;
-      display: grid;
-      grid-template-columns: min-content min-content;
-      gap: 8px;
-    }
+    font-size: var(--iui-font-size-2);
+    font-weight: var(--iui-font-weight-semibold);
+    padding-block: var(--iui-size-s);
   }
-}
-
-.rule-group-items > .rule-group {
-  padding-bottom: 22px;
 
-  &:last-child {
-    padding-bottom: 11px;
+  .fb-group-operator {
+    border-style: solid;
+    border-color: var(--border-color);
+    border-width: 1px 0 1px 1px;
   }
 }

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleOperator.d.ts

@@ -1,24 +1,29 @@
 /** @packageDocumentation
  * @module PropertyFilterBuilder
  */
-/// <reference types="react" />
-import type { PropertyDescription } from "@itwin/appui-abstract";
-import type { PropertyFilterRuleOperator } from "./Operators";
+import * as React from "react";
+import { type PropertyDescription } from "@itwin/appui-abstract";
+import type { PropertyFilterBuilderRuleOperator } from "./Operators";
 /**
  * Props for [[PropertyFilterBuilderRuleOperator]] component.
  * @beta
  */
 export interface PropertyFilterBuilderRuleOperatorProps {
     /** Currently selected operator. */
-    operator?: PropertyFilterRuleOperator;
+    operator?: PropertyFilterBuilderRuleOperator;
     /** Property used in rule for which this operator will be used. */
     property: PropertyDescription;
     /** Callback that is invoked when selected operator changes. */
-    onChange: (operator: PropertyFilterRuleOperator) => void;
+    onChange: (operator: PropertyFilterBuilderRuleOperator) => void;
 }
 /**
  * Component that renders [[PropertyFilterBuilderRuleRenderer]] operator selector.
  * @internal
  */
-export declare function PropertyFilterBuilderRuleOperator(props: PropertyFilterBuilderRuleOperatorProps): JSX.Element;
+export declare function PropertyFilterBuilderRuleOperatorRenderer(props: PropertyFilterBuilderRuleOperatorProps): React.JSX.Element;
+/**
+ * Function that returns display label for [[PropertyFilterBuilderRuleOperator]].
+ * @beta
+ */
+export declare function getPropertyFilterBuilderOperatorLabel(operator: PropertyFilterBuilderRuleOperator): string;
 //# sourceMappingURL=FilterBuilderRuleOperator.d.ts.map

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleOperator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilderRuleOperator.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleOperator.tsx"],"names":[],"mappings":"AAIA;;GAEG;;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAM9D;;;GAGG;AACH,MAAM,WAAW,sCAAsC;IACrD,mCAAmC;IACnC,QAAQ,CAAC,EAAE,0BAA0B,CAAC;IACtC,kEAAkE;IAClE,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,+DAA+D;IAC/D,QAAQ,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;CAC1D;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,sCAAsC,eAkC9C"}
+{"version":3,"file":"FilterBuilderRuleOperator.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleOperator.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,aAAa,CAAC;AAIrE;;;GAGG;AACH,MAAM,WAAW,sCAAsC;IACrD,mCAAmC;IACnC,QAAQ,CAAC,EAAE,iCAAiC,CAAC;IAC7C,kEAAkE;IAClE,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,+DAA+D;IAC/D,QAAQ,EAAE,CAAC,QAAQ,EAAE,iCAAiC,KAAK,IAAI,CAAC;CACjE;AAED;;;GAGG;AACH,wBAAgB,yCAAyC,CACvD,KAAK,EAAE,sCAAsC,qBAkC9C;AAGD;;;GAGG;AACH,wBAAgB,qCAAqC,CACnD,QAAQ,EAAE,iCAAiC,UA8B5C"}

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleOperator.js

@@ -30,28 +30,64 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PropertyFilterBuilderRuleOperator = void 0;
+exports.getPropertyFilterBuilderOperatorLabel = exports.PropertyFilterBuilderRuleOperatorRenderer = void 0;
 const React = __importStar(require("react"));
 const itwinui_react_1 = require("@itwin/itwinui-react");
 const Operators_1 = require("./Operators");
+const UiComponents_1 = require("../UiComponents");
 /**
  * Component that renders [[PropertyFilterBuilderRuleRenderer]] operator selector.
  * @internal
  */
-function PropertyFilterBuilderRuleOperator(props) {
-    var _a;
+function PropertyFilterBuilderRuleOperatorRenderer(props) {
     const { operator, property, onChange } = props;
-    const availableOperators = React.useMemo(() => (0, Operators_1.getPropertyFilterOperators)(property), [property]);
-    const selectedOperator = (_a = availableOperators.find((op) => op === operator)) !== null && _a !== void 0 ? _a : availableOperators[0];
+    const availableOperators = React.useMemo(() => (0, Operators_1.getPropertyFilterBuilderOperators)(property), [property]);
+    const selectedOperator = availableOperators.find((op) => op === operator) ?? availableOperators[0];
     React.useEffect(() => {
         onChange(selectedOperator);
     }, [onChange, selectedOperator]);
     const availableOptions = React.useMemo(() => availableOperators.map((op) => ({
         value: op,
-        label: (0, Operators_1.getPropertyFilterOperatorLabel)(op),
+        label: getPropertyFilterBuilderOperatorLabel(op),
     })), [availableOperators]);
-    return (React.createElement("div", { className: "rule-operator" },
+    return (React.createElement("div", { className: "fb-row-condition" },
         React.createElement(itwinui_react_1.Select, { options: availableOptions, value: selectedOperator, onChange: onChange, size: "small" })));
 }
-exports.PropertyFilterBuilderRuleOperator = PropertyFilterBuilderRuleOperator;
+exports.PropertyFilterBuilderRuleOperatorRenderer = PropertyFilterBuilderRuleOperatorRenderer;
+/* istanbul ignore next */
+/**
+ * Function that returns display label for [[PropertyFilterBuilderRuleOperator]].
+ * @beta
+ */
+function getPropertyFilterBuilderOperatorLabel(operator) {
+    switch (operator) {
+        case "is-true":
+            return UiComponents_1.UiComponents.translate("filterBuilder.operators.isTrue");
+        case "is-false":
+            return UiComponents_1.UiComponents.translate("filterBuilder.operators.isFalse");
+        case "is-equal":
+            return UiComponents_1.UiComponents.translate("filterBuilder.operators.equal");
+        case "is-not-equal":
+            return UiComponents_1.UiComponents.translate("filterBuilder.operators.notEqual");
+        case "greater":
+            return ">";
+        case "greater-or-equal":
+            return ">=";
+        case "less":
+            return "<";
+        case "less-or-equal":
+            return "<=";
+        case "like":
+            return UiComponents_1.UiComponents.translate("filterBuilder.operators.contains");
+        case "is-null":
+            return UiComponents_1.UiComponents.translate("filterBuilder.operators.isNull");
+        case "is-not-null":
+            return UiComponents_1.UiComponents.translate("filterBuilder.operators.isNotNull");
+        case "between":
+            return UiComponents_1.UiComponents.translate("filterBuilder.operators.between");
+        case "not-between":
+            return UiComponents_1.UiComponents.translate("filterBuilder.operators.notBetween");
+    }
+}
+exports.getPropertyFilterBuilderOperatorLabel = getPropertyFilterBuilderOperatorLabel;
 //# sourceMappingURL=FilterBuilderRuleOperator.js.map

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleOperator.js.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilderRuleOperator.js","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleOperator.tsx"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6CAA+B;AAE/B,wDAA8C;AAE9C,2CAGqB;AAerB;;;GAGG;AACH,SAAgB,iCAAiC,CAC/C,KAA6C;;IAE7C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAE/C,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,CACtC,GAAG,EAAE,CAAC,IAAA,sCAA0B,EAAC,QAAQ,CAAC,EAC1C,CAAC,QAAQ,CAAC,CACX,CAAC;IACF,MAAM,gBAAgB,GACpB,MAAA,kBAAkB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,QAAQ,CAAC,mCAAI,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAE5E,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC7B,CAAC,EAAE,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEjC,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CACpC,GAAG,EAAE,CACH,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9B,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,IAAA,0CAA8B,EAAC,EAAE,CAAC;KAC1C,CAAC,CAAC,EACL,CAAC,kBAAkB,CAAC,CACrB,CAAC;IAEF,OAAO,CACL,6BAAK,SAAS,EAAC,eAAe;QAC5B,oBAAC,sBAAM,IACL,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAC,OAAO,GACZ,CACE,CACP,CAAC;AACJ,CAAC;AAnCD,8EAmCC","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 PropertyFilterBuilder\n */\n\nimport * as React from \"react\";\nimport type { PropertyDescription } from \"@itwin/appui-abstract\";\nimport { Select } from \"@itwin/itwinui-react\";\nimport type { PropertyFilterRuleOperator } from \"./Operators\";\nimport {\n  getPropertyFilterOperatorLabel,\n  getPropertyFilterOperators,\n} from \"./Operators\";\n\n/**\n * Props for [[PropertyFilterBuilderRuleOperator]] component.\n * @beta\n */\nexport interface PropertyFilterBuilderRuleOperatorProps {\n  /** Currently selected operator. */\n  operator?: PropertyFilterRuleOperator;\n  /** Property used in rule for which this operator will be used. */\n  property: PropertyDescription;\n  /** Callback that is invoked when selected operator changes. */\n  onChange: (operator: PropertyFilterRuleOperator) => void;\n}\n\n/**\n * Component that renders [[PropertyFilterBuilderRuleRenderer]] operator selector.\n * @internal\n */\nexport function PropertyFilterBuilderRuleOperator(\n  props: PropertyFilterBuilderRuleOperatorProps\n) {\n  const { operator, property, onChange } = props;\n\n  const availableOperators = React.useMemo(\n    () => getPropertyFilterOperators(property),\n    [property]\n  );\n  const selectedOperator =\n    availableOperators.find((op) => op === operator) ?? availableOperators[0];\n\n  React.useEffect(() => {\n    onChange(selectedOperator);\n  }, [onChange, selectedOperator]);\n\n  const availableOptions = React.useMemo(\n    () =>\n      availableOperators.map((op) => ({\n        value: op,\n        label: getPropertyFilterOperatorLabel(op),\n      })),\n    [availableOperators]\n  );\n\n  return (\n    <div className=\"rule-operator\">\n      <Select\n        options={availableOptions}\n        value={selectedOperator}\n        onChange={onChange}\n        size=\"small\"\n      />\n    </div>\n  );\n}\n"]}
+{"version":3,"file":"FilterBuilderRuleOperator.js","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleOperator.tsx"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6CAA+B;AAE/B,wDAA8C;AAE9C,2CAAgE;AAChE,kDAA+C;AAe/C;;;GAGG;AACH,SAAgB,yCAAyC,CACvD,KAA6C;IAE7C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAE/C,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,CACtC,GAAG,EAAE,CAAC,IAAA,6CAAiC,EAAC,QAAQ,CAAC,EACjD,CAAC,QAAQ,CAAC,CACX,CAAC;IACF,MAAM,gBAAgB,GACpB,kBAAkB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,QAAQ,CAAC,IAAI,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAE5E,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC7B,CAAC,EAAE,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEjC,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CACpC,GAAG,EAAE,CACH,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9B,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,qCAAqC,CAAC,EAAE,CAAC;KACjD,CAAC,CAAC,EACL,CAAC,kBAAkB,CAAC,CACrB,CAAC;IAEF,OAAO,CACL,6BAAK,SAAS,EAAC,kBAAkB;QAC/B,oBAAC,sBAAM,IACL,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,OAAO,GACb,CACE,CACP,CAAC;AACJ,CAAC;AAnCD,8FAmCC;AAED,0BAA0B;AAC1B;;;GAGG;AACH,SAAgB,qCAAqC,CACnD,QAA2C;IAE3C,QAAQ,QAAQ,EAAE;QAChB,KAAK,SAAS;YACZ,OAAO,2BAAY,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;QAClE,KAAK,UAAU;YACb,OAAO,2BAAY,CAAC,SAAS,CAAC,iCAAiC,CAAC,CAAC;QACnE,KAAK,UAAU;YACb,OAAO,2BAAY,CAAC,SAAS,CAAC,+BAA+B,CAAC,CAAC;QACjE,KAAK,cAAc;YACjB,OAAO,2BAAY,CAAC,SAAS,CAAC,kCAAkC,CAAC,CAAC;QACpE,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC;QACb,KAAK,kBAAkB;YACrB,OAAO,IAAI,CAAC;QACd,KAAK,MAAM;YACT,OAAO,GAAG,CAAC;QACb,KAAK,eAAe;YAClB,OAAO,IAAI,CAAC;QACd,KAAK,MAAM;YACT,OAAO,2BAAY,CAAC,SAAS,CAAC,kCAAkC,CAAC,CAAC;QACpE,KAAK,SAAS;YACZ,OAAO,2BAAY,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;QAClE,KAAK,aAAa;YAChB,OAAO,2BAAY,CAAC,SAAS,CAAC,mCAAmC,CAAC,CAAC;QACrE,KAAK,SAAS;YACZ,OAAO,2BAAY,CAAC,SAAS,CAAC,iCAAiC,CAAC,CAAC;QACnE,KAAK,aAAa;YAChB,OAAO,2BAAY,CAAC,SAAS,CAAC,oCAAoC,CAAC,CAAC;KACvE;AACH,CAAC;AA/BD,sFA+BC","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 PropertyFilterBuilder\n */\n\nimport * as React from \"react\";\nimport { type PropertyDescription } from \"@itwin/appui-abstract\";\nimport { Select } from \"@itwin/itwinui-react\";\nimport type { PropertyFilterBuilderRuleOperator } from \"./Operators\";\nimport { getPropertyFilterBuilderOperators } from \"./Operators\";\nimport { UiComponents } from \"../UiComponents\";\n\n/**\n * Props for [[PropertyFilterBuilderRuleOperator]] component.\n * @beta\n */\nexport interface PropertyFilterBuilderRuleOperatorProps {\n  /** Currently selected operator. */\n  operator?: PropertyFilterBuilderRuleOperator;\n  /** Property used in rule for which this operator will be used. */\n  property: PropertyDescription;\n  /** Callback that is invoked when selected operator changes. */\n  onChange: (operator: PropertyFilterBuilderRuleOperator) => void;\n}\n\n/**\n * Component that renders [[PropertyFilterBuilderRuleRenderer]] operator selector.\n * @internal\n */\nexport function PropertyFilterBuilderRuleOperatorRenderer(\n  props: PropertyFilterBuilderRuleOperatorProps\n) {\n  const { operator, property, onChange } = props;\n\n  const availableOperators = React.useMemo(\n    () => getPropertyFilterBuilderOperators(property),\n    [property]\n  );\n  const selectedOperator =\n    availableOperators.find((op) => op === operator) ?? availableOperators[0];\n\n  React.useEffect(() => {\n    onChange(selectedOperator);\n  }, [onChange, selectedOperator]);\n\n  const availableOptions = React.useMemo(\n    () =>\n      availableOperators.map((op) => ({\n        value: op,\n        label: getPropertyFilterBuilderOperatorLabel(op),\n      })),\n    [availableOperators]\n  );\n\n  return (\n    <div className=\"fb-row-condition\">\n      <Select\n        options={availableOptions}\n        value={selectedOperator}\n        onChange={onChange}\n        size={\"small\"}\n      />\n    </div>\n  );\n}\n\n/* istanbul ignore next */\n/**\n * Function that returns display label for [[PropertyFilterBuilderRuleOperator]].\n * @beta\n */\nexport function getPropertyFilterBuilderOperatorLabel(\n  operator: PropertyFilterBuilderRuleOperator\n) {\n  switch (operator) {\n    case \"is-true\":\n      return UiComponents.translate(\"filterBuilder.operators.isTrue\");\n    case \"is-false\":\n      return UiComponents.translate(\"filterBuilder.operators.isFalse\");\n    case \"is-equal\":\n      return UiComponents.translate(\"filterBuilder.operators.equal\");\n    case \"is-not-equal\":\n      return UiComponents.translate(\"filterBuilder.operators.notEqual\");\n    case \"greater\":\n      return \">\";\n    case \"greater-or-equal\":\n      return \">=\";\n    case \"less\":\n      return \"<\";\n    case \"less-or-equal\":\n      return \"<=\";\n    case \"like\":\n      return UiComponents.translate(\"filterBuilder.operators.contains\");\n    case \"is-null\":\n      return UiComponents.translate(\"filterBuilder.operators.isNull\");\n    case \"is-not-null\":\n      return UiComponents.translate(\"filterBuilder.operators.isNotNull\");\n    case \"between\":\n      return UiComponents.translate(\"filterBuilder.operators.between\");\n    case \"not-between\":\n      return UiComponents.translate(\"filterBuilder.operators.notBetween\");\n  }\n}\n"]}

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleProperty.d.ts

@@ -23,5 +23,5 @@ export interface PropertyFilterBuilderRulePropertyProps {
  * Component that renders [[PropertyFilterBuilderRuleRenderer]] property selector.
  * @internal
  */
-export declare function PropertyFilterBuilderRuleProperty(props: PropertyFilterBuilderRulePropertyProps): JSX.Element;
+export declare function PropertyFilterBuilderRuleProperty(props: PropertyFilterBuilderRulePropertyProps): React.JSX.Element;
 //# sourceMappingURL=FilterBuilderRuleProperty.d.ts.map

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleProperty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilderRuleProperty.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleProperty.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAOjE;;;GAGG;AACH,MAAM,WAAW,sCAAsC;IACrD,oCAAoC;IACpC,UAAU,EAAE,mBAAmB,EAAE,CAAC;IAClC,mCAAmC;IACnC,gBAAgB,CAAC,EAAE,mBAAmB,CAAC;IACvC,+DAA+D;IAC/D,yBAAyB,EAAE,CAAC,QAAQ,CAAC,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACpE,yDAAyD;IACzD,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC,SAAS,CAAC;IACrD,4DAA4D;IAC5D,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,sCAAsC,eAoE9C"}
+{"version":3,"file":"FilterBuilderRuleProperty.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleProperty.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAOjE;;;GAGG;AACH,MAAM,WAAW,sCAAsC;IACrD,oCAAoC;IACpC,UAAU,EAAE,mBAAmB,EAAE,CAAC;IAClC,mCAAmC;IACnC,gBAAgB,CAAC,EAAE,mBAAmB,CAAC;IACvC,+DAA+D;IAC/D,yBAAyB,EAAE,CAAC,QAAQ,CAAC,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACpE,yDAAyD;IACzD,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC,SAAS,CAAC;IACrD,4DAA4D;IAC5D,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,sCAAsC,qBAoE9C"}

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleProperty.js

@@ -49,8 +49,8 @@ function PropertyFilterBuilderRuleProperty(props) {
         onSelectedPropertyChanged(properties.find((property) => property.name === name));
     }, [properties, onSelectedPropertyChanged]);
     React.useEffect(() => {
-        const currentSelectedProperty = properties.find((property) => property.name === (selectedProperty === null || selectedProperty === void 0 ? void 0 : selectedProperty.name));
-        if ((currentSelectedProperty === null || currentSelectedProperty === void 0 ? void 0 : currentSelectedProperty.name) !== (selectedProperty === null || selectedProperty === void 0 ? void 0 : selectedProperty.name))
+        const currentSelectedProperty = properties.find((property) => property.name === selectedProperty?.name);
+        if (currentSelectedProperty?.name !== selectedProperty?.name)
             onSelectedPropertyChanged(currentSelectedProperty);
     }, [properties, selectedProperty, onSelectedPropertyChanged]);
     const itemRenderer = React.useCallback((selectOption, { isSelected, id }) => {
@@ -58,8 +58,8 @@ function PropertyFilterBuilderRuleProperty(props) {
             ? propertyRenderer(selectOption.value)
             : selectOption.label));
     }, [propertyRenderer]);
-    return (React.createElement("div", { className: "rule-property" },
-        React.createElement(itwinui_react_1.ComboBox, { options: selectOptions, onChange: onPropertyChanged, value: selectedProperty === null || selectedProperty === void 0 ? void 0 : selectedProperty.name, inputProps: {
+    return (React.createElement("div", { className: "fb-property-name" },
+        React.createElement(itwinui_react_1.ComboBox, { options: selectOptions, onChange: onPropertyChanged, value: selectedProperty?.name, inputProps: {
                 placeholder: UiComponents_1.UiComponents.translate("filterBuilder.chooseProperty"),
                 disabled: isDisabled,
                 size: "small",

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleProperty.js.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilderRuleProperty.js","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleProperty.tsx"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6CAA+B;AAG/B,wDAA0D;AAC1D,kDAA+C;AAqB/C;;;GAGG;AACH,SAAgB,iCAAiC,CAC/C,KAA6C;IAE7C,MAAM,EACJ,gBAAgB,EAChB,UAAU,EACV,yBAAyB,EACzB,gBAAgB,EAChB,UAAU,GACX,GAAG,KAAK,CAAC;IAEV,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CACjC,GAAG,EAAE,CACH,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC5B,EAAE,EAAE,QAAQ,CAAC,IAAI;QACjB,KAAK,EAAE,QAAQ,CAAC,YAAY;QAC5B,KAAK,EAAE,QAAQ,CAAC,IAAI;KACrB,CAAC,CAAC,EACL,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CACzC,CAAC,IAAY,EAAE,EAAE;QACf,yBAAyB,CACvB,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,CACtD,CAAC;IACJ,CAAC,EACD,CAAC,UAAU,EAAE,yBAAyB,CAAC,CACxC,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,uBAAuB,GAAG,UAAU,CAAC,IAAI,CAC7C,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,MAAK,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,CAAA,CACvD,CAAC;QACF,IAAI,CAAA,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAE,IAAI,OAAK,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,CAAA;YAC1D,yBAAyB,CAAC,uBAAuB,CAAC,CAAC;IACvD,CAAC,EAAE,CAAC,UAAU,EAAE,gBAAgB,EAAE,yBAAyB,CAAC,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAGpC,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE;QACnC,OAAO,CACL,oBAAC,wBAAQ,IAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,IAC9C,gBAAgB;YACf,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,CAAC;YACtC,CAAC,CAAC,YAAY,CAAC,KAAK,CACb,CACZ,CAAC;IACJ,CAAC,EACD,CAAC,gBAAgB,CAAC,CACnB,CAAC;IAEF,OAAO,CACL,6BAAK,SAAS,EAAC,eAAe;QAC5B,oBAAC,wBAAQ,IACP,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EAAE,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,EAC7B,UAAU,EAAE;gBACV,WAAW,EAAE,2BAAY,CAAC,SAAS,CAAC,8BAA8B,CAAC;gBACnE,QAAQ,EAAE,UAAU;gBACpB,IAAI,EAAE,OAAO;aACd,EACD,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,IAAI,GAC1B,CACE,CACP,CAAC;AACJ,CAAC;AArED,8EAqEC","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 PropertyFilterBuilder\n */\n\nimport * as React from \"react\";\nimport type { PropertyDescription } from \"@itwin/appui-abstract\";\nimport type { SelectOption } from \"@itwin/itwinui-react\";\nimport { ComboBox, MenuItem } from \"@itwin/itwinui-react\";\nimport { UiComponents } from \"../UiComponents\";\n\ntype ComboBoxProps<T> = React.ComponentPropsWithoutRef<typeof ComboBox<T>>;\n\n/**\n * Props for [[PropertyFilterBuilderRuleProperty]] component.\n * @internal\n */\nexport interface PropertyFilterBuilderRulePropertyProps {\n  /** List of available properties. */\n  properties: PropertyDescription[];\n  /** Currently selected property. */\n  selectedProperty?: PropertyDescription;\n  /** Callback that is invoked when selected property changes. */\n  onSelectedPropertyChanged: (property?: PropertyDescription) => void;\n  /** Custom renderer for property item inside selector. */\n  propertyRenderer?: (name: string) => React.ReactNode;\n  /** Specifies whether selector should be disabled or not. */\n  isDisabled?: boolean;\n}\n\n/**\n * Component that renders [[PropertyFilterBuilderRuleRenderer]] property selector.\n * @internal\n */\nexport function PropertyFilterBuilderRuleProperty(\n  props: PropertyFilterBuilderRulePropertyProps\n) {\n  const {\n    selectedProperty,\n    properties,\n    onSelectedPropertyChanged,\n    propertyRenderer,\n    isDisabled,\n  } = props;\n\n  const selectOptions = React.useMemo<SelectOption<string>[]>(\n    () =>\n      properties.map((property) => ({\n        id: property.name,\n        label: property.displayLabel,\n        value: property.name,\n      })),\n    [properties]\n  );\n\n  const onPropertyChanged = React.useCallback(\n    (name: string) => {\n      onSelectedPropertyChanged(\n        properties.find((property) => property.name === name)\n      );\n    },\n    [properties, onSelectedPropertyChanged]\n  );\n\n  React.useEffect(() => {\n    const currentSelectedProperty = properties.find(\n      (property) => property.name === selectedProperty?.name\n    );\n    if (currentSelectedProperty?.name !== selectedProperty?.name)\n      onSelectedPropertyChanged(currentSelectedProperty);\n  }, [properties, selectedProperty, onSelectedPropertyChanged]);\n\n  const itemRenderer = React.useCallback<\n    Required<ComboBoxProps<string>>[\"itemRenderer\"]\n  >(\n    (selectOption, { isSelected, id }) => {\n      return (\n        <MenuItem key={id} id={id} isSelected={isSelected}>\n          {propertyRenderer\n            ? propertyRenderer(selectOption.value)\n            : selectOption.label}\n        </MenuItem>\n      );\n    },\n    [propertyRenderer]\n  );\n\n  return (\n    <div className=\"rule-property\">\n      <ComboBox\n        options={selectOptions}\n        onChange={onPropertyChanged}\n        value={selectedProperty?.name}\n        inputProps={{\n          placeholder: UiComponents.translate(\"filterBuilder.chooseProperty\"),\n          disabled: isDisabled,\n          size: \"small\",\n        }}\n        itemRenderer={itemRenderer}\n        enableVirtualization={true}\n      />\n    </div>\n  );\n}\n"]}
+{"version":3,"file":"FilterBuilderRuleProperty.js","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleProperty.tsx"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6CAA+B;AAG/B,wDAA0D;AAC1D,kDAA+C;AAqB/C;;;GAGG;AACH,SAAgB,iCAAiC,CAC/C,KAA6C;IAE7C,MAAM,EACJ,gBAAgB,EAChB,UAAU,EACV,yBAAyB,EACzB,gBAAgB,EAChB,UAAU,GACX,GAAG,KAAK,CAAC;IAEV,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CACjC,GAAG,EAAE,CACH,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC5B,EAAE,EAAE,QAAQ,CAAC,IAAI;QACjB,KAAK,EAAE,QAAQ,CAAC,YAAY;QAC5B,KAAK,EAAE,QAAQ,CAAC,IAAI;KACrB,CAAC,CAAC,EACL,CAAC,UAAU,CAAC,CACb,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CACzC,CAAC,IAAY,EAAE,EAAE;QACf,yBAAyB,CACvB,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,CACtD,CAAC;IACJ,CAAC,EACD,CAAC,UAAU,EAAE,yBAAyB,CAAC,CACxC,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,uBAAuB,GAAG,UAAU,CAAC,IAAI,CAC7C,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,gBAAgB,EAAE,IAAI,CACvD,CAAC;QACF,IAAI,uBAAuB,EAAE,IAAI,KAAK,gBAAgB,EAAE,IAAI;YAC1D,yBAAyB,CAAC,uBAAuB,CAAC,CAAC;IACvD,CAAC,EAAE,CAAC,UAAU,EAAE,gBAAgB,EAAE,yBAAyB,CAAC,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAGpC,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE;QACnC,OAAO,CACL,oBAAC,wBAAQ,IAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,IAC9C,gBAAgB;YACf,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,CAAC;YACtC,CAAC,CAAC,YAAY,CAAC,KAAK,CACb,CACZ,CAAC;IACJ,CAAC,EACD,CAAC,gBAAgB,CAAC,CACnB,CAAC;IAEF,OAAO,CACL,6BAAK,SAAS,EAAC,kBAAkB;QAC/B,oBAAC,wBAAQ,IACP,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAC7B,UAAU,EAAE;gBACV,WAAW,EAAE,2BAAY,CAAC,SAAS,CAAC,8BAA8B,CAAC;gBACnE,QAAQ,EAAE,UAAU;gBACpB,IAAI,EAAE,OAAO;aACd,EACD,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,IAAI,GAC1B,CACE,CACP,CAAC;AACJ,CAAC;AArED,8EAqEC","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 PropertyFilterBuilder\n */\n\nimport * as React from \"react\";\nimport type { PropertyDescription } from \"@itwin/appui-abstract\";\nimport type { SelectOption } from \"@itwin/itwinui-react\";\nimport { ComboBox, MenuItem } from \"@itwin/itwinui-react\";\nimport { UiComponents } from \"../UiComponents\";\n\ntype ComboBoxProps<T> = React.ComponentPropsWithoutRef<typeof ComboBox<T>>;\n\n/**\n * Props for [[PropertyFilterBuilderRuleProperty]] component.\n * @internal\n */\nexport interface PropertyFilterBuilderRulePropertyProps {\n  /** List of available properties. */\n  properties: PropertyDescription[];\n  /** Currently selected property. */\n  selectedProperty?: PropertyDescription;\n  /** Callback that is invoked when selected property changes. */\n  onSelectedPropertyChanged: (property?: PropertyDescription) => void;\n  /** Custom renderer for property item inside selector. */\n  propertyRenderer?: (name: string) => React.ReactNode;\n  /** Specifies whether selector should be disabled or not. */\n  isDisabled?: boolean;\n}\n\n/**\n * Component that renders [[PropertyFilterBuilderRuleRenderer]] property selector.\n * @internal\n */\nexport function PropertyFilterBuilderRuleProperty(\n  props: PropertyFilterBuilderRulePropertyProps\n) {\n  const {\n    selectedProperty,\n    properties,\n    onSelectedPropertyChanged,\n    propertyRenderer,\n    isDisabled,\n  } = props;\n\n  const selectOptions = React.useMemo<SelectOption<string>[]>(\n    () =>\n      properties.map((property) => ({\n        id: property.name,\n        label: property.displayLabel,\n        value: property.name,\n      })),\n    [properties]\n  );\n\n  const onPropertyChanged = React.useCallback(\n    (name: string) => {\n      onSelectedPropertyChanged(\n        properties.find((property) => property.name === name)\n      );\n    },\n    [properties, onSelectedPropertyChanged]\n  );\n\n  React.useEffect(() => {\n    const currentSelectedProperty = properties.find(\n      (property) => property.name === selectedProperty?.name\n    );\n    if (currentSelectedProperty?.name !== selectedProperty?.name)\n      onSelectedPropertyChanged(currentSelectedProperty);\n  }, [properties, selectedProperty, onSelectedPropertyChanged]);\n\n  const itemRenderer = React.useCallback<\n    Required<ComboBoxProps<string>>[\"itemRenderer\"]\n  >(\n    (selectOption, { isSelected, id }) => {\n      return (\n        <MenuItem key={id} id={id} isSelected={isSelected}>\n          {propertyRenderer\n            ? propertyRenderer(selectOption.value)\n            : selectOption.label}\n        </MenuItem>\n      );\n    },\n    [propertyRenderer]\n  );\n\n  return (\n    <div className=\"fb-property-name\">\n      <ComboBox\n        options={selectOptions}\n        onChange={onPropertyChanged}\n        value={selectedProperty?.name}\n        inputProps={{\n          placeholder: UiComponents.translate(\"filterBuilder.chooseProperty\"),\n          disabled: isDisabled,\n          size: \"small\",\n        }}\n        itemRenderer={itemRenderer}\n        enableVirtualization={true}\n      />\n    </div>\n  );\n}\n"]}

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleValue.d.ts

@@ -1,9 +1,9 @@
 /** @packageDocumentation
  * @module PropertyFilterBuilder
  */
-/// <reference types="react" />
+import * as React from "react";
 import type { PropertyDescription, PropertyValue } from "@itwin/appui-abstract";
-import type { PropertyFilterRuleOperator } from "./Operators";
+import type { PropertyFilterBuilderRuleOperator } from "./Operators";
 /**
  * Props for [[PropertyFilterBuilderRuleValue]] component.
  * @beta
@@ -22,11 +22,11 @@ export interface PropertyFilterBuilderRuleValueProps {
  */
 export interface PropertyFilterBuilderRuleValueRendererProps extends PropertyFilterBuilderRuleValueProps {
     /** Current operator. */
-    operator: PropertyFilterRuleOperator;
+    operator: PropertyFilterBuilderRuleOperator;
 }
 /**
  * Component that renders [[PropertyFilterBuilderRuleRenderer]] value input.
  * @beta
  */
-export declare function PropertyFilterBuilderRuleValue(props: PropertyFilterBuilderRuleValueProps): JSX.Element;
+export declare function PropertyFilterBuilderRuleValue(props: PropertyFilterBuilderRuleValueRendererProps): React.JSX.Element;
 //# sourceMappingURL=FilterBuilderRuleValue.d.ts.map

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilderRuleValue.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleValue.tsx"],"names":[],"mappings":"AAIA;;GAEG;;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAIhF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAE9D;;;GAGG;AACH,MAAM,WAAW,mCAAmC;IAClD,+BAA+B;IAC/B,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,qEAAqE;IACrE,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,mDAAmD;IACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC1C;AAED;;;GAGG;AACH,MAAM,WAAW,2CACf,SAAQ,mCAAmC;IAC3C,wBAAwB;IACxB,QAAQ,EAAE,0BAA0B,CAAC;CACtC;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,mCAAmC,eA2B3C"}
+{"version":3,"file":"FilterBuilderRuleValue.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleValue.tsx"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMhF,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,aAAa,CAAC;AAGrE;;;GAGG;AACH,MAAM,WAAW,mCAAmC;IAClD,+BAA+B;IAC/B,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,qEAAqE;IACrE,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,mDAAmD;IACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC1C;AAED;;;GAGG;AACH,MAAM,WAAW,2CACf,SAAQ,mCAAmC;IAC3C,wBAAwB;IACxB,QAAQ,EAAE,iCAAiC,CAAC;CAC7C;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,2CAA2C,qBASnD"}

package/lib/cjs/components-react/filter-builder/FilterBuilderRuleValue.js

@@ -34,19 +34,57 @@ exports.PropertyFilterBuilderRuleValue = void 0;
 const React = __importStar(require("react"));
 const appui_abstract_1 = require("@itwin/appui-abstract");
 const EditorContainer_1 = require("../editors/EditorContainer");
+const itwinui_react_1 = require("@itwin/itwinui-react");
+const FilterBuilderRangeValue_1 = require("./FilterBuilderRangeValue");
+const UiComponents_1 = require("../UiComponents");
 /**
  * Component that renders [[PropertyFilterBuilderRuleRenderer]] value input.
  * @beta
  */
 function PropertyFilterBuilderRuleValue(props) {
-    const { value, property, onChange } = props;
+    const { operator, ...restProps } = props;
+    return operator === "between" || operator === "not-between" ? (React.createElement(FilterBuilderRuleRangeValueRenderer, { ...restProps })) : (React.createElement(FilterBuilderRulePrimitiveValueRenderer, { ...restProps }));
+}
+exports.PropertyFilterBuilderRuleValue = PropertyFilterBuilderRuleValue;
+function FilterBuilderRulePrimitiveValueRenderer({ property, value, onChange, }) {
     const propertyRecord = React.useMemo(() => {
-        return new appui_abstract_1.PropertyRecord(value !== null && value !== void 0 ? value : { valueFormat: appui_abstract_1.PropertyValueFormat.Primitive }, property);
+        return new appui_abstract_1.PropertyRecord(value ?? { valueFormat: appui_abstract_1.PropertyValueFormat.Primitive }, property);
     }, [value, property]);
     const onValueChange = React.useCallback(({ newValue }) => {
         onChange(newValue);
     }, [onChange]);
     return (React.createElement(EditorContainer_1.EditorContainer, { propertyRecord: propertyRecord, onCancel: /* istanbul ignore next */ () => { }, onCommit: onValueChange, setFocus: false, shouldCommitOnChange: false }));
 }
-exports.PropertyFilterBuilderRuleValue = PropertyFilterBuilderRuleValue;
+function FilterBuilderRuleRangeValueRenderer({ property, value, onChange, }) {
+    const { from, to } = React.useMemo(() => {
+        const rangeValue = FilterBuilderRangeValue_1.PropertyFilterBuilderRuleRangeValue.parse(value);
+        return {
+            from: new appui_abstract_1.PropertyRecord(rangeValue.from, property),
+            to: new appui_abstract_1.PropertyRecord(rangeValue.to, property),
+        };
+    }, [property, value]);
+    const handleFromValue = React.useCallback(({ newValue }) => {
+        onChange(getSerializedRangeValue(newValue, to.value));
+    }, [onChange, to]);
+    const handleToValue = React.useCallback(({ newValue }) => {
+        onChange(getSerializedRangeValue(from.value, newValue));
+    }, [onChange, from]);
+    return (React.createElement(itwinui_react_1.Flex, { className: "rule-value-range", display: "inline-flex", flexDirection: "row" },
+        React.createElement(itwinui_react_1.Flex.Item, null,
+            React.createElement(EditorContainer_1.EditorContainer, { propertyRecord: from, onCancel: /* istanbul ignore next */ () => { }, onCommit: handleFromValue, setFocus: false, shouldCommitOnChange: false })),
+        React.createElement(itwinui_react_1.Text, null, UiComponents_1.UiComponents.translate("filterBuilder.operators.and").toLowerCase()),
+        React.createElement(itwinui_react_1.Flex.Item, null,
+            React.createElement(EditorContainer_1.EditorContainer, { propertyRecord: to, onCancel: /* istanbul ignore next */ () => { }, onCommit: handleToValue, setFocus: false, shouldCommitOnChange: false }))));
+}
+// istanbul ignore next
+function getSerializedRangeValue(from, to) {
+    return FilterBuilderRangeValue_1.PropertyFilterBuilderRuleRangeValue.serialize({
+        from: from.valueFormat === appui_abstract_1.PropertyValueFormat.Primitive
+            ? from
+            : { valueFormat: appui_abstract_1.PropertyValueFormat.Primitive },
+        to: to.valueFormat === appui_abstract_1.PropertyValueFormat.Primitive
+            ? to
+            : { valueFormat: appui_abstract_1.PropertyValueFormat.Primitive },
+    });
+}
 //# sourceMappingURL=FilterBuilderRuleValue.js.map