npm - @itwin/components-react - Versions diffs - 4.16.5 → 4.17.1 - Mend

@itwin/components-react 4.16.5 → 4.17.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (150) hide show

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

@@ -43,17 +43,16 @@ const FilterBuilderLogicalOperator_1 = require("./FilterBuilderLogicalOperator")
  * @internal
  */
 function PropertyFilterBuilderRuleGroupRenderer(props) {
-    const { path, group, isGroupOperatorDisabled } = props;
+    const { path, group, isGroupOperatorDisabled, allowLastRuleDelete } = 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 showOperator = group.items.length > 1;
     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(PropertyFilterBuilderRuleGroupOperator, { operator: group.operator, onChange: onOperatorChange, isGroupOperatorDisabled: isGroupOperatorDisabled }),
         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 })))))));
+            React.createElement(PropertyFilterBuilderGroupOrRule, { path: path, item: item, onRuleAdded: onRuleAdded, allowLastRuleDelete: allowLastRuleDelete })))))));
 }
 exports.PropertyFilterBuilderRuleGroupRenderer = PropertyFilterBuilderRuleGroupRenderer;
 /**
@@ -66,11 +65,11 @@ function PropertyFilterBuilderRuleGroupOperator(props) {
         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, onRuleAdded, }) {
+const PropertyFilterBuilderGroupOrRule = React.memo(function PropertyFilterBuilderGroupOrRule({ path, item, onRuleAdded, allowLastRuleDelete, }) {
     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, onRuleAdded: onRuleAdded }));
+    return (React.createElement(FilterBuilderRule_1.PropertyFilterBuilderRuleRenderer, { path: itemPath, rule: item, onRuleAdded: onRuleAdded, allowLastRuleDelete: allowLastRuleDelete }));
 });
 const useRulePropertyFocus = (currentGroupItemsLength) => {
     const previousGroupItemsLength = React.useRef(0);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"FilterBuilderRuleGroup.js","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderRuleGroup.tsx"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,yCAAuC;AACvC,6CAA+B;AAC/B,wDAA4C;AAC5C,iEAAsE;AACtE,2DAAwE;AAKxE,6DAAwE;AAExE,iFAAsF;~~AAetF~~;;;GAGG;AACH,SAAgB,sCAAsC,CACpD,KAAkD;IAElD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,uBAAuB,EAAE,GAAG,KAAK,CAAC;~~IACvD~~,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,mDAA4B,CAAC,CAAC;IACnE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE3E,MAAM,gBAAgB,GAAG,KAAK,CAAC,WAAW,CACxC,CAAC,QAA8C,EAAE,EAAE;QACjD,OAAO,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC,EACD,CAAC,IAAI,EAAE,OAAO,CAAC,CAChB,CAAC;IAEF,~~MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAE5C,~~OAAO,CACL,oBAAC,oBAAI,IACH,GAAG,EAAE,QAAQ,EACb,KAAK,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,EAClC,SAAS,EAAC,UAAU,EACpB,GAAG,EAAC,KAAK;~~QAER~~,~~YAAY,CAAC,CAAC,CAAC,CACd,~~oBAAC,sCAAsC,IACrC,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,QAAQ,EAAE,gBAAgB,EAC1B,uBAAuB,EAAE,uBAAuB,GAChD~~,CACH,CAAC,CAAC,CAAC,IAAI~~;~~QACR~~,6BAAK,SAAS,EAAC,YAAY,IACxB,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACzB,6BAAK,SAAS,EAAC,QAAQ,EAAC,GAAG,EAAE,IAAI,CAAC,EAAE;YAClC,oBAAC,gCAAgC,IAC/B,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,WAAW,~~GACxB~~,CACE,CACP,CAAC,CACE,CACD,CACR,CAAC;AACJ,CAAC;~~AA3CD~~,~~wFA2CC~~;AAeD;;;GAGG;AACH,SAAgB,sCAAsC,CACpD,KAAkD;IAElD,MAAM,EAAE,QAAQ,EAAE,uBAAuB,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAE9D,OAAO,CACL,oBAAC,oBAAI,CAAC,IAAI,IAAC,SAAS,EAAC,SAAS;QAC5B,oBAAC,mEAAoC,IACnC,SAAS,EAAC,mBAAmB,EAC7B,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,QAAQ,EAC1B,UAAU,EAAE,uBAAuB,GACnC,CACQ,CACb,CAAC;AACJ,CAAC;AAfD,wFAeC;~~AAOD~~,MAAM,gCAAgC,GAAG,KAAK,CAAC,IAAI,CACjD,SAAS,gCAAgC,CAAC,EACxC,IAAI,EACJ,IAAI,EACJ,WAAW,~~GAC2B~~;IACtC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAEpC,IAAI,IAAA,qDAAgC,EAAC,IAAI,CAAC;QACxC,OAAO,CACL,oBAAC,sCAAsC,IAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,GAAI,CACxE,CAAC;IACJ,OAAO,CACL,oBAAC,qDAAiC,IAChC,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,WAAW,~~GACxB~~,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,uBAA+B,EAAE,EAAE;IAC/D,MAAM,wBAAwB,GAAG,KAAK,CAAC,MAAM,CAAS,CAAC,CAAC,CAAC;IACzD,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAU,KAAK,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAiB,IAAI,CAAC,CAAC;IACpD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IACE,cAAc,CAAC,OAAO;YACtB,wBAAwB,CAAC,OAAO,GAAG,uBAAuB;YAC1D,QAAQ,CAAC,OAAO,EAChB,CAAC;YACD,MAAM,cAAc,GAClB,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAC/B,yBAAyB,CAC1B,CAAC;YACJ,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YAClD,cAAc,CAAC,OAAO,GAAG,KAAK,CAAC;QACjC,CAAC;QACD,wBAAwB,CAAC,OAAO,GAAG,uBAAuB,CAAC;IAC7D,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAE9B,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;AAC1E,CAAC,CAAC","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"]}
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 { 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 /* Controls whether the last rule remaining in a group is deletable /\n allowLastRuleDelete?: 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, allowLastRuleDelete } = 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 return (\n <Flex\n ref={groupRef}\n style={{ alignSelf: \"flex-start\" }}\n className=\"fb-group\"\n gap=\"0px\"\n >\n <PropertyFilterBuilderRuleGroupOperator\n operator={group.operator}\n onChange={onOperatorChange}\n isGroupOperatorDisabled={isGroupOperatorDisabled}\n />\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 allowLastRuleDelete={allowLastRuleDelete}\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 allowLastRuleDelete?: boolean;\n}\n\nconst PropertyFilterBuilderGroupOrRule = React.memo(\n function PropertyFilterBuilderGroupOrRule({\n path,\n item,\n onRuleAdded,\n allowLastRuleDelete,\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 allowLastRuleDelete={allowLastRuleDelete}\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 CHANGED Viewed

@@ -4,12 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 .fb-group {
   --border-color: var(--iui-color-border);
-  --fb-operator-width: 110px;
+  --fb-operator-width: 128px;
   --divider-width: var(--iui-size-2xs);
   --divider-background-color: var(--iui-color-border-subtle);
+  gap: var(--iui-size-s);
   .fb-wrapper {
     width: 100%;
+    display: flex;
+    flex-direction: column;
+    gap: var(--iui-size-xs);
   }
   .fb-logical-operator {
@@ -18,17 +22,14 @@
     text-align: center;
     background-color: var(--iui-color-background-hover);
     user-select: none;
+    -webkit-user-select: none;
     display: grid;
     place-items: center;
     box-sizing: border-box;
-    font-size: var(--iui-font-size-2);
     font-weight: var(--iui-font-weight-semibold);
-    padding-block: var(--iui-size-s);
   }
   .fb-group-operator {
-    border-style: solid;
-    border-color: var(--border-color);
-    border-width: 1px 0 1px 1px;
+    border: 1px solid var(--border-color);
   }
 }

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

@@ -21,9 +21,4 @@ export interface PropertyFilterBuilderRuleOperatorProps {
  * @internal
  */
 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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"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~~;AAED;;;GAGG;AACH,wBAAgB,qCAAqC,CACnD,QAAQ,EAAE,iCAAiC,UA8B5C~~"}
