@reltio/components 1.4.2282 → 1.4.2283

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/DropDownMenuButton/DropDownMenuButton.js +10 -6
  2. package/DropDownMenuButton/DropDownMenuButton.spec.js +36 -0
  3. package/cjs/DropDownMenuButton/DropDownMenuButton.js +10 -6
  4. package/cjs/DropDownMenuButton/DropDownMenuButton.spec.js +36 -0
  5. package/package.json +1 -1
package/DropDownMenuButton/DropDownMenuButton.js CHANGED
@@ -26,18 +26,22 @@ export function DropDownMenuButton(_a) {
26
26
  var styles = useStyles();
27
27
  var buttonRef = useRef(null);
28
28
  var _k = useState(false), isOpen = _k[0], setIsOpen = _k[1];
29
+ // onMenuOpen is fired synchronously in the click handler (below) so it wins the race against a
30
+ // parent's onMouseLeave when the button lives in an unmounting hover overlay; onMenuClose stays
31
+ // deferred to this effect so consumers can keep the button mounted (e.g. delete confirmation).
29
32
  useDidUpdateEffect(function () {
30
- if (isOpen) {
31
- onMenuOpen();
32
- }
33
- else {
33
+ if (!isOpen) {
34
34
  onMenuClose();
35
35
  }
36
36
  }, [isOpen]);
37
37
  var handleToggle = useCallback(function (e) {
38
38
  e === null || e === void 0 ? void 0 : e.stopPropagation();
39
- setIsOpen(function (open) { return !open; });
40
- }, []);
39
+ var nextIsOpen = !isOpen;
40
+ setIsOpen(nextIsOpen);
41
+ if (nextIsOpen) {
42
+ onMenuOpen();
43
+ }
44
+ }, [isOpen, onMenuOpen]);
41
45
  var renderMenuItem = function (item, index) {
42
46
  return React.createElement(MenuItemRenderer, { item: item, key: index, onMenuClose: handleToggle });
43
47
  };
package/DropDownMenuButton/DropDownMenuButton.spec.js CHANGED
@@ -45,6 +45,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
45
45
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
46
46
  }
47
47
  };
48
+ var __rest = (this && this.__rest) || function (s, e) {
49
+ var t = {};
50
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
51
+ t[p] = s[p];
52
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
53
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
54
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
55
+ t[p[i]] = s[p[i]];
56
+ }
57
+ return t;
58
+ };
48
59
  import React from 'react';
49
60
  import { render, screen, within } from '@testing-library/react';
50
61
  import userEvent from '@testing-library/user-event';
@@ -104,4 +115,29 @@ describe('Dropdown menu button tests', function () {
104
115
  }
105
116
  });
106
117
  }); });
118
+ it('should call onMenuOpen synchronously within the click handler, before it is deferred to an effect', function () { return __awaiter(void 0, void 0, void 0, function () {
119
+ var callOrder, ButtonComponent, onMenuOpen, user;
120
+ return __generator(this, function (_a) {
121
+ switch (_a.label) {
122
+ case 0:
123
+ callOrder = [];
124
+ ButtonComponent = React.forwardRef(function (_a, ref) {
125
+ var onClick = _a.onClick, children = _a.children, rest = __rest(_a, ["onClick", "children"]);
126
+ return (React.createElement("button", __assign({ ref: ref }, rest, { onClick: function (e) {
127
+ onClick === null || onClick === void 0 ? void 0 : onClick(e);
128
+ callOrder.push('afterClick');
129
+ } }), children));
130
+ });
131
+ ButtonComponent.displayName = 'ButtonComponent';
132
+ onMenuOpen = jest.fn(function () { return callOrder.push('menuOpen'); });
133
+ user = setUp(__assign(__assign({}, defaultProps), { buttonComponent: ButtonComponent, onMenuOpen: onMenuOpen })).user;
134
+ return [4 /*yield*/, user.click(screen.getByText('content'))];
135
+ case 1:
136
+ _a.sent();
137
+ expect(onMenuOpen).toHaveBeenCalledTimes(1);
138
+ expect(callOrder).toEqual(['menuOpen', 'afterClick']);
139
+ return [2 /*return*/];
140
+ }
141
+ });
142
+ }); });
107
143
  });
