@enact/ui 4.1.2 → 4.5.0-alpha.1

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 (169) hide show
  1. package/AnnounceDecorator/Announce.js +9 -9
  2. package/AnnounceDecorator/AnnounceDecorator.js +6 -4
  3. package/AnnounceDecorator/tests/Announce-specs.js +13 -5
  4. package/AnnounceDecorator/tests/AnnounceDecorator-specs.js +9 -7
  5. package/AnnounceDecorator/tests/useAnnounce-specs.js +25 -17
  6. package/AnnounceDecorator/useAnnounce.js +1 -1
  7. package/BodyText/BodyText.d.ts +1 -1
  8. package/BodyText/BodyText.js +6 -4
  9. package/BodyText/tests/BodyText-specs.js +51 -37
  10. package/Button/Button.d.ts +6 -6
  11. package/Button/Button.js +11 -7
  12. package/Button/tests/Button-specs.js +104 -3
  13. package/CHANGELOG.md +25 -0
  14. package/Cancelable/Cancelable.js +12 -11
  15. package/Cancelable/tests/Cancelable-specs.js +133 -70
  16. package/Changeable/Changeable.js +9 -9
  17. package/Changeable/tests/Changeable-specs.js +172 -110
  18. package/ComponentOverride/ComponentOverride.js +6 -4
  19. package/FloatingLayer/FloatingLayer.js +40 -49
  20. package/FloatingLayer/FloatingLayer.module.css +3 -0
  21. package/FloatingLayer/FloatingLayerContainer.js +2 -2
  22. package/FloatingLayer/FloatingLayerDecorator.js +6 -4
  23. package/FloatingLayer/Scrim.js +9 -7
  24. package/FloatingLayer/index.js +1 -1
  25. package/FloatingLayer/tests/FloatingLayer-specs.js +83 -8
  26. package/FloatingLayer/tests/Scrim-specs.js +20 -11
  27. package/FloatingLayer/tests/useFloatingLayerDecorator-specs.js +17 -11
  28. package/FloatingLayer/useFloatingLayer.js +2 -2
  29. package/FloatingLayer/useFloatingLayerDecorator.js +1 -1
  30. package/ForwardRef/ForwardRef.js +3 -3
  31. package/GridListImageItem/GridListImageItem.d.ts +1 -1
  32. package/GridListImageItem/GridListImageItem.js +6 -4
  33. package/Group/Group.d.ts +2 -2
  34. package/Group/Group.js +7 -4
  35. package/Group/GroupItem.js +6 -4
  36. package/Group/tests/Group-specs.js +73 -43
  37. package/Heading/Heading.d.ts +2 -1
  38. package/Heading/Heading.js +6 -4
  39. package/Heading/tests/Heading-specs.js +27 -20
  40. package/Icon/Icon.d.ts +4 -4
  41. package/Icon/Icon.js +6 -4
  42. package/Icon/tests/Icon-specs.js +54 -33
  43. package/IconButton/IconButton.d.ts +4 -4
  44. package/IconButton/IconButton.js +6 -4
  45. package/IconButton/tests/IconButton-specs.js +2 -2
  46. package/Image/Image.js +6 -4
  47. package/Image/tests/Image-specs.js +41 -31
  48. package/ImageItem/ImageItem.js +8 -5
  49. package/ImageItem/tests/ImageItem-specs.js +75 -72
  50. package/Item/Item.js +6 -4
  51. package/Item/tests/Item-specs.js +59 -35
  52. package/LabeledIcon/LabeledIcon.d.ts +4 -4
  53. package/LabeledIcon/LabeledIcon.js +6 -4
  54. package/LabeledIcon/tests/LabeledIcon-specs.js +30 -19
  55. package/Layout/Cell.js +6 -4
  56. package/Layout/Layout.d.ts +16 -16
  57. package/Layout/Layout.js +6 -4
  58. package/Layout/tests/Layout-specs.js +42 -30
  59. package/Marquee/MarqueeBase.js +7 -9
  60. package/Marquee/MarqueeController.js +9 -9
  61. package/Marquee/MarqueeDecorator.js +18 -13
  62. package/Marquee/index.d.ts +4 -1
  63. package/Marquee/index.js +2 -1
  64. package/Marquee/tests/Marquee-specs.js +254 -122
  65. package/Measurable/Measurable.js +4 -4
  66. package/Media/Media.js +10 -10
  67. package/Placeholder/PlaceholderControllerDecorator.js +9 -9
  68. package/Placeholder/PlaceholderDecorator.js +9 -9
  69. package/ProgressBar/ProgressBar.js +6 -4
  70. package/ProgressBar/tests/ProgressBar-specs.js +60 -42
  71. package/README.md +1 -1
  72. package/RadioDecorator/RadioControllerDecorator.js +9 -9
  73. package/RadioDecorator/RadioDecorator.js +12 -14
  74. package/RadioDecorator/tests/RadioDecorator-specs.js +179 -65
  75. package/Repeater/Repeater.d.ts +2 -1
  76. package/Repeater/Repeater.js +6 -4
  77. package/Repeater/tests/Repeater-specs.js +90 -49
  78. package/Resizable/Resizable.js +10 -10
  79. package/Routable/Link.js +9 -7
  80. package/Routable/Routable.d.ts +2 -2
  81. package/Routable/Routable.js +10 -6
  82. package/Routable/Route.js +1 -1
  83. package/Routable/Router.js +14 -11
  84. package/Routable/tests/Routable-specs.js +29 -20
  85. package/Routable/tests/Router-specs.js +65 -41
  86. package/Routable/useLink.js +1 -1
  87. package/Routable/util.js +1 -1
  88. package/Scrollable/ScrollAnimator.js +2 -2
  89. package/Scrollable/ScrollThumb.js +3 -3
  90. package/Scrollable/Scrollable.js +14 -10
  91. package/Scrollable/ScrollableNative.js +14 -10
  92. package/Scrollable/Scrollbar.js +14 -8
  93. package/Scroller/Scroller.d.ts +2 -14
  94. package/Scroller/Scroller.js +8 -7
  95. package/Scroller/ScrollerBasic.js +18 -35
  96. package/Scroller/UiScrollerBase.js +9 -7
  97. package/Skinnable/Skinnable.js +6 -4
  98. package/Skinnable/tests/Skinnable-specs.js +104 -56
  99. package/Skinnable/tests/useSkins-specs.js +39 -44
  100. package/Skinnable/useSkins.js +1 -1
  101. package/Slider/Knob.js +6 -4
  102. package/Slider/PositionDecorator.js +9 -9
  103. package/Slider/Slider.d.ts +3 -3
  104. package/Slider/Slider.js +6 -4
  105. package/Slider/tests/Slider-specs.js +4 -4
  106. package/SlotItem/SlotItem.d.ts +2 -2
  107. package/SlotItem/SlotItem.js +6 -4
  108. package/SlotItem/tests/SlotItem-specs.js +4 -4
  109. package/Slottable/Slottable.js +3 -3
  110. package/Slottable/tests/Slottable-specs.js +67 -36
  111. package/Slottable/tests/useSlots-specs.js +68 -35
  112. package/Slottable/useSlots.js +6 -4
  113. package/Spinner/Spinner.d.ts +1 -1
  114. package/Spinner/Spinner.js +6 -4
  115. package/Spinner/tests/Spinner-specs.js +46 -31
  116. package/ToggleIcon/ToggleIcon.js +6 -4
  117. package/ToggleIcon/tests/ToggleIcon-specs.js +32 -20
  118. package/ToggleItem/ToggleItem.d.ts +13 -11
  119. package/ToggleItem/ToggleItem.js +6 -4
  120. package/ToggleItem/tests/ToggleItem-specs.js +54 -37
  121. package/Toggleable/Toggle.js +10 -10
  122. package/Toggleable/Toggleable.js +11 -17
  123. package/Toggleable/tests/Toggleable-specs.js +464 -324
  124. package/Toggleable/useToggle.js +4 -2
  125. package/Touchable/ClickAllow.js +2 -2
  126. package/Touchable/Drag.js +22 -22
  127. package/Touchable/Flick.js +22 -18
  128. package/Touchable/Hold.js +18 -23
  129. package/Touchable/Touch.js +2 -2
  130. package/Touchable/Touchable.d.ts +3 -3
  131. package/Touchable/Touchable.js +7 -4
  132. package/Touchable/config.js +3 -3
  133. package/Touchable/tests/Touchable-specs.js +225 -109
  134. package/Touchable/tests/useTouch-specs.js +163 -86
  135. package/Touchable/useTouch.js +4 -4
  136. package/Transition/Transition.d.ts +29 -27
  137. package/Transition/Transition.js +22 -17
  138. package/Transition/tests/Transition-specs.js +116 -36
  139. package/ViewManager/Arranger.js +3 -3
  140. package/ViewManager/TransitionGroup.js +10 -9
  141. package/ViewManager/View.js +7 -7
  142. package/ViewManager/ViewManager.d.ts +4 -4
  143. package/ViewManager/ViewManager.js +24 -22
  144. package/ViewManager/tests/View-specs.js +141 -81
  145. package/ViewManager/tests/ViewManager-specs.js +486 -193
  146. package/VirtualList/UiVirtualListBase.js +26 -35
  147. package/VirtualList/VirtualList.d.ts +11 -29
  148. package/VirtualList/VirtualList.js +10 -9
  149. package/VirtualList/VirtualListBase.js +1 -1
  150. package/VirtualList/VirtualListBasic.js +44 -61
  151. package/VirtualList/tests/VirtualList-specs.js +81 -95
  152. package/internal/IdProvider/IdProvider.js +3 -3
  153. package/internal/IdProvider/Provider.js +2 -2
  154. package/internal/IdProvider/tests/useId-specs.js +37 -20
  155. package/internal/Pure/Pure.js +9 -9
  156. package/internal/localized-fonts/localized-fonts.js +1 -1
  157. package/internal/validators/validators.js +1 -1
  158. package/package.json +11 -11
  159. package/resolution/ResolutionDecorator.js +9 -9
  160. package/resolution/index.js +2 -2
  161. package/resolution/resolution.js +4 -2
  162. package/resolution/tests/ResolutionDecorator-specs.js +17 -8
  163. package/styles/mixins.less +14 -2
  164. package/useControlledState/tests/useControlledState-specs.js +68 -43
  165. package/useControlledState/useControlledState.js +2 -2
  166. package/useScroll/ScrollAnimator.js +2 -2
  167. package/useScroll/Scrollbar.js +7 -4
  168. package/useScroll/ScrollbarTrack.js +6 -4
  169. package/useScroll/useScroll.js +18 -29
