@enact/ui 4.1.0 → 4.1.3

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 (89) hide show
  1. package/AnnounceDecorator/tests/Announce-specs.js +13 -5
  2. package/AnnounceDecorator/tests/AnnounceDecorator-specs.js +9 -7
  3. package/AnnounceDecorator/tests/useAnnounce-specs.js +25 -17
  4. package/BodyText/BodyText.d.ts +1 -1
  5. package/BodyText/tests/BodyText-specs.js +49 -35
  6. package/Button/Button.d.ts +6 -6
  7. package/Button/tests/Button-specs.js +104 -3
  8. package/CHANGELOG.md +15 -0
  9. package/Cancelable/Cancelable.js +1 -1
  10. package/Cancelable/tests/Cancelable-specs.js +131 -70
  11. package/Changeable/tests/Changeable-specs.js +162 -110
  12. package/FloatingLayer/FloatingLayer.js +5 -17
  13. package/FloatingLayer/tests/FloatingLayer-specs.js +83 -8
  14. package/FloatingLayer/tests/Scrim-specs.js +20 -11
  15. package/FloatingLayer/tests/useFloatingLayerDecorator-specs.js +15 -9
  16. package/GridListImageItem/GridListImageItem.d.ts +1 -1
  17. package/Group/Group.d.ts +2 -2
  18. package/Group/tests/Group-specs.js +71 -41
  19. package/Heading/Heading.d.ts +2 -1
  20. package/Heading/tests/Heading-specs.js +27 -20
  21. package/Icon/Icon.d.ts +4 -4
  22. package/Icon/tests/Icon-specs.js +52 -31
  23. package/IconButton/IconButton.d.ts +4 -4
  24. package/IconButton/tests/IconButton-specs.js +2 -2
  25. package/Image/tests/Image-specs.js +39 -29
  26. package/ImageItem/tests/ImageItem-specs.js +71 -68
  27. package/Item/tests/Item-specs.js +59 -35
  28. package/LabeledIcon/LabeledIcon.d.ts +4 -4
  29. package/LabeledIcon/tests/LabeledIcon-specs.js +30 -19
  30. package/Layout/Layout.d.ts +16 -16
  31. package/Layout/tests/Layout-specs.js +37 -25
  32. package/Marquee/MarqueeBase.js +1 -5
  33. package/Marquee/tests/Marquee-specs.js +221 -116
  34. package/Media/Media.js +1 -3
  35. package/ProgressBar/tests/ProgressBar-specs.js +60 -42
  36. package/README.md +1 -1
  37. package/RadioDecorator/RadioDecorator.js +3 -5
  38. package/RadioDecorator/tests/RadioDecorator-specs.js +179 -65
  39. package/Repeater/Repeater.d.ts +2 -1
  40. package/Repeater/tests/Repeater-specs.js +86 -45
  41. package/Routable/Routable.d.ts +2 -2
  42. package/Routable/tests/Routable-specs.js +26 -17
  43. package/Routable/tests/Router-specs.js +65 -41
  44. package/Scrollable/Scrollable.js +2 -1
  45. package/Scrollable/ScrollableNative.js +2 -1
  46. package/Scroller/Scroller.d.ts +2 -2
  47. package/Scroller/ScrollerBasic.js +1 -1
  48. package/Scroller/UiScrollerBase.js +1 -1
  49. package/Skinnable/tests/Skinnable-specs.js +102 -54
  50. package/Skinnable/tests/useSkins-specs.js +37 -42
  51. package/Slider/Slider.d.ts +3 -3
  52. package/Slider/tests/Slider-specs.js +4 -4
  53. package/SlotItem/SlotItem.d.ts +2 -2
  54. package/SlotItem/tests/SlotItem-specs.js +4 -4
  55. package/Slottable/tests/Slottable-specs.js +67 -36
  56. package/Slottable/tests/useSlots-specs.js +68 -35
  57. package/Spinner/Spinner.d.ts +1 -1
  58. package/Spinner/tests/Spinner-specs.js +46 -31
  59. package/ToggleIcon/tests/ToggleIcon-specs.js +32 -20
  60. package/ToggleItem/ToggleItem.d.ts +13 -11
  61. package/ToggleItem/tests/ToggleItem-specs.js +51 -34
  62. package/Toggleable/Toggle.js +6 -6
  63. package/Toggleable/Toggleable.js +6 -12
  64. package/Toggleable/tests/Toggleable-specs.js +428 -324
  65. package/Touchable/Drag.js +13 -17
  66. package/Touchable/Flick.js +20 -16
  67. package/Touchable/Hold.js +14 -19
  68. package/Touchable/Touchable.d.ts +3 -3
  69. package/Touchable/tests/Touchable-specs.js +223 -109
  70. package/Touchable/tests/useTouch-specs.js +159 -84
  71. package/Transition/Transition.d.ts +29 -27
  72. package/Transition/Transition.js +5 -9
  73. package/Transition/tests/Transition-specs.js +135 -31
  74. package/ViewManager/TransitionGroup.js +6 -5
  75. package/ViewManager/View.js +1 -1
  76. package/ViewManager/ViewManager.d.ts +4 -4
  77. package/ViewManager/ViewManager.js +10 -10
  78. package/ViewManager/tests/View-specs.js +109 -81
  79. package/ViewManager/tests/ViewManager-specs.js +471 -185
  80. package/VirtualList/UiVirtualListBase.js +1 -1
  81. package/VirtualList/VirtualList.d.ts +11 -9
  82. package/VirtualList/VirtualListBasic.js +1 -1
  83. package/VirtualList/tests/VirtualList-specs.js +44 -31
  84. package/internal/IdProvider/tests/useId-specs.js +35 -18
  85. package/package.json +11 -11
  86. package/resolution/tests/ResolutionDecorator-specs.js +17 -8
  87. package/styles/mixins.less +14 -2
  88. package/useControlledState/tests/useControlledState-specs.js +67 -42
  89. package/useScroll/useScroll.js +2 -2