1	+ {"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"}

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

@@ -30,17 +30,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPropertyFilterBuilderOperatorLabel = exports.PropertyFilterBuilderRuleOperatorRenderer = void 0;
+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");
+const useTranslation_1 = require("../l10n/useTranslation");
 /**
  * Component that renders [[PropertyFilterBuilderRuleRenderer]] operator selector.
  * @internal
  */
 function PropertyFilterBuilderRuleOperatorRenderer(props) {
     const { operator, property, onChange } = props;
+    const getLabel = usePropertyFilterBuilderOperatorLabels();
     const availableOperators = React.useMemo(() => (0, Operators_1.getPropertyFilterBuilderOperators)(property), [property]);
     const selectedOperator = availableOperators.find((op) => op === operator) ?? availableOperators[0];
     React.useEffect(() => {
@@ -48,8 +49,8 @@ function PropertyFilterBuilderRuleOperatorRenderer(props) {
     }, [onChange, selectedOperator]);
     const availableOptions = React.useMemo(() => availableOperators.map((op) => ({
         value: op,
-        label: getPropertyFilterBuilderOperatorLabel(op),
-    })), [availableOperators]);
+        label: getLabel(op),
+    })), [availableOperators, getLabel]);
     return (React.createElement("div", { className: "fb-row-condition" },
         React.createElement(itwinui_react_1.Select, { options: availableOptions, value: selectedOperator, onChange: onChange, size: "small" })));
 }
