@material-ui/system
Advanced tools
Comparing version 4.0.0-beta.1 to 4.0.0-beta.2
@@ -10,4 +10,2 @@ "use strict"; | ||
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")); | ||
var _merge = _interopRequireDefault(require("./merge")); | ||
@@ -48,3 +46,3 @@ | ||
fn.propTypes = process.env.NODE_ENV !== 'production' ? styles.reduce(function (acc, style) { | ||
return (0, _extends2.default)(acc, style.propTypes); | ||
return Object.assign(acc, style.propTypes); | ||
}, {}) : {}; | ||
@@ -51,0 +49,0 @@ fn.filterProps = styles.reduce(function (acc, style) { |
@@ -1,2 +0,1 @@ | ||
import _extends from "@babel/runtime/helpers/extends"; | ||
import merge from './merge'; | ||
@@ -30,3 +29,3 @@ | ||
fn.propTypes = process.env.NODE_ENV !== 'production' ? styles.reduce((acc, style) => _extends(acc, style.propTypes), {}) : {}; | ||
fn.propTypes = process.env.NODE_ENV !== 'production' ? styles.reduce((acc, style) => Object.assign(acc, style.propTypes), {}) : {}; | ||
fn.filterProps = styles.reduce((acc, style) => acc.concat(style.filterProps), []); | ||
@@ -33,0 +32,0 @@ return fn; |
@@ -1,2 +0,1 @@ | ||
import _extends from "@babel/runtime/helpers/extends"; | ||
import merge from './merge'; | ||
@@ -37,3 +36,3 @@ | ||
fn.propTypes = process.env.NODE_ENV !== 'production' ? styles.reduce(function (acc, style) { | ||
return _extends(acc, style.propTypes); | ||
return Object.assign(acc, style.propTypes); | ||
}, {}) : {}; | ||
@@ -40,0 +39,0 @@ fn.filterProps = styles.reduce(function (acc, style) { |
@@ -1,2 +0,2 @@ | ||
/** @license Material-UI v4.0.0-beta.1 | ||
/** @license Material-UI v4.0.0-beta.2 | ||
* | ||
@@ -3,0 +3,0 @@ * This source code is licensed under the MIT license found in the |
@@ -62,3 +62,3 @@ import { CSSProperties } from '@material-ui/styles'; | ||
styleFunction: StyleFunction<Props>, | ||
): StyleFunction<Props | { css: Omit<Props, 'theme'> }>; | ||
): StyleFunction<Props & { css: Omit<Props, 'theme'> }>; | ||
@@ -65,0 +65,0 @@ // default display.js TODO |
@@ -1,2 +0,2 @@ | ||
/** @license Material-UI v4.0.0-beta.1 | ||
/** @license Material-UI v4.0.0-beta.2 | ||
* | ||
@@ -3,0 +3,0 @@ * This source code is licensed under the MIT license found in the |
{ | ||
"name": "@material-ui/system", | ||
"version": "4.0.0-beta.1", | ||
"version": "4.0.0-beta.2", | ||
"private": false, | ||
@@ -5,0 +5,0 @@ "author": "Material-UI Team", |
@@ -19,2 +19,2 @@ # @material-ui/system | ||
[The documentation](https://material-ui.com/system/basics/) | ||
[The documentation](https://next.material-ui.com/system/basics/) |
Sorry, the diff of this file is too big to display
487769
1939