@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,25 @@
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");
6
+
7
+ var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
8
+
9
+ var _react2 = require("react");
4
10
 
5
11
  var _RadioDecorator = require("../RadioDecorator");
6
12
 
7
13
  var _jsxRuntime = require("react/jsx-runtime");
8
14
 
15
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
16
+
9
17
  describe('RadioDecorator', function () {
10
18
  var Item = function Item(_ref) {
11
19
  var onClick = _ref.onClick,
12
20
  active = _ref.active;
13
21
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
22
+ "data-testid": "span-element",
14
23
  onClick: onClick,
15
24
  children: active ? 'Active' : 'Inactive'
16
25
  });
@@ -19,29 +28,34 @@ describe('RadioDecorator', function () {
19
28
  var Controller = (0, _RadioDecorator.RadioControllerDecorator)('main');
20
29
 
21
30
  var expectToBeActive = function expectToBeActive(controller, decorator) {
22
- expect(controller.instance().active).toBe(decorator && decorator.instance().handleDeactivate);
31
+ expect(controller.active).toBe(decorator && decorator.handleDeactivate);
23
32
  };
24
33
 
25
34
  test('should be activated when its prop is true on mount', function () {
26
35
  var Component = (0, _RadioDecorator.RadioDecorator)({
27
36
  prop: 'active'
28
37
  }, Item);
29
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
38
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
30
39
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
31
40
  active: true
32
41
  })
33
42
  }));
34
- var instance = subject.find('RadioDecorator');
35
- expectToBeActive(subject, instance);
43
+
44
+ var component = _react.screen.getByTestId('span-element');
45
+
46
+ expect(component).toHaveTextContent('Active');
36
47
  });
37
48
  test('should not be activated when its prop is false on mount', function () {
38
49
  var Component = (0, _RadioDecorator.RadioDecorator)({
39
50
  prop: 'active'
40
51
  }, Item);
41
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
52
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
42
53
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {})
43
54
  }));
44
- expectToBeActive(subject, null);
55
+
56
+ var component = _react.screen.getByTestId('span-element');
57
+
58
+ expect(component).toHaveTextContent('Inactive');
45
59
  });
46
60
  test('should be activated when its prop is set to true after mount', function () {
47
61
  var Component = (0, _RadioDecorator.RadioDecorator)({
@@ -57,106 +71,206 @@ describe('RadioDecorator', function () {
57
71
  });
58
72
  };
59
73
 
60
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {}));
61
- subject.setProps({
74
+ var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {})),
75
+ rerender = _render.rerender;
76
+
77
+ var component = _react.screen.getByTestId('span-element');
78
+
79
+ var expected = 'Inactive';
80
+ expect(component).toHaveTextContent(expected);
81
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {
62
82
  active: true
63
- });
64
- var instance = subject.find('RadioDecorator');
65
- expectToBeActive(subject.find('RadioControllerDecorator'), instance);
83
+ }));
84
+ var secondExpected = 'Active';
85
+ expect(component).toHaveTextContent(secondExpected);
86
+ });
87
+ test('should fire `activate` event with type when become activated', function () {
88
+ var Component = (0, _RadioDecorator.RadioDecorator)({
89
+ activate: 'onClick',
90
+ prop: 'active'
91
+ }, Item);
92
+ var handleActivate = jest.fn();
93
+
94
+ var Wrapper = function Wrapper() {
95
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
96
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
97
+ onClick: handleActivate
98
+ })
99
+ });
100
+ };
101
+
102
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {}));
103
+
104
+ var component = _react.screen.getByTestId('span-element');
105
+
106
+ _userEvent["default"].click(component);
107
+
108
+ var expected = 1;
109
+ var expectedType = {
110
+ type: 'onClick'
111
+ };
112
+ var actual = handleActivate.mock.calls.length && handleActivate.mock.calls[0][0];
113
+ expect(handleActivate).toBeCalledTimes(expected);
114
+ expect(actual).toMatchObject(expectedType);
115
+ });
116
+ test('should fire `deactivate` event with type when become deactivated', function () {
117
+ var Component = (0, _RadioDecorator.RadioDecorator)({
118
+ deactivate: 'onClick',
119
+ prop: 'active'
120
+ }, Item);
121
+ var handleDeactivate = jest.fn();
122
+
123
+ var Wrapper = function Wrapper() {
124
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
125
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
126
+ onClick: handleDeactivate
127
+ })
128
+ });
129
+ };
130
+
131
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {}));
132
+
133
+ var component = _react.screen.getByTestId('span-element');
134
+
135
+ _userEvent["default"].click(component);
136
+
137
+ var expected = 1;
138
+ var expectedType = {
139
+ type: 'onClick'
140
+ };
141
+ var actual = handleDeactivate.mock.calls.length && handleDeactivate.mock.calls[0][0];
142
+ expect(handleDeactivate).toBeCalledTimes(expected);
143
+ expect(actual).toMatchObject(expectedType);
144
+ });
145
+ test('should not call deactivate callback on inactive items', function () {
146
+ var handleDeactivate = jest.fn();
147
+ var Component = (0, _RadioDecorator.RadioDecorator)({
148
+ deactivate: 'onClick',
149
+ prop: 'active'
150
+ }, Item); // deactivate() is only called when there was a previously active item
151
+
152
+ var Wrapper = function Wrapper(_ref3) {
153
+ var active = _ref3.active;
154
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Controller, {
155
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
156
+ active: !active
157
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
158
+ active: active
159
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
160
+ onClick: handleDeactivate
161
+ })]
162
+ });
163
+ }; // create a controller with no active item
164
+
165
+
166
+ var _render2 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {})),
167
+ rerender = _render2.rerender; // activate the second item via prop change
168
+
169
+
170
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {
171
+ active: true
172
+ })); // verify that the deactivate handler wasn't called
173
+
174
+ var expected = 0;
175
+ var actual = handleDeactivate.mock.calls.length;
176
+ expect(actual).toBe(expected);
66
177
  });
