Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0bd5e7e
Merge pull request #2 from bl4ckm0r3/feature/add-individual-region-color
Oct 27, 2017
bc6a1ce
Upgraded packages and small refactors
bl4ckm0r3 Oct 31, 2017
6b868a9
Merge pull request #3 from bl4ckm0r3/update-dependencies
Oct 31, 2017
2b1a032
Updated build
bl4ckm0r3 Oct 31, 2017
c94632f
Merge pull request #4 from bl4ckm0r3/update-lib
Oct 31, 2017
86a7592
New release, fixed peerdependency
bl4ckm0r3 Oct 31, 2017
2bc124f
Merge pull request #5 from bl4ckm0r3/update-version-2.3.1
Oct 31, 2017
cb5340f
Added defaultData for regions
bl4ckm0r3 Nov 3, 2017
797789d
Merge pull request #6 from bl4ckm0r3/feature/default-data
Nov 3, 2017
a0c93aa
bump version to 2.3.2
bl4ckm0r3 Nov 3, 2017
51d5ec8
Merge pull request #7 from bl4ckm0r3/bump-version
Nov 3, 2017
3961a07
Added zoom feature
bl4ckm0r3 Nov 19, 2017
8b3e139
Merge pull request #8 from bl4ckm0r3/feature/zoom-wip
Nov 20, 2017
45eebbd
Removed styles used for debugging
bl4ckm0r3 Nov 20, 2017
cda5fba
Merge pull request #9 from bl4ckm0r3/bugfix/fix-image-style-debug
Nov 20, 2017
91a5e9b
Removed styles used for debugging
bl4ckm0r3 Nov 20, 2017
f73a8e5
Merge pull request #10 from bl4ckm0r3/bugfix/fix-image-style-debug
Nov 20, 2017
98fd572
Using classNames to allow easier override of default classes
bl4ckm0r3 Dec 6, 2017
82b3245
version bump 2.4.4
bl4ckm0r3 Dec 6, 2017
d73f2de
Merge pull request #11 from bl4ckm0r3/refactor/style-issues
Dec 6, 2017
feb6d17
Added emotion css-in-js
bl4ckm0r3 Dec 7, 2017
5038c94
Changed mouse event to be more reliable
bl4ckm0r3 Dec 8, 2017
012a4c1
Merge pull request #12 from bl4ckm0r3/feature/emotion
Dec 8, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"presets": ["es2015", "stage-0", "react"]
"presets": ["es2015", "stage-0", "react"],
"plugins": [
"emotion"
]
}
34 changes: 20 additions & 14 deletions lib/Region.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ var _objectAssign2 = _interopRequireDefault(_objectAssign);

var _style = require('./style');

var _style2 = _interopRequireDefault(_style);

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

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
Expand All @@ -27,10 +25,10 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
var Region = function (_Component) {
_inherits(Region, _Component);

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

return _possibleConstructorReturn(this, (Region.__proto__ || Object.getPrototypeOf(Region)).call(this, props));
return _possibleConstructorReturn(this, (Region.__proto__ || Object.getPrototypeOf(Region)).apply(this, arguments));
}

_createClass(Region, [{
Expand All @@ -39,30 +37,32 @@ var Region = function (_Component) {
return _react2.default.createElement(
'div',
null,
_react2.default.createElement('div', { 'data-dir': 'se', style: _style2.default.RegionHandleSE }),
_react2.default.createElement('div', { 'data-dir': 'sw', style: _style2.default.RegionHandleSW }),
_react2.default.createElement('div', { 'data-dir': 'nw', style: _style2.default.RegionHandleNW }),
_react2.default.createElement('div', { 'data-dir': 'ne', style: _style2.default.RegionHandleNE })
_react2.default.createElement('div', { 'data-dir': 'se', className: _style.regionHandleSE + ' region-handle-se' }),
_react2.default.createElement('div', { 'data-dir': 'sw', className: _style.regionHandleSW + ' region-handle-sw' }),
_react2.default.createElement('div', { 'data-dir': 'nw', className: _style.regionHandleNW + ' region-handle-nw' }),
_react2.default.createElement('div', { 'data-dir': 'ne', className: _style.regionHandleNE + ' region-handle-ne' })
);
}
}, {
key: 'render',
value: function render() {
var localStyle = {
width: this.props.width + '%',
height: this.props.height + '%',
left: this.props.x + '%',
top: this.props.y + '%'
width: this.props.width * this.props.zoom + 'px',
height: this.props.height * this.props.zoom + 'px',
left: this.props.x * this.props.zoom + 'px',
top: this.props.y * this.props.zoom + 'px'
};
var dataRenderArgs = {
data: this.props.data,
isChanging: this.props.changing,
index: this.props.index
};

return _react2.default.createElement(
'div',
{
style: (0, _objectAssign2.default)({}, _style2.default.Region, localStyle),
style: (0, _objectAssign2.default)({}, localStyle, this.props.customStyle, this.props.data.regionStyle),
className: _style.region + ' region',
onMouseDown: this.props.onCropStart,
onTouchStart: this.props.onCropStart,
'data-wrapper': 'wrapper'
Expand All @@ -86,7 +86,13 @@ Region.propTypes = {
handles: _propTypes.PropTypes.bool,
changing: _propTypes.PropTypes.bool,
dataRenderer: _propTypes.PropTypes.func,
data: _propTypes.PropTypes.object
data: _propTypes.PropTypes.object,
customStyle: _propTypes.PropTypes.object,
zoom: _propTypes.PropTypes.number
};

Region.defaultProps = {
zoom: 1
};

module.exports = Region;
Loading