@pega/cosmos-react-condition-builder 8.0.0-build.6.1 → 8.0.0-build.60.1

package/lib/components/PromotedFilters/PromotedFilters.types.d.ts

@@ -1,8 +1,10 @@
 import type { Ref } from 'react';
 import type { BaseProps, NoChildrenProp, SimpleStore } from '@pega/cosmos-react-core';
-import type { Condition, LeafCondition } from '../ConditionBuilder/ConditionBuilder.types';
+import type { Field, LeafCondition } from '../ConditionBuilder/ConditionBuilder.types';
 import type { ConditionInputMode, ConditionField } from '../ConditionInput/ConditionInput.types';
 export interface PromotedFilter {
+    /** Optional for multiple filters on the same field. */
+    id?: string;
     /** Definition of the field to be filtered. */
     field: ConditionField;
     /** Display mode. */
@@ -16,20 +18,43 @@ export interface PromotedFilter {
         label?: string;
     }[];
 }
+export interface HandleValue {
+    /** Returns currently visible condition in the PromotedFilters */
+    getCondition: () => PromotedFiltersProps['condition'];
+}
 export interface PromotedFiltersProps extends BaseProps, NoChildrenProp {
     /** Configuration of filters for every field that has been defined as promoted. */
     filters: PromotedFilter[];
-    /** A value representing the current condition state. */
-    condition?: Condition;
+    /** A value representing the current condition state. Optional filterId for multiple filters per field support. */
+    condition?: {
+        AND: {
+            condition: LeafCondition & {
+                filterId?: string;
+            };
+        }[];
+    };
     /**
      * Orientation mode.
      * @default 'horizontal'
      */
     orientation?: 'vertical' | 'horizontal';
-    /** Callback fired on change of any of the filters. */
-    onChange: (condition?: Condition) => void;
+    /** Metadata (data-model) for the Fields to use in the RHS field-selector */
+    fields?: Field[];
+    /** Callback fired on apply click. */
+    onChange: (condition?: {
+        AND: {
+            condition: LeafCondition & {
+                filterId?: string;
+            };
+        }[];
+    }) => void;
     /** Ref for the wrapping element. */
     ref?: Ref<HTMLDivElement>;
+    /**
+     * Imperative handle.
+     * Used to fetch the currently visible condition, regardless of the `Apply` click
+     */
+    handle?: Ref<HandleValue>;
 }
 export interface PromotedFiltersContentProps extends BaseProps, NoChildrenProp {
     /** Configuration of filters for every field that has been defined as promoted. */
@@ -38,15 +63,19 @@ export interface PromotedFiltersContentProps extends BaseProps, NoChildrenProp {
     conditionStore: SimpleStore<{
         [key: string]: LeafCondition | undefined;
     }>;
+    /** Callback fired on apply */
+    onApply?: () => void;
     /**
      * Orientation mode.
      * @default 'horizontal'
      */
     orientation?: 'vertical' | 'horizontal';
+    /** Metadata (data-model) for the Fields to use in the RHS field-selector */
+    fields?: Field[];
     /** Ref for the wrapping element. */
     ref?: Ref<HTMLDivElement>;
 }
-export interface FilterModalProps extends Pick<PromotedFiltersContentProps, 'filters' | 'conditionStore'> {
+export interface FilterModalProps extends Pick<PromotedFiltersContentProps, 'filters' | 'conditionStore' | 'fields'> {
     /** Callback fired on apply */
     onApply: () => void;
     /** Callback fired on cancel */

package/lib/components/PromotedFilters/PromotedFilters.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PromotedFilters.types.d.ts","sourceRoot":"","sources":["../../../src/components/PromotedFilters/PromotedFilters.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtF,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAEjG,MAAM,WAAW,cAAc;IAC7B,8CAA8C;IAC9C,KAAK,EAAE,cAAc,CAAC;IACtB,oBAAoB;IACpB,IAAI,EAAE,kBAAkB,CAAC;IACzB,4BAA4B;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,oBAAoB,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,aAAa,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC/E;AAED,MAAM,WAAW,oBAAqB,SAAQ,SAAS,EAAE,cAAc;IACrE,kFAAkF;IAClF,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,wDAAwD;IACxD,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;OAGG;IACH,WAAW,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACxC,sDAAsD;IACtD,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;IAC1C,oCAAoC;IACpC,GAAG,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,2BAA4B,SAAQ,SAAS,EAAE,cAAc;IAC5E,kFAAkF;IAClF,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,gDAAgD;IAChD,cAAc,EAAE,WAAW,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;IAC1E;;;OAGG;IACH,WAAW,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACxC,oCAAoC;IACpC,GAAG,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,gBACf,SAAQ,IAAI,CAAC,2BAA2B,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACvE,8BAA8B;IAC9B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB"}
+{"version":3,"file":"PromotedFilters.types.d.ts","sourceRoot":"","sources":["../../../src/components/PromotedFilters/PromotedFilters.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtF,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAEjG,MAAM,WAAW,cAAc;IAC7B,uDAAuD;IACvD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,8CAA8C;IAC9C,KAAK,EAAE,cAAc,CAAC;IACtB,oBAAoB;IACpB,IAAI,EAAE,kBAAkB,CAAC;IACzB,4BAA4B;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,oBAAoB,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,aAAa,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC/E;AAED,MAAM,WAAW,WAAW;IAC1B,iEAAiE;IACjE,YAAY,EAAE,MAAM,oBAAoB,CAAC,WAAW,CAAC,CAAC;CACvD;AAED,MAAM,WAAW,oBAAqB,SAAQ,SAAS,EAAE,cAAc;IACrE,kFAAkF;IAClF,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,kHAAkH;IAClH,SAAS,CAAC,EAAE;QAAE,GAAG,EAAE;YAAE,SAAS,EAAE,aAAa,GAAG;gBAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,EAAE,CAAA;KAAE,CAAC;IAC5E;;;OAGG;IACH,WAAW,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACxC,4EAA4E;IAC5E,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACjB,qCAAqC;IACrC,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE;QAAE,GAAG,EAAE;YAAE,SAAS,EAAE,aAAa,GAAG;gBAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,EAAE,CAAA;KAAE,KAAK,IAAI,CAAC;IAChG,oCAAoC;IACpC,GAAG,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IAC1B;;;OAGG;IACH,MAAM,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,2BAA4B,SAAQ,SAAS,EAAE,cAAc;IAC5E,kFAAkF;IAClF,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,gDAAgD;IAChD,cAAc,EAAE,WAAW,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;IAC1E,8BAA8B;IAC9B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB;;;OAGG;IACH,WAAW,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACxC,4EAA4E;IAC5E,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACjB,oCAAoC;IACpC,GAAG,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,gBACf,SAAQ,IAAI,CAAC,2BAA2B,EAAE,SAAS,GAAG,gBAAgB,GAAG,QAAQ,CAAC;IAClF,8BAA8B;IAC9B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB"}

package/lib/components/PromotedFilters/PromotedFilters.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"PromotedFilters.types.js","sourceRoot":"","sources":["../../../src/components/PromotedFilters/PromotedFilters.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Ref } from 'react';\n\nimport type { BaseProps, NoChildrenProp, SimpleStore } from '@pega/cosmos-react-core';\n\nimport type { Condition, LeafCondition } from '../ConditionBuilder/ConditionBuilder.types';\nimport type { ConditionInputMode, ConditionField } from '../ConditionInput/ConditionInput.types';\n\nexport interface PromotedFilter {\n  /** Definition of the field to be filtered. */\n  field: ConditionField;\n  /** Display mode. */\n  mode: ConditionInputMode;\n  /** Label for the filter. */\n  label?: string;\n  /** List of possible predefined Conditions */\n  predefinedConditions?: { id: string; value: LeafCondition; label?: string }[];\n}\n\nexport interface PromotedFiltersProps extends BaseProps, NoChildrenProp {\n  /** Configuration of filters for every field that has been defined as promoted. */\n  filters: PromotedFilter[];\n  /** A value representing the current condition state. */\n  condition?: Condition;\n  /**\n   * Orientation mode.\n   * @default 'horizontal'\n   */\n  orientation?: 'vertical' | 'horizontal';\n  /** Callback fired on change of any of the filters. */\n  onChange: (condition?: Condition) => void;\n  /** Ref for the wrapping element. */\n  ref?: Ref<HTMLDivElement>;\n}\n\nexport interface PromotedFiltersContentProps extends BaseProps, NoChildrenProp {\n  /** Configuration of filters for every field that has been defined as promoted. */\n  filters: PromotedFilter[];\n  /** A value representing the condition store. */\n  conditionStore: SimpleStore<{ [key: string]: LeafCondition | undefined }>;\n  /**\n   * Orientation mode.\n   * @default 'horizontal'\n   */\n  orientation?: 'vertical' | 'horizontal';\n  /** Ref for the wrapping element. */\n  ref?: Ref<HTMLDivElement>;\n}\n\nexport interface FilterModalProps\n  extends Pick<PromotedFiltersContentProps, 'filters' | 'conditionStore'> {\n  /** Callback fired on apply */\n  onApply: () => void;\n  /** Callback fired on cancel */\n  onCancel: () => void;\n}\n"]}
+{"version":3,"file":"PromotedFilters.types.js","sourceRoot":"","sources":["../../../src/components/PromotedFilters/PromotedFilters.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Ref } from 'react';\n\nimport type { BaseProps, NoChildrenProp, SimpleStore } from '@pega/cosmos-react-core';\n\nimport type { Field, LeafCondition } from '../ConditionBuilder/ConditionBuilder.types';\nimport type { ConditionInputMode, ConditionField } from '../ConditionInput/ConditionInput.types';\n\nexport interface PromotedFilter {\n  /** Optional for multiple filters on the same field. */\n  id?: string;\n  /** Definition of the field to be filtered. */\n  field: ConditionField;\n  /** Display mode. */\n  mode: ConditionInputMode;\n  /** Label for the filter. */\n  label?: string;\n  /** List of possible predefined Conditions */\n  predefinedConditions?: { id: string; value: LeafCondition; label?: string }[];\n}\n\nexport interface HandleValue {\n  /** Returns currently visible condition in the PromotedFilters */\n  getCondition: () => PromotedFiltersProps['condition'];\n}\n\nexport interface PromotedFiltersProps extends BaseProps, NoChildrenProp {\n  /** Configuration of filters for every field that has been defined as promoted. */\n  filters: PromotedFilter[];\n  /** A value representing the current condition state. Optional filterId for multiple filters per field support. */\n  condition?: { AND: { condition: LeafCondition & { filterId?: string } }[] };\n  /**\n   * Orientation mode.\n   * @default 'horizontal'\n   */\n  orientation?: 'vertical' | 'horizontal';\n  /** Metadata (data-model) for the Fields to use in the RHS field-selector */\n  fields?: Field[];\n  /** Callback fired on apply click. */\n  onChange: (condition?: { AND: { condition: LeafCondition & { filterId?: string } }[] }) => void;\n  /** Ref for the wrapping element. */\n  ref?: Ref<HTMLDivElement>;\n  /**\n   * Imperative handle.\n   * Used to fetch the currently visible condition, regardless of the `Apply` click\n   */\n  handle?: Ref<HandleValue>;\n}\n\nexport interface PromotedFiltersContentProps extends BaseProps, NoChildrenProp {\n  /** Configuration of filters for every field that has been defined as promoted. */\n  filters: PromotedFilter[];\n  /** A value representing the condition store. */\n  conditionStore: SimpleStore<{ [key: string]: LeafCondition | undefined }>;\n  /** Callback fired on apply */\n  onApply?: () => void;\n  /**\n   * Orientation mode.\n   * @default 'horizontal'\n   */\n  orientation?: 'vertical' | 'horizontal';\n  /** Metadata (data-model) for the Fields to use in the RHS field-selector */\n  fields?: Field[];\n  /** Ref for the wrapping element. */\n  ref?: Ref<HTMLDivElement>;\n}\n\nexport interface FilterModalProps\n  extends Pick<PromotedFiltersContentProps, 'filters' | 'conditionStore' | 'fields'> {\n  /** Callback fired on apply */\n  onApply: () => void;\n  /** Callback fired on cancel */\n  onCancel: () => void;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/cosmos-react-condition-builder",
-  "version": "8.0.0-build.6.1",
+  "version": "8.0.0-build.60.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/pegasystems/cosmos-react.git",
@@ -22,20 +22,20 @@
     "build": "tsc -b tsconfig.build.json"
   },
   "dependencies": {
-    "@pega/cosmos-react-core": "8.0.0-build.6.1",
-    "@types/react": "^17.0.62",
-    "@types/react-dom": "^17.0.20",
+    "@pega/cosmos-react-core": "8.0.0-build.60.1",
+    "@types/react": "^17.0.62 || ^18.3.3",
+    "@types/react-dom": "^17.0.20 || ^18.3.0",
     "@types/styled-components": "^5.1.26",
-    "dayjs": "^1.11.10",
+    "dayjs": "^1.11.13",
     "polished": "^4.1.0",
-    "react": "^17.0.0",
-    "react-dom": "^17.0.0",
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0",
     "styled-components": "^5.2.0"
   },
   "devDependencies": {
     "@storybook/react": "~8.2.9",
-    "@testing-library/react": "^12.1.3",
-    "@testing-library/user-event": "^14.5.1",
+    "@testing-library/react": "^16.0.0",
+    "@testing-library/user-event": "^14.6.1",
     "typescript": "~5.5.4"
   }
 }