@@ -1,16 +1,24 @@
1
1
  "use strict";
2
2
 
3
- var _enzyme = require("enzyme");
4
-
5
- var _Touchable = _interopRequireDefault(require("../Touchable"));
3
+ var _react = require("@testing-library/react");
6
4
 
7
5
  var _config = require("../config");
8
6
 
7
+ var _Touchable = _interopRequireDefault(require("../Touchable"));
8
+
9
9
  var _jsxRuntime = require("react/jsx-runtime");
10
10
 
11
+ var _excluded = ["children", "id", "onClick", "onMouseDown", "onMouseLeave", "onMouseUp", "onTouchStart", "onTouchEnd"];
12
+
11
13
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
12
14
 
15
+ function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
16
+
17
+ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
18
+
13
19
  describe('Touchable', function () {
20
+ var data;
21
+
14
22
  var DivComponent = function DivComponent(_ref) {
15
23
  var _ref$children = _ref.children,
16
24
  children = _ref$children === void 0 ? 'Toggle' : _ref$children,
@@ -20,8 +28,12 @@ describe('Touchable', function () {
20
28
  onMouseLeave = _ref.onMouseLeave,
21
29
  onMouseUp = _ref.onMouseUp,
22
30
  onTouchStart = _ref.onTouchStart,
23
- onTouchEnd = _ref.onTouchEnd;
31
+ onTouchEnd = _ref.onTouchEnd,
32
+ props = _objectWithoutProperties(_ref, _excluded);
33
+
34
+ data = props;
24
35
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
36
+ "data-testid": "component",
25
37
  id: id,
26
38
  onClick: onClick,
27
39
  onMouseDown: onMouseDown,
@@ -44,11 +56,9 @@ describe('Touchable', function () {
44
56
  var Component = (0, _Touchable["default"])({
45
57
  activeProp: 'active'
46
58
  }, DivComponent);
47
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
48
- var wrapped = subject.find(DivComponent);
49
- var expected = true;
50
- var actual = ('active' in wrapped.props());
51
- expect(actual).toBe(expected);
59
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
60
+ var expected = data.active;
61
+ expect(expected).toBeDefined();
52
62
  });
53
63
  test('should update state configurations onHold events', function (done) {
54
64
  var holdConfig = {
@@ -60,15 +70,24 @@ describe('Touchable', function () {
60
70
  };
61
71
  var Component = (0, _Touchable["default"])(DivComponent);
62
72
  var handler = jest.fn();
63
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
73
+
74
+ var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
64
75
  onHoldStart: function onHoldStart() {},
65
76
  holdConfig: holdConfig
66
- }));
77
+ })),
78
+ rerender = _render.rerender;
79
+
80
+ var component = _react.screen.getByTestId('component');
81
+
67
82
  var ev = {};
68
- subject.simulate('mousedown', ev);
69
- subject.setProps({
70
- onHold: handler
71
- });
83
+
84
+ _react.fireEvent.mouseDown(component, ev);
85
+
86
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
87
+ holdConfig: holdConfig,
88
+ onHold: handler,
89
+ onHoldStart: function onHoldStart() {}
90
+ }));
72
91
  setTimeout(function () {
73
92
  expect(handler).toHaveBeenCalled();
74
93
  done();
@@ -84,15 +103,24 @@ describe('Touchable', function () {
84
103
  };
85
104
  var Component = (0, _Touchable["default"])(DivComponent);
86
105
  var handler = jest.fn();
87
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
88
- onHold: function onHold() {},
89
- holdConfig: holdConfig
90
- }));
106
+
107
+ var _render2 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
108
+ holdConfig: holdConfig,
109
+ onHold: function onHold() {}
110
+ })),
111
+ rerender = _render2.rerender;
112
+
113
+ var component = _react.screen.getByTestId('component');
114
+
91
115
  var ev = {};