@@ -58,35 +59,37 @@ exports.PropertyFilterBuilderRuleOperatorRenderer = PropertyFilterBuilderRuleOpe
  * 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");
-    }
+function usePropertyFilterBuilderOperatorLabels() {
+    const { translate } = (0, useTranslation_1.useTranslation)();
+    return React.useCallback((operator) => {
+        switch (operator) {
+            case "is-true":
+                return translate("filterBuilder.operators.isTrue");
+            case "is-false":
+                return translate("filterBuilder.operators.isFalse");
+            case "is-equal":
+                return translate("filterBuilder.operators.equal");
+            case "is-not-equal":
+                return translate("filterBuilder.operators.notEqual");
+            case "greater":
+                return ">";
+            case "greater-or-equal":
+                return ">=";
+            case "less":
+                return "<";
+            case "less-or-equal":
+                return "<=";
+            case "like":
+                return translate("filterBuilder.operators.contains");
+            case "is-null":
+                return translate("filterBuilder.operators.isNull");
+            case "is-not-null":
+                return translate("filterBuilder.operators.isNotNull");
+            case "between":
+                return translate("filterBuilder.operators.between");
+            case "not-between":
+                return translate("filterBuilder.operators.notBetween");
+        }
+    }, [translate]);
 }
-exports.getPropertyFilterBuilderOperatorLabel = getPropertyFilterBuilderOperatorLabel;
 //# sourceMappingURL=FilterBuilderRuleOperator.js.map

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

	@@ -1 +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,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;;;GAGG;AACH,~~SAAgB~~,~~qCAAqC~~,~~CACnD~~,QAA2C;~~IAE3C~~,QAAQ,QAAQ,EAAE,CAAC;~~QACjB~~,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;~~IACxE~~,CAAC;~~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/\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"]}
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,2CAAgE;AAChE,2DAAwD;AAexD;;;GAGG;AACH,SAAgB,yCAAyC,CACvD,KAA6C;IAE7C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC/C,MAAM,QAAQ,GAAG,sCAAsC,EAAE,CAAC;IAC1D,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,QAAQ,CAAC,EAAE,CAAC;KACpB,CAAC,CAAC,EACL,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAC/B,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;;;GAGG;AACH,SAAS,sCAAsC;IAC7C,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,+BAAc,GAAE,CAAC;IAEvC,OAAO,KAAK,CAAC,WAAW,CACtB,CAAC,QAA2C,EAAE,EAAE;QAC9C,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,SAAS;gBACZ,OAAO,SAAS,CAAC,gCAAgC,CAAC,CAAC;YACrD,KAAK,UAAU;gBACb,OAAO,SAAS,CAAC,iCAAiC,CAAC,CAAC;YACtD,KAAK,UAAU;gBACb,OAAO,SAAS,CAAC,+BAA+B,CAAC,CAAC;YACpD,KAAK,cAAc;gBACjB,OAAO,SAAS,CAAC,kCAAkC,CAAC,CAAC;YACvD,KAAK,SAAS;gBACZ,OAAO,GAAG,CAAC;YACb,KAAK,kBAAkB;gBACrB,OAAO,IAAI,CAAC;YACd,KAAK,MAAM;gBACT,OAAO,GAAG,CAAC;YACb,KAAK,eAAe;gBAClB,OAAO,IAAI,CAAC;YACd,KAAK,MAAM;gBACT,OAAO,SAAS,CAAC,kCAAkC,CAAC,CAAC;YACvD,KAAK,SAAS;gBACZ,OAAO,SAAS,CAAC,gCAAgC,CAAC,CAAC;YACrD,KAAK,aAAa;gBAChB,OAAO,SAAS,CAAC,mCAAmC,CAAC,CAAC;YACxD,KAAK,SAAS;gBACZ,OAAO,SAAS,CAAC,iCAAiC,CAAC,CAAC;YACtD,KAAK,aAAa;gBAChB,OAAO,SAAS,CAAC,oCAAoC,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,EACD,CAAC,SAAS,CAAC,CACZ,CAAC;AACJ,CAAC","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 { useTranslation } from \"../l10n/useTranslation\";\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 const getLabel = usePropertyFilterBuilderOperatorLabels();\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: getLabel(op),\n })),\n [availableOperators, getLabel]\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/\n Function that returns display label for [[PropertyFilterBuilderRuleOperator]].\n * @beta\n */\nfunction usePropertyFilterBuilderOperatorLabels() {\n const { translate } = useTranslation();\n\n return React.useCallback(\n (operator: PropertyFilterBuilderRuleOperator) => {\n switch (operator) {\n case \"is-true\":\n return translate(\"filterBuilder.operators.isTrue\");\n case \"is-false\":\n return translate(\"filterBuilder.operators.isFalse\");\n case \"is-equal\":\n return translate(\"filterBuilder.operators.equal\");\n case \"is-not-equal\":\n return 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 translate(\"filterBuilder.operators.contains\");\n case \"is-null\":\n return translate(\"filterBuilder.operators.isNull\");\n case \"is-not-null\":\n return translate(\"filterBuilder.operators.isNotNull\");\n case \"between\":\n return translate(\"filterBuilder.operators.between\");\n case \"not-between\":\n return translate(\"filterBuilder.operators.notBetween\");\n }\n },\n [translate]\n );\n}\n"]}

