Huge News!Announcing our $40M Series B led by Abstract Ventures.Learn More
Socket
Sign inDemoInstall
Socket

react-flexr

Package Overview
Dependencies
Maintainers
1
Versions
42
Alerts
File Explorer

Advanced tools

Socket logo

Install Socket

Detect and block malicious and high-risk dependencies

Install

react-flexr - npm Package Compare versions

Comparing version 2.0.1 to 2.0.2

.babelrc

9

CHANGELOG.md

@@ -13,4 +13,9 @@ # Changelog

## 2.0.2
* __[Internal]__
* Tested with `react@0.14.0` and going forward `react@^0.14.0` is required for test and development
* `Object.assign` is no longer imported from React internals
## 2.0.1
* [Bug Fix]
* __[Bug Fix]__
* `react-flexr` now works correctly with `stilr@^1.2.1`

@@ -21,3 +26,3 @@

* Context rendering removed. Use `setBreakpoints` instead.
* react-style removed. [Stilr](https://github.com/chriskjaer/stilr) is now
* react-style removed. [Stilr](https://github.com/kodyl/stilr) is now
handling base styles. See updated readme for more information on how to

@@ -24,0 +29,0 @@ include basic styling for flexr. (tl;dr get css at react-flexr/styles.css)

'use strict';
Object.defineProperty(exports, '__esModule', {
value: true
});
exports.__esModule = true;
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { desc = parent = getter = undefined; _again = false; var object = _x,
property = _x2,
receiver = _x3; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }; })();
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();

@@ -19,7 +15,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

@@ -38,6 +32,2 @@ var _stylesheet = require('./stylesheet');

var _reactLibObjectAssign = require('react/lib/Object.assign');
var _reactLibObjectAssign2 = _interopRequireDefault(_reactLibObjectAssign);
var _utils = require('./utils');

@@ -69,11 +59,13 @@