92
- subject.simulate('mousedown', ev);
93
- subject.setProps({
116
+
117
+ _react.fireEvent.mouseDown(component, ev);
118
+
119
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
120
+ holdConfig: holdConfig,
121
+ onHold: function onHold() {},
94
122
  onHoldStart: handler
95
- });
123
+ }));
96
124
  setTimeout(function () {
97
125
  expect(handler).toHaveBeenCalled();
98
126
  done();
@@ -108,19 +136,29 @@ describe('Touchable', function () {
108
136
  };
109
137
  var Component = (0, _Touchable["default"])(DivComponent);
110
138
  var handler = jest.fn();
111
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
112
- onHold: function onHold() {},
113
- holdConfig: holdConfig
114
- }));
139
+
140
+ var _render3 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
141
+ holdConfig: holdConfig,
142
+ onHold: function onHold() {}
143
+ })),
144
+ rerender = _render3.rerender;
145
+
146
+ var component = _react.screen.getByTestId('component');
147
+
115
148
  var ev = {
116
149
  currentTarget: {}
117
150
  };
118
- subject.simulate('mousedown', ev);
119
- subject.setProps({
151
+
152
+ _react.fireEvent.mouseDown(component, ev);
153
+
154
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
155
+ holdConfig: holdConfig,
156
+ onHold: function onHold() {},
120
157
  onHoldEnd: handler
121
- });
158
+ }));
122
159
  setTimeout(function () {
123
- subject.simulate('mouseup', ev);
160
+ _react.fireEvent.mouseUp(component, ev);
161
+
124
162
  expect(handler).toHaveBeenCalled();
125
163
  done();
126
164
  }, 30);