@@ -1,62 +1,77 @@
1
1
  "use strict";
2
2
 
3
- var _enzyme = require("enzyme");
3
+ require("@testing-library/jest-dom");
4
+
5
+ var _react = require("@testing-library/react");
4
6
 
5
7
  var _Spinner = require("../Spinner");
6
8
 
7
- var _SpinnerModule = _interopRequireDefault(require("../Spinner.module.css"));
9
+ var _FloatingLayer = require("../../FloatingLayer");
8
10
 
9
11
  var _jsxRuntime = require("react/jsx-runtime");
10
12
 
11
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
12
-
13
13
  describe('Spinner Specs', function () {
14
14
  test('should have centered class when centered prop equals true', function () {
15
- var spinner = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.SpinnerBase, {
16
- component: "div",
15
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.SpinnerBase, {
17
16
  centered: true,
17
+ component: "div",
18
18
  children: "Loading..."
19
19
  }));
20
- var expected = true;
21
- var actual = spinner.find(".".concat(_SpinnerModule["default"].spinner)).hasClass(_SpinnerModule["default"].centered);
22
- expect(actual).toBe(expected);
20
+
21
+ var spinner = _react.screen.getByText('Loading...');
22
+
23
+ var expected = 'centered';
24
+ expect(spinner).toHaveClass(expected);
23
25
  });
24
26
  test('should not have content class when Spinner has no children', function () {
25
- var spinner = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.SpinnerBase, {
26
- component: "div"
27
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.SpinnerBase, {
28
+ component: "div",
29
+ "data-testid": "spinner"
27
30
  }));
28
- var expected = false;
29
- var actual = spinner.find(".".concat(_SpinnerModule["default"].spinner)).hasClass(_SpinnerModule["default"].content);
30
- expect(actual).toBe(expected);
31
+
32
+ var spinner = _react.screen.getByTestId('spinner');
33
+
34
+ var expected = 'content';
35
+ expect(spinner).not.toHaveClass(expected);
31
36
  });