var Cell = (function (_React$Component) {
_inherits(Cell, _React$Component);
function Cell(props, context) {
var _this2 = this;
var _this = this;
_classCallCheck(this, Cell);
_get(Object.getPrototypeOf(Cell.prototype), 'constructor', this).call(this, props, context);
_React$Component.call(this, props, context);
this.handleFlexSize = function (breakpoint) {
var _props = _this2.props;
var _props = _this.props;
var grow = _props.grow;

@@ -84,5 +76,5 @@ var size = _props.size;

return breakpoint && breakpoint !== 'hidden' ? _this2.calcWidth(breakpoint) : size ? _this2.calcWidth(size) : growStyle !== undefined ? { flex: '' + growStyle + ' 1 auto',
WebkitFlex: '' + growStyle + ' 1 auto',
msFlex: '' + growStyle + ' 1 auto' } : null;
return breakpoint && breakpoint !== 'hidden' ? _this.calcWidth(breakpoint) : size ? _this.calcWidth(size) : growStyle !== undefined ? { flex: growStyle + ' 1 auto',
WebkitFlex: growStyle + ' 1 auto',
msFlex: growStyle + ' 1 auto' } : null;
};

@@ -94,3 +86,3 @@

for (var i = 0, len = ERGONOMICS.length; i < len; i++) {
if (_this2.props[ERGONOMICS[i]]) breakpoints.push(ERGONOMICS[i]);
if (_this.props[ERGONOMICS[i]]) breakpoints.push(ERGONOMICS[i]);
}

@@ -102,52 +94,48 @@

this.getMatchingBreakpoint = function () {
return _this2.props[_utils.findMatch.apply(null, _this2.getDefinedBreakpoints())];
return _this.props[_utils.findMatch.apply(null, _this.getDefinedBreakpoints())];
};
}
_inherits(Cell, _React$Component);
Cell.prototype.calcWidth = function calcWidth(size) {
var _ref = size ? size.split('/') : [];
_createClass(Cell, [{
key: 'calcWidth',
value: function calcWidth(size) {
var _ref = size ? size.split('/') : [];
var _ref2 = _slicedToArray(_ref, 2);
var _ref2 = _slicedToArray(_ref, 2);
var numerator = _ref2[0];
var denominator = _ref2[1];
var numerator = _ref2[0];
var denominator = _ref2[1];
var calcSize = 100 / denominator * numerator + '%';
return {
width: calcSize
};
};
var calcSize = '' + 100 / denominator * numerator + '%';
return {
width: calcSize
};
}
}, {
key: 'render',
value: function render() {
var _props2 = this.props;
var gutter = _props2.gutter;
var flex = _props2.flex;
var className = _props2.className;
var align = _props2.align;
var style = _props2.style;
var children = _props2.children;
Cell.prototype.render = function render() {
var _props2 = this.props;
var gutter = _props2.gutter;
var flex = _props2.flex;
var className = _props2.className;
var align = _props2.align;
var style = _props2.style;
var children = _props2.children;
var rest = _objectWithoutProperties(_props2, ['gutter', 'flex', 'className', 'align', 'style', 'children']);
var rest = _objectWithoutProperties(_props2, ['gutter', 'flex', 'className', 'align', 'style', 'children']);
var breakpoint = this.getMatchingBreakpoint();
var flexSize = this.handleFlexSize(breakpoint);
var breakpoint = this.getMatchingBreakpoint();
var flexSize = this.handleFlexSize(breakpoint);
this.styles = _reactLibObjectAssign2['default']({}, gutter ? { padding: '0 ' + gutter } : null, flexSize, style);
this.styles = _utils.assign({}, gutter ? { padding: '0 ' + gutter } : null, flexSize, style);
var classes = [cellStyles.base, flexSize ? null : cellStyles.baseFlex, className, flex ? cellStyles.flex : null, align ? cellStyles[align] : null].filter(Boolean).join(' ');
var classes = [cellStyles.base, flexSize ? null : cellStyles.baseFlex, className, flex ? cellStyles.flex : null, align ? cellStyles[align] : null].filter(Boolean).join(' ');
return breakpoint === 'hidden' ? null : _react2['default'].createElement(
'div',
_extends({}, rest, {
style: this.styles,
className: classes }),
children
);
}
}], [{
return breakpoint === 'hidden' ? null : _react2['default'].createElement(
'div',
_extends({}, rest, {
style: this.styles,
className: classes }),
children
);
};
_createClass(Cell, null, [{
key: 'propTypes',

@@ -154,0 +142,0 @@ value: {

'use strict';
Object.defineProperty(exports, '__esModule', {
value: true
});
exports.__esModule = true;
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { desc = parent = getter = undefined; _again = false; var object = _x,
property = _x2,
receiver = _x3; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

@@ -21,3 +15,3 @@

function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

@@ -36,6 +30,2 @@ var _stylesheet = require('./stylesheet');

var _reactLibObjectAssign = require('react/lib/Object.assign');
var _reactLibObjectAssign2 = _interopRequireDefault(_reactLibObjectAssign);
var _utils = require('./utils');

@@ -72,47 +62,46 @@

var Grid = (function (_Component) {
_inherits(Grid, _Component);
function Grid(props) {
_classCallCheck(this, Grid);
_get(Object.getPrototypeOf(Grid.prototype), 'constructor', this).call(this, props);
_Component.call(this, props);
_utils.findBreakpoints();
}
_inherits(Grid, _Component);
Grid.prototype.render = function render() {
var _props = this.props;
var gutter = _props.gutter;
var style = _props.style;
var align = _props.align;
var hAlign = _props.hAlign;
var flexCells = _props.flexCells;
var children = _props.children;
var className = _props.className;
_createClass(Grid, [{
key: 'render',
value: function render() {
var _props = this.props;
var gutter = _props.gutter;
var style = _props.style;
var align = _props.align;
var hAlign = _props.hAlign;
var flexCells = _props.flexCells;
var children = _props.children;
var className = _props.className;
var rest = _objectWithoutProperties(_props, ['gutter', 'style', 'align', 'hAlign', 'flexCells', 'children', 'className']);
var rest = _objectWithoutProperties(_props, ['gutter', 'style', 'align', 'hAlign', 'flexCells', 'children', 'className']);
this.styles = _utils.assign({}, style, gutter ? { margin: '0 -' + gutter + ' ' + _utils.doubleUnit(gutter) } : null);
this.styles = _reactLibObjectAssign2['default']({}, style, gutter ? { margin: '0 -' + gutter + ' ' + _utils.doubleUnit(gutter) } : null);
var classes = [styles.base, className, align ? styles[align + 'Vertical'] : null, hAlign ? styles[hAlign + 'Horizontal'] : null].filter(Boolean).join(' ');
var classes = [styles.base, className, align ? styles[align + 'Vertical'] : null, hAlign ? styles[hAlign + 'Horizontal'] : null].filter(Boolean).join(' ');
var parentProps = {};
if (gutter) parentProps.gutter = gutter;
if (flexCells) parentProps.flex = true;
var parentProps = {};
if (gutter) parentProps.gutter = gutter;
if (flexCells) parentProps.flex = true;
var wrappedChildren = Object.keys(parentProps).length ? _react2['default'].Children.map(children, function (child) {
if (!child) return child;
return _react2['default'].cloneElement(child, _extends({}, parentProps));
}) : children;
var wrappedChildren = Object.keys(parentProps).length ? _react2['default'].Children.map(children, function (child) {
if (!child) return child;
return _react2['default'].cloneElement(child, _extends({}, parentProps));
}) : children;
return _react2['default'].createElement(
'div',
_extends({}, rest, {
style: this.styles,
className: classes }),
wrappedChildren
);
};
return _react2['default'].createElement(
'div',
_extends({}, rest, {
style: this.styles,
className: classes }),
wrappedChildren
);
}
}], [{
_createClass(Grid, null, [{
key: 'propTypes',

@@ -119,0 +108,0 @@ value: {

'use strict';
Object.defineProperty(exports, '__esModule', {
value: true
});
exports.__esModule = true;

@@ -34,3 +32,4 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

getBreakpoints: _utils.getBreakpoints,
clearBreakpoints: _utils.clearBreakpoints }, _utils.mediaQueries);
clearBreakpoints: _utils.clearBreakpoints
}, _utils.mediaQueries);
module.exports = exports['default'];
'use strict';
Object.defineProperty(exports, '__esModule', {
value: true
});
exports.__esModule = true;

@@ -7,0 +5,0 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

'use strict';
Object.defineProperty(exports, '__esModule', {
value: true
});
exports.__esModule = true;
var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }; })();
exports.generateMatchMediaString = generateMatchMediaString;

@@ -14,5 +15,3 @@ exports.setBreakpoints = setBreakpoints;

exports.doubleUnit = doubleUnit;
function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }
exports.assign = assign;
var canUseDOM = (function () {

@@ -39,3 +38,3 @@ return typeof window !== 'undefined' && window.document && window.document.createElement && window.matchMedia;

var str = minStr && maxStr ? '' + minStr + ' and ' + maxStr : minStr || maxStr;
var str = minStr && maxStr ? minStr + ' and ' + maxStr : minStr || maxStr;

@@ -158,3 +157,3 @@ return str;

return '' + val * 2 + '' + unit;
return '' + val * 2 + unit;
}

@@ -179,2 +178,34 @@

};
exports.variables = variables;
function assign(target, sources) {
if (target == null) {
throw new TypeError('Object.assign target cannot be null or undefined');
}
var to = Object(target);
var hasOwnProperty = Object.prototype.hasOwnProperty;
for (var nextIndex = 1; nextIndex < arguments.length; nextIndex++) {
var nextSource = arguments[nextIndex];
if (nextSource == null) {
continue;
}
var source = Object(nextSource);
// We don't currently support accessors nor proxies. Therefore this
// copy cannot throw. If we ever supported this then we must handle
// exceptions and side-effects. We don't support symbols so they won't
// be transferred.
for (var key in source) {
if (hasOwnProperty.call(source, key)) {
to[key] = source[key];
}
}
}
return to;
}
import stylesheet from './stylesheet';
import StyleSheet from 'stilr';
import React, { PropTypes as Type } from 'react';
import assign from 'react/lib/Object.assign';
import { findMatch, settings, vertical, variables } from './utils';
import { findMatch, settings, vertical, variables, assign } from './utils';

@@ -7,0 +6,0 @@ const ERGONOMICS = Object.keys( settings );

import stylesheet from './stylesheet';
import StyleSheet from 'stilr';
import React, { Component, PropTypes as Type } from 'react';
import assign from 'react/lib/Object.assign';
import { findBreakpoints, doubleUnit, vertical, horizontal, variables } from './utils';
import { findBreakpoints, doubleUnit, vertical, horizontal, variables, assign } from './utils';

@@ -7,0 +6,0 @@ const styles = StyleSheet.create({

@@ -149,1 +149,32 @@ export const canUseDOM = (() => (

};
export function assign(target, sources) {
if (target == null) {
throw new TypeError('Object.assign target cannot be null or undefined');
}
const to = Object(target);
const hasOwnProperty = Object.prototype.hasOwnProperty;
for (let nextIndex = 1; nextIndex < arguments.length; nextIndex++) {
const nextSource = arguments[nextIndex];
if (nextSource == null) {
continue;
}
const source = Object(nextSource);
// We don't currently support accessors nor proxies. Therefore this
// copy cannot throw. If we ever supported this then we must handle
// exceptions and side-effects. We don't support symbols so they won't
// be transferred.
for (const key in source) {
if (hasOwnProperty.call(source, key)) {
to[key] = source[key];
}
}
}
return to;
}
{
"name": "react-flexr",
"version": "2.0.1",
"version": "2.0.2",
"description": "React flexbox grid made simple.",

@@ -20,5 +20,7 @@ "main": "dist",

"babel-loader": "^5.0.0",
"jsdom": "^5.4.1",
"jsdom": "^6.5.1",
"mocha": "^2.2.4",
"mocha-clean": "^0.4.0",
"react": "^0.14.0",
"react-addons-test-utils": "^0.14.0",
"react-dom": "^0.14.0",
"react-hot-loader": "^1.2.7",

@@ -33,5 +35,5 @@ "semver": "^5.0.1",

},
"repository": "chriskjaer/react-flexr",
"repository": "kodyl/react-flexr",
"author": "Chris Kjær Sørensen",
"license": "MIT"
}

Sorry, the diff of this file is not supported yet

SocketSocket SOC 2 Logo

Product

  • Package Alerts
  • Integrations
  • Docs
  • Pricing
  • FAQ
  • Roadmap
  • Changelog

Packages

npm

Stay in touch

Get open source security insights delivered straight into your inbox.


  • Terms
  • Privacy
  • Security

Made with ⚡️ by Socket Inc