@@ -178,13 +216,16 @@ describe('Touchable', function () {
178
216
  test('should invoke onDown handle on mouse down', function () {
179
217
  var Component = (0, _Touchable["default"])(DivComponent);
180
218
  var handler = jest.fn();
181
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
219
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
182
220
  onDown: handler
183
221
  }));
184
- subject.simulate('mousedown', {});
222
+
223
+ var component = _react.screen.getByTestId('component');
224
+
225
+ _react.fireEvent.mouseDown(component, {});
226
+
185
227
  var expected = 1;
186
- var actual = handler.mock.calls.length;
187
- expect(actual).toBe(expected);
228
+ expect(handler).toHaveBeenCalledTimes(expected);
188
229
  });
189
230
  });
190
231
  describe('#onUp', function () {
@@ -193,15 +234,20 @@ describe('Touchable', function () {
193
234
  activeProp: 'active'
194
235
  }, DivComponent);
195
236
  var handler = jest.fn();
196
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
237
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
197
238
  onUp: handler
198
239
  }));
240
+
241
+ var component = _react.screen.getByTestId('component');
242
+
199
243
  var ev = {};
200
- subject.simulate('mousedown', ev);
201
- subject.simulate('mouseup', ev);
244
+
245
+ _react.fireEvent.mouseDown(component, ev);
246
+
247
+ _react.fireEvent.mouseUp(component, ev);
248
+
202
249
  var expected = 1;