67
178
  test('should be activated when the activated event fires', function () {
179
+ var controllerRef = /*#__PURE__*/(0, _react2.createRef)();
180
+ var decoratorRef = /*#__PURE__*/(0, _react2.createRef)();
68
181
  var Component = (0, _RadioDecorator.RadioDecorator)({
69
182
  activate: 'onClick',
70
183
  prop: 'active'
71
184
  }, Item);
72
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
73
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {})
185
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
186
+ ref: controllerRef,
187
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
188
+ ref: decoratorRef
189
+ })
74
190
  }));
75
- subject.find('span').simulate('click');
76
- var instance = subject.find('RadioDecorator');
77
- expectToBeActive(subject, instance);
191
+
192
+ var component = _react.screen.getByTestId('span-element');
193
+
194
+ _userEvent["default"].click(component);
195
+
196
+ expectToBeActive(controllerRef.current, decoratorRef.current);
78
197
  });
79
198
  test('should be deactivated when the deactivated event fires', function () {
199
+ var controllerRef = /*#__PURE__*/(0, _react2.createRef)();
200
+ var decoratorRef = /*#__PURE__*/(0, _react2.createRef)();
80
201
  var Component = (0, _RadioDecorator.RadioDecorator)({
81
202
  deactivate: 'onClick',
82
203
  prop: 'active'
83
204
  }, Item);
84
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
205
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
206
+ ref: controllerRef,
85
207
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
86
- active: true
208
+ active: true,
209
+ ref: decoratorRef
87
210
  })
88
211
  }));
89
- subject.find('span').simulate('click');
90
- expectToBeActive(subject, null);
212
+
213
+ var component = _react.screen.getByTestId('span-element');
214
+
215
+ _userEvent["default"].click(component);
216
+
217
+ expectToBeActive(controllerRef.current, null);
91
218
  });
92
219
  test('should be deactivated when the activated event fires on another instance', function () {
220
+ var controllerRef = /*#__PURE__*/(0, _react2.createRef)();
221
+ var decoratorRef = /*#__PURE__*/(0, _react2.createRef)();
93
222
  var Component = (0, _RadioDecorator.RadioDecorator)({
94
223
  activate: 'onClick',
95
224
  prop: 'active'
96
225
  }, Item);
97
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(Controller, {
226
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(Controller, {
227
+ ref: controllerRef,
98
228
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
99
229
  active: true
100
- }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {})]
230
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
231
+ ref: decoratorRef
232
+ })]
101
233
  }));
