Merge branch 'master' into num_validator_message_fix

jspannu919 · web-flow · commit 90e26c311423 · 2023-06-02T17:36:50.000+05:30
diff --git a/packages/ant-component-mapper/package.json b/packages/ant-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/ant-component-mapper",
-  "version": "3.20.4",
+  "version": "3.20.9",
   "description": "Ant Design React component mapper for Data Driven Forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/blueprint-component-mapper/package.json b/packages/blueprint-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/blueprint-component-mapper",
-  "version": "3.20.4",
+  "version": "3.20.9",
   "description": "BlueprintJS React component mapper for Data Driven Forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/carbon-component-mapper/package.json b/packages/carbon-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/carbon-component-mapper",
-  "version": "3.20.4",
+  "version": "3.20.9",
   "description": "Carbon React component mapper for Data Driven Forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/common",
-  "version": "3.20.4",
+  "version": "3.20.9",
   "description": "Common components, helpers and other pieces of code for Data Driven Forms",
   "license": "Apache-2.0",
   "main": "index.js",
diff --git a/packages/mui-component-mapper/package.json b/packages/mui-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/mui-component-mapper",
-  "version": "3.20.4",
+  "version": "3.20.9",
   "description": "Component mapper for Material ui component mapper form data-driven-forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/mui-component-mapper/src/switch/switch.js b/packages/mui-component-mapper/src/switch/switch.js
@@ -47,6 +47,7 @@ export const Switch = (props) => {
                 readOnly={isReadOnly}
                 disabled={isDisabled || isReadOnly}
                 onChange={({ target: { checked } }) => input.onChange(checked)}
+                {...SwitchProps}
               />
             }
             label={<FormLabel {...FormLabelProps}>{input.checked ? onText || label : offText || label}</FormLabel>}
diff --git a/packages/parsers/package.json b/packages/parsers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/parsers",
-  "version": "3.20.4",
+  "version": "3.20.9",
   "description": "Parsers for Data Driven Forms.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
diff --git a/packages/pf4-component-mapper/package.json b/packages/pf4-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/pf4-component-mapper",
-  "version": "3.20.4",
+  "version": "3.20.9",
   "description": "Patternfly 4 React component mapper for Data Driven Forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/pf4-component-mapper/src/wizard/wizard.d.ts b/packages/pf4-component-mapper/src/wizard/wizard.d.ts
@@ -1,5 +1,6 @@
 import { ReactNode } from "react";
 import { Field, AnyObject } from "@data-driven-forms/react-form-renderer";
