@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,20 +1,18 @@
1
1
  "use strict";
2
2
 
3
- var _enzyme = require("enzyme");
3
+ require("@testing-library/jest-dom");
4
4
 
5
- var _index = require("../index.js");
5
+ var _react = require("@testing-library/react");
6
6
 
7
- var _MarqueeModule = _interopRequireDefault(require("../Marquee.module.css"));
7
+ var _index = require("../index.js");
8
8
 
9
9
  var _jsxRuntime = require("react/jsx-runtime");
10
10
 
11
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
12
-
13
11
  var ltrText = 'This is some fine latin text.',
14
- rtlText = 'العربية - العراق',
15
- contentSelector = ".".concat(_MarqueeModule["default"].text);
12
+ rtlText = 'العربية - العراق';
16
13
  describe('Marquee', function () {
17
14
  beforeEach(function () {
15
+ jest.useFakeTimers();
18
16
  global.Element.prototype.getBoundingClientRect = jest.fn(function () {
19
17
  return {
20
18
  width: 100,
@@ -26,268 +24,402 @@ describe('Marquee', function () {
26
24
  };
27
25
  });
28
26
  });
27
+ afterEach(function () {
28
+ jest.useRealTimers();
29
+ });
29
30
  test('should determine the correct directionality of latin text on initial render', function () {
30
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
31
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
31
32
  children: ltrText
32
33
  }));
34
+
35
+ var marquee = _react.screen.getByText(ltrText);
36
+
33
37
  var expected = 'ltr';
34
- var actual = subject.find(contentSelector).prop('style');
35
- expect(actual).toHaveProperty('direction', expected);
38
+ expect(marquee).toHaveStyle({
39
+ 'direction': expected
40
+ });
36
41
  });
37
42
  test('should determine the correct directionality of non-latin text on initial render', function () {
38
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
43
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
39
44
  children: rtlText
40
45
  }));
46
+
47
+ var marquee = _react.screen.getByText(rtlText);
48
+
41
49
  var expected = 'rtl';
42
- var actual = subject.find(contentSelector).prop('style');
43
- expect(actual).toHaveProperty('direction', expected);
50
+ expect(marquee).toHaveStyle({
51
+ 'direction': expected
52
+ });
44
53
  });
45
54
  test('should force the directionality text if forceDirection is specified', function () {
46
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
55
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
47
56
  forceDirection: "ltr",
48
57
  children: rtlText
49
58
  }));
59
+
60
+ var marquee = _react.screen.getByText(rtlText);
61
+
50
62
  var expected = 'ltr';
51
- var actual = subject.find(contentSelector).prop('style');
52
- expect(actual).toHaveProperty('direction', expected);
63
+ expect(marquee).toHaveStyle({
64
+ 'direction': expected
65
+ });
53
66
  });
54
67
  test('should switch directionality when the text content changes after initial render', function () {
55
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
68
+ var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
56
69
  children: ltrText
57
- }));
58
- subject.setProps({
70
+ })),
71
+ rerender = _render.rerender;
72
+
73
+ var marquee = _react.screen.getByText(ltrText);
74
+
75
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
59
76
  children: rtlText
60
- });
61
- subject.update();
77
+ }));
62
78
  var expected = 'rtl';
63
- var actual = subject.find(contentSelector).prop('style');
64
- expect(actual).toHaveProperty('direction', expected);
79
+ expect(marquee).toHaveStyle({
80
+ 'direction': expected
81
+ });
65
82
  });
66
83
  test('should not switch directionality when the text content changes after initial render and the forceDirection property was already set', function () {
67
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
84
+ var _render2 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
68
85
  forceDirection: "ltr",
69
86
  children: ltrText
70
- }));
71
- subject.setProps({
87
+ })),
88
+ rerender = _render2.rerender;
89
+
90
+ var marquee = _react.screen.getByText(ltrText);
91
+
92
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
93
+ forceDirection: "ltr",
72
94
  children: rtlText
73
- });
74
- subject.update();
95
+ }));
75
96
  var expected = 'ltr';
76
- var actual = subject.find(contentSelector).prop('style');
77
- expect(actual).toHaveProperty('direction', expected);
97
+ expect(marquee).toHaveStyle({
98
+ 'direction': expected
99
+ });
78
100
  });
79
101
  test('should override direction to RTL when forceDirection is set and locale is LTR', function () {
80
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
102
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
103
+ "data-testid": "marquee",
81
104
  forceDirection: "rtl",
82
105
  locale: "ltr"
83
106
  }));
