Skip to content

Commit ffbccc7

Browse files
authored
Merge pull request #20 from marcotrinelli/master
Add support of new options
2 parents 4e9210f + 92b773a commit ffbccc7

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

packages/react-nipple/lib/ReactNipple.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,11 @@ var ReactNipple = (_class = function (_Component) {
265265
mode: _propTypes2.default.string, // 'dynamic', 'static' or 'semi'
266266
restJoystick: _propTypes2.default.bool,
267267
restOpacity: _propTypes2.default.number, // opacity when not 'dynamic' and rested
268-
catchDistance: _propTypes2.default.number
268+
catchDistance: _propTypes2.default.number,
269+
lockX: _propTypes2.default.bool,
270+
lockY: _propTypes2.default.bool,
271+
shape: _propTypes2.default.string,
272+
dynamicPage: _propTypes2.default.bool
269273
}),
270274
static: _propTypes2.default.bool,
271275
onStart: _propTypes2.default.func,

packages/react-nipple/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"autobind-decorator": "^2.1.0",
2121
"classnames": "^2.2.6",
2222
"lodash.isequal": "^4.5.0",
23-
"nipplejs": "^0.7.1"
23+
"nipplejs": "^0.8.7"
2424
},
2525
"devDependencies": {
2626
"@loopmode/babel6-base": "^0.0.6",

packages/react-nipple/src/ReactNipple.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ export default class ReactNipple extends Component {
4848
mode: PropTypes.string, // 'dynamic', 'static' or 'semi'
4949
restJoystick: PropTypes.bool,
5050
restOpacity: PropTypes.number, // opacity when not 'dynamic' and rested
51-
catchDistance: PropTypes.number
51+
catchDistance: PropTypes.number,
52+
lockX: PropTypes.bool,
53+
lockY: PropTypes.bool,
54+
shape: PropTypes.string,
55+
dynamicPage: PropTypes.bool
5256
}),
5357
static: PropTypes.bool,
5458
onStart: PropTypes.func,

0 commit comments

Comments
 (0)