Merge pull request #629 from rvsia/updateMasterToAnt

Merge master to ant

Author: Hyperkid123

README.md

@@ -265,7 +265,6 @@ yarn start
 4. How to clean?
 
 ```console
-rm yarn.lock
 yarn lerna clean # will delete all node_modules
 ```
 
@@ -306,7 +305,7 @@ All packages are releasing together and they share the version number.
 
 #### Changes to documentation
 
-If your changes influence API or add new features, you should describe these new options in the `demo` repository. Thanks!
+If your changes influence API or add new features, you should describe these new options in the `react-renderer-demo` repository. Thanks!
 
 ### Contribution
 

packages/blueprint-component-mapper/README.md

@@ -129,7 +129,6 @@ yarn start
 4. How to clean?
 
 ```console
-rm yarn.lock
 yarn lerna clean # will delete all node_modules
 ```
 
@@ -170,7 +169,7 @@ All packages are releasing together and they share the version number.
 
 #### Changes to documentation
 
-If your changes influence API or add new features, you should describe these new options in the `demo` repository. Thanks!
+If your changes influence API or add new features, you should describe these new options in the `react-renderer-demo` repository. Thanks!
 
 ### Contribution
 

packages/blueprint-component-mapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/blueprint-component-mapper",
-  "version": "2.6.1",
+  "version": "2.6.6",
   "description": "Blueprint component mapper for data-driven-forms.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/common",
-  "version": "2.6.1",
+  "version": "2.6.6",
   "description": "Common components, helpers and other pieces of code",
   "license": "Apache-2.0",
   "main": "index.js",

packages/mui-component-mapper/README.md

@@ -132,7 +132,6 @@ yarn start
 4. How to clean?
 
 ```console
-rm yarn.lock
 yarn lerna clean # will delete all node_modules
 ```
 
@@ -173,7 +172,7 @@ All packages are releasing together and they share the version number.
 
 #### Changes to documentation
 
-If your changes influence API or add new features, you should describe these new options in the `demo` repository. Thanks!
+If your changes influence API or add new features, you should describe these new options in the `react-renderer-demo` repository. Thanks!
 
 ### Contribution
 

packages/mui-component-mapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/mui-component-mapper",
-  "version": "2.6.1",
+  "version": "2.6.6",
   "description": "Component mapper for Material ui component mapper form data-driven-forms.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -26,9 +26,9 @@
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@material-ui/core": "^4.9.14",
+    "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
-    "@material-ui/styles": "^4.9.14",
+    "@material-ui/styles": "^4.10.0",
     "@semantic-release/git": "^7.0.5",
     "@semantic-release/npm": "^5.1.1",
     "babel-core": "^7.0.0-bridge.0",
@@ -61,20 +61,19 @@
   },
   "peerDependencies": {
     "@data-driven-forms/react-form-renderer": "^1.9.3",
-    "@material-ui/core": "^4.9.14",
+    "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/styles": "^4.9.14",
-    "material-ui-pickers": "^2.2.4",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"
   },
   "dependencies": {
     "@date-io/date-fns": "^1.0.1",
     "@date-io/moment": "^1.0.1",
+    "@material-ui/pickers": "^3.2.10",
     "clsx": "^1.0.4",
     "date-fns": "^1.30.1",
-    "material-ui-pickers": "^2.2.4",
     "moment": "^2.23.0",
     "@material-ui/lab": "^4.0.0-alpha.53"
   },

packages/mui-component-mapper/src/files/date-picker.d.ts

@@ -1,7 +1,7 @@
-import { DatePickerProps as MuiDatePickerProps } from "material-ui-pickers/DatePicker";
+import { DatePickerProps as MuiDatePickerProps } from "@material-ui/pickers/DatePicker";
 import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
 import { GridProps } from "@material-ui/core";
-import { MuiPickersUtilsProviderProps } from "material-ui-pickers/MuiPickersUtilsProvider";
+import { MuiPickersUtilsProviderProps } from "@material-ui/pickers/MuiPickersUtilsProvider";
 
 interface InternalDatePickerProps extends MuiDatePickerProps {
   FormFieldGridProps: GridProps;

packages/mui-component-mapper/src/files/date-picker.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { MuiPickersUtilsProvider, DatePicker as MUIDatePicker } from 'material-ui-pickers';
+import { MuiPickersUtilsProvider, DatePicker as MUIDatePicker } from '@material-ui/pickers';
 import MomentUtils from '@date-io/moment';
 
 import FormFieldGrid from '../common/form-field-grid';

packages/mui-component-mapper/src/files/select.d.ts

@@ -3,7 +3,7 @@ import { AutocompleteProps } from "@material-ui/lab/Autocomplete";
 import { ReactNode } from "react";
 import { GridProps, TextFieldProps, InputProps } from "@material-ui/core";
 
-interface InternalSelectProps<T> extends AutocompleteProps<T> {
+interface InternalSelectProps<T> extends AutocompleteProps<T, boolean | undefined, boolean | undefined, boolean | undefined> {
   isRequired?: boolean;
   isDisabled?: boolean;
   isReadOnly?: boolean;

packages/mui-component-mapper/src/files/time-picker.d.ts

@@ -1,7 +1,7 @@
 import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
-import { TimePickerProps as MuiTimePickerProps } from 'material-ui-pickers';
+import { TimePickerProps as MuiTimePickerProps } from '@material-ui/pickers';
 import { ReactNode } from "react";
-import { MuiPickersUtilsProviderProps } from "material-ui-pickers/MuiPickersUtilsProvider";
+import { MuiPickersUtilsProviderProps } from "@material-ui/pickers/MuiPickersUtilsProvider";
 import { GridProps } from "@material-ui/core";
 interface InternalTimePickerProps extends MuiTimePickerProps {
   isReadOnly?: boolean;