32
37
  test('should have no scrim class when blockClickOn prop equals container', function () {
33
- var spinner = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.SpinnerBase, {
38
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.SpinnerBase, {
39
+ blockClickOn: "container",
34
40
  component: "div",
35
- blockClickOn: "container"
41
+ "data-testid": "spinner"
36
42
  }));
37
- var expected = false;
38
- var actual = spinner.find(".".concat(_SpinnerModule["default"].scrim)).exists();
39
- expect(actual).toBe(expected);
43
+
44
+ var spinnerContainer = _react.screen.getByTestId('spinner').previousElementSibling;
45
+
46
+ var expected = 'scrim';
47
+ expect(spinnerContainer).not.toHaveClass(expected);
40
48
  });
41
49
  test('should have scrim class when blockClickOn prop equals container and when scrim prop equals true', function () {
42
- var spinner = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.SpinnerBase, {
43
- component: "div",
50
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.SpinnerBase, {
44
51
  blockClickOn: "container",
52
+ component: "div",
53
+ "data-testid": "spinner",
45
54
  scrim: true
46
55
  }));
47
- var expected = true;
48
- var actual = spinner.find(".".concat(_SpinnerModule["default"].scrim)).exists();
49
- expect(actual).toBe(expected);
56
+
57
+ var spinnerContainer = _react.screen.getByTestId('spinner').previousElementSibling;
58
+
59
+ var expected = 'scrim';
60
+ expect(spinnerContainer).toHaveClass(expected);
50
61
  });
51
62
  test('should have FloatingLayer when blockClickOn prop equals screen', function () {
52
- var spinner = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.SpinnerBase, {
53
- component: "div",
54
- blockClickOn: "screen"
63
+ var Root = (0, _FloatingLayer.FloatingLayerDecorator)('div');
64
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Root, {
65
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.SpinnerBase, {
66
+ blockClickOn: "screen",
67
+ component: "div",
68
+ "data-testid": "spinner"
69
+ })
55
70
  }));
56
- var expected = true; // FloatingLayer is wrapped by Cancelable so it's undiscoverable by name with shallow
57
- // mounting
58
71
 
59
- var actual = spinner.find('Cancelable').exists();
60
- expect(actual).toBe(expected);
72
+ var spinner = _react.screen.getByTestId('spinner');
73
+
74
+ expect(spinner).toBeInTheDocument();
75
+ expect(spinner.parentElement.parentElement.parentElement.id).toBe('floatLayer');
61
76
  });
62
77
  });
@@ -1,6 +1,8 @@
1
1
  "use strict";
2
2
 
3
- var _enzyme = require("enzyme");
3
+ var _react = require("@testing-library/react");
4
+
5
+ var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
4
6
 
5
7
  var _ToggleIcon = _interopRequireDefault(require("../ToggleIcon"));
6
8
 
@@ -9,59 +11,69 @@ var _jsxRuntime = require("react/jsx-runtime");
9
11
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
10
12
 
11
13
  var tap = function tap(node) {
12
- node.simulate('mousedown');
13
- node.simulate('mouseup');
14
+ _react.fireEvent.mouseDown(node);
15
+
16
+ _react.fireEvent.mouseUp(node);
14
17
  };
15
18
 
