Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit c2a9244

Browse files
committed
update build
1 parent 2bf707b commit c2a9244

File tree

4 files changed

+41
-39
lines changed

4 files changed

+41
-39
lines changed

dist/react-contextmenu.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/menu-container.js

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ var MenuContainer = _react2["default"].createClass({
6969

7070
return menuStyles;
7171
},
72-
_hideMenu: function _hideMenu() {
73-
this.props.flux.getActions("menu").setParams({
74-
isVisible: false,
75-
currentItem: {}
76-
});
77-
},
7872
_outsideClickHandler: function _outsideClickHandler(event) {
7973
var localNode = this.localNode,
8074
source = event.target,
@@ -109,8 +103,6 @@ var MenuContainer = _react2["default"].createClass({
109103
document.addEventListener("scroll", fn2);
110104
},
111105
render: function render() {
112-
var _this = this;
113-
114106
var _props = this.props;
115107
var currentItem = _props.currentItem;
116108
var isVisible = _props.isVisible;
@@ -127,9 +119,7 @@ var MenuContainer = _react2["default"].createClass({
127119
_react2["default"].createElement(
128120
"ul",
129121
{ ref: "menu", className: "dropdown-menu" },
130-
_react2["default"].Children.map(this.props.children, function (child) {
131-
return _react2["default"].cloneElement(child, { currentItem: currentItem, hideMenu: _this._hideMenu });
132-
})
122+
this.props.children
133123
)
134124
);
135125
}

modules/menu-item.js

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,54 +14,67 @@ var _classnames = require("classnames");
1414

1515
var _classnames2 = _interopRequireDefault(_classnames);
1616

17-
var _lodashMerge = require("lodash.merge");
17+
var _objectAssign = require("object-assign");
1818

19-
var _lodashMerge2 = _interopRequireDefault(_lodashMerge);
19+
var _objectAssign2 = _interopRequireDefault(_objectAssign);
2020

21-
var PropTypes = _react2["default"].PropTypes;
21+
var _flux = require("./flux");
22+
23+
var _flux2 = _interopRequireDefault(_flux);
24+
25+
var _monitor = require("./monitor");
26+
27+
var _monitor2 = _interopRequireDefault(_monitor);
2228

2329
var MenuItem = _react2["default"].createClass({
2430
displayName: "MenuItem",
2531
propTypes: {
26-
disabled: PropTypes.bool,
27-
selected: PropTypes.bool,
28-
divider: PropTypes.bool,
29-
data: PropTypes.object,
30-
onSelect: PropTypes.func,
31-
onClick: PropTypes.func
32+
data: _react.PropTypes.object,
33+
disabled: _react.PropTypes.bool,
34+
divider: _react.PropTypes.bool,
35+
onClick: _react.PropTypes.func,
36+
onSelect: _react.PropTypes.func,
37+
selected: _react.PropTypes.bool
3238
},
3339
getDefaultProps: function getDefaultProps() {
3440
return {
3541
disabled: false,
3642
selected: false,
37-
data: null
43+
data: {}
3844
};
3945
},
4046
handleClick: function handleClick(event) {
4147
var _props = this.props;
4248
var disabled = _props.disabled;
4349
var onSelect = _props.onSelect;
4450
var onClick = _props.onClick;
45-
var currentItem = _props.currentItem;
4651
var data = _props.data;
4752

4853
if (disabled) {
4954
event.preventDefault();
5055
return;
5156
}
5257

58+
(0, _objectAssign2["default"])(data, _monitor2["default"].getItem());
59+
5360
if (typeof onSelect === "function") {
5461
event.preventDefault();
55-
onSelect((0, _lodashMerge2["default"])(currentItem, data));
56-
this.props.hideMenu();
62+
onSelect(data);
63+
this.hideMenu();
5764
return;
5865
}
5966

6067
if (typeof onClick === "function") {
61-
onClick(event, (0, _lodashMerge2["default"])(currentItem, data));
68+
onClick(event, data);
6269
}
6370

64-
this.props.hideMenu();
71+
this.hideMenu();
72+
},
73+
hideMenu: function hideMenu() {
74+
_flux2["default"].getActions("menu").setParams({
75+
isVisible: false,
76+
currentItem: {}
77+
});
6578
},
6679
render: function render() {
6780
var _props2 = this.props;

modules/monitor.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ var _flux = require("./flux");
1010

1111
var _flux2 = _interopRequireDefault(_flux);
1212

13-
var _flux$getStore = _flux2["default"].getStore("menu");
14-
15-
var state = _flux$getStore.state;
1613
exports["default"] = {
1714
getItem: function getItem() {
18-
return state.currentItem;
15+
return _flux2["default"].getStore("menu").state.currentItem;
1916
},
2017
getPosition: function getPosition() {
21-
var x = state.x;
22-
var y = state.y;
18+
var _flux$getStore$state = _flux2["default"].getStore("menu").state;
19+
20+
var x = _flux$getStore$state.x;
21+
var y = _flux$getStore$state.y;
2322

2423
return { x: x, y: y };
2524
}

0 commit comments

Comments
 (0)