+import { ModalProps } from "@patternfly/react-core";
 
 export interface WizardButtonLabels {
   submit?: ReactNode;
@@ -92,6 +93,7 @@ export interface WizardProps {
   hasNoBodyPadding?: boolean;
   navAriaLabel?: string;
   StepTemplate?: React.ComponentType<StepTemplateProps>;
+  ModalProps?: ModalProps
 }
 
 declare const Wizard: React.ComponentType<WizardProps>;
diff --git a/packages/pf4-component-mapper/src/wizard/wizard.js b/packages/pf4-component-mapper/src/wizard/wizard.js
@@ -44,6 +44,7 @@ const WizardInternal = ({
   StepTemplate,
   className,
   conditionalSubmitFlag,
+  ModalProps = {},
   ...rest
 }) => {
   const {
@@ -71,7 +72,10 @@ const WizardInternal = ({
   }, [inModal]);
 
   useEffect(() => {
-    if (state.container) {
+    if (ModalProps.appendTo) {
+      // override with default append to
+      dispatch({ type: 'finishLoading' });
+    } else if (state.container) {
       document.body.appendChild(state.container);
       dispatch({ type: 'finishLoading' });
     }
@@ -88,7 +92,7 @@ const WizardInternal = ({
   }
 
   return (
-    <Modal inModal={inModal} container={state.container} aria-labelledby={rest.name}>
+    <Modal inModal={inModal} container={state.container} aria-labelledby={rest.name} {...ModalProps}>
       <div
         tabIndex={inModal ? 0 : null}
         className={`pf-c-wizard ${inModal ? '' : 'no-shadow'} ddorg__pf4-component-mapper__wizard ${className ? className : ''}`}
@@ -179,6 +183,7 @@ WizardInternal.propTypes = {
   StepTemplate: PropTypes.elementType,
   className: PropTypes.string,
   conditionalSubmitFlag: PropTypes.string,
+  ModalProps: PropTypes.object,
 };
 
 const defaultLabels = {
diff --git a/packages/react-form-renderer/package.json b/packages/react-form-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/react-form-renderer",
-  "version": "3.20.4",
+  "version": "3.20.9",
   "description": "React Form Renderer. Data Driven Forms converts JSON form definitions into fully functional React forms.",
   "main": "index.js",
   "module": "esm/index.js",
diff --git a/packages/react-form-renderer/src/condition/condition.js b/packages/react-form-renderer/src/condition/condition.js
@@ -103,7 +103,7 @@ const Condition = React.memo(
 
 const conditionProps = {
   when: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string), PropTypes.func]),
-  is: PropTypes.oneOfType([PropTypes.array, PropTypes.string, PropTypes.object, PropTypes.number, PropTypes.bool]),
+  is: PropTypes.oneOfType([PropTypes.array, PropTypes.string, PropTypes.object, PropTypes.number, PropTypes.bool, PropTypes.func]),
   isNotEmpty: PropTypes.bool,
   isEmpty: PropTypes.bool,
   pattern: (props, name, componentName) => {
diff --git a/packages/react-form-renderer/src/form-renderer/render-form.js b/packages/react-form-renderer/src/form-renderer/render-form.js
@@ -86,15 +86,21 @@ FormConditionWrapper.propTypes = {
   field: PropTypes.object,
 };
 
-const SingleField = ({ component, condition, hideField, ...rest }) => {
+const SingleField = ({ component, ...rest }) => {
   const { actionMapper, componentMapper } = useContext(RendererContext);
 
   const { componentProps, Component, overrideProps, mergedResolveProps } = prepareComponentProps({ component, rest, componentMapper, actionMapper });
 
+  const { condition, hideField, ...restProps } = {
+    ...componentProps,
+    ...overrideProps,
+    ...(mergedResolveProps && { resolveProps: mergedResolveProps }),
+  };
+
   return (
-    <FormConditionWrapper condition={condition} field={componentProps}>
+    <FormConditionWrapper condition={condition} field={restProps}>
       <FormFieldHideWrapper hideField={hideField}>
-        <Component {...componentProps} {...overrideProps} {...(mergedResolveProps && { resolveProps: mergedResolveProps })} />
+        <Component {...restProps} />
       </FormFieldHideWrapper>
     </FormConditionWrapper>
   );
diff --git a/packages/react-form-renderer/src/tests/form-renderer/condition.test.js b/packages/react-form-renderer/src/tests/form-renderer/condition.test.js
@@ -100,6 +100,46 @@ describe('condition test', () => {
     expect(() => screen.getByLabelText('field-2')).toThrow();
   });
 
+  it('should render when condition is fulfill - when is a function from action mapper', async () => {
+    const whenSpy = jest.fn().mockImplementation(() => 'field-1');
+    const actionMapper = {
+      condition: () => [
+        {
+          when: whenSpy,
+          is: 'show',
+        },
+      ],
+    };
+
+    schema = {
+      fields: [
+        {
+          component: componentTypes.TEXT_FIELD,
+          name: 'field-1',
+        },
+        {
+          component: componentTypes.TEXT_FIELD,
+          name: 'field-2',
+          actions: { condition: ['condition'] },
+        },
+      ],
+    };
+
+    render(<FormRenderer {...initialProps} schema={schema} actionMapper={actionMapper} />);
+
+    expect(whenSpy.mock.calls[0][0]).toEqual({ component: 'text-field', name: 'field-2' });
+
+    expect(() => screen.getByLabelText('field-2')).toThrow();
+
+    await userEvent.type(screen.getByLabelText('field-1'), 'show');
+
+    expect(screen.getByLabelText('field-2')).toBeInTheDocument();
+
+    await userEvent.type(screen.getByLabelText('field-1'), 'dont');
+
+    expect(() => screen.getByLabelText('field-2')).toThrow();
+  });
+
   it('sets value when condition is fulfill', async () => {
     schema = {
       fields: [
diff --git a/packages/react-form-renderer/src/tests/validators/validators.test.js b/packages/react-form-renderer/src/tests/validators/validators.test.js
@@ -135,6 +135,10 @@ describe('New validators', () => {
     it('should not pass the validation and return type error message', () => {
       expect(validatorMapper[validatorTypes.MIN_NUMBER_VALUE]({ value: 99, message: 'Foo' })("oo")).toEqual('Value is not a number');
     });
+    
+    it('should not pass the validation (with value as 0)', () => {
+      expect(validatorMapper[validatorTypes.MIN_NUMBER_VALUE]({ value: 2 })(0)).toEqual('Value must be greater than or equal to 2.');
+    });
   });
 
   describe('max value validator', () => {
diff --git a/packages/react-form-renderer/src/validators/validator-functions.js b/packages/react-form-renderer/src/validators/validator-functions.js
@@ -90,7 +90,7 @@ export const numericality = memoize(
     lessOrEqual = selectNum(lessOrEqual, lessThanOrEqualTo);
 
     return prepare((value) => {
-      if (!value) {
+      if (value === null || value === undefined) {
         return;
       }
 
diff --git a/packages/react-renderer-demo/package.json b/packages/react-renderer-demo/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@data-driven-forms/react-renderer-demo",
-    "version": "3.20.4",
+    "version": "3.20.9",
     "description": "Documentation page for Data Driven Forms.",
     "homepage": "https://data-driven-forms.org/",
     "bugs": "https://github.com/data-driven-forms/react-forms/issues",
diff --git a/packages/react-renderer-demo/src/doc-components/examples-texts/pf4/wizard.md b/packages/react-renderer-demo/src/doc-components/examples-texts/pf4/wizard.md
@@ -17,6 +17,7 @@ Don't forget hide form controls by setting \`showFormControls\` to \`false\` as
 |showTitles|bool|undefined|If true, step titles will be shown in the wizard body|
 |crossroads|array|undefined|Array of field names, which change next steps|
 |StepTemplate|componenr|DefaultStepTemplate|Custom component for rendering wizard body content.|
+|ModalProps|PF4 Modal props object. Used to customize the Modal element if `inModal` is true|
 
 Also accepts these props from the original component: `titleId`, `descriptionId`, `hideClose`, `hasNoBodyPadding`, `navAriaLabel` and `closeButtonAriaLabel`.
 
diff --git a/packages/suir-component-mapper/package.json b/packages/suir-component-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/suir-component-mapper",
-  "version": "3.20.4",
+  "version": "3.20.9",
   "description": "Semantíc UI React component mapper for Data Driven Forms.",
   "main": "index.js",
   "module": "esm/index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/ant-component-mapper",`
`3`		`- "version": "3.20.4",`
	`3`	`+ "version": "3.20.9",`
`4`	`4`	`"description": "Ant Design React component mapper for Data Driven Forms.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"module": "esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/blueprint-component-mapper",`
`3`		`- "version": "3.20.4",`
	`3`	`+ "version": "3.20.9",`
`4`	`4`	`"description": "BlueprintJS React component mapper for Data Driven Forms.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"module": "esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/carbon-component-mapper",`
`3`		`- "version": "3.20.4",`
	`3`	`+ "version": "3.20.9",`
`4`	`4`	`"description": "Carbon React component mapper for Data Driven Forms.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"module": "esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/common",`
`3`		`- "version": "3.20.4",`
	`3`	`+ "version": "3.20.9",`
`4`	`4`	`"description": "Common components, helpers and other pieces of code for Data Driven Forms",`
`5`	`5`	`"license": "Apache-2.0",`
`6`	`6`	`"main": "index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/mui-component-mapper",`
`3`		`- "version": "3.20.4",`
	`3`	`+ "version": "3.20.9",`
`4`	`4`	`"description": "Component mapper for Material ui component mapper form data-driven-forms.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"module": "esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ export const Switch = (props) => {`
`47`	`47`	`readOnly={isReadOnly}`
`48`	`48`	`disabled={isDisabled \|\| isReadOnly}`
`49`	`49`	`onChange={({ target: { checked } }) => input.onChange(checked)}`
	`50`	`+ {...SwitchProps}`
`50`	`51`	`/>`
`51`	`52`	`}`
`52`	`53`	`label={<FormLabel {...FormLabelProps}>{input.checked ? onText \|\| label : offText \|\| label}</FormLabel>}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/parsers",`
`3`		`- "version": "3.20.4",`
	`3`	`+ "version": "3.20.9",`
`4`	`4`	`"description": "Parsers for Data Driven Forms.",`
`5`	`5`	`"main": "dist/cjs/index.js",`
`6`	`6`	`"module": "dist/esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@data-driven-forms/pf4-component-mapper",`
`3`		`- "version": "3.20.4",`
	`3`	`+ "version": "3.20.9",`
`4`	`4`	`"description": "Patternfly 4 React component mapper for Data Driven Forms.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"module": "esm/index.js",`