102
- subject.find('span').at(1).simulate('click');
103
- var instance = subject.find('RadioDecorator').at(1);
104
- expectToBeActive(subject, instance);
234
+
235
+ var inactiveComponent = _react.screen.getByText('Inactive');
236
+
237
+ _userEvent["default"].click(inactiveComponent);
238
+
239
+ expectToBeActive(controllerRef.current, decoratorRef.current);
105
240
  });
106
241
  test('should not deactivate items in a ancestor controller', function () {
242
+ var parentControllerRef = /*#__PURE__*/(0, _react2.createRef)();
243
+ var parentDecoratorRef = /*#__PURE__*/(0, _react2.createRef)();
244
+ var childControllerRef = /*#__PURE__*/(0, _react2.createRef)();
245
+ var childDecoratorRef = /*#__PURE__*/(0, _react2.createRef)();
107
246
  var Component = (0, _RadioDecorator.RadioDecorator)({
108
247
  activate: 'onClick',
109
248
  prop: 'active'
110
249
  }, Item);
111
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(Controller, {
250
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(Controller, {
251
+ ref: parentControllerRef,
112
252
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
113
- active: true
253
+ active: true,
254
+ ref: parentDecoratorRef
114
255
  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}), /*#__PURE__*/(0, _jsxRuntime.jsxs)(Controller, {
115
256
  "data-child-controller": true,
257
+ ref: childControllerRef,
116
258
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
117
259
  active: true
118
- }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {})]
119
- })]
120
- }));
121
- var childController = subject.find('RadioControllerDecorator').at(1);
122
- childController.find('span').at(1).simulate('click'); // Breaking the pattern of 1 expect per test in order to verify the expect change happened
123
- // (activating second component in child controller) and no unexpected change happened in
124
- // the parent controller (active component should remain the first component)
125
-
126
- var childInstance = childController.find('RadioDecorator').at(1);
127
- expectToBeActive(childController, childInstance);
128
- var parentInstance = subject.find('RadioDecorator').at(0);
129
- expectToBeActive(subject, parentInstance);
130
- });
131
- test('should not call deactivate callback on inactive items', function () {
132
- var handleDeactivate = jest.fn();
133
- var Component = (0, _RadioDecorator.RadioDecorator)({
134
- deactivate: 'onClick',
135
- prop: 'active'
136
- }, Item); // deactivate() is only called when there was a previously active item
137
-
138
- var Wrapper = function Wrapper(_ref3) {
139
- var active = _ref3.active;
140
- return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Controller, {
141
- children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
142
- active: !active
143
- }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
144
- active: active
145
260
  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
146
- onClick: handleDeactivate
261
+ ref: childDecoratorRef
147
262
  })]
148
- });
149
- }; // create a controller with no active item
263
+ })]
264
+ }));
150
265
 
266
+ var inactiveComponents = _react.screen.getAllByText('Inactive');
151
267
 
152
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {})); // activate the second item via prop change
268
+ _userEvent["default"].click(inactiveComponents[1]); // Breaking the pattern of 1 expect per test in order to verify the expect change happened
269
+ // (activating second component in child controller) and no unexpected change happened in
270
+ // the parent controller (active component should remain the first component)
153
271
 
154
- subject.setProps({
155
- active: true
156
- }); // verify that the deactivate handler wasn't called
157
272
 
158
- var expected = 0;
159
- var actual = handleDeactivate.mock.calls.length;
160
- expect(actual).toBe(expected);
273
+ expectToBeActive(parentControllerRef, parentDecoratorRef);
274
+ expectToBeActive(childControllerRef, childDecoratorRef);
161
275
  });
162
276
  });
@@ -23,7 +23,8 @@ You'll be responsible for setting properties like `disabled` , `className` , a
23
23
  text content using the `children` key.
24
24
  *
25
25
  * NOTE : When an array of objects is provided, make sure a unique `key` is assigned to each
26
- data. See for more information.
26
+ *
27
+ * data. See for more information.
27
28
  */
28
29
  children: string[] | { key: number | string; [propName: string]: any }[];