203
- var actual = handler.mock.calls.length;
204
- expect(actual).toBe(expected);
250
+ expect(handler).toHaveBeenCalledTimes(expected);
205
251
  });
206
252
  });
207
253
  describe('#onTap', function () {
@@ -210,62 +256,89 @@ describe('Touchable', function () {
210
256
  activeProp: 'active'
211
257
  }, DivComponent);
212
258
  var handler = jest.fn();
213
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
259
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
214
260
  onTap: handler
215
261
  }));
262
+
263
+ var component = _react.screen.getByTestId('component');
264
+
216
265
  var ev = {};
217
- subject.simulate('mousedown', ev);
218
- subject.simulate('mouseup', ev);
266
+
267
+ _react.fireEvent.mouseDown(component, ev);
268
+
269
+ _react.fireEvent.mouseUp(component, ev);
270
+
219
271
  var expected = 1;
220
- var actual = handler.mock.calls.length;
221
- expect(actual).toBe(expected);
272
+ expect(handler).toHaveBeenCalledTimes(expected);
222
273
  });
223
274
  test('should be called on click', function () {
224
275
  var Component = (0, _Touchable["default"])({
225
276
  activeProp: 'active'
226
277
  }, DivComponent);
227
278
  var handler = jest.fn();
228
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
279
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
229
280
  onTap: handler
230
281
  }));
231
- subject.simulate('click');
282
+
283
+ var component = _react.screen.getByTestId('component');
284
+
285
+ _react.fireEvent.click(component, {});
286
+
232
287
  var expected = 1;
233
- var actual = handler.mock.calls.length;
234
- expect(actual).toBe(expected);
288
+ expect(handler).toHaveBeenCalledTimes(expected);
235
289
  });
236
290
  test('should be called before onClick on click', function () {
237
291
  var Component = (0, _Touchable["default"])({
238
292
  activeProp: 'active'
239
293
  }, DivComponent);
240
294
  var handler = jest.fn();
241
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
242
- onTap: handler,
243
- onClick: handler
295
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
296
+ onClick: handler,
297
+ onTap: handler
244
298
  }));
245
- subject.simulate('click');
299
+
300
+ var component = _react.screen.getByTestId('component');
301
+
302
+ _react.fireEvent.click(component, {});
303
+
246
304
  var expected = ['onTap', 'click'];
247
305
  var actual = handler.mock.calls.map(function (call) {
248
306
  return call[0].type;
249
307
  });
250
308
  expect(actual).toEqual(expected);
251
309
  });
252
- test('should be called before onCLick on mouse up', function () {
310
+ test('should be called before onClick on mouse up', function () {
253
311
  var Component = (0, _Touchable["default"])({
254
312
  activeProp: 'active'
255
313
  }, DivComponent);
256
314
  var handler = jest.fn();
257
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
258
- onTap: handler,
259
- onClick: handler
315
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
316
+ onClick: handler,
317
+ onTap: handler
260
318
  }));
261
- var ev = {
262
- // a matching timeStamp is used by Touchable to prevent multiple onTaps on "true"
263
- // click (mouseup + click)
264
- timeStamp: 1
265
- };
266
- subject.simulate('mousedown', ev);
267
- subject.simulate('mouseup', ev);
268
- subject.simulate('click', ev);
319
+
320
+ var component = _react.screen.getByTestId('component');
321
+
322
+ var mouseDownEvent = _react.createEvent.mouseDown(component, {});
323
+
324
+ var mouseUpEvent = _react.createEvent.mouseUp(component, {});
325
+
326
+ var clickEvent = _react.createEvent.click(component, {}); // a matching timeStamp is used by Touchable to prevent multiple onTaps on "true"
327
+ // click (mouseup + click)
328
+
329
+
330
+ Object.defineProperty(mouseDownEvent, 'timeStamp', {
331
+ value: 1
332
+ });
333
+ Object.defineProperty(mouseUpEvent, 'timeStamp', {
334
+ value: 1
335
+ });
336
+ Object.defineProperty(clickEvent, 'timeStamp', {
337
+ value: 1
338
+ });
339
+ (0, _react.fireEvent)(component, mouseDownEvent);
340
+ (0, _react.fireEvent)(component, mouseUpEvent);
341
+ (0, _react.fireEvent)(component, clickEvent);
269
342
  var expected = ['onTap', 'click'];
270
343
  var actual = handler.mock.calls.map(function (call) {
271
344
  return call[0].type;
@@ -277,16 +350,20 @@ describe('Touchable', function () {
277
350
  activeProp: 'active'
278
351
  }, DivComponent);
279
352
  var handler = jest.fn();
280
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
353
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
281
354
  onTap: handler,
282
355
  onUp: preventDefault
283
356
  }));
