Skip to content

Commit

Permalink
Ginormous Babel 6.0 Update
Browse files Browse the repository at this point in the history
  • Loading branch information
casesandberg committed Jan 18, 2016
1 parent 770b243 commit 0d1c7d2
Show file tree
Hide file tree
Showing 88 changed files with 4,931 additions and 3,803 deletions.
10 changes: 10 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"presets": [
"es2015",
"stage-0",
"react"
],
"plugins": [
"lodash"
]
}
4,802 changes: 3,036 additions & 1,766 deletions build/bundle.js

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions docs/components/home/Home.jsx → docs/components/home/Home.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
'use strict';

var React = require('react');
var ReactCSS = require('reactcss');
import React from 'react';
import ReactCSS from 'reactcss';

var HomeFeature = require('./HomeFeature');
var HomeDocumentation = require('./HomeDocumentation');
import HomeFeature from './HomeFeature';
import HomeDocumentation from './HomeDocumentation';

module.exports = class Home extends ReactCSS.Component {
class Home extends ReactCSS.Component {

constructor() {
super();
Expand Down Expand Up @@ -56,3 +56,5 @@ module.exports = class Home extends ReactCSS.Component {
);
}
};

export default Home;
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
'use strict';

var React = require('react');
var ReactCSS = require('reactcss');
import React from 'react';
import ReactCSS from 'reactcss';

var { Container, Grid } = require('react-basic-layout');
var { Raised } = require('react-material-design');
var Docs = require('react-docs');
var Markdown = require('../../../modules/react-docs/lib/components/Markdown');
import { Container, Grid } from 'react-basic-layout';
import { Raised } from 'react-material-design';
import Docs from 'react-docs';
import Markdown from '../../../modules/react-docs/lib/components/Markdown';

var documentation = require('../../documentation');
var { Button, buttonmd, Sketch, sketchmd } = require('../../../examples');
import documentation from '../../documentation';
import { Button, buttonmd, Sketch, sketchmd } from '../../../examples';

class HomeDocumentation extends ReactCSS.Component {

Expand Down Expand Up @@ -55,6 +55,8 @@ class HomeDocumentation extends ReactCSS.Component {

render() {
var bottom = <iframe src="https://ghbtns.com/github-btn.html?user=casesandberg&repo=react-color&type=star&count=true&size=large" scrolling="0" width="160px" height="30px" frameBorder="0"></iframe>;

// return <div></div>;
return (
<div is="body">
<Container width={ 780 }>
Expand Down Expand Up @@ -90,4 +92,4 @@ class HomeDocumentation extends ReactCSS.Component {
}
}

module.exports = HomeDocumentation;
export default HomeDocumentation;
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
'use strict';

var React = require('react');
var ReactCSS = require('reactcss');
var ColorPicker = require('react-color');
import React from 'react';
import ReactCSS from 'reactcss';

var { Container, Grid } = require('react-basic-layout');
var { Raised } = require('react-material-design');
var Move = require('react-move');
import ColorPicker from 'react-color';

import { Container, Grid } from 'react-basic-layout';
import { Raised } from 'react-material-design';
import Move from 'react-move';

class HomeFeature extends ReactCSS.Component {

Expand Down Expand Up @@ -208,4 +209,4 @@ class HomeFeature extends ReactCSS.Component {
}
}

module.exports = HomeFeature;
export default HomeFeature;
6 changes: 3 additions & 3 deletions docs/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

var React = require('react');
var ReactDOM = require('react-dom');
import React from 'react';
import ReactDOM from 'react-dom';

var Home = require('./components/home/Home');
import Home from './components/home/Home';

// var html = React.renderToString(React.createElement(Home));
// console.log(html);
Expand Down
8 changes: 5 additions & 3 deletions examples/Button.jsx → examples/Button.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

var React = require('react');
var ColorPicker = require('react-color');
import React from 'react';
import ColorPicker from 'react-color';

module.exports = class ButtonExample extends React.Component {
class ButtonExample extends React.Component {

constructor() {
super();
Expand Down Expand Up @@ -31,3 +31,5 @@ module.exports = class ButtonExample extends React.Component {
);
}
};

export default ButtonExample;
10 changes: 6 additions & 4 deletions examples/Sketch.jsx → examples/Sketch.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use strict';

var React = require('react');
var ReactCSS = require('reactcss');
var ColorPicker = require('react-color');
import React from 'react';
import ReactCSS from 'reactcss';
import ColorPicker from 'react-color';

module.exports = class SketchExample extends ReactCSS.Component {
class SketchExample extends ReactCSS.Component {

constructor() {
super();
Expand Down Expand Up @@ -61,3 +61,5 @@ module.exports = class SketchExample extends ReactCSS.Component {
);
}
};

export default SketchExample;
33 changes: 27 additions & 6 deletions examples/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
'use strict';

module.exports = {
Button: require('./Button'),
buttonmd: require('./button.md'),
Sketch: require('./Sketch'),
sketchmd: require('./sketch.md'),
};
Object.defineProperty(exports, '__esModule', {
value: true,
});

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

var _Button = require('./Button');

var _Button2 = _interopRequireDefault(_Button);

var _buttonMd = require('./button.md');

var _buttonMd2 = _interopRequireDefault(_buttonMd);

var _Sketch = require('./Sketch');

var _Sketch2 = _interopRequireDefault(_Sketch);

var _sketchMd = require('./sketch.md');

var _sketchMd2 = _interopRequireDefault(_sketchMd);

exports.Button = _Button2['default'];
exports.buttonmd = _buttonMd2['default'];
exports.Sketch = _Sketch2['default'];
exports.sketchmd = _sketchMd2['default'];
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require('babel/register');
require('babel-register');
require('require-dir')('./gulp');
require('gulp').task('dist', ['docs:dist', 'lib:dist', 'modules:dist']);
639 changes: 1 addition & 638 deletions index.html

Large diffs are not rendered by default.

72 changes: 39 additions & 33 deletions lib/components/ChromePicker.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
'use strict';Object.defineProperty(exports, '__esModule', {
value: true
});
'use strict';

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 _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) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; 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; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
Object.defineProperty(exports, "__esModule", {
value: true
});

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
var _isPlainObject = require('lodash/lang/isPlainObject');

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
var _isPlainObject2 = _interopRequireDefault(_isPlainObject);

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; }
var _debounce = require('lodash/function/debounce');

var _debounce2 = _interopRequireDefault(_debounce);

var _react = require('react');

Expand All @@ -26,38 +28,43 @@ var _merge = require('merge');

var _merge2 = _interopRequireDefault(_merge);

var _lodash = require('lodash');
var _color = require('../helpers/color');

var _color2 = _interopRequireDefault(_color);

var _Chrome = require('./chrome/Chrome');

var _lodash2 = _interopRequireDefault(_lodash);
var _Chrome2 = _interopRequireDefault(_Chrome);

var _helpersColor = require('../helpers/color');
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var _helpersColor2 = _interopRequireDefault(_helpersColor);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

var _chromeChrome = require('./chrome/Chrome');
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }

var _chromeChrome2 = _interopRequireDefault(_chromeChrome);
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; }

var ColorPicker = (function (_ReactCSS$Component) {
var ColorPicker = function (_ReactCSS$Component) {
_inherits(ColorPicker, _ReactCSS$Component);

function ColorPicker(props) {
_classCallCheck(this, ColorPicker);

_get(Object.getPrototypeOf(ColorPicker.prototype), 'constructor', this).call(this);
var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(ColorPicker).call(this));

this.state = (0, _merge2['default'])(_helpersColor2['default'].toState(props.color, 0), {
_this.state = (0, _merge2.default)(_color2.default.toState(props.color, 0), {
visible: props.display
});

this.debounce = _lodash2['default'].debounce(function (fn, data) {
_this.debounce = (0, _debounce2.default)(function (fn, data) {
fn(data);
}, 100);

this.handleChange = this.handleChange.bind(this);
this.handleHide = this.handleHide.bind(this);
this.handleAccept = this.handleAccept.bind(this);
this.handleCancel = this.handleCancel.bind(this);
_this.handleChange = _this.handleChange.bind(_this);
_this.handleHide = _this.handleHide.bind(_this);
_this.handleAccept = _this.handleAccept.bind(_this);
_this.handleCancel = _this.handleCancel.bind(_this);
return _this;
}

_createClass(ColorPicker, [{
Expand Down Expand Up @@ -125,7 +132,7 @@ var ColorPicker = (function (_ReactCSS$Component) {
'left': this.props.position === 'left' && this.props.display !== null,
'show': this.state.visible === true,
'hide': this.state.visible === false,
'override': _lodash2['default'].isPlainObject(this.props.positionCSS)
'override': (0, _isPlainObject2.default)(this.props.positionCSS)
});
}
}, {
Expand Down Expand Up @@ -159,9 +166,9 @@ var ColorPicker = (function (_ReactCSS$Component) {
}, {
key: 'handleChange',
value: function handleChange(data) {
data = _helpersColor2['default'].simpleCheckForValidColor(data);
data = _color2.default.simpleCheckForValidColor(data);
if (data) {
var colors = _helpersColor2['default'].toState(data, data.h || this.state.oldHue);
var colors = _color2.default.toState(data, data.h || this.state.oldHue);
this.setState(colors);
this.props.onChangeComplete && this.debounce(this.props.onChangeComplete, colors);
this.props.onChange && this.props.onChange(colors);
Expand All @@ -170,28 +177,28 @@ var ColorPicker = (function (_ReactCSS$Component) {
}, {
key: 'componentWillReceiveProps',
value: function componentWillReceiveProps(nextProps) {
this.setState((0, _merge2['default'])(_helpersColor2['default'].toState(nextProps.color, this.state.oldHue), {
this.setState((0, _merge2.default)(_color2.default.toState(nextProps.color, this.state.oldHue), {
visible: nextProps.display
}));
}
}, {
key: 'render',
value: function render() {
return _react2['default'].createElement(
return _react2.default.createElement(
'div',
{ style: this.styles().wrap },
_react2['default'].createElement(
_react2.default.createElement(
'div',
{ style: this.styles().picker },
_react2['default'].createElement(_chromeChrome2['default'], _extends({}, this.props, this.state, { onChange: this.handleChange, onAccept: this.handleAccept, onCancel: this.handleCancel }))
_react2.default.createElement(_Chrome2.default, _extends({}, this.props, this.state, { onChange: this.handleChange, onAccept: this.handleAccept, onCancel: this.handleCancel }))
),
_react2['default'].createElement('div', { style: this.styles().cover, onClick: this.handleHide })
_react2.default.createElement('div', { style: this.styles().cover, onClick: this.handleHide })
);
}
}]);

return ColorPicker;
})(_reactcss2['default'].Component);
}(_reactcss2.default.Component);

ColorPicker.defaultProps = {
color: {
Expand All @@ -206,5 +213,4 @@ ColorPicker.defaultProps = {
positionCSS: {}
};

exports['default'] = ColorPicker;
module.exports = exports['default'];
exports.default = ColorPicker;
Loading

0 comments on commit 0d1c7d2

Please sign in to comment.