package/lib/cjs/components-react/filter-builder/FilterBuilderState.d.ts CHANGED Viewed

@@ -65,7 +65,7 @@ export declare class PropertyFilterBuilderActions {
     /** Adds new rule or group of rules to the group specified by path. */
     addItem(path: string[], item: "RULE_GROUP" | "RULE" | PropertyFilterRule | PropertyFilterRuleGroup): void;
     /** Removes item specified by path. */
-    removeItem(path: string[]): void;
+    removeItem(path: string[], allowLastRuleDelete?: boolean): void;
     /** Removes all items from root group. */
     removeAllItems(): void;
     /** Sets operator of rule group specified by the path. */
@@ -125,9 +125,15 @@ export interface UsePropertyFilterBuilderResult {
  * @beta
  */
 export declare function usePropertyFilterBuilder(props?: UsePropertyFilterBuilderProps): UsePropertyFilterBuilderResult;
+/**
+ * Creates default rule validator.
+ * @beta
+ */
+export declare function useDefaultPropertyFilterBuilderRuleValidator(): (item: PropertyFilterBuilderRule) => string | undefined;
 /**
  * Default rule validator.
  * @beta
+ * @deprecated in 4.17.0. Use `useDefaultPropertyFilterBuilderRuleValidator` instead.
  */
 export declare function defaultPropertyFilterBuilderRuleValidator(item: PropertyFilterBuilderRule): string | undefined;
 /** @internal */

package/lib/cjs/components-react/filter-builder/FilterBuilderState.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"FilterBuilderState.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderState.ts"],"names":[],"mappings":"AAIA;;GAEG;AAKH,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGhF,OAAO,KAAK,EACV,iCAAiC,EACjC,+BAA+B,EAChC,MAAM,aAAa,CAAC;AAKrB,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAKjB;;;GAGG;AACH,MAAM,WAAW,0BAA0B;IACzC,kEAAkE;IAClE,SAAS,EAAE,8BAA8B,CAAC;CAC3C;AAED;;;GAGG;AACH,MAAM,MAAM,kCAAkC,GAC1C,8BAA8B,GAC9B,yBAAyB,CAAC;AAE9B;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C,6BAA6B;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,QAAQ,EAAE,GAAG,+BAA+B,EAAE,CAAC;IAC/C,2BAA2B;IAC3B,KAAK,EAAE,kCAAkC,EAAE,CAAC;CAC7C;AAED;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,uBAAuB;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,kCAAkC;IAClC,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,iCAAiC,CAAC;IAC7C,iDAAiD;IACjD,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,kCAAkC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,kCAAkC,GACvC,IAAI,IAAI,8BAA8B,CAExC;AAED;;;GAGG;AACH,qBAAa,4BAA4B;IAErC,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,CAChB,MAAM,EAAE,CACN,SAAS,EAAE,0BAA0B,KAClC,0BAA0B,KAC5B,IAAI;IAGX,OAAO,CAAC,WAAW;IAMnB,sEAAsE;IAC/D,OAAO,CACZ,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,YAAY,GAAG,MAAM,GAAG,kBAAkB,GAAG,uBAAuB;IAgC5E,sCAAsC;IAC/B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE;~~IA8BhC~~,yCAAyC;IAClC,cAAc;IAMrB,yDAAyD;IAClD,oBAAoB,CACzB,IAAI,EAAE,MAAM,EAAE,EACd,QAAQ,EAAE,GAAG,+BAA+B,EAAE;IAWhD,mDAAmD;IAC5C,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,QAAQ,CAAC,EAAE,mBAAmB;IAarE,mDAAmD;IAC5C,eAAe,CACpB,IAAI,EAAE,MAAM,EAAE,EACd,QAAQ,EAAE,iCAAiC;IAoB7C,gDAAgD;IACzC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,aAAa;IAUxD;;;OAGG;IACI,oBAAoB,CAAC,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CAezE;AAED;;;GAGG;AACH,MAAM,WAAW,6BAA6B;IAC5C,mDAAmD;IACnD,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,qKAAqK;IACrK,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,yBAAyB,KAAK,MAAM,GAAG,SAAS,CAAC;CACzE;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C,mDAAmD;IACnD,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gEAAgE;IAChE,OAAO,EAAE,4BAA4B,CAAC;IACtC;;;;OAIG;IACH,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,kBAAkB,KAAK,cAAc,GAAG,SAAS,CAAC;CAC3E;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,CAAC,EAAE,6BAA6B,GACpC,8BAA8B,~~CA6BhC~~;~~AA0BD~~;;;GAGG;AACH,wBAAgB,yCAAyC,CACvD,IAAI,EAAE,yBAAyB,GAC9B,MAAM,GAAG,SAAS,CAepB;AAaD,gBAAgB;AAChB,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,kCAAkC,GAC5C,cAAc,GAAG,SAAS,CAI5B"}
1	+ {"version":3,"file":"FilterBuilderState.d.ts","sourceRoot":"","sources":["../../../../src/components-react/filter-builder/FilterBuilderState.ts"],"names":[],"mappings":"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"}