357
+
358
+ var component = _react.screen.getByTestId('component');
359
+
284
360
  var ev = {};
285
- subject.simulate('mousedown', ev);
286
- subject.simulate('mouseup', ev);
287
- var expected = 0;
288
- var actual = handler.mock.calls.length;
289
- expect(actual).toBe(expected);
361
+
362
+ _react.fireEvent.mouseDown(component, ev);
363
+
364
+ _react.fireEvent.mouseUp(component, ev);
365
+
366
+ expect(handler).not.toHaveBeenCalled();
290
367
  });
291
368
  });
292
369
  describe('state management', function () {
@@ -296,13 +373,18 @@ describe('Touchable', function () {
296
373
  activeProp: 'active'
297
374
  }, DivComponent);
298
375
  var handler = jest.fn();
299
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
376
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
300
377
  onDown: handler
301
378
  }));
379
+
380
+ var component = _react.screen.getByTestId('component');
381
+
302
382
  var ev = {};
303
- var beforeDown = subject.find(DivComponent).prop('active');
304
- subject.simulate('mousedown', ev);
305
- var afterDown = subject.find(DivComponent).prop('active');
383
+ var beforeDown = data.active;
384
+
385
+ _react.fireEvent.mouseDown(component, ev);
386
+
387
+ var afterDown = data.active;
306
388
  var expected = false;
307
389
  var actual = beforeDown === afterDown;
308
390
  expect(actual).toBe(expected);
@@ -312,13 +394,17 @@ describe('Touchable', function () {
312
394
  activeProp: 'active'
313
395
  }, DivComponent);
314
396
  var handler = jest.fn();
315
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
316
- onDown: handler,
317
- disabled: true
397
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
398
+ disabled: true,
399
+ onDown: handler
318
400
  }));
319
- subject.simulate('mousedown', {});
401
+
402
+ var component = _react.screen.getByTestId('component');
403
+
404
+ _react.fireEvent.mouseDown(component, {});
405
+
320
406
  var expected = false;
321
- var actual = subject.find(DivComponent).prop('active');
407
+ var actual = data.active;
322
408
  expect(actual).toBe(expected);
323
409
  });
324
410
  test('should not update active state on mouse down when preventDefault is called', function () {
@@ -330,12 +416,16 @@ describe('Touchable', function () {
330
416
  return ev.preventDefault();
331
417
  };
332
418
 
333
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
419
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
334
420
  onDown: handler
335
421
  }));
336
- subject.simulate('mousedown', {});
422
+
423
+ var component = _react.screen.getByTestId('component');
424
+
425
+ _react.fireEvent.mouseDown(component, {});
426
+
337
427
  var expected = false;
338
- var actual = subject.find(DivComponent).prop('active');
428
+ var actual = data.active;
339
429
  expect(actual).toBe(expected);
340
430
  });
341
431
  });
@@ -345,14 +435,21 @@ describe('Touchable', function () {
345
435
  activeProp: 'active'
346
436
  }, DivComponent);
347
437
  var handler = jest.fn();
348
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
438
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
349
439
  onDown: handler
350
440
  }));
441
+
442
+ var component = _react.screen.getByTestId('component');
443
+
351
444
  var ev = {};