16
19
  describe('ToggleIcon Specs', function () {
17
20
  test('should call onToggle when tapped', function () {
18
21
  var handleToggle = jest.fn();
19
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleIcon["default"], {
22
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleIcon["default"], {
20
23
  onToggle: handleToggle,
21
24
  children: "star"
22
25
  }));
23
- tap(subject);
26
+
27
+ var toggleIcon = _react.screen.getByText('star');
28
+
29
+ tap(toggleIcon);
24
30
  var expected = 1;
25
- var actual = handleToggle.mock.calls.length;
26
- expect(expected).toBe(actual);
31
+ expect(handleToggle).toHaveBeenCalledTimes(expected);
27
32
  });
28
33
  test('should call onClick when clicked', function () {
29
34
  var handleClick = jest.fn();
30
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleIcon["default"], {
35
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleIcon["default"], {
31
36
  onClick: handleClick,
32
37
  children: "star"
33
38
  }));
34
- subject.simulate('click');
39
+
40
+ var toggleIcon = _react.screen.getByText('star');
41
+
42
+ _userEvent["default"].click(toggleIcon);
43
+
35
44
  var expected = 1;
36
- var actual = handleClick.mock.calls.length;
37
- expect(expected).toBe(actual);
45
+ expect(handleClick).toHaveBeenCalledTimes(expected);
38
46
  });
39
47
  test('should call onTap when tapped', function () {
40
48
  var handleTap = jest.fn();
41
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleIcon["default"], {
49
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleIcon["default"], {
42
50
  onTap: handleTap,
43
51
  children: "star"
44
52
  }));
45
- tap(subject);
53
+
54
+ var toggleIcon = _react.screen.getByText('star');
55
+
56
+ tap(toggleIcon);
46
57
  var expected = 1;
47
- var actual = handleTap.mock.calls.length;
48
- expect(expected).toBe(actual);
58
+ expect(handleTap).toHaveBeenCalledTimes(expected);
49
59
  });
50
60
  test('should call both onToggle and onTap when tapped', function () {
51
61
  var handleBoth = jest.fn();
52
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleIcon["default"], {
62
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleIcon["default"], {
53
63
  onTap: handleBoth,
54
64
  onToggle: handleBoth,
55
65
  children: "star"
56
66
  }));
57
- tap(subject);
67
+
68
+ var toggleIcon = _react.screen.getByText('star');
69
+
70
+ tap(toggleIcon);
58
71
  var expected = 2;
59
- var actual = handleBoth.mock.calls.length;
60
- expect(expected).toBe(actual);
72
+ expect(handleBoth).toHaveBeenCalledTimes(expected);
61
73
  });