107
+
108
+ var marquee = _react.screen.getByTestId('marquee').children.item(0).children.item(0);
109
+
84
110
  var expected = 'rtl';
85
- var actual = subject.find(contentSelector).prop('style');
86
- expect(actual).toHaveProperty('direction', expected);
111
+ expect(marquee).toHaveStyle({
112
+ 'direction': expected
113
+ });
114
+ });
115
+ test('should not override direction to RTL when forceDirection is "locale" and locale is LTR', function () {
116
+ var _render3 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
117
+ forceDirection: "locale",
118
+ children: ltrText
119
+ })),
120
+ rerender = _render3.rerender;
121
+
122
+ var marquee = _react.screen.getByText(ltrText);
123
+
124
+ var expected = 'ltr';
125
+ expect(marquee).toHaveStyle({
126
+ 'direction': expected
127
+ });
128
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
129
+ forceDirection: "locale",
130
+ children: rtlText
131
+ }));
132
+ expect(marquee).toHaveStyle({
133
+ 'direction': expected
134
+ });
87
135
  });
88
136
  test('should override direction to LTR when forceDirection is set and locale is RTL', function () {
89
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
137
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
138
+ "data-testid": "marquee",
90
139
  forceDirection: "ltr",
91
140
  locale: "rtl"
92
141
  }));
142
+
143
+ var marquee = _react.screen.getByTestId('marquee').children.item(0).children.item(0);
144
+
93
145
  var expected = 'ltr';
94
- var actual = subject.find(contentSelector).prop('style');
95
- expect(actual).toHaveProperty('direction', expected);
146
+ expect(marquee).toHaveStyle({
147
+ 'direction': expected
148
+ });
96
149
  });
97
150
  test('should have direction of RTL when forceDirection is RTL and locale is RTL', function () {
98
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
151
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
152
+ "data-testid": "marquee",
99
153
  forceDirection: "rtl",
100
154
  locale: "rtl"
101
155
  }));
156
+
157
+ var marquee = _react.screen.getByTestId('marquee').children.item(0).children.item(0);
158
+
102
159
  var expected = 'rtl';
103
- var actual = subject.find(contentSelector).prop('style');
104
- expect(actual).toHaveProperty('direction', expected);
160
+ expect(marquee).toHaveStyle({
161
+ 'direction': expected
162
+ });
105
163
  });
106
164
  test('should have direction of LTR when forceDirection is LTR and locale is LTR', function () {
107
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
165
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
166
+ "data-testid": "marquee",
108
167
  forceDirection: "ltr",
109
168
  locale: "ltr"
110
169
  }));
170
+
171
+ var marquee = _react.screen.getByTestId('marquee').children.item(0).children.item(0);
172
+
111
173
  var expected = 'ltr';
112
- var actual = subject.find(contentSelector).prop('style');
113
- expect(actual).toHaveProperty('direction', expected);
174
+ expect(marquee).toHaveStyle({
175
+ 'direction': expected
176
+ });
114
177
  });
115
178
  test('should convert percentage values of marqueeSpacing to absolute values', function (done) {
116
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
117
- marqueeSpacing: "60%",
179
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
180
+ "data-testid": "marquee",
118
181
  marqueeOn: "render",
119
- marqueeOnRenderDelay: 10
182
+ marqueeOnRenderDelay: 10,
183
+ marqueeSpacing: "60%"
120
184
  }));
121
- setTimeout(function () {
122
- subject.update();
123
- var expected = 60;
124
- var actual = subject.find(_index.MarqueeBase).prop('spacing');
125
- expect(actual).toBe(expected);
126
- done();
127
- }, 100);
185
+ (0, _react.act)(function () {
186
+ return jest.advanceTimersByTime(100);
187
+ });
188
+ var expected = '60';
189
+
190
+ var marquee = _react.screen.getByTestId('marquee').children.item(0).children.item(0);
191
+
192
+ expect(marquee).toHaveStyle({
193
+ '--ui-marquee-spacing': expected
194
+ });
195
+ done();
128
196
  });
129
197
  test('should pass absolute values of marqueeSpacing', function (done) {
130
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
131
- marqueeSpacing: 80,
198
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
199
+ "data-testid": "marquee",
132
200
  marqueeOn: "render",
133
- marqueeOnRenderDelay: 10
201
+ marqueeOnRenderDelay: 10,
202
+ marqueeSpacing: 80
134
203
  }));
