Merge pull request #898 from rvsia/integrateManagerDdf

feat(manager): integrate manager with DDF

Author: Hyperkid123

packages/ant-component-mapper/src/tests/components.test.js

@@ -107,7 +107,6 @@ describe('formFields generated tests', () => {
           const errorField = {
             ...field,
             validate: [{ type: validatorTypes.REQUIRED, warning: true }],
-            useWarnings: true,
             validateOnMount: true
           };
           let wrapper;

packages/ant-component-mapper/src/tests/dual-list-select.test.js

@@ -123,6 +123,8 @@ describe('DualListSelect', () => {
       wrapper.find('form').simulate('submit');
     });
 
-    expect(onSubmit).toHaveBeenCalledWith({});
+    expect(onSubmit).toHaveBeenCalledWith({
+      'dual-Menu': []
+    });
   });
 });

packages/blueprint-component-mapper/src/tests/components.test.js

@@ -112,7 +112,6 @@ describe('formFields generated tests', () => {
           const errorField = {
             ...field,
             validate: [{ type: validatorTypes.REQUIRED, warning: true }],
-            useWarnings: true,
             validateOnMount: true
           };
           let wrapper;

packages/blueprint-component-mapper/src/tests/dual-list-select.test.js

@@ -254,7 +254,9 @@ describe('DualListSelect', () => {
       wrapper.find('form').simulate('submit');
     });
 
-    expect(onSubmit).toHaveBeenCalledWith({});
+    expect(onSubmit).toHaveBeenCalledWith({
+      'dual-Menu': []
+    });
   });
 
   it('switch all to right', async () => {
@@ -288,7 +290,9 @@ describe('DualListSelect', () => {
       wrapper.find('form').simulate('submit');
     });
 
-    expect(onSubmit).toHaveBeenCalledWith({});
+    expect(onSubmit).toHaveBeenCalledWith({
+      'dual-Menu': []
+    });
   });
 
   it('filters options', async () => {

packages/carbon-component-mapper/src/tests/components.test.js

@@ -103,7 +103,6 @@ describe('component tests', () => {
           const errorField = {
             ...field,
             validate: [{ type: validatorTypes.REQUIRED, warning: true }],
-            useWarnings: true,
             validateOnMount: true
           };
           let wrapper;

packages/carbon-component-mapper/src/tests/dual-list-select.test.js

@@ -249,7 +249,9 @@ describe('DualListSelect', () => {
       wrapper.find('form').simulate('submit');
     });
 
-    expect(onSubmit).toHaveBeenCalledWith({});
+    expect(onSubmit).toHaveBeenCalledWith({
+      'dual-StructuredListWrapper': []
+    });
   });
 
   it('switch all to right', async () => {
@@ -283,7 +285,9 @@ describe('DualListSelect', () => {
       wrapper.find('form').simulate('submit');
     });
 
-    expect(onSubmit).toHaveBeenCalledWith({});
+    expect(onSubmit).toHaveBeenCalledWith({
+      'dual-StructuredListWrapper': []
+    });
   });
 
   it('filters options', async () => {

packages/form-state-manager/package.json

@@ -2,10 +2,16 @@
   "name": "@data-driven-forms/form-state-manager",
   "version": "0.0.1-beta.0",
   "description": "Form state management library for data driven forms",
-  "main": "index.js",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
   "author": "Martin Marosi",
   "typings": "dist/cjs/index.d.ts",
-  "private": true,
+  "repository": "[email protected]:data-driven-forms/react-forms.git",
+  "keywords": [
+    "react",
+    "forms",
+    "javascript"
+  ],
   "devDependencies": {
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-class-properties": "^7.1.0",

packages/form-state-manager/src/files/compose-validators.ts

@@ -9,12 +9,12 @@ import ComposeValidators from '../types/compose-validators';
  * Synchronous validators are run in synchrounously and sync error is prioritized over async errors.
  * @returns {Function} New validation function
  */
-const composeValidators: ComposeValidators = (validators = []) => (value, allValues) => {
+const composeValidators: ComposeValidators = (validators = []) => (value, allValues, meta) => {
   const promises: Promise<any>[] = [];
   let index = 0;
   let error: any;
   while (validators.length > 0 && !error && index < validators.length) {
-    const result = validators[index](value, allValues);
+    const result = validators[index](value, allValues, meta);
     if (isPromise(result)) {
       promises.push(result as Promise<any>);
     } else {

packages/form-state-manager/src/files/form-manager-context.ts

@@ -19,7 +19,7 @@ const FormManagerContext = createContext<ManagerContextValue>({
   }),
   formOptions: createManagerApi({
     onSubmit: noop
-  }),
+  })(),
   getFieldValue: noop,
   getFieldState: () => undefined,
   blur: noop,
@@ -39,7 +39,8 @@ const FormManagerContext = createContext<ManagerContextValue>({
   shift: noop,
   swap: noop,
   unshift: noop,
-  update: noop
+  update: noop,
+  updateFieldConfig: noop
 });
 
 export default FormManagerContext;

packages/form-state-manager/src/files/form-spy.ts

@@ -3,8 +3,8 @@ import FormManagerContext from './form-manager-context';
 import generateId from '../utils/generate-id';
 import FormSpyProps from '../types/form-spy';
 
-const FormSpy: React.FunctionComponent<FormSpyProps> = ({ children, subscription }) => {
-  const { subscribe, unsubscribe, getState } = useContext(FormManagerContext);
+const FormSpy: React.FunctionComponent<FormSpyProps> = ({ children, onChange, subscription = { all: true } }) => {
+  const { subscribe, unsubscribe, getState, formOptions } = useContext(FormManagerContext);
   const [, rerender] = useReducer((prev) => prev + 1, 0);
 
   const [id] = useState(() => {
@@ -23,7 +23,14 @@ const FormSpy: React.FunctionComponent<FormSpyProps> = ({ children, subscription
     []
   );
 
-  return children({ ...getState() });
+  const newState = { ...getState(), form: formOptions };
+
+  if (onChange) {
+    onChange(newState);
+    return null;
+  }
+
+  return children(newState);
 };
 
 export default FormSpy;