|
1 | 1 | diff --git a/node_modules/react-contextmenu/modules/ContextMenu.js b/node_modules/react-contextmenu/modules/ContextMenu.js |
2 | | -index 2f88213..150f93e 100644 |
| 2 | +index 2f88213..d41a53c 100644 |
3 | 3 | --- a/node_modules/react-contextmenu/modules/ContextMenu.js |
4 | 4 | +++ b/node_modules/react-contextmenu/modules/ContextMenu.js |
5 | 5 | @@ -81,6 +81,11 @@ var ContextMenu = function (_AbstractMenu) { |
@@ -40,15 +40,15 @@ index 2f88213..150f93e 100644 |
40 | 40 | _this2.menu.style.opacity = 0; |
41 | 41 | _this2.menu.style.pointerEvents = 'none'; |
42 | 42 | + |
43 | | -+ if (this.previousFocus && this.previousFocus.focus) { |
44 | | -+ this.previousFocus.focus(); |
45 | | -+ this.previousFocus = null; |
| 43 | ++ if (_this2.previousFocus && _this2.previousFocus.focus) { |
| 44 | ++ _this2.previousFocus.focus(); |
| 45 | ++ _this2.previousFocus = null; |
46 | 46 | + } |
47 | 47 | }); |
48 | 48 | } |
49 | 49 | } |
50 | 50 | diff --git a/node_modules/react-contextmenu/modules/SubMenu.js b/node_modules/react-contextmenu/modules/SubMenu.js |
51 | | -index ad1dc70..ef0c960 100644 |
| 51 | +index ad1dc70..4604898 100644 |
52 | 52 | --- a/node_modules/react-contextmenu/modules/SubMenu.js |
53 | 53 | +++ b/node_modules/react-contextmenu/modules/SubMenu.js |
54 | 54 | @@ -129,6 +129,7 @@ var SubMenu = function (_AbstractMenu) { |
@@ -83,7 +83,7 @@ index ad1dc70..ef0c960 100644 |
83 | 83 | _this.state = (0, _objectAssign2.default)({}, _this.state, { |
84 | 84 | visible: false |
85 | 85 | }); |
86 | | -@@ -202,21 +213,24 @@ var SubMenu = function (_AbstractMenu) { |
| 86 | +@@ -202,32 +213,28 @@ var SubMenu = function (_AbstractMenu) { |
87 | 87 | if (this.props.forceOpen || this.state.visible) { |
88 | 88 | var wrapper = window.requestAnimationFrame || setTimeout; |
89 | 89 | wrapper(function () { |
@@ -122,11 +122,14 @@ index ad1dc70..ef0c960 100644 |
122 | 122 | + } |
123 | 123 | }); |
124 | 124 | } else { |
125 | | - var cleanup = function cleanup() { |
126 | | -@@ -227,7 +241,8 @@ var SubMenu = function (_AbstractMenu) { |
127 | | - _this2.subMenu.style.left = '100%'; |
128 | | - _this2.unregisterHandlers(); |
129 | | - }; |
| 125 | +- var cleanup = function cleanup() { |
| 126 | +- _this2.subMenu.removeEventListener('transitionend', cleanup); |
| 127 | +- _this2.subMenu.style.removeProperty('bottom'); |
| 128 | +- _this2.subMenu.style.removeProperty('right'); |
| 129 | +- _this2.subMenu.style.top = 0; |
| 130 | +- _this2.subMenu.style.left = '100%'; |
| 131 | +- _this2.unregisterHandlers(); |
| 132 | +- }; |
130 | 133 | - this.subMenu.addEventListener('transitionend', cleanup); |
131 | 134 | + this.subMenu.removeEventListener('transitionend', this.cleanup); |
132 | 135 | + this.subMenu.addEventListener('transitionend', this.cleanup); |
|
0 commit comments