135
- setTimeout(function () {
136
- subject.update();
137
- var expected = 80;
138
- var actual = subject.find(_index.MarqueeBase).prop('spacing');
139
- expect(actual).toBe(expected);
140
- done();
141
- }, 100);
204
+ (0, _react.act)(function () {
205
+ return jest.advanceTimersByTime(100);
206
+ });
207
+ var expected = '80';
208
+
209
+ var marquee = _react.screen.getByTestId('marquee').children.item(0).children.item(0);
210
+
211
+ expect(marquee).toHaveStyle({
212
+ '--ui-marquee-spacing': expected
213
+ });
214
+ done();
142
215
  });
143
216
  });
144
217
  describe('MarqueeBase', function () {
145
218
  // Computed Property Tests
146
219
  test('should not include the animate class when animating is false', function () {
147
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {}));
148
- var expected = false;
149
- var actual = subject.childAt(0).hasClass(_MarqueeModule["default"].animate);
150
- expect(actual).toBe(expected);
220
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
221
+ "data-testid": "marquee"
222
+ }));
223
+
224
+ var marquee = _react.screen.getByTestId('marquee').children.item(0);
225
+
226
+ var expected = 'animate';
227
+ expect(marquee).not.toHaveClass(expected);
151
228
  });
152
229
  test('should include the animate class when animating is true', function () {
153
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
154
- animating: true
230
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
231
+ animating: true,
232
+ "data-testid": "marquee"
155
233
  }));
156
- var expected = true;
157
- var actual = subject.childAt(0).hasClass(_MarqueeModule["default"].animate);
158
- expect(actual).toBe(expected);
234
+
235
+ var marquee = _react.screen.getByTestId('marquee').children.item(0);
236
+
237
+ var expected = 'animate';
238
+ expect(marquee).toHaveClass(expected);
159
239
  });
160
240
  test('should not transition when animating is false', function () {
161
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {}));
162
- var actual = subject.childAt(0).prop('style');
163
- expect(actual).not.toHaveProperty('transition');
241
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
242
+ "data-testid": "marquee"
243
+ }));
244
+
245
+ var marquee = _react.screen.getByTestId('marquee').children.item(0);
246
+
247
+ expect(marquee).not.toHaveStyle({
248
+ 'transition-duration': 'NaNs'
249
+ });
164
250
  });
165
251
  test('should transition when animating is true', function () {
166
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
167
- animating: true
252
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
253
+ animating: true,
254
+ "data-testid": "marquee"
168
255
  }));
169
- var actual = subject.childAt(0).prop('style');
170
- expect(actual).toHaveProperty('transitionDuration');
256
+
257
+ var marquee = _react.screen.getByTestId('marquee').children.item(0);
258
+
259
+ expect(marquee).toHaveStyle({
260
+ 'transition-duration': 'NaNs'
261
+ });
171
262
  });
172
263
  test('should set RTL direction in LTR context when the text directionality is RTL', function () {
173
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
264
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
265
+ "data-testid": "marquee",
174
266
  rtl: true
175
267
  }), {
176
268
  context: {
177
269
  rtl: false
178
270
  }
179
271
  });
272
+
273
+ var marquee = _react.screen.getByTestId('marquee').children.item(0);
274
+
180
275
  var expected = 'rtl';
181
- var actual = subject.childAt(0).prop('style').direction;
182
- expect(actual).toBe(expected);
276
+ expect(marquee).toHaveStyle({
277
+ 'direction': expected
278
+ });
183
279
  });
184
280
  test('should set LTR direction in RTL when the text directionality is LTR', function () {
185
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {}), {
281
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
282
+ "data-testid": "marquee"
283
+ }), {
186
284
  context: {
187
285
  rtl: true
188
286
  }
189
287
  });
288
+
289
+ var marquee = _react.screen.getByTestId('marquee').children.item(0);
290
+
190
291
  var expected = 'ltr';
191
- var actual = subject.childAt(0).prop('style').direction;
192
- expect(actual).toBe(expected);
292
+ expect(marquee).toHaveStyle({
293
+ 'direction': expected
294
+ });
193
295
  });
194
296
  test('should transition from the right with LTR text (a negative translate value)', function () {
195
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
297
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
196
298
  animating: true,
299
+ "data-testid": "marquee",
197
300
  distance: 100
198
301
  }));