package/lib/cjs/components-react/filter-builder/FilterBuilderState.js CHANGED Viewed

@@ -30,15 +30,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildPropertyFilter = exports.defaultPropertyFilterBuilderRuleValidator = exports.usePropertyFilterBuilder = exports.PropertyFilterBuilderActions = exports.isPropertyFilterBuilderRuleGroup = void 0;
+exports.buildPropertyFilter = exports.defaultPropertyFilterBuilderRuleValidator = exports.useDefaultPropertyFilterBuilderRuleValidator = exports.usePropertyFilterBuilder = exports.PropertyFilterBuilderActions = exports.isPropertyFilterBuilderRuleGroup = void 0;
 const immer_1 = require("immer");
 const React = __importStar(require("react"));
 const appui_abstract_1 = require("@itwin/appui-abstract");
 const core_bentley_1 = require("@itwin/core-bentley");
 const Operators_1 = require("./Operators");
 const Types_1 = require("./Types");
-const UiComponents_1 = require("../UiComponents");
 const FilterBuilderRangeValue_1 = require("./FilterBuilderRangeValue");
+const useTranslation_1 = require("../l10n/useTranslation");
 /**
  * Function to check if supplied [[PropertyFilterBuilderRuleGroupItem]] is [[PropertyFilterBuilderRuleGroup]].
  * @beta
@@ -86,7 +86,7 @@ class PropertyFilterBuilderActions {
         });
     }
     /** Removes item specified by path. */
