@evoke-platform/ui-components 1.0.0-dev.109 → 1.0.0-dev.110

package/dist/published/components/custom/CriteriaBuilder/CriteriaBuilder.js

@@ -5,6 +5,7 @@ import 'react-querybuilder/dist/query-builder.css';
 import { RemoveCircleOutline } from '../../../icons';
 import { Autocomplete, Button, DatePicker, IconButton, LocalizationProvider, MenuItem, TextField, Typography, } from '../../core';
 import { Box } from '../../layout';
+import { NumericFormat } from '../FormField/InputFieldComponent';
 const ALL_OPERATORS = [
     { name: '=', label: '=' },
     { name: '!=', label: '!=' },
@@ -132,7 +133,9 @@ const dynamicContentInputEditor = (props) => {
     const DynamicContentInput = (_a = props.context) === null || _a === void 0 ? void 0 : _a.dynamicContentInput.component;
     let valueEditor;
     if (DynamicContentInput) {
-        valueEditor = (React.createElement(DynamicContentInput, { values: ['null', 'notNull'].includes(operator) ? '' : value, setValues: handleOnChange, disabled: ['null', 'notNull'].includes(operator), size: 'small', previousSteps: (_c = (_b = props.context) === null || _b === void 0 ? void 0 : _b.dynamicContentInput.previousSteps) !== null && _c !== void 0 ? _c : [], isSingleValue: true, width: '33%', useStringInterpolation: true }));
+        valueEditor = (React.createElement(DynamicContentInput, { values: ['null', 'notNull'].includes(operator) ? '' : value, setValues: (e) => {
+                handleOnChange(e !== null && e !== void 0 ? e : '');
+            }, disabled: ['null', 'notNull'].includes(operator), size: 'small', previousSteps: (_c = (_b = props.context) === null || _b === void 0 ? void 0 : _b.dynamicContentInput.previousSteps) !== null && _c !== void 0 ? _c : [], isSingleValue: true, width: '33%', useStringInterpolation: true }));
     }
     return determineValueEditor(valueEditor, props);
 };
@@ -147,6 +150,17 @@ const determineValueEditor = (baseValueEditor, props) => {
                         handleOnChange(value);
                     }, renderInput: (params) => (React.createElement(TextField, Object.assign({}, params, { placeholder: "Value", size: "small", style: { width: '33%' } }))) })));
             break;
+        case 'integer':
+            valueEditor = (React.createElement(TextField, { value: ['null', 'notNull'].includes(operator) ? '' : value, disabled: ['null', 'notNull'].includes(operator), onChange: (e) => {
+                    handleOnChange(isNaN(parseInt(e.target.value)) ? '' : parseInt(e.target.value));
+                }, type: "number", placeholder: "Value", size: "small", sx: { width: '33%' } }));
+            break;
+        case 'number':
+            valueEditor = (React.createElement(TextField, { value: ['null', 'notNull'].includes(operator) ? '' : value, disabled: ['null', 'notNull'].includes(operator), onChange: (e) => {
+                    var _a;
+                    handleOnChange((_a = e.target.value) !== null && _a !== void 0 ? _a : '');
+                }, InputProps: { inputComponent: NumericFormat }, placeholder: "Value", size: "small", sx: { width: '33%' } }));
+            break;
         case 'array':
             valueEditor = (React.createElement(Autocomplete, { multiple: true, options: values || [], getOptionLabel: (option) => (option.label ? option.label : ''), value: Array.isArray(value) ? (disabled ? [] : value) : [], disabled: disabled, onChange: (event, newValue) => {
                     const uniqueSelections = Array.from(new Set(newValue.map((item) => item.label))).map((label) => {
@@ -245,7 +259,7 @@ const CriteriaBuilder = (props) => {
             React.createElement(QueryBuilderMaterial, null,
                 React.createElement(QueryBuilder, { query: !criteria ? { combinator: 'and', rules: [] } : query, fields: fields, onQueryChange: (q) => {
                         handleQueryChange(q);
-                    }, showCombinatorsBetweenRules: true, listsAsArrays: true, controlElements: {
+                    }, showCombinatorsBetweenRules: true, listsAsArrays: true, addRuleToNewGroups: true, controlElements: {
                         combinatorSelector: customCombinator,
                         fieldSelector: customSelector,
                         operatorSelector: customSelector,

package/dist/published/components/custom/FormField/InputFieldComponent/InputFieldComponent.d.ts

@@ -1,4 +1,5 @@
-/// <reference types="react" />
+import { FunctionComponent } from 'react';
 import { FormFieldProps } from '../FormField';
+export declare const NumericFormat: FunctionComponent<any>;
 declare const InputFieldComponent: (props: FormFieldProps) => JSX.Element;
 export default InputFieldComponent;

package/dist/published/components/custom/FormField/InputFieldComponent/InputFieldComponent.js

@@ -14,7 +14,7 @@ import NumberFormat from 'react-number-format';
 import { Autocomplete, TextField } from '../../../core';
 import InputMask from 'react-input-mask';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const NumericFormat = (props) => {
+export const NumericFormat = (props) => {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { inputRef, onChange, defaultValue } = props, other = __rest(props, ["inputRef", "onChange", "defaultValue"]);
     return (React.createElement(NumberFormat, Object.assign({}, other, { getInputRef: inputRef, onValueChange: (values) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.0.0-dev.109",
+    "version": "1.0.0-dev.110",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",