199
- var actual = subject.childAt(0).prop('style').transform;
200
- expect(actual).toContain('-');
302
+
303
+ var marquee = _react.screen.getByTestId('marquee').children.item(0);
304
+
305
+ var expected = 'translateX(-100px)';
306
+ expect(marquee).toHaveStyle({
307
+ 'transform': expected
308
+ });
201
309
  });
202
310
  test('should transition from the left with RTL text (a positive translate value)', function () {
203
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
311
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
204
312
  animating: true,
313
+ "data-testid": "marquee",
205
314
  distance: 100,
206
315
  rtl: true
207
316
  }));
208
- var actual = subject.childAt(0).prop('style').transform;
209
- expect(actual).not.toContain('-');
317
+
318
+ var marquee = _react.screen.getByTestId('marquee').children.item(0);
319
+
320
+ var expected = 'translateX(100px)';
321
+ expect(marquee).toHaveStyle({
322
+ 'transform': expected
323
+ });
210
324
  });
211
325
  test('should duplicate from content when promoted and a non-zero distance', function () {
212
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
213
- willAnimate: true,
326
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
214
327
  distance: 100,
328
+ willAnimate: true,
215
329
  children: "Text"
216
330
  }));
217
- var actual = subject.text();
218
- expect(actual).toBe('TextText');
331
+
332
+ var marquee = _react.screen.getByText('TextText');
333
+
334
+ expect(marquee).toBeInTheDocument();
219
335
  });
220
336
  test('should not duplicate from content when promoted and a zero distance', function () {
221
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
222
- willAnimate: true,
337
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
223
338
  distance: 0,
339
+ willAnimate: true,
224
340
  children: "Text"
225
341
  }));
226
- var actual = subject.text();
227
- expect(actual).toBe('Text');
342
+
343
+ var marquee = _react.screen.getByText('Text');
344
+
345
+ expect(marquee).toBeInTheDocument();
228
346
  });
229
347
  test('should not duplicate from content when not promoted and a non-zero distance', function () {
230
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
348
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
231
349
  distance: 100,
232
350
  children: "Text"
233
351
  }));
234
- var actual = subject.text();
235
- expect(actual).toBe('Text');
352
+
353
+ var marquee = _react.screen.getByText('Text');
354
+
355
+ expect(marquee).toBeInTheDocument();
236
356
  });
237
357
  test('should add aria-label with content when promoted and a non-zero distance', function () {
238
358
  var text = 'Text';
239
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
240
- willAnimate: true,
359
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
360
+ "data-testid": "marquee",
241
361
  distance: 100,
362
+ willAnimate: true,
242
363
  children: text
243
364
  }));
365
+
366
+ var marquee = _react.screen.getByTestId('marquee');
367
+
244
368
  var expected = text;
245
- var actual = subject.childAt(0).prop('aria-label');
246
- expect(actual).toBe(expected);
369
+ expect(marquee).toHaveAttribute('aria-label', expected);
247
370
  });
248
371
  test('should not override aria-label with content when promoted and a non-zero distance', function () {
249
372
  var aria = 'Custom';
250
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
251
- willAnimate: true,
252
- distance: 100,
373
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
253
374
  "aria-label": aria,
375
+ "data-testid": "marquee",
376
+ distance: 100,
377
+ willAnimate: true,
254
378
  children: "Text"
255
379
  }));
380
+
381
+ var marquee = _react.screen.getByTestId('marquee');
382
+
256
383
  var expected = aria;
257
- var actual = subject.childAt(0).prop('aria-label');
258
- expect(actual).toBe(expected);
384
+ expect(marquee).toHaveAttribute('aria-label', expected);
259
385
  });
260
386
  test('should concatenate string children when promoted and a non-zero distance', function () {
261
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_index.MarqueeBase, {
262
- willAnimate: true,
387
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_index.MarqueeBase, {
388
+ "data-testid": "marquee",
263
389
  distance: 100,
390
+ willAnimate: true,
264
391
  children: ["This is ", 'A', " test"]
265
392
  }));
393
+
394
+ var marquee = _react.screen.getByTestId('marquee');
395
+
266
396
  var expected = 'This is A test';
267
- var actual = subject.childAt(0).prop('aria-label');
268
- expect(actual).toBe(expected);
397
+ expect(marquee).toHaveAttribute('aria-label', expected);
269
398
  });