package/cjs/DropDownMenuButton/DropDownMenuButton.js CHANGED
@@ -55,18 +55,22 @@ function DropDownMenuButton(_a) {
55
55
  var styles = (0, styles_1.useStyles)();
56
56
  var buttonRef = (0, react_1.useRef)(null);
57
57
  var _k = (0, react_1.useState)(false), isOpen = _k[0], setIsOpen = _k[1];
58
+ // onMenuOpen is fired synchronously in the click handler (below) so it wins the race against a
59
+ // parent's onMouseLeave when the button lives in an unmounting hover overlay; onMenuClose stays
60
+ // deferred to this effect so consumers can keep the button mounted (e.g. delete confirmation).
58
61
  (0, useDidUpdateEffect_1.useDidUpdateEffect)(function () {
59
- if (isOpen) {
60
- onMenuOpen();
61
- }
62
- else {
62
+ if (!isOpen) {
63
63
  onMenuClose();
64
64
  }
65
65
  }, [isOpen]);
66
66
  var handleToggle = (0, react_1.useCallback)(function (e) {
67
67
  e === null || e === void 0 ? void 0 : e.stopPropagation();
68
- setIsOpen(function (open) { return !open; });
69
- }, []);
68
+ var nextIsOpen = !isOpen;
69
+ setIsOpen(nextIsOpen);
70
+ if (nextIsOpen) {
71
+ onMenuOpen();
72
+ }
73
+ }, [isOpen, onMenuOpen]);
70
74
  var renderMenuItem = function (item, index) {
71
75
  return react_1.default.createElement(MenuItemRenderer, { item: item, key: index, onMenuClose: handleToggle });
72
76
  };
package/cjs/DropDownMenuButton/DropDownMenuButton.spec.js CHANGED
@@ -46,6 +46,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
46
46
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
47
47
  }
48
48
  };
49
+ var __rest = (this && this.__rest) || function (s, e) {
50
+ var t = {};
51
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
52
+ t[p] = s[p];
53
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
54
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
55
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
56
+ t[p[i]] = s[p[i]];
57
+ }
58
+ return t;
59
+ };
49
60
  var __importDefault = (this && this.__importDefault) || function (mod) {
50
61
  return (mod && mod.__esModule) ? mod : { "default": mod };
51
62
  };
@@ -109,4 +120,29 @@ describe('Dropdown menu button tests', function () {
109
120
  }
110
121
  });
111
122
  }); });
123
+ it('should call onMenuOpen synchronously within the click handler, before it is deferred to an effect', function () { return __awaiter(void 0, void 0, void 0, function () {
124
+ var callOrder, ButtonComponent, onMenuOpen, user;
125
+ return __generator(this, function (_a) {
126
+ switch (_a.label) {
127
+ case 0:
128
+ callOrder = [];
129
+ ButtonComponent = react_1.default.forwardRef(function (_a, ref) {
130
+ var onClick = _a.onClick, children = _a.children, rest = __rest(_a, ["onClick", "children"]);
131
+ return (react_1.default.createElement("button", __assign({ ref: ref }, rest, { onClick: function (e) {
132
+ onClick === null || onClick === void 0 ? void 0 : onClick(e);
133
+ callOrder.push('afterClick');
134
+ } }), children));
135
+ });
136
+ ButtonComponent.displayName = 'ButtonComponent';
137
+ onMenuOpen = jest.fn(function () { return callOrder.push('menuOpen'); });
138
+ user = setUp(__assign(__assign({}, defaultProps), { buttonComponent: ButtonComponent, onMenuOpen: onMenuOpen })).user;
139
+ return [4 /*yield*/, user.click(react_2.screen.getByText('content'))];
140
+ case 1:
141
+ _a.sent();
142
+ expect(onMenuOpen).toHaveBeenCalledTimes(1);
143
+ expect(callOrder).toEqual(['menuOpen', 'afterClick']);
144
+ return [2 /*return*/];
145
+ }
146
+ });
147
+ }); });
112
148
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@reltio/components",
3
- "version": "1.4.2282",
3
+ "version": "1.4.2283",
4
4
  "license": "SEE LICENSE IN LICENSE FILE",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./index.js",