react-flexr
Advanced tools
Comparing version 2.1.2 to 2.1.3
@@ -55,2 +55,6 @@ 'use strict'; | ||
var _propTypes = require('prop-types'); | ||
var _propTypes2 = _interopRequireDefault(_propTypes); | ||
var _utils = require('./utils'); | ||
@@ -83,4 +87,4 @@ | ||
var Cell = function (_React$Component) { | ||
(0, _inherits3.default)(Cell, _React$Component); | ||
var Cell = function (_Component) { | ||
(0, _inherits3.default)(Cell, _Component); | ||
@@ -125,2 +129,3 @@ function Cell(props, context) { | ||
children = _props.children, | ||
size = _props.size, | ||
palm = _props.palm, | ||
@@ -131,3 +136,3 @@ lap = _props.lap, | ||
grow = _props.grow, | ||
rest = (0, _objectWithoutProperties3.default)(_props, ['gutter', 'flex', 'className', 'align', 'style', 'children', 'palm', 'lap', 'portable', 'desk', 'grow']); | ||
rest = (0, _objectWithoutProperties3.default)(_props, ['gutter', 'flex', 'className', 'align', 'style', 'children', 'size', 'palm', 'lap', 'portable', 'desk', 'grow']); | ||
@@ -150,5 +155,3 @@ | ||
'div', | ||
(0, _extends3.default)({}, rest, { | ||
style: this.styles, | ||
className: classes }), | ||
(0, _extends3.default)({}, rest, { style: this.styles, className: classes }), | ||
children | ||
@@ -159,9 +162,9 @@ ); | ||
return Cell; | ||
}(_react2.default.Component); | ||
}(_react.Component); | ||
Cell.propTypes = { | ||
grow: _react.PropTypes.oneOf([false, true, _react.PropTypes.number]), | ||
gutter: _react.PropTypes.string, | ||
flex: _react.PropTypes.bool, | ||
align: _react.PropTypes.oneOf(['top', 'center', 'bottom']), | ||
grow: _propTypes2.default.oneOf([false, true, _propTypes2.default.number]), | ||
gutter: _propTypes2.default.string, | ||
flex: _propTypes2.default.bool, | ||
align: _propTypes2.default.oneOf(['top', 'center', 'bottom']), | ||
size: function size(props, propName) { | ||
@@ -168,0 +171,0 @@ var value = props[propName]; |
@@ -51,2 +51,6 @@ 'use strict'; | ||
var _propTypes = require('prop-types'); | ||
var _propTypes2 = _interopRequireDefault(_propTypes); | ||
var _utils = require('./utils'); | ||
@@ -135,7 +139,7 @@ | ||
Grid.propTypes = { | ||
gutter: _react.PropTypes.string, | ||
flexCells: _react.PropTypes.bool, | ||
align: _react.PropTypes.oneOf(['top', 'center', 'bottom']) | ||
gutter: _propTypes2.default.string, | ||
flexCells: _propTypes2.default.bool, | ||
align: _propTypes2.default.oneOf(['top', 'center', 'bottom']) | ||
}; | ||
exports.default = Grid; | ||
module.exports = exports['default']; |
import stylesheet from './stylesheet'; | ||
import StyleSheet from 'stilr'; | ||
import React, { PropTypes as Type } from 'react'; | ||
import React, { Component } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { findMatch, settings, vertical, variables, assign } from './utils'; | ||
const ERGONOMICS = Object.keys( settings ); | ||
const ERGONOMICS = Object.keys(settings); | ||
@@ -29,3 +30,3 @@ const cellStyles = StyleSheet.create({ | ||
class Cell extends React.Component { | ||
class Cell extends Component { | ||
constructor(props, context) { | ||
@@ -36,6 +37,6 @@ super(props, context); | ||
static propTypes = { | ||
grow: Type.oneOf([false, true, Type.number]), | ||
gutter: Type.string, | ||
flex: Type.bool, | ||
align: Type.oneOf(['top', 'center', 'bottom']), | ||
grow: PropTypes.oneOf([false, true, PropTypes.number]), | ||
gutter: PropTypes.string, | ||
flex: PropTypes.bool, | ||
align: PropTypes.oneOf(['top', 'center', 'bottom']), | ||
size: (props, propName) => { | ||
@@ -108,3 +109,3 @@ const value = props[propName]; | ||
children, | ||
palm, lap, portable, desk, grow, // eslint-disable-line no-unused-vars | ||
size, palm, lap, portable, desk, grow, // eslint-disable-line no-unused-vars | ||
...rest | ||
@@ -144,7 +145,4 @@ } = this.props; | ||
return ( | ||
<div | ||
{ ...rest } | ||
style={ this.styles } | ||
className={ classes }> | ||
{ children } | ||
<div {...rest} style={this.styles} className={classes}> | ||
{children} | ||
</div> | ||
@@ -151,0 +149,0 @@ ); |
import stylesheet from './stylesheet'; | ||
import StyleSheet from 'stilr'; | ||
import React, { Component, PropTypes as Type } from 'react'; | ||
import React, { Component } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { initBreakpoints, doubleUnit, vertical, horizontal, variables, assign } from './utils'; | ||
@@ -42,5 +43,5 @@ | ||
static propTypes = { | ||
gutter: Type.string, | ||
flexCells: Type.bool, | ||
align: Type.oneOf(['top', 'center', 'bottom']) | ||
gutter: PropTypes.string, | ||
flexCells: PropTypes.bool, | ||
align: PropTypes.oneOf(['top', 'center', 'bottom']) | ||
} | ||
@@ -47,0 +48,0 @@ |
{ | ||
"name": "react-flexr", | ||
"version": "2.1.2", | ||
"version": "2.1.3", | ||
"description": "React flexbox grid made simple.", | ||
@@ -17,29 +17,29 @@ "main": "dist", | ||
"devDependencies": { | ||
"babel-cli": "^6.18.0", | ||
"babel-core": "^6.18.2", | ||
"babel-eslint": "^7.1.1", | ||
"babel-loader": "^6.2.8", | ||
"babel-cli": "^6.24.1", | ||
"babel-core": "^6.24.1", | ||
"babel-eslint": "^7.2.2", | ||
"babel-loader": "^6.4.1", | ||
"babel-plugin-add-module-exports": "^0.2.1", | ||
"babel-plugin-transform-object-rest-spread": "^6.19.0", | ||
"babel-plugin-transform-react-constant-elements": "^6.9.1", | ||
"babel-plugin-transform-react-inline-elements": "^6.8.0", | ||
"babel-plugin-transform-runtime": "^6.15.0", | ||
"babel-preset-es2015": "^6.18.0", | ||
"babel-preset-react": "^6.16.0", | ||
"babel-preset-stage-0": "^6.16.0", | ||
"babel-register": "^6.18.0", | ||
"babel-runtime": "^6.18.0", | ||
"eslint": "^3.10.2", | ||
"eslint-plugin-react": "^6.7.1", | ||
"jsdom": "^9.8.3", | ||
"mocha": "^3.1.2", | ||
"react-addons-test-utils": "^15.4.0", | ||
"react-dom": "^15.4.0", | ||
"react-hot-loader": "^1.2.7", | ||
"babel-plugin-transform-object-rest-spread": "^6.23.0", | ||
"babel-plugin-transform-react-constant-elements": "^6.23.0", | ||
"babel-plugin-transform-react-inline-elements": "^6.22.0", | ||
"babel-plugin-transform-runtime": "^6.23.0", | ||
"babel-preset-es2015": "^6.24.1", | ||
"babel-preset-react": "^6.24.1", | ||
"babel-preset-stage-0": "^6.24.1", | ||
"babel-register": "^6.24.1", | ||
"babel-runtime": "^6.23.0", | ||
"eslint": "^3.19.0", | ||
"eslint-plugin-react": "^6.10.3", | ||
"jsdom": "^9.12.0", | ||
"mocha": "^3.2.0", | ||
"react-dom": "^15.5.4", | ||
"react-hot-loader": "^1.3.1", | ||
"semver": "^5.3.0", | ||
"webpack": "^1.13.3", | ||
"webpack-dev-server": "^1.16.2" | ||
"webpack": "^2.4.1", | ||
"webpack-dev-server": "^2.4.2" | ||
}, | ||
"dependencies": { | ||
"react": ">=0.11.0", | ||
"prop-types": "^15.5.8", | ||
"stilr": "^1.2.1" | ||
@@ -46,0 +46,0 @@ }, |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
190597
23
21
891
3
+ Addedprop-types@^15.5.8
+ Addedjs-tokens@4.0.0(transitive)
+ Addedloose-envify@1.4.0(transitive)
+ Addedobject-assign@4.1.1(transitive)
+ Addedprop-types@15.8.1(transitive)
+ Addedreact-is@16.13.1(transitive)