29
30
  /**
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.RepeaterBase = exports.Repeater = exports["default"] = void 0;
6
+ exports["default"] = exports.RepeaterBase = exports.Repeater = void 0;
7
7
 
8
8
  var _propTypes = _interopRequireDefault(require("@enact/core/internal/prop-types"));
9
9
 
@@ -15,15 +15,17 @@ var _ForwardRef = _interopRequireDefault(require("../ForwardRef"));
15
15
 
16
16
  var _jsxRuntime = require("react/jsx-runtime");
17
17
 
18
+ var _excluded = ["component", "componentRef"];
19
+
18
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
19
21
 
20
22
  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; }
21
23
 
22
24
  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; }
23
25
 
24
- 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; }
26
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
25
27
 
26
- 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; }
28
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
27
29
 
28
30
  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; }
29
31
 
@@ -151,7 +153,7 @@ var RepeaterBase = (0, _kind["default"])({
151
153
  render: function render(_ref2) {
152
154
  var Component = _ref2.component,
153
155
  componentRef = _ref2.componentRef,
154
- rest = _objectWithoutProperties(_ref2, ["component", "componentRef"]);
156
+ rest = _objectWithoutProperties(_ref2, _excluded);
155
157
 
156
158
  delete rest.childComponent;
157
159
  delete rest.childProp;
@@ -1,18 +1,20 @@
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 _Repeater = _interopRequireWildcard(require("../Repeater"));
6
8
 
7
9
  var _jsxRuntime = require("react/jsx-runtime");
8
10
 
9
- function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
11
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
10
12
 
11
- 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; }
13
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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; }
12
14
 
13
- 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; }
15
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
14
16
 
15
- 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; }
17
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
16
18
 
17
19
  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; }
18
20
 
@@ -36,134 +38,173 @@ describe('Repeater Specs', function () {
36
38
  };
37
39
 
38
40
  test('should have a root span element', function () {
39
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
41
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
40
42
  childComponent: "div",
43
+ "data-testid": "repeater",
41
44
  children: stringItems
42
45
  }));
43
- var expected = 'span';
44
- var actual = subject.first().name();
45
- expect(actual).toBe(expected);
46
+ var expected = 'SPAN';
47
+
48
+ var rootElementName = _react.screen.getByTestId('repeater').nodeName;
49
+
50
+ expect(rootElementName).toBe(expected);
46
51
  });
47
52
  test('should accept a nodeName as root element', function () {
48
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
49
- component: "div",
53
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
50
54
  childComponent: "div",
55
+ component: "div",
56
+ "data-testid": "repeater",
51
57
  children: stringItems
52
58
  }));
53
- var expected = 'div';
54
- var actual = subject.first().name();
55
- expect(actual).toBe(expected);
59
+ var expected = 'DIV';
60
+
61
+ var rootElementName = _react.screen.getByTestId('repeater').nodeName;
62
+
63
+ expect(rootElementName).toBe(expected);
56
64
  });
57
65
  test('should accept a function as root element', function () {
58
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
59
- component: CustomRootType,
66
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
60
67
  childComponent: "div",
68
+ component: CustomRootType,
69
+ "data-testid": "repeater",
61
70
  children: stringItems
62
71
  }));
63
- var expected = 'CustomRootType';
64
- var actual = subject.first().name();
65
- expect(actual).toBe(expected);
72
+ var expected = 'DIV';
73
+
74
+ var rootElementName = _react.screen.getByTestId('repeater').nodeName;
75
+
76
+ expect(rootElementName).toBe(expected);
66
77
  });
67
78
  test('should accept a nodeName as childComponent', function () {
68
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
79
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
69
80
  childComponent: "div",
81
+ "data-testid": "repeater",
70
82
  children: stringItems
71
83
  }));
72
84
  var expected = 3;
73
- var actual = subject.first().children().length;
85
+
86
+ var actual = _react.screen.getByTestId('repeater').children.length;
87
+
74
88
  expect(actual).toBe(expected);
75
89
  });
76
90
  test('should accept a function as childComponent', function () {
77
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
91
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
78
92
  childComponent: CustomType,
93
+ "data-testid": "repeater",
79
94
  children: stringItems
80
95
  }));
81
96
  var expected = 3;
82
- var actual = subject.first().children().length;
97
+
98
+ var actual = _react.screen.getByTestId('repeater').children.length;
99
+
83
100
  expect(actual).toBe(expected);
84
101
  });
85
102
  test('should create a number of children matching the length of items', function () {
86
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
103
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
87
104
  childComponent: "div",
105
+ "data-testid": "repeater",
88
106
  children: stringItems
89
107
  }));
90
108
  var expected = stringItems.length;
91
- var actual = subject.first().children().length;
109
+
110
+ var actual = _react.screen.getByTestId('repeater').children.length;
111
+
92
112
  expect(actual).toBe(expected);
93
113
  });
94
114
  test('should support an array of objects as items', function () {
95
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
115
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
96
116
  childComponent: CustomType,
117
+ "data-testid": "repeater",
97
118
  children: objItems
98
119
  }));
99
120
  var expected = objItems.length;
100
- var actual = subject.first().children().length;
121
+
122
+ var actual = _react.screen.getByTestId('repeater').children.length;
123
+
101
124
  expect(actual).toBe(expected);
102
125
  });
103
126
  test('should support passing itemProps to children', function () {
104
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
127
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
105
128
  childComponent: "div",
129
+ "data-testid": "repeater",
106
130
  itemProps: {
107
131
  title: 'test'
108
132
  },
109
133
  children: stringItems
110
134
  }));
111
135
  var expected = 'test';
112
- var actual = subject.first().childAt(0).prop('title');
113
- expect(actual).toBe(expected);
136
+
137
+ var actual = _react.screen.getByTestId('repeater').children.item(0);
138
+
139
+ expect(actual).toHaveAttribute('title', expected);
114
140
  });
115
141
  test('should pass index to each child', function () {
116
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
142
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
117
143
  childComponent: "div",
144
+ "data-testid": "repeater",
118
145
  children: stringItems
119
146
  }));
120
- var expected = 0;
121
- var actual = subject.first().childAt(0).prop('data-index');
122
- expect(actual).toBe(expected);
147
+ var expected = '0';
148
+
149
+ var actual = _react.screen.getByTestId('repeater').children.item(0);
150
+
151
+ expect(actual).toHaveAttribute('data-index', expected);
123
152
  });
124
153
  test('should pass data to each child', function () {
125
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
154
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
126
155
  childComponent: "div",
127
156
  childProp: "data-str",
157
+ "data-testid": "repeater",
128
158
  children: stringItems
129
159
  }));
130
160
  var expected = stringItems[0];
131
- var actual = subject.first().childAt(0).prop('data-str');
132
- expect(actual).toBe(expected);
161
+
162
+ var actual = _react.screen.getByTestId('repeater').children.item(0);
163
+
164
+ expect(actual).toHaveAttribute('data-str', expected);
133
165
  });
134
166
  test('should pass item as children to each child', function () {
135
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
167
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
136
168
  childComponent: "div",
169
+ "data-testid": "repeater",
137
170
  children: stringItems
138
171
  }));
139
172
  var expected = stringItems[0];
140
- var actual = subject.first().childAt(0).prop('children');
141
- expect(actual).toBe(expected);
173
+
174
+ var actual = _react.screen.getByTestId('repeater').children.item(0);
175
+
176
+ expect(actual).toHaveTextContent(expected);
142
177
  });
143
178
  test('should set role to list by default', function () {
144
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
179
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
145
180
  childComponent: "div",
181
+ "data-testid": "repeater",
146
182
  children: stringItems
147
183
  }));
148
184
  var expected = 'list';
149
- var actual = subject.prop('role');
150
- expect(actual).toBe(expected);
185
+
186
+ var listElement = _react.screen.getByTestId('repeater');
187
+
188
+ expect(listElement).toHaveAttribute('role', expected);
151
189
  });
152
190
  test('should allow role to be overridden', function () {
153
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
191
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater.RepeaterBase, {
154
192
  childComponent: "div",
193
+ "data-testid": "repeater",
155
194
  role: "listbox",
156
195
  children: stringItems
157
196
  }));
158
197
  var expected = 'listbox';
159
- var actual = subject.prop('role');
160
- expect(actual).toBe(expected);
198
+
199
+ var listElement = _react.screen.getByTestId('repeater');
200
+
201
+ expect(listElement).toHaveAttribute('role', expected);
161
202
  });
162
- test('should return a DOM node reference for `componentRef``', function () {
203
+ test('should return a DOM node reference for `componentRef`', function () {
163
204
  var ref = jest.fn();
164
- (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater["default"], {
165
- component: "div",
205
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Repeater["default"], {
166
206
  childComponent: "div",
207
+ component: "div",
167
208
  ref: ref,
168
209
  children: stringItems
169
210
  }));