352
- subject.simulate('mousedown', ev);
353
- var beforeUp = subject.find(DivComponent).prop('active');
354
- subject.simulate('mouseup', ev);
355
- var afterUp = subject.find(DivComponent).prop('active');
445
+
446
+ _react.fireEvent.mouseDown(component, ev);
447
+
448
+ var beforeUp = data.active;
449
+
450
+ _react.fireEvent.mouseUp(component, ev);
451
+
452
+ var afterUp = data.active;
356
453
  var expected = false;
357
454
  var actual = beforeUp === afterUp;
358
455
  expect(actual).toBe(expected);
@@ -362,15 +459,22 @@ describe('Touchable', function () {
362
459
  activeProp: 'active'
363
460
  }, DivComponent);
364
461
  var handler = jest.fn();
365
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
366
- onDown: handler,
367
- disabled: true
462
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
463
+ disabled: true,
464
+ onDown: handler
368
465
  }));
466
+
467
+ var component = _react.screen.getByTestId('component');
468
+
369
469
  var ev = {};
370
- subject.simulate('mousedown', ev);
371
- var beforeUp = subject.find(DivComponent).prop('active');
372
- subject.simulate('mouseup', ev);
373
- var afterUp = subject.find(DivComponent).prop('active');
470
+
471
+ _react.fireEvent.mouseDown(component, ev);
472
+
473
+ var beforeUp = data.active;
474
+
475
+ _react.fireEvent.mouseUp(component, ev);
476
+
477
+ var afterUp = data.active;
374
478
  var expected = true;
375
479
  var actual = beforeUp === afterUp;
376
480
  expect(actual).toBe(expected);
@@ -379,14 +483,21 @@ describe('Touchable', function () {
379
483
  var Component = (0, _Touchable["default"])({
380
484
  activeProp: 'active'
381
485
  }, DivComponent);
382
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
486
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
383
487
  onDown: preventDefault
384
488
  }));
489
+
490
+ var component = _react.screen.getByTestId('component');
491
+
385
492
  var ev = {};
386
- subject.simulate('mousedown', ev);
387
- var beforeUp = subject.find(DivComponent).prop('active');
388
- subject.simulate('mouseup', ev);
389
- var afterUp = subject.find(DivComponent).prop('active');
493
+
494
+ _react.fireEvent.mouseDown(component, ev);
495
+
496
+ var beforeUp = data.active;
497
+
498
+ _react.fireEvent.mouseUp(component, ev);
499
+
500
+ var afterUp = data.active;
390
501
  var expected = true;
391
502
  var actual = beforeUp === afterUp;
392
503
  expect(actual).toBe(expected);
@@ -397,13 +508,16 @@ describe('Touchable', function () {
397
508
  test('should only emit onTap once when tapping an child instance of Touchable', function () {
398
509
  var Component = (0, _Touchable["default"])(DivComponent);
399
510
  var handler = jest.fn();
400
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
401
- onTap: handler,
511
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
402
512
  id: "outer",
513
+ onTap: handler,
403
514
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
404
515
  id: "inner"
405
516
  })
406
517
  }));
518
+
519
+ var innerComponent = _react.screen.getAllByTestId('component')[1];
520
+
407
521
  var mouseEvent = {
408
522
  timeStamp: 1
409
523
  };
@@ -418,14 +532,16 @@ describe('Touchable', function () {
418
532
  clientY: 0
419
533
  }]
420
534
  };
421
- var inner = subject.find('div#inner');
422
- inner.simulate('touchstart', touchEvent);
423
- inner.simulate('touchend', touchEvent);
424
- inner.simulate('mousedown', mouseEvent);
425
- inner.simulate('mouseup', mouseEvent);
426
- var expected = 1;
427
- var actual = handler.mock.calls.length;
428
- expect(actual).toBe(expected);
535
+
536
+ _react.fireEvent.touchStart(innerComponent, touchEvent);
537
+
538
+ _react.fireEvent.touchEnd(innerComponent, touchEvent);
539
+
540
+ _react.fireEvent.mouseDown(innerComponent, mouseEvent);
541
+
542
+ _react.fireEvent.mouseUp(innerComponent, mouseEvent);
543
+
544
+ expect(handler).toHaveBeenCalled();
429
545
  });
430
546
  });
431
547
  });