270
399
  test('should not concatenate non-string children when promoted and a non-zero distance', function () {
271
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_index.MarqueeBase, {
272
- willAnimate: true,
400
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_index.MarqueeBase, {
401
+ "data-testid": "marquee",
273
402
  distance: 100,
403
+ willAnimate: true,
274
404
  children: ["Test", /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
275
405
  children: "Hello"
276
406
  }), "World"]
277
407
  }));
408
+
409
+ var marquee = _react.screen.getByTestId('marquee');
410
+
278
411
  var expected = 'Test World';
279
- var actual = subject.childAt(0).prop('aria-label');
280
- expect(actual).toBe(expected);
412
+ expect(marquee).toHaveAttribute('aria-label', expected);
281
413
  });
282
414
  test('should not throw exception for null children when promoted and a non-zero distance - ENYO-6362', function () {
283
- var mountSubject = function mountSubject() {
284
- return (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
285
- willAnimate: true,
415
+ var renderSubject = function renderSubject() {
416
+ return (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.MarqueeBase, {
286
417
  distance: 100,
418
+ willAnimate: true,
287
419
  children: null
288
420
  }));
289
421
  };
290
422
 
291
- expect(mountSubject).not.toThrow();
423
+ expect(renderSubject).not.toThrow();
292
424
  });
293
425
  });
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.useMeasurable = exports.Measurable = exports["default"] = void 0;
6
+ exports.useMeasurable = exports["default"] = exports.Measurable = void 0;
7
7
 
8
8
  var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
9
9
 
@@ -13,9 +13,9 @@ var _jsxRuntime = require("react/jsx-runtime");
13
13
 
14
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
15
15
 
16
- 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; }
16
+ 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; }
17
17
 
18
- 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; }
18
+ 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; }
19
19
 
20
20
  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; }
21
21
 
@@ -29,7 +29,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
29
29
 
30
30
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
31
31
 
32
- function _iterableToArrayLimit(arr, i) { var _i = arr && (typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]); if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
32
+ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
33
33
 
34
34
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
35
35
 
package/Media/Media.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.Media = exports.handledMediaEventsMap = exports.getKeyFromSource = exports["default"] = void 0;
6
+ exports.handledMediaEventsMap = exports.getKeyFromSource = exports["default"] = exports.Media = void 0;
7
7
 
8
8
  var _dispatcher = require("@enact/core/dispatcher");
9
9
 
@@ -17,11 +17,13 @@ var _react = require("react");
17
17
 
18
18
  var _jsxRuntime = require("react/jsx-runtime");
19
19
 
20
+ var _excluded = ["customMediaEventsMap", "mediaComponent", "source"];
21
+
20
22
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
21
23
 
22
- 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
+ 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; }
23
25
 
24
- 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
+ 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; }
25
27
 
26
28
  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; }
27
29
 
@@ -33,15 +35,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
33
35
 
34
36
  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
35
37
 
36
- function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
38
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
37
39
 
38
- function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
40
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
39
41
 
40
42
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
41
43
 
42
44
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
43
45
 
44
- function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
46
+ function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
45
47
 
46
48
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
47
49
 
@@ -185,9 +187,7 @@ var Media = /*#__PURE__*/function (_ReactComponent) {
185
187
  };
186
188
 
187
189
  _this.handleEvent = function (ev) {
188
- (0, _handle.forward)('onUpdate', {
189
- type: 'onUpdate'
190
- }, _this.props); // fetch the forward() we generated earlier, using the event type as a key to find the real event name.
190
+ (0, _handle.forwardCustom)('onUpdate')(null, _this.props); // fetch the forward() we generated earlier, using the event type as a key to find the real event name.
191
191
 
192
192
  var fwd = _this.handledMediaForwards[handledMediaEventsMap[ev.type]];
193
193
 
@@ -316,7 +316,7 @@ var Media = /*#__PURE__*/function (_ReactComponent) {
316
316
  customMediaEventsMap = _this$props.customMediaEventsMap,
317
317
  Component = _this$props.mediaComponent,
318
318
  source = _this$props.source,
319
- rest = _objectWithoutProperties(_this$props, ["customMediaEventsMap", "mediaComponent", "source"]);
319
+ rest = _objectWithoutProperties(_this$props, _excluded);
320
320
 
321
321
  delete rest.mediaEventsMap;
322
322
  delete rest.onUpdate; // Remove the events we manually added so they aren't added twice or fail.