Update to material-ui v4

18techs · Jun 25, 2019 · 283d914 · 283d914
1 parent a7644c7
commit 283d914
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 23 deletions.
diff --git a/lib/Array.js b/lib/Array.js
@@ -66,15 +66,15 @@ var styles = function styles(theme) {
     return {
         arrayItem: {
             position: "relative",
-            padding: theme.spacing.unit,
-            marginTop: theme.spacing.unit,
+            padding: theme.spacing(),
+            marginTop: theme.spacing(),
             display: "flex"
         },
         deleteItemButton: {
-            margin: [[-theme.spacing.unit, -theme.spacing.unit, "auto", "auto"]]
+            margin: [[theme.spacing(-1), theme.spacing(-1), "auto", "auto"]]
         },
         addButton: {
-            marginLeft: theme.spacing.unit
+            marginLeft: theme.spacing()
         },
         elementsContainer: {
             display: "flex",

diff --git a/lib/FieldSet.js b/lib/FieldSet.js
@@ -33,10 +33,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var styles = function styles(theme) {
     return {
         root: {
-            marginTop: theme.spacing.unit
+            marginTop: theme.spacing(1)
         },
         fields: {
-            marginLeft: theme.spacing.unit
+            marginLeft: theme.spacing(1)
         }
     };
 };

diff --git a/lib/MultiSelect.js b/lib/MultiSelect.js
@@ -61,7 +61,7 @@ var styles = function styles(theme) {
             flexWrap: "wrap"
         },
         chip: {
-            margin: theme.spacing.unit / 4
+            margin: theme.spacing(0.25)
         },
         menuItem: {
             fontWeight: theme.typography.fontWeightRegular

diff --git a/lib/Radios.js b/lib/Radios.js
@@ -49,10 +49,10 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 var styles = function styles(theme) {
     return {
         formControl: {
-            marginTop: theme.spacing.unit
+            marginTop: theme.spacing(1)
         },
         group: {
-            margin: theme.spacing.unit + "px 0"
+            margin: theme.spacing(1, 0)
         }
     };
 };

diff --git a/lib/utils.js b/lib/utils.js
@@ -37,6 +37,10 @@ var _notevil = require("notevil");
 
 var _notevil2 = _interopRequireDefault(_notevil);
 
+var _set2 = require("lodash/fp/set");
+
+var _set3 = _interopRequireDefault(_set2);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Evaluates an expression in a safe way
@@ -617,6 +621,17 @@ function selectOrSet(projection, obj, valueToSet, type) {
     return value;
 }
 
+function set(projection, obj, valueToSet, type) {
+    if (!obj) {
+        obj = this;
+    }
+
+    // Support [] array syntax
+    var parts = typeof projection === "string" ? _objectpath2.default.parse(projection) : projection;
+
+    return (0, _set3.default)(parts, valueToSet)(obj);
+}
+
 var validateBySchema = function validateBySchema(schema, value) {
     return _tv2.default.validateResult(value, schema);
 };
@@ -721,5 +736,6 @@ exports.default = {
     selectOrSet: selectOrSet,
     getValueFromModel: getValueFromModel,
     getTitleByValue: getTitleByValue,
-    removeEmpty: removeEmpty
+    removeEmpty: removeEmpty,
+    set: set
 };
diff --git a/package.json b/package.json
@@ -39,8 +39,8 @@
   },
   "devDependencies": {
     "@babel/preset-flow": "^7.0.0",
-    "@material-ui/core": "^3.7.1",
-    "@material-ui/icons": "3.0.1",
+    "@material-ui/core": "^4.0.0",
+    "@material-ui/icons": "^4.0.0",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",
     "babel-eslint": "^10.0.1",
@@ -75,8 +75,8 @@
   "peerDependencies": {
     "react": "*",
     "react-dom": "*",
-    "@material-ui/core": ">=3.2.0",
-    "@material-ui/icons": ">=3.0.0"
+    "@material-ui/core": ">=4.0.0",
+    "@material-ui/icons": ">=4.0.0"
   },
   "scripts": {
     "preversion": "webpack -p",

diff --git a/src/Array.js b/src/Array.js
@@ -17,15 +17,15 @@ import type { Localization } from "./types";
 const styles = theme => ({
     arrayItem: {
         position: "relative",
-        padding: theme.spacing.unit,
-        marginTop: theme.spacing.unit,
+        padding: theme.spacing(),
+        marginTop: theme.spacing(),
         display: "flex"
     },
     deleteItemButton: {
-        margin: [[-theme.spacing.unit, -theme.spacing.unit, "auto", "auto"]]
+        margin: [[theme.spacing(-1), theme.spacing(-1), "auto", "auto"]]
     },
     addButton: {
-        marginLeft: theme.spacing.unit
+        marginLeft: theme.spacing()
     },
     elementsContainer: {
         display: "flex",

diff --git a/src/FieldSet.js b/src/FieldSet.js
@@ -11,10 +11,10 @@ import type { Localization } from "./types";
 
 const styles = theme => ({
     root: {
-        marginTop: theme.spacing.unit
+        marginTop: theme.spacing(1)
     },
     fields: {
-        marginLeft: theme.spacing.unit
+        marginLeft: theme.spacing(1)
     }
 });
 

diff --git a/src/MultiSelect.js b/src/MultiSelect.js
@@ -20,7 +20,7 @@ const styles = theme => ({
         flexWrap: "wrap"
     },
     chip: {
-        margin: theme.spacing.unit / 4
+        margin: theme.spacing(0.25)
     },
     menuItem: {
         fontWeight: theme.typography.fontWeightRegular

diff --git a/src/Radios.js b/src/Radios.js
@@ -11,10 +11,10 @@ import type { Localization } from "./types";
 
 const styles = theme => ({
     formControl: {
-        marginTop: theme.spacing.unit
+        marginTop: theme.spacing(1)
     },
     group: {
-        margin: `${theme.spacing.unit}px 0`
+        margin: theme.spacing(1, 0)
     }
 });