62
74
  test('should return a DOM node reference for `componentRef`', function () {
63
75
  var ref = jest.fn();
64
- (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleIcon["default"], {
76
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleIcon["default"], {
65
77
  ref: ref,
66
78
  children: "star"
67
79
  }));
@@ -18,7 +18,7 @@ export interface ToggleItemBaseProps {
18
18
  *
19
19
  * This receives the `css` prop for theme extension and therefore must be a custom
20
20
  component and not a simple HTML DOM node. Recommended component or themed
21
- derivative: SlotItem
21
+ derivative: [SlotItem]
22
22
  */
23
23
  component: React.ComponentType;
24
24
  /**
@@ -26,7 +26,7 @@ derivative: SlotItem
26
26
  *
27
27
  * This component receives the `selected` prop and value,
28
28
  and must therefore respond to it in some way. It is recommended to use
29
- ToggleIcon for this.
29
+ [ToggleIcon] for this.
30
30
  */
31
31
  iconComponent: React.ComponentType | JSX.Element;
32
32
  /**
@@ -51,7 +51,7 @@ corresponding internal elements and states of this component.
51
51
  /**
52
52
  * An optional prop that lets you override the icon of the `iconComponent` component.
53
53
  *
54
- * This accepts any string that the Icon component supports, provided
54
+ * This accepts any string that the [Icon] component supports, provided
55
55
  the recommendations of `iconComponent` are followed.
56
56
  */
57
57
  icon?: string | object;
@@ -68,14 +68,16 @@ or behind the existing `icon` . See `itemIconPosition` for options.
68
68
  */
69
69
  itemIcon?: React.ReactNode;
70
70
  /**
71
- * Specifies where `itemIcon` appears.
72
- * * `'before'` - first element in the item
73
- * * `'beforeChildren'` - before `children` . If `iconPosition` is `'before'` , `icon` will be
74
- before `itemIcon`
75
- * * `'afterChildren'` - after `children` . If iconPosition `is` 'after' `,` icon `will be
76
- after` itemIcon`
77
- * * `'after'` - the last element in the item
78
- */
71
+ * Specifies where `itemIcon` appears.
72
+ * * `'before'` - first element in the item
73
+ * * `'beforeChildren'` - before `children` . If `iconPosition` is `'before'` , `icon` will be
74
+ *
75
+ * before `itemIcon`
76
+ * * `'afterChildren'` - after `children` . If iconPosition `is` 'after' `, ` icon` will be
77
+ *
78
+ * after `itemIcon`
79
+ * * `'after'` - the last element in the item
80
+ */
79
81
  itemIconPosition?: "before" | "beforeChildren" | "afterChildren" | "after";
80
82
  /**
81
83
  * Called when the toggle item is toggled. Developers should generally use `onToggle` instead.
@@ -1,32 +1,36 @@
1
1
  "use strict";
2
2
 
3
- var _react = require("react");
3
+ require("@testing-library/jest-dom");
4
4
 
5
- var _enzyme = require("enzyme");
5
+ var _react = require("@testing-library/react");
6
6
 
7
- var _ToggleItem = _interopRequireWildcard(require("../ToggleItem"));
7
+ var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
8
+
9
+ var _react2 = require("react");
8
10
 
9
11
  var _Icon = _interopRequireDefault(require("../../Icon"));
10
12
 
13
+ var _Item = _interopRequireDefault(require("../../Item"));
14
+
11
15
  var _SlotItem = _interopRequireDefault(require("../../SlotItem"));
12
16
 
13
- var _Item = _interopRequireDefault(require("../../Item"));
17
+ var _ToggleItem = _interopRequireWildcard(require("../ToggleItem"));
14
18
 
15
19
  var _jsxRuntime = require("react/jsx-runtime");
16
20
 
17
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
18
-
19
21
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
20
22
 
21
23
  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
22
24
 
25
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
26
+
23
27
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
24
28
 
25
29
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
26
30
 
27
31
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
28
32
 
29
- var SlottedItem = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
33
+ var SlottedItem = /*#__PURE__*/(0, _react2.forwardRef)(function (props, ref) {
30
34
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SlotItem["default"], _objectSpread(_objectSpread({}, props), {}, {
31
35
  component: _Item["default"],
32
36
  ref: ref
@@ -34,8 +38,9 @@ var SlottedItem = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
34
38
  });
35
39
 
36
40
  var tap = function tap(node) {
37
- node.simulate('mousedown');
38
- node.simulate('mouseup');
41
+ _react.fireEvent.mouseDown(node);
42
+
43
+ _react.fireEvent.mouseUp(node);
39
44
  };
40
45
 
41
46
  var CustomIcon = function CustomIcon(props) {
@@ -47,75 +52,87 @@ var CustomIcon = function CustomIcon(props) {
47
52
  describe('ToggleItem Specs', function () {
48
53
  test('should call onToggle, onClick, or both when clicked', function () {
49
54
  var handleToggle = jest.fn();
50
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem["default"], {
55
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem["default"], {
51
56
  component: SlottedItem,
52
- onToggle: handleToggle,
53
57
  iconComponent: CustomIcon,
54
- children: "Toggle Item"
58
+ onToggle: handleToggle,
59
+ children: "ToggleItem"
55
60
  }));
56
- tap(subject);
61
+
62
+ var toggleItem = _react.screen.getByText('star');
63
+
64
+ tap(toggleItem);
57
65
  var expected = 1;
58
- var actual = handleToggle.mock.calls.length;
59
- expect(expected).toBe(actual);
66
+ expect(handleToggle).toHaveBeenCalledTimes(expected);
60
67
  });
61
68
  test('should call onClick when clicked', function () {
62
69
  var handleClick = jest.fn();
63
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem.ToggleItemBase, {
70
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem.ToggleItemBase, {
64
71
  component: SlottedItem,
65
- onClick: handleClick,
66
72
  iconComponent: CustomIcon,
73
+ onClick: handleClick,
67
74
  children: "Toggle Item"
68
75
  }));
69
- subject.simulate('click');
76
+
77
+ var toggleItem = _react.screen.getByText('star');
78
+
79
+ _userEvent["default"].click(toggleItem);
80
+
70
81
  var expected = 1;
71
- var actual = handleClick.mock.calls.length;
72
- expect(expected).toBe(actual);
82
+ expect(handleClick).toHaveBeenCalledTimes(expected);
73
83
  });
74
84
  test('should call onTap when tapped', function () {
75
85
  var handleTap = jest.fn();
76
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem["default"], {
86
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem["default"], {
77
87
  component: SlottedItem,
78
- onTap: handleTap,
79
88
  iconComponent: CustomIcon,
89
+ onTap: handleTap,
80
90
  children: "Toggle Item"
81
91
  }));
82
- tap(subject);
92
+
93
+ var toggleItem = _react.screen.getByText('star');
94
+
95
+ tap(toggleItem);
83
96
  var expected = 1;
84
- var actual = handleTap.mock.calls.length;
85
- expect(expected).toBe(actual);
97
+ expect(handleTap).toHaveBeenCalledTimes(expected);
86
98
  });
87
99
  test('should call both onToggle and onTap when tapped', function () {
88
100
  var handleBoth = jest.fn();
89
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem["default"], {
101
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem["default"], {
90
102
  component: SlottedItem,
103
+ iconComponent: CustomIcon,
91
104
  onTap: handleBoth,
92
105
  onToggle: handleBoth,
93
- iconComponent: CustomIcon,
94
106
  children: "Toggle Item"
95
107
  }));
96
- tap(subject);
108
+
109
+ var toggleItem = _react.screen.getByText('star');
110
+
111
+ tap(toggleItem);
97
112
  var expected = 2;
98
- var actual = handleBoth.mock.calls.length;
99
- expect(expected).toBe(actual);
113
+ expect(handleBoth).toHaveBeenCalledTimes(expected);
100
114
  });
101
115
  test('should receive its value prop in the onToggle handler', function () {
102
116
  var handleToggle = jest.fn();
103
117
  var value = 100;
104
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem["default"], {
118
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem["default"], {
105
119
  component: SlottedItem,
106
- onToggle: handleToggle,
107
120
  iconComponent: CustomIcon,
121
+ onToggle: handleToggle,
108
122
  value: value,
109
123
  children: "Toggle Item"
110
124
  }));
111
- tap(subject);
125
+
126
+ var toggleItem = _react.screen.getByText('star');
127
+
128
+ tap(toggleItem);
112
129
  var expected = value;
113
130
  var actual = handleToggle.mock.calls[0][0].value;
114
131
  expect(expected).toBe(actual);
115
132
  });
116
133
  test('should return a DOM node reference for `componentRef`', function () {
117
134
  var ref = jest.fn();
118
- (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem["default"], {
135
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleItem["default"], {
119
136
  component: SlottedItem,
120
137
  iconComponent: CustomIcon,
121
138
  ref: ref,
@@ -29,20 +29,20 @@ var Toggle = /*#__PURE__*/function () {
29
29
  function Toggle(config) {
30
30
  _classCallCheck(this, Toggle);
31
31
 
32
- this.handleActivate = (0, _handle.handle)(isEnabled, (0, _handle.adaptEvent)(function (ev, props) {
32
+ this.handleActivate = (0, _handle.handle)(isEnabled, (0, _handle.forwardCustom)('onToggle', function (ev, props) {
33
33
  return makeEvent(props, true);
34
- }, (0, _handle.forward)('onToggle')), (0, _handle.returnsTrue)(function (ev, props, context) {
34
+ }), (0, _handle.returnsTrue)(function (ev, props, context) {
35
35
  return context.onToggle(true);
36
36
  })).bindAs(this, 'handleActivate');
37
- this.handleDeactivate = (0, _handle.handle)(isEnabled, (0, _handle.adaptEvent)(function (ev, props) {
37
+ this.handleDeactivate = (0, _handle.handle)(isEnabled, (0, _handle.forwardCustom)('onToggle', function (ev, props) {
38
38
  return makeEvent(props, false);
39
- }, (0, _handle.forward)('onToggle')), (0, _handle.returnsTrue)(function (ev, props, context) {
39
+ }), (0, _handle.returnsTrue)(function (ev, props, context) {
40
40
  return context.onToggle(false);
41
41
  })).bindAs(this, 'handleDeactivate');
42
- this.handleToggle = (0, _handle.handle)(isEnabled, (0, _handle.adaptEvent)(function (ev, props, _ref2) {
42
+ this.handleToggle = (0, _handle.handle)(isEnabled, (0, _handle.forwardCustom)('onToggle', function (ev, props, _ref2) {
43
43
  var value = _ref2.value;
44
44
  return makeEvent(props, !value);
45
- }, (0, _handle.forward)('onToggle')), (0, _handle.returnsTrue)(function (ev, props, _ref3) {
45
+ }), (0, _handle.returnsTrue)(function (ev, props, _ref3) {
46
46
  var onToggle = _ref3.onToggle,
47
47
  value = _ref3.value;
48
48
  return onToggle(!value);
@@ -170,26 +170,20 @@ var ToggleableHOC = (0, _hoc["default"])(defaultConfig, function (config, Wrappe
170
170
  toggleProp = config.toggleProp;
171
171
  var defaultPropKey = 'default' + (0, _util.cap)(prop);
172
172
 
173
- var forwardWithEventProps = function forwardWithEventProps(eventName) {
174
- return (0, _handle.adaptEvent)(function (ev, props) {
175
- return _objectSpread(_objectSpread({}, (0, _pick["default"])(eventProps, props)), ev);
176
- }, (0, _handle.forward)(eventName));
173
+ var adapter = function adapter(ev, props) {
174
+ return _objectSpread(_objectSpread({}, (0, _pick["default"])(eventProps, props)), ev);
177
175
  };
178
176
 
179
- var forwardActivate = forwardWithEventProps(activate);
180
- var forwardDeactivate = forwardWithEventProps(deactivate);
181
- var forwardToggle = forwardWithEventProps(toggle);
182
- var forwardToggleProp = forwardWithEventProps(toggleProp);
183
177
  var toggleHandlers = {
184
178
  onToggle: (0, _handle["default"])(function (ev, props, context) {
185
179
  return context.toggle();
186
- }, forwardToggleProp),
180
+ }, (0, _handle.forwardCustom)(toggleProp, adapter)),
187
181
  onActivate: (0, _handle["default"])(function (ev, props, context) {
188
182
  return context.activate();
189
- }, forwardActivate),
183
+ }, (0, _handle.forwardCustom)(activate, adapter)),
190
184
  onDeactivate: (0, _handle["default"])(function (ev, props, context) {
191
185
  return context.deactivate();
192
- }, forwardDeactivate)
186
+ }, (0, _handle.forwardCustom)(deactivate, adapter))
193
187
  };
194
188
 
195
189
  function Toggleable(props) {
@@ -200,7 +194,7 @@ var ToggleableHOC = (0, _hoc["default"])(defaultConfig, function (config, Wrappe
200
194
  defaultSelected: props[defaultPropKey],
201
195
  disabled: props.disabled,
202
196
  onToggle: function onToggle(ev) {
203
- return forwardToggle(ev, props);
197
+ return (0, _handle.forwardCustom)(toggle, adapter)(ev, props);
204
198
  },
205
199
  prop: prop,
206
200
  // FIXME: Current behavior for Toggleable treats `null` as undefined so we coerce it