Changes based on review.

Author: Arun-42

README.md

@@ -36,13 +36,10 @@ Data Driven Forms is a React library used for rendering and managing forms with
   - [Material-UI Mapper](#material-ui-mapper)
   - [PatternFly 3 Mapper](#patternfly-3-mapper)
   - [PatternFly 4 Mapper](#patternfly-4-mapper)
-<<<<<<< HEAD
   - [BlueprintJS Mapper](#blueprintjs-mapper)
   - [Semantic UI Mapper](#semantic-ui-mapper)
-=======
   - [Material-UI Mapper](#material-ui-mapper)
   - [Ant Design Mapper](#ant-design-mapper)
->>>>>>> Added wizard.js
 - [Usage](#usage)
   - [Custom mapper](#custom-mapper)
 - [Basic provided components](#basic-provided-components)
@@ -112,7 +109,6 @@ $ npm install @data-driven-forms/blueprint-component-mapper -S
 $ yarn add @data-driven-forms/blueprint-component-mapper
 ```
 
-<<<<<<< HEAD
 #### [Semantic UI Mapper](https://data-driven-forms.org/mappers/suir-component-mapper)
 
 ```console
@@ -125,7 +121,6 @@ $ yarn add @data-driven-forms/suir-component-mapper
 
 Component libraries in mappers are external dependencies. Make sure to install them in your bundles.
 
-=======
 #### [Ant Design Mapper](https://www.npmjs.com/package/@data-driven-forms/ant-component-mapper)
 
 ```console
@@ -136,7 +131,6 @@ $ npm install @data-driven-forms/ant-component-mapper -S
 $ yarn add @data-driven-forms/ant-component-mapper
 ```
 
->>>>>>> Added wizard.js
 ### Usage
 
 In order to Data Driven Forms in your component you need the renderer and a component mapper, which provides component mapper and form template.

package.json

@@ -43,7 +43,7 @@
     ]
   },
   "devDependencies": {
-    "@babel/plugin-transform-runtime": "^7.9.0",
+    "@babel/plugin-transform-runtime": "^7.10.3",
     "@babel/preset-typescript": "^7.9.0",
     "@khala/commit-analyzer-wildcard": "^2.4.1",
     "@khala/npm-release-monorepo": "^2.4.1",
@@ -64,31 +64,44 @@
     "eslint-config-react-app": "^5.2.0",
     "eslint-loader": "^3.0.3",
     "eslint-plugin-flowtype": "^4.6.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-prettier": "^3.1.2",
-    "eslint-plugin-react": "^7.18.3",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-jsx-a11y": "^6.3.1",
+    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-react": "^7.20.1",
     "eslint-plugin-react-hooks": "^2.4.0",
     "glob": "^7.1.6",
     "identity-obj-proxy": "^3.0.0",
     "inquirer": "^7.1.0",
     "jest": "^24.8.0",
-    "lerna": "^3.13.1",
+    "lerna": "^3.22.1",
     "ncp": "^2.0.0",
     "prettier": "^1.19.1",
     "replace-in-file": "^6.0.0",
     "semantic-release": "^16.0.4",
     "source-map-loader": "^0.2.4",
     "strip-ansi": "^6.0.0",
-    "terser-webpack-plugin": "^1.3.0",
+    "terser-webpack-plugin": "^1.4.4",
     "ts-loader": "^7.0.5",
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0",
     "typescript": "^3.9.3"
   },
   "release": {
     "monorepo": "./packages",
-    "branches": ["+([0-9])?(.{+([0-9]),x}).x", "master", "next", "next-major", {"name": "beta", "prerelease": true}, {"name": "alpha", "prerelease": true}],
+    "branches": [
+      "+([0-9])?(.{+([0-9]),x}).x",
+      "master",
+      "next",
+      "next-major",
+      {
+        "name": "beta",
+        "prerelease": true
+      },
+      {
+        "name": "alpha",
+        "prerelease": true
+      }
+    ],
     "plugins": [
       "@khala/npm-release-monorepo",
       [

packages/ant-component-mapper/README.md

@@ -1,18 +1,16 @@
-[![npm version](https://badge.fury.io/js/%40data-driven-forms%2Fmui-component-mapper.svg)](https://badge.fury.io/js/%40data-driven-forms%2Fmui-component-mapper)
+[![npm version](https://badge.fury.io/js/%40data-driven-forms%2Fant-component-mapper.svg)](https://badge.fury.io/js/%40data-driven-forms%2Fant-component-mapper)
 
 [![Data Driven Form logo](images/logo.png)](https://data-driven-forms.org/)
 
 Material-UI component mapper for [Data Driven Forms](https://github.com/data-driven-forms/react-forms).
 
 :book: For more information please visit the [documentation](https://data-driven-forms.org/). :book:
 
-Used by [ManageIQ](http://manageiq.org/), Red Hat Cloud Services.
-
 **Table of Contents**
 
 - [Installation](#installation)
   - [React Form Renderer](#react-form-renderer)
-  - [MUI mapper](#mui-mapper)
+  - [ANT mapper](#ant-mapper)
 - [Usage](#usage)
 - [Basic provided components](#basic-provided-components)
 - [Useful links](#useful-links)
@@ -39,14 +37,14 @@ $ yarn add @data-driven-forms/react-form-renderer
 
 Optionally you can install one of provided mappers:
 
-#### [MUI mapper](https://www.npmjs.com/package/@data-driven-forms/mui-component-mapper)
+#### [ANT mapper](https://www.npmjs.com/package/@data-driven-forms/ant-component-mapper)
 
 ```console
-$ npm install @data-driven-forms/mui-component-mapper -S
+$ npm install @data-driven-forms/ant-component-mapper -S
 ```
 
 ```console
-$ yarn add @data-driven-forms/mui-component-mapper
+$ yarn add @data-driven-forms/ant-component-mapper
 ```
 
 
@@ -57,7 +55,7 @@ For using Data Driven Forms in your component you need the renderer and a compon
 ```jsx
 import React from 'react';
 import FormRenderer, { componentTypes } from '@data-driven-forms/react-form-renderer';
-import { componentMapper, layoutMapper } from '@data-driven-forms/mui-component-mapper';
+import { componentMapper, layoutMapper } from '@data-driven-forms/ant-component-mapper';
 
 const schema = {
   fields: [{
@@ -100,7 +98,7 @@ Data Driven Forms supports all kinds of component, basic set is consisted of:
 - [Material-UI documentation](https://material-ui.com/)
 - NPM
   - [React Form Renderer](https://www.npmjs.com/package/@data-driven-forms/react-form-renderer)
-  - [MaterialUI Mapper](https://www.npmjs.com/package/@data-driven-forms/mui-component-mapper)
+  - [MaterialUI Mapper](https://www.npmjs.com/package/@data-driven-forms/ant-component-mapper)
 
 
 ### Development setup
@@ -124,7 +122,7 @@ yarn build
 Each package has a small playground `package/demo`, where you can test your changes.
 
 ```console
-cd packages/mui-component-mapper
+cd packages/ant-component-mapper
 yarn start
 ```
 
@@ -144,7 +142,7 @@ Tests needed to be run from the core folder.
 ```console
 yarn test
 
-yarn test packages/mui-component-mapper
+yarn test packages/ant-component-mapper
 ```
 
 #### Commits
@@ -156,7 +154,7 @@ Format:
 ```
 [type]([package]): message
 
-fix(mui): title accepts node
+fix(ant): title accepts node
 ```
 
 Types:

packages/ant-component-mapper/demo/index.js

@@ -8,8 +8,6 @@ import demoSchema from '@data-driven-forms/common/src/demoschema';
 import { componentMapper, FormTemplate } from '../src';
 import wizardSchema from './demo-schemas/wizard-schema';
 
-
-
 const style = {
   position: 'relative',
   width:'70%',

packages/ant-component-mapper/package.json

@@ -50,26 +50,7 @@
     "webpack": "^4.25.1",
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^3.1.10",
-    "webpack-merge": "^4.1.4"
-  },
-  "peerDependencies": {
-    "@data-driven-forms/react-form-renderer": "^1.9.3",
-    "react": "^16.13.0",
-    "react-dom": "^16.13.0"
-  },
-  "release": {
-    "prepare": [
-      "@semantic-release/npm",
-      {
-        "path": "@semantic-release/git",
-        "assets": [
-          "package.json"
-        ],
-        "message": "Release of new version: ${nextRelease.version} <no> [skip ci]"
-      }
-    ]
-  },
-  "dependencies": {
+    "webpack-merge": "^4.1.4",
     "@date-io/date-fns": "^1.0.1",
     "@date-io/moment": "^1.0.1",
     "classnames": "^2.2.6",
@@ -78,5 +59,13 @@
     "moment": "^2.23.0",
     "react-select": "^2.2.0"
   },
+  "peerDependencies": {
+    "@data-driven-forms/react-form-renderer": "^1.9.3",
+    "antd": "^4.2.0",
+    "react": "^16.13.0",
+    "react-dom": "^16.13.0"
+  },
+  "dependencies": {
+  },
   "postpublish": "export RELEASE_DEMO=true"
 }

packages/ant-component-mapper/rollup.config.js

@@ -20,7 +20,9 @@ const antExternals = createFilter(
     'react-dom',
     'prop-types',
     '@data-driven-forms/react-form-renderer',
-    'antd/**'
+    'antd/**',
+    '@data-driven-forms/react-form-renderer/**',
+    'antd'
   ],
   null,
   { resolve: false }

packages/ant-component-mapper/scripts/update_demo.sh

@@ -1,14 +1,10 @@
 import React from 'react';
 import { childrenPropTypes } from '@data-driven-forms/common/src/prop-types-templates';
-
-const styles = {
-  color: '#ff4d4f',
-  marginRight: '4px'
-};
+import './style.scss';
 
 const IsRequired = ({ children }) => (
   <React.Fragment>
-    <span style={styles} aria-hidden="true">
+    <span className="styles" aria-hidden="true">
       *
     </span>
     {children}

packages/ant-component-mapper/src/common/is-required.js

@@ -0,0 +1,4 @@
+.styles {
+    color: #ff4d4f;
+    margin-right: 4px;
+  }

packages/ant-component-mapper/src/common/style.scss

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Checkbox as AntCheckbox } from 'antd';
-import { meta, input } from '@data-driven-forms/common/src/prop-types-templates';
 import MultipleChoiceList from '../common/multiple-choice-list';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import { validationError } from '../common/helpers';
@@ -31,8 +30,6 @@ export const SingleCheckbox = (props) => {
 };
 
 SingleCheckbox.propTypes = {
-  input,
-  meta,
   isReadOnly: PropTypes.bool,
   isDisabled: PropTypes.bool,
   isRequired: PropTypes.bool,