Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 2 additions & 9 deletions dist/react-hammerjs.es.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import { findDOMNode } from 'react-dom';

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; }; }();

Expand Down Expand Up @@ -117,7 +118,7 @@ var HammerComponent = function (_React$Component) {
_createClass(HammerComponent, [{
key: 'componentDidMount',
value: function componentDidMount() {
this.hammer = new Hammer(this.domElement);
this.hammer = new Hammer(findDOMNode(this));
updateHammer(this.hammer, this.props);
}
}, {
Expand Down Expand Up @@ -147,14 +148,6 @@ var HammerComponent = function (_React$Component) {
}
}, this);

var self = this;
props.ref = function (domElement) {
if (self.props.ref) {
self.props.ref(domElement);
}
self.domElement = domElement;
};

// Reuse the child provided
// This makes it flexible to use whatever element is wanted (div, ul, etc)
return React.cloneElement(React.Children.only(this.props.children), props);
Expand Down
18 changes: 5 additions & 13 deletions dist/react-hammerjs.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('prop-types'), require('react')) :
typeof define === 'function' && define.amd ? define(['prop-types', 'react'], factory) :
(global.Hammer = factory(global.PropTypes,global.React));
}(this, (function (PropTypes,React) { 'use strict';
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('prop-types'), require('react'), require('react-dom')) :
typeof define === 'function' && define.amd ? define(['prop-types', 'react', 'react-dom'], factory) :
(global.Hammer = factory(global.PropTypes,global.React,global.ReactDOM));
}(this, (function (PropTypes,React,reactDom) { 'use strict';

PropTypes = PropTypes && PropTypes.hasOwnProperty('default') ? PropTypes['default'] : PropTypes;
React = React && React.hasOwnProperty('default') ? React['default'] : React;
Expand Down Expand Up @@ -123,7 +123,7 @@ var HammerComponent = function (_React$Component) {
_createClass(HammerComponent, [{
key: 'componentDidMount',
value: function componentDidMount() {
this.hammer = new Hammer(this.domElement);
this.hammer = new Hammer(reactDom.findDOMNode(this));
updateHammer(this.hammer, this.props);
}
}, {
Expand Down Expand Up @@ -153,14 +153,6 @@ var HammerComponent = function (_React$Component) {
}
}, this);

var self = this;
props.ref = function (domElement) {
if (self.props.ref) {
self.props.ref(domElement);
}
self.domElement = domElement;
};

// Reuse the child provided
// This makes it flexible to use whatever element is wanted (div, ul, etc)
return React.cloneElement(React.Children.only(this.props.children), props);
Expand Down
2 changes: 1 addition & 1 deletion dist/react-hammerjs.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 3 additions & 9 deletions lib/Hammer.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ var _react = require('react');

var _react2 = _interopRequireDefault(_react);

var _reactDom = require('react-dom');

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 Down Expand Up @@ -130,7 +132,7 @@ var HammerComponent = function (_React$Component) {
_createClass(HammerComponent, [{
key: 'componentDidMount',
value: function componentDidMount() {
this.hammer = new Hammer(this.domElement);
this.hammer = new Hammer((0, _reactDom.findDOMNode)(this));
updateHammer(this.hammer, this.props);
}
}, {
Expand Down Expand Up @@ -160,14 +162,6 @@ var HammerComponent = function (_React$Component) {
}
}, this);

var self = this;
props.ref = function (domElement) {
if (self.props.ref) {
self.props.ref(domElement);
}
self.domElement = domElement;
};

// Reuse the child provided
// This makes it flexible to use whatever element is wanted (div, ul, etc)
return _react2.default.cloneElement(_react2.default.Children.only(this.props.children), props);
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"uglify-es": "^3.1.5"
},
"peerDependencies": {
"react": "^0.14.9 || ^15.3.0 || ^16.0.0-rc || ^16.0"
"react": ">= 0.14.9 < 17.0.0",
"react-dom": ">= 0.14.9 < 17.0.0"
},
"scripts": {
"build": "npm run build:clean && npm run build:lib && npm run build:dist",
Expand Down
11 changes: 2 additions & 9 deletions src/Hammer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import { findDOMNode } from 'react-dom'

// require('hammerjs') when in a browser. This is safe because Hammer is only
// invoked in componentDidMount, which is not executed on the server.
Expand Down Expand Up @@ -109,7 +110,7 @@ export default class HammerComponent extends React.Component {
};

componentDidMount() {
this.hammer = new Hammer(this.domElement);
this.hammer = new Hammer(findDOMNode(this));
updateHammer(this.hammer, this.props);
}

Expand All @@ -136,14 +137,6 @@ export default class HammerComponent extends React.Component {
}
}, this);

var self = this;
props.ref = function(domElement) {
if (self.props.ref) {
self.props.ref(domElement);
}
self.domElement = domElement;
};

// Reuse the child provided
// This makes it flexible to use whatever element is wanted (div, ul, etc)
return React.cloneElement(React.Children.only(this.props.children), props);
Expand Down