-    removeItem(path) {
+    removeItem(path, allowLastRuleDelete = false) {
         function removeItemFromGroup(state, pathToItem) {
             const pathToParent = pathToItem.slice(0, -1);
             const parentGroup = findRuleGroup(state.rootGroup, pathToParent);
@@ -98,7 +98,7 @@ class PropertyFilterBuilderActions {
             if (itemIndex === -1) {
                 return;
             }
-            if (parentGroup.items.length === 1) {
+            if (parentGroup.items.length === 1 && !allowLastRuleDelete) {
                 parentGroup.items[0] = createEmptyRule(parentGroup.id);
                 return;
             }
@@ -199,40 +199,63 @@ function usePropertyFilterBuilder(props) {
         ? convertFilterToState(initialFilter)
         : { rootGroup: createEmptyRuleGroup() });
     const [actions] = React.useState(() => new PropertyFilterBuilderActions(setState));
+    const validateRules = useRulesValidation(ruleValidator);
     const buildFilter = React.useCallback((options) => {
-        const ruleErrors = validateRules(state.rootGroup, ruleValidator);
+        const ruleErrors = validateRules(state.rootGroup);
         if (!options?.ignoreErrors) {
             actions.setRuleErrorMessages(ruleErrors);
         }
         return ruleErrors.size === 0
             ? buildPropertyFilter(state.rootGroup)
             : undefined;
-    }, [state.rootGroup, actions, ruleValidator]);
+    }, [state.rootGroup, actions, validateRules]);
     return { rootGroup: state.rootGroup, actions, buildFilter };
 }
 exports.usePropertyFilterBuilder = usePropertyFilterBuilder;
-function validateRules(rule, ruleValidator) {
-    const ruleIdsAndErrorMessages = new Map();
-    const validateRulesInner = (item) => {
-        if (isPropertyFilterBuilderRuleGroup(item)) {
-            item.items.forEach((itm) => {
-                validateRulesInner(itm);
-            });
-        }
-        else {
-            const errorMessage = ruleValidator
-                ? ruleValidator(item)
-                : defaultPropertyFilterBuilderRuleValidator(item);
-            if (errorMessage)
-                ruleIdsAndErrorMessages.set(item.id, errorMessage);
-        }
-    };
-    validateRulesInner(rule);
-    return ruleIdsAndErrorMessages;
+function useRulesValidation(ruleValidator) {
+    const defaultValidator = useDefaultPropertyFilterBuilderRuleValidator();
+    const { translate } = (0, useTranslation_1.useTranslation)();
+    return React.useCallback((rootRule) => {
+        const ruleIdsAndErrorMessages = new Map();
+        const validateRulesInner = (item) => {
+            if (isPropertyFilterBuilderRuleGroup(item)) {
+                item.items.forEach((itm) => {
+                    validateRulesInner(itm);
+                });
+            }
+            else {
+                const errorMessage = ruleValidator
+                    ? ruleValidator(item)
+                    : defaultValidator(item);
+                if (errorMessage)
+                    ruleIdsAndErrorMessages.set(item.id,
+                    // need to check if error message is a key for translation in case `ruleValidator` is using `defaultPropertyFilterBuilderRuleValidator` internally
+                    errorMessage.startsWith("filterBuilder.errorMessages")
+                        ? translate(errorMessage)
+                        : errorMessage);
+            }
+        };
+        validateRulesInner(rootRule);
+        return ruleIdsAndErrorMessages;
+    }, [ruleValidator, defaultValidator, translate]);
+}
+/**
+ * Creates default rule validator.
+ * @beta
+ */
+function useDefaultPropertyFilterBuilderRuleValidator() {
+    const { translate } = (0, useTranslation_1.useTranslation)();
+    return React.useCallback((item) => {
+        // eslint-disable-next-line deprecation/deprecation
+        const errorMessage = defaultPropertyFilterBuilderRuleValidator(item);
+        return errorMessage ? translate(errorMessage) : undefined;
+    }, [translate]);
 }
+exports.useDefaultPropertyFilterBuilderRuleValidator = useDefaultPropertyFilterBuilderRuleValidator;
 /**
  * Default rule validator.
  * @beta
+ * @deprecated in 4.17.0. Use `useDefaultPropertyFilterBuilderRuleValidator` instead.
  */
 function defaultPropertyFilterBuilderRuleValidator(item) {
     if (item.property === undefined ||
@@ -244,7 +267,7 @@ function defaultPropertyFilterBuilderRuleValidator(item) {
         return rangeRuleValidator(item.value);
     }
     if (isEmptyValue(item.value)) {
-        return UiComponents_1.UiComponents.translate("filterBuilder.errorMessages.emptyValue");
+        return "filterBuilder.errorMessages.emptyValue";
     }
     return undefined;
 }
@@ -252,10 +275,10 @@ exports.defaultPropertyFilterBuilderRuleValidator = defaultPropertyFilterBuilder
 function rangeRuleValidator(value) {
     const range = FilterBuilderRangeValue_1.PropertyFilterBuilderRuleRangeValue.parse(value);
     if (isEmptyValue(range.from) || isEmptyValue(range.to)) {
-        return UiComponents_1.UiComponents.translate("filterBuilder.errorMessages.emptyValue");
+        return "filterBuilder.errorMessages.emptyValue";
     }
     if (!FilterBuilderRangeValue_1.PropertyFilterBuilderRuleRangeValue.isRangeValid(range)) {
-        return UiComponents_1.UiComponents.translate("filterBuilder.errorMessages.invalidRange");
+        return "filterBuilder.errorMessages.invalidRange";
     }
     return undefined;
 }