Skip to content
Open
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
12 changes: 12 additions & 0 deletions bundle.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
var blahh = (function (exports) {
'use strict';

const x = 'hi';
const y = 'hi';

exports.x = x;
exports.y = y;

return exports;

}({}));
1 change: 1 addition & 0 deletions dist/react-hammerjs-iife.min.js

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

20 changes: 18 additions & 2 deletions dist/react-hammerjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ var handlerToEvent = {
onPan: 'pan',
onPanCancel: 'pancancel',
onPanEnd: 'panend',
onPanMove: 'panmove',
onPanStart: 'panstart',
onPinch: 'pinch',
onPinchCancel: 'pinchcancel',
Expand All @@ -41,6 +42,10 @@ var handlerToEvent = {
onRotateMove: 'rotatemove',
onRotateStart: 'rotatestart',
onSwipe: 'swipe',
onSwipeRight: 'swiperight',
onSwipeLeft: 'swipeleft',
onSwipeUp: 'swipeup',
onSwipeDown: 'swipedown',
onTap: 'tap',
};

Expand All @@ -55,7 +60,7 @@ function updateHammer (hammer, props) {

var directionProp = props.direction;
if (directionProp || props.hasOwnProperty('vertical')) {
direction = directionProp ? directionProp : (props.vertical ? 'DIRECTION_ALL' : 'DIRECTION_HORIZONTAL');
var direction = directionProp ? directionProp : (props.vertical ? 'DIRECTION_ALL' : 'DIRECTION_HORIZONTAL');
hammer.get('pan').set({ direction: Hammer[direction] });
hammer.get('swipe').set({ direction: Hammer[direction] });
}
Expand All @@ -66,6 +71,9 @@ function updateHammer (hammer, props) {
Object.keys(props.options.recognizers).forEach(function (gesture) {
var recognizer = hammer.get(gesture);
recognizer.set(props.options.recognizers[gesture]);
if (props.options.recognizers[gesture].requireFailure) {
recognizer.requireFailure(props.options.recognizers[gesture].requireFailure);
}
}, this);
} else {
var key = option;
Expand Down Expand Up @@ -101,7 +109,7 @@ var HammerComponent = React.createClass({
},

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

Expand All @@ -128,6 +136,14 @@ var HammerComponent = React.createClass({
}
}, 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.

2 changes: 2 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const x = 'hi'
export const y = 'hi'
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
"merge-stream": "^1.0.0",
"react": "^15.2.0",
"react-dom": "^15.2.0",
"rollup": "^0.50.0",
"rollup-plugin-uglify": "^2.0.1",
"vinyl-source-stream": "^1.1.0"
},
"peerDependencies": {
Expand All @@ -37,6 +39,7 @@
"react-dom": "global:ReactDOM"
},
"scripts": {
"build:iife": "rollup -c",
"build": "NODE_ENV=production gulp build",
"bump": "gulp bump",
"bump:minor": "gulp bump:minor",
Expand Down
11 changes: 11 additions & 0 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import uglify from 'rollup-plugin-uglify'

export default {
name: 'ReactHammer',
input: 'src/Hammer.js',
output: {
file: 'dist/react-hammerjs-iife.min.js',
format: 'iife',
},
plugins: [uglify()],
}
47 changes: 19 additions & 28 deletions src/Hammer.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
var React = require('react');
var ReactDOM = require('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.
var Hammer = (typeof window !== 'undefined') ? require('hammerjs') : undefined;
// External Dependencies: React, Hammer
// hope these 2 lines don't break iife build
import React from 'react'
import 'hammerjs'

var privateProps = {
children: true,
Expand All @@ -24,6 +22,7 @@ var handlerToEvent = {
onPan: 'pan',
onPanCancel: 'pancancel',
onPanEnd: 'panend',
onPanMove: 'panmove',
onPanStart: 'panstart',
onPinch: 'pinch',
onPinchCancel: 'pinchcancel',
Expand Down Expand Up @@ -97,34 +96,28 @@ function updateHammer (hammer, props) {
});
}

var HammerComponent = React.createClass({

displayName: 'Hammer',

propTypes: {
className: React.PropTypes.string,
},
class ReactHammer extends React.Component {

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

componentDidUpdate: function () {
componentDidUpdate() {
if (this.hammer) {
updateHammer(this.hammer, this.props);
}
},
}

componentWillUnmount: function () {
componentWillUnmount() {
if (this.hammer) {
this.hammer.stop();
this.hammer.destroy();
}
this.hammer = null;
},
}

render: function () {
render() {
var props = {};

Object.keys(this.props).forEach(function (i) {
Expand All @@ -133,18 +126,16 @@ var HammerComponent = React.createClass({
}
}, this);

var self = this;
props.ref = function(domElement) {
if (self.props.ref) {
self.props.ref(domElement);
}
self.domElement = domElement;
props.ref = domElement => {
if (this.props.ref) this.props.ref(domElement)
this.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);
}
});
}

module.exports = HammerComponent;
ReactHammer.displayName = 'ReactHammer'
export default ReactHammer