@enact/ui 5.4.3 → 5.5.0
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.
- package/AnnounceDecorator/Announce.js +9 -5
- package/AnnounceDecorator/AnnounceDecorator.js +5 -3
- package/AnnounceDecorator/tests/AnnounceDecorator-specs.js +4 -1
- package/AnnounceDecorator/tests/useAnnounce-specs.js +4 -1
- package/CHANGELOG.md +17 -0
- package/Cancelable/Cancelable.js +7 -0
- package/Cancelable/tests/Cancelable-specs.js +26 -0
- package/Changeable/Changeable.js +6 -0
- package/Changeable/tests/Changeable-specs.js +4 -1
- package/FloatingLayer/FloatingLayer.js +3 -0
- package/FloatingLayer/FloatingLayerDecorator.js +2 -0
- package/FloatingLayer/Scrim.js +3 -0
- package/Marquee/Marquee.module.css +1 -1
- package/Marquee/MarqueeDecorator.js +19 -3
- package/Marquee/tests/Marquee-specs.js +306 -1
- package/Marquee/useMarqueeController.js +6 -4
- package/Measurable/tests/Measurable-specs.js +6 -2
- package/Media/Media.js +5 -2
- package/Placeholder/tests/PlaceholderControllerDecorator-specs.js +4 -1
- package/Resizable/tests/Resizable-specs.js +4 -1
- package/Resizable/tests/useResize-specs.js +4 -1
- package/Routable/Route.js +5 -3
- package/Routable/Router.js +25 -16
- package/Routable/tests/Routable-specs.js +16 -0
- package/Scroller/Scroller.js +6 -5
- package/Scroller/ScrollerBasic.js +5 -5
- package/Skinnable/Skinnable.js +9 -7
- package/Skinnable/tests/Skinnable-specs.js +7 -2
- package/Skinnable/useSkins.js +6 -2
- package/Slider/PositionDecorator.js +20 -5
- package/Slider/Slider.d.ts +4 -0
- package/Slider/Slider.js +10 -0
- package/Slider/tests/Slider-specs.js +18 -0
- package/Slider/utils.js +9 -1
- package/Toggleable/Toggleable.js +4 -2
- package/Toggleable/tests/Toggleable-specs.js +4 -1
- package/Touchable/Touchable.js +6 -4
- package/Touchable/tests/Touchable-specs.js +4 -1
- package/Touchable/tests/useTouch-specs.js +4 -1
- package/Touchable/useTouch.js +7 -2
- package/Transition/Transition.js +2 -0
- package/ViewManager/TransitionGroup.js +3 -0
- package/ViewManager/View.js +2 -0
- package/ViewManager/ViewManager.js +7 -0
- package/VirtualList/VirtualList.js +7 -5
- package/VirtualList/VirtualListBasic.js +59 -8
- package/VirtualList/tests/VirtualList-native-specs.js +14 -0
- package/VirtualList/tests/VirtualList-specs.js +13 -0
- package/internal/IdProvider/IdProvider.js +2 -0
- package/internal/IdProvider/tests/IdProvider-specs.js +4 -1
- package/internal/Pure/tests/Pure-specs.js +7 -0
- package/package.json +12 -7
- package/resolution/ResolutionDecorator.js +21 -18
- package/resolution/index.d.ts +63 -4
- package/resolution/index.js +18 -2
- package/resolution/resolution.js +209 -29
- package/resolution/tests/ResolutionDecorator-specs.js +84 -4
- package/resolution/tests/resolution-specs.js +217 -599
- package/useControlledState/tests/useControlledState-specs.js +4 -1
- package/useControlledState/useControlledState.js +11 -7
- package/useScroll/Scrollbar.js +27 -24
- package/useScroll/ScrollbarTrack.js +5 -3
- package/useScroll/tests/useScroll-specs.js +402 -25
- package/useScroll/useScroll.js +117 -26
- package/useScroll/utilEvent.js +18 -0
|
@@ -237,6 +237,207 @@ describe('Marquee', function () {
|
|
|
237
237
|
var expected = 'marquee';
|
|
238
238
|
expect(marquee).not.toHaveClass(expected);
|
|
239
239
|
});
|
|
240
|
+
test('should re-measure content after marqueeDisabled transitions to false', function () {
|
|
241
|
+
var originalGetBoundingClientRect = global.Element.prototype.getBoundingClientRect;
|
|
242
|
+
global.Element.prototype.getBoundingClientRect = jest.fn(function () {
|
|
243
|
+
var isSpan = this && this.tagName === 'SPAN';
|
|
244
|
+
return {
|
|
245
|
+
width: isSpan ? 200 : 100,
|
|
246
|
+
height: 50,
|
|
247
|
+
top: 0,
|
|
248
|
+
left: 0,
|
|
249
|
+
bottom: 0,
|
|
250
|
+
right: isSpan ? 200 : 100
|
|
251
|
+
};
|
|
252
|
+
});
|
|
253
|
+
var _render4 = (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
254
|
+
marqueeOn: "render",
|
|
255
|
+
marqueeDelay: 0,
|
|
256
|
+
marqueeOnRenderDelay: 0,
|
|
257
|
+
children: ltrText
|
|
258
|
+
})),
|
|
259
|
+
rerender = _render4.rerender;
|
|
260
|
+
(0, _react.act)(function () {
|
|
261
|
+
return jest.advanceTimersByTime(100);
|
|
262
|
+
});
|
|
263
|
+
rerender(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
264
|
+
marqueeOn: "render",
|
|
265
|
+
marqueeDelay: 0,
|
|
266
|
+
marqueeOnRenderDelay: 0,
|
|
267
|
+
marqueeDisabled: true,
|
|
268
|
+
children: ltrText
|
|
269
|
+
}));
|
|
270
|
+
global.Element.prototype.getBoundingClientRect = jest.fn(function () {
|
|
271
|
+
var isSpan = this && this.tagName === 'SPAN';
|
|
272
|
+
return {
|
|
273
|
+
width: isSpan ? 300 : 100,
|
|
274
|
+
height: 50,
|
|
275
|
+
top: 0,
|
|
276
|
+
left: 0,
|
|
277
|
+
bottom: 0,
|
|
278
|
+
right: isSpan ? 300 : 100
|
|
279
|
+
};
|
|
280
|
+
});
|
|
281
|
+
rerender(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
282
|
+
marqueeOn: "render",
|
|
283
|
+
marqueeDelay: 0,
|
|
284
|
+
marqueeOnRenderDelay: 0,
|
|
285
|
+
children: ltrText
|
|
286
|
+
}));
|
|
287
|
+
(0, _react.act)(function () {
|
|
288
|
+
return jest.advanceTimersByTime(100);
|
|
289
|
+
});
|
|
290
|
+
var marquee = _react.screen.getAllByText(ltrText).find(function (el) {
|
|
291
|
+
return el.classList.contains('text');
|
|
292
|
+
});
|
|
293
|
+
expect(marquee).toHaveStyle({
|
|
294
|
+
'transform': 'translateX(-350px)'
|
|
295
|
+
});
|
|
296
|
+
global.Element.prototype.getBoundingClientRect = originalGetBoundingClientRect;
|
|
297
|
+
});
|
|
298
|
+
test('should start marquee when transitioning into `marqueeOn="render"`', function () {
|
|
299
|
+
var _render5 = (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
300
|
+
marqueeOn: "focus",
|
|
301
|
+
marqueeDelay: 0,
|
|
302
|
+
marqueeOnRenderDelay: 0,
|
|
303
|
+
children: ltrText
|
|
304
|
+
})),
|
|
305
|
+
rerender = _render5.rerender;
|
|
306
|
+
rerender(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
307
|
+
marqueeOn: "render",
|
|
308
|
+
marqueeDelay: 0,
|
|
309
|
+
marqueeOnRenderDelay: 0,
|
|
310
|
+
children: ltrText
|
|
311
|
+
}));
|
|
312
|
+
(0, _react.act)(function () {
|
|
313
|
+
return jest.advanceTimersByTime(100);
|
|
314
|
+
});
|
|
315
|
+
var marquee = _react.screen.getByText(ltrText);
|
|
316
|
+
expect(marquee).toHaveStyle({
|
|
317
|
+
'--ui-marquee-spacing': '50'
|
|
318
|
+
});
|
|
319
|
+
});
|
|
320
|
+
test('should restart render-mode marquee when children change', function () {
|
|
321
|
+
var _render6 = (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
322
|
+
marqueeOn: "render",
|
|
323
|
+
marqueeDelay: 0,
|
|
324
|
+
marqueeOnRenderDelay: 0,
|
|
325
|
+
children: ltrText
|
|
326
|
+
})),
|
|
327
|
+
rerender = _render6.rerender;
|
|
328
|
+
(0, _react.act)(function () {
|
|
329
|
+
return jest.advanceTimersByTime(100);
|
|
330
|
+
});
|
|
331
|
+
var ltrMarquee = _react.screen.getByText(ltrText);
|
|
332
|
+
expect(ltrMarquee).toHaveStyle({
|
|
333
|
+
'--ui-marquee-spacing': '50'
|
|
334
|
+
});
|
|
335
|
+
rerender(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
336
|
+
marqueeOn: "render",
|
|
337
|
+
marqueeDelay: 0,
|
|
338
|
+
marqueeOnRenderDelay: 0,
|
|
339
|
+
children: rtlText
|
|
340
|
+
}));
|
|
341
|
+
(0, _react.act)(function () {
|
|
342
|
+
return jest.advanceTimersByTime(100);
|
|
343
|
+
});
|
|
344
|
+
var rtlMarquee = _react.screen.getByText(rtlText);
|
|
345
|
+
expect(rtlMarquee).toHaveStyle({
|
|
346
|
+
'direction': 'rtl'
|
|
347
|
+
});
|
|
348
|
+
});
|
|
349
|
+
test('should cancel animation on marqueeSpeed change while animating (render mode)', function () {
|
|
350
|
+
var originalGetBoundingClientRect = global.Element.prototype.getBoundingClientRect;
|
|
351
|
+
global.Element.prototype.getBoundingClientRect = jest.fn(function () {
|
|
352
|
+
var isSpan = this && this.tagName === 'SPAN';
|
|
353
|
+
return {
|
|
354
|
+
width: isSpan ? 200 : 100,
|
|
355
|
+
height: 50,
|
|
356
|
+
top: 0,
|
|
357
|
+
left: 0,
|
|
358
|
+
bottom: 0,
|
|
359
|
+
right: isSpan ? 200 : 100
|
|
360
|
+
};
|
|
361
|
+
});
|
|
362
|
+
var _render7 = (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
363
|
+
marqueeOn: "render",
|
|
364
|
+
marqueeDelay: 0,
|
|
365
|
+
marqueeOnRenderDelay: 0,
|
|
366
|
+
marqueeSpeed: 60,
|
|
367
|
+
children: ltrText
|
|
368
|
+
})),
|
|
369
|
+
rerender = _render7.rerender;
|
|
370
|
+
(0, _react.act)(function () {
|
|
371
|
+
return jest.advanceTimersByTime(100);
|
|
372
|
+
});
|
|
373
|
+
var marquee = _react.screen.getAllByText(ltrText).find(function (el) {
|
|
374
|
+
return el.classList.contains('text');
|
|
375
|
+
});
|
|
376
|
+
expect(marquee).not.toHaveStyle({
|
|
377
|
+
'transform': 'translateX(0)'
|
|
378
|
+
});
|
|
379
|
+
rerender(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
380
|
+
marqueeOn: "render",
|
|
381
|
+
marqueeDelay: 0,
|
|
382
|
+
marqueeOnRenderDelay: 0,
|
|
383
|
+
marqueeSpeed: 70,
|
|
384
|
+
children: ltrText
|
|
385
|
+
}));
|
|
386
|
+
var marqueeAfter = _react.screen.getAllByText(ltrText).find(function (el) {
|
|
387
|
+
return el.classList.contains('text');
|
|
388
|
+
});
|
|
389
|
+
expect(marqueeAfter).toHaveStyle({
|
|
390
|
+
'transform': 'translateX(0)'
|
|
391
|
+
});
|
|
392
|
+
global.Element.prototype.getBoundingClientRect = originalGetBoundingClientRect;
|
|
393
|
+
});
|
|
394
|
+
test('should restart render-mode marquee after forceDirection changes', function () {
|
|
395
|
+
var originalGetBoundingClientRect = global.Element.prototype.getBoundingClientRect;
|
|
396
|
+
global.Element.prototype.getBoundingClientRect = jest.fn(function () {
|
|
397
|
+
var isSpan = this && this.tagName === 'SPAN';
|
|
398
|
+
return {
|
|
399
|
+
width: isSpan ? 200 : 100,
|
|
400
|
+
height: 50,
|
|
401
|
+
top: 0,
|
|
402
|
+
left: 0,
|
|
403
|
+
bottom: 0,
|
|
404
|
+
right: isSpan ? 200 : 100
|
|
405
|
+
};
|
|
406
|
+
});
|
|
407
|
+
var _render8 = (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
408
|
+
marqueeOn: "render",
|
|
409
|
+
marqueeDelay: 0,
|
|
410
|
+
marqueeOnRenderDelay: 0,
|
|
411
|
+
children: ltrText
|
|
412
|
+
})),
|
|
413
|
+
rerender = _render8.rerender;
|
|
414
|
+
(0, _react.act)(function () {
|
|
415
|
+
return jest.advanceTimersByTime(100);
|
|
416
|
+
});
|
|
417
|
+
var marquee = _react.screen.getAllByText(ltrText).find(function (el) {
|
|
418
|
+
return el.classList.contains('text');
|
|
419
|
+
});
|
|
420
|
+
expect(marquee).toHaveStyle({
|
|
421
|
+
'--ui-marquee-spacing': '50'
|
|
422
|
+
});
|
|
423
|
+
rerender(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
424
|
+
marqueeOn: "render",
|
|
425
|
+
marqueeDelay: 0,
|
|
426
|
+
marqueeOnRenderDelay: 0,
|
|
427
|
+
forceDirection: "rtl",
|
|
428
|
+
children: ltrText
|
|
429
|
+
}));
|
|
430
|
+
(0, _react.act)(function () {
|
|
431
|
+
return jest.advanceTimersByTime(100);
|
|
432
|
+
});
|
|
433
|
+
var marqueeAfter = _react.screen.getAllByText(ltrText).find(function (el) {
|
|
434
|
+
return el.classList.contains('text');
|
|
435
|
+
});
|
|
436
|
+
expect(marqueeAfter).toHaveStyle({
|
|
437
|
+
'--ui-marquee-spacing': '50'
|
|
438
|
+
});
|
|
439
|
+
global.Element.prototype.getBoundingClientRect = originalGetBoundingClientRect;
|
|
440
|
+
});
|
|
240
441
|
test('should start marquee on focus if `marqueeOn` is focus', function () {
|
|
241
442
|
(0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
242
443
|
marqueeOn: "focus",
|
|
@@ -302,7 +503,9 @@ describe('Marquee', function () {
|
|
|
302
503
|
test('should creates and observes with ResizeObserver', function () {
|
|
303
504
|
var originalResizeObserver = global.ResizeObserver;
|
|
304
505
|
var observe = jest.fn();
|
|
305
|
-
|
|
506
|
+
var resizeCallback = null;
|
|
507
|
+
global.ResizeObserver = jest.fn(function (cb) {
|
|
508
|
+
resizeCallback = cb;
|
|
306
509
|
return {
|
|
307
510
|
observe: observe,
|
|
308
511
|
disconnect: jest.fn()
|
|
@@ -316,6 +519,11 @@ describe('Marquee', function () {
|
|
|
316
519
|
});
|
|
317
520
|
expect(global.ResizeObserver).toHaveBeenCalled();
|
|
318
521
|
expect(observe).toHaveBeenCalled();
|
|
522
|
+
(0, _react.act)(function () {
|
|
523
|
+
if (typeof resizeCallback === 'function') {
|
|
524
|
+
resizeCallback();
|
|
525
|
+
}
|
|
526
|
+
});
|
|
319
527
|
global.ResizeObserver = originalResizeObserver;
|
|
320
528
|
});
|
|
321
529
|
});
|
|
@@ -651,4 +859,101 @@ describe('MarqueeController', function () {
|
|
|
651
859
|
'transform': 'translateX(-125px)'
|
|
652
860
|
});
|
|
653
861
|
});
|
|
862
|
+
test('should enter marquee context when component becomes disabled while hovered in sync mode', function () {
|
|
863
|
+
var _render9 = (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
|
|
864
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
865
|
+
marqueeDelay: 0,
|
|
866
|
+
marqueeOn: "focus",
|
|
867
|
+
children: ltrText
|
|
868
|
+
})
|
|
869
|
+
})),
|
|
870
|
+
rerender = _render9.rerender;
|
|
871
|
+
var marquee = _react.screen.getByText(ltrText);
|
|
872
|
+
_react.fireEvent.mouseOver(marquee);
|
|
873
|
+
rerender(/*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
|
|
874
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
875
|
+
disabled: true,
|
|
876
|
+
marqueeDelay: 0,
|
|
877
|
+
marqueeOn: "focus",
|
|
878
|
+
children: ltrText
|
|
879
|
+
})
|
|
880
|
+
}));
|
|
881
|
+
(0, _react.act)(function () {
|
|
882
|
+
return jest.advanceTimersByTime(100);
|
|
883
|
+
});
|
|
884
|
+
expect(marquee).toHaveStyle({
|
|
885
|
+
'--ui-marquee-spacing': '50'
|
|
886
|
+
});
|
|
887
|
+
});
|
|
888
|
+
test('should call resetAnimation on content change while focused (marqueeOn="focus")', function () {
|
|
889
|
+
var originalGetBoundingClientRect = global.Element.prototype.getBoundingClientRect;
|
|
890
|
+
global.Element.prototype.getBoundingClientRect = jest.fn(function () {
|
|
891
|
+
var isSpan = this && this.tagName === 'SPAN';
|
|
892
|
+
return {
|
|
893
|
+
width: isSpan ? 200 : 100,
|
|
894
|
+
height: 50,
|
|
895
|
+
top: 0,
|
|
896
|
+
left: 0,
|
|
897
|
+
bottom: 0,
|
|
898
|
+
right: isSpan ? 200 : 100
|
|
899
|
+
};
|
|
900
|
+
});
|
|
901
|
+
var _render0 = (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
|
|
902
|
+
children: [ltrText].map(function (children, index) {
|
|
903
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
904
|
+
marqueeDelay: 10,
|
|
905
|
+
marqueeOn: "focus",
|
|
906
|
+
children: children
|
|
907
|
+
}, index);
|
|
908
|
+
})
|
|
909
|
+
})),
|
|
910
|
+
rerender = _render0.rerender;
|
|
911
|
+
var marquee1 = _react.screen.getByText(ltrText);
|
|
912
|
+
_react.fireEvent.focus(marquee1);
|
|
913
|
+
(0, _react.act)(function () {
|
|
914
|
+
return jest.advanceTimersByTime(100);
|
|
915
|
+
});
|
|
916
|
+
rerender(/*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
|
|
917
|
+
children: [rtlText].map(function (children, index) {
|
|
918
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
919
|
+
marqueeDelay: 10,
|
|
920
|
+
marqueeOn: "focus",
|
|
921
|
+
children: children
|
|
922
|
+
}, index);
|
|
923
|
+
})
|
|
924
|
+
}));
|
|
925
|
+
(0, _react.act)(function () {
|
|
926
|
+
return jest.advanceTimersByTime(1);
|
|
927
|
+
});
|
|
928
|
+
expect(_react.screen.getByText(rtlText)).toHaveStyle({
|
|
929
|
+
'transform': 'translateX(0)'
|
|
930
|
+
});
|
|
931
|
+
global.Element.prototype.getBoundingClientRect = originalGetBoundingClientRect;
|
|
932
|
+
});
|
|
933
|
+
test('should detect RTL direction when content changes mid-marquee in sync mode', function () {
|
|
934
|
+
var _render1 = (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
|
|
935
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
936
|
+
marqueeDelay: 10,
|
|
937
|
+
marqueeOn: "focus",
|
|
938
|
+
children: ltrText
|
|
939
|
+
})
|
|
940
|
+
})),
|
|
941
|
+
rerender = _render1.rerender;
|
|
942
|
+
var marquee1 = _react.screen.getByText(ltrText);
|
|
943
|
+
_react.fireEvent.focus(marquee1);
|
|
944
|
+
(0, _react.act)(function () {
|
|
945
|
+
return jest.advanceTimersByTime(200);
|
|
946
|
+
});
|
|
947
|
+
rerender(/*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
|
|
948
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Marquee, {
|
|
949
|
+
marqueeDelay: 10,
|
|
950
|
+
marqueeOn: "focus",
|
|
951
|
+
children: rtlText
|
|
952
|
+
})
|
|
953
|
+
}));
|
|
954
|
+
var marquee2 = _react.screen.getByText(rtlText);
|
|
955
|
+
expect(marquee2).toHaveStyle({
|
|
956
|
+
'direction': 'rtl'
|
|
957
|
+
});
|
|
958
|
+
});
|
|
654
959
|
});
|
|
@@ -29,6 +29,8 @@ var useMarqueeController = exports.useMarqueeController = function useMarqueeCon
|
|
|
29
29
|
isFocused: false,
|
|
30
30
|
isHovered: false
|
|
31
31
|
});
|
|
32
|
+
var propsRef = (0, _react.useRef)(props);
|
|
33
|
+
propsRef.current = props;
|
|
32
34
|
|
|
33
35
|
/*
|
|
34
36
|
* Invokes the `action` handler for each synchronized component except the invoking
|
|
@@ -233,8 +235,8 @@ var useMarqueeController = exports.useMarqueeController = function useMarqueeCon
|
|
|
233
235
|
dispatch('start');
|
|
234
236
|
}
|
|
235
237
|
cancelJob.stop();
|
|
236
|
-
forwardFocus(ev,
|
|
237
|
-
}, [anyRunning, cancelJob, dispatch
|
|
238
|
+
forwardFocus(ev, propsRef.current);
|
|
239
|
+
}, [anyRunning, cancelJob, dispatch]);
|
|
238
240
|
|
|
239
241
|
/*
|
|
240
242
|
* Handler for the blur event
|
|
@@ -244,8 +246,8 @@ var useMarqueeController = exports.useMarqueeController = function useMarqueeCon
|
|
|
244
246
|
if (anyRunning()) {
|
|
245
247
|
cancelJob.start();
|
|
246
248
|
}
|
|
247
|
-
forwardBlur(ev,
|
|
248
|
-
}, [anyRunning, cancelJob
|
|
249
|
+
forwardBlur(ev, propsRef.current);
|
|
250
|
+
}, [anyRunning, cancelJob]);
|
|
249
251
|
(0, _react.useEffect)(function () {
|
|
250
252
|
return function () {
|
|
251
253
|
cancelJob.stop();
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _react = require("@testing-library/react");
|
|
4
|
+
var _react2 = require("react");
|
|
4
5
|
var _Measurable = _interopRequireWildcard(require("../Measurable"));
|
|
5
6
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
6
7
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
@@ -14,9 +15,12 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
|
|
|
14
15
|
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
15
16
|
var data;
|
|
16
17
|
var DivComponent = function DivComponent(props) {
|
|
17
|
-
|
|
18
|
+
var controlsRef = props.controlsRef;
|
|
19
|
+
(0, _react2.useEffect)(function () {
|
|
20
|
+
data = props;
|
|
21
|
+
}, [props]);
|
|
18
22
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
19
|
-
ref:
|
|
23
|
+
ref: controlsRef
|
|
20
24
|
});
|
|
21
25
|
};
|
|
22
26
|
var MeasurableComponent = (0, _Measurable["default"])({
|
package/Media/Media.js
CHANGED
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.handledMediaEventsMap = exports.getKeyFromSource = exports["default"] = exports.Media = void 0;
|
|
7
7
|
var _dispatcher = require("@enact/core/dispatcher");
|
|
8
8
|
var _handle = require("@enact/core/handle");
|
|
9
|
+
var _util = require("@enact/core/util");
|
|
9
10
|
var _propTypes = _interopRequireDefault(require("@enact/core/internal/prop-types"));
|
|
10
11
|
var _propTypes2 = _interopRequireDefault(require("prop-types"));
|
|
11
12
|
var _react = require("react");
|
|
@@ -168,6 +169,7 @@ var Media = exports.Media = /*#__PURE__*/function (_ReactComponent) {
|
|
|
168
169
|
_this.mediaRef = function (node) {
|
|
169
170
|
_this.media = node;
|
|
170
171
|
};
|
|
172
|
+
(0, _util.checkPropTypes)(_this, props);
|
|
171
173
|
_this.media = null;
|
|
172
174
|
_this.handledMediaForwards = {};
|
|
173
175
|
_this.handledMediaEvents = {};
|
|
@@ -201,9 +203,10 @@ var Media = exports.Media = /*#__PURE__*/function (_ReactComponent) {
|
|
|
201
203
|
}
|
|
202
204
|
}, {
|
|
203
205
|
key: "componentDidUpdate",
|
|
204
|
-
value: function componentDidUpdate(
|
|
205
|
-
var prevSource = _ref.source;
|
|
206
|
+
value: function componentDidUpdate(prevProps) {
|
|
206
207
|
var source = this.props.source;
|
|
208
|
+
var prevSource = prevProps.source;
|
|
209
|
+
(0, _util.checkPropTypes)(this, this.props, prevProps);
|
|
207
210
|
if (getKeyFromSource(source) !== getKeyFromSource(prevSource)) {
|
|
208
211
|
this.load();
|
|
209
212
|
}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
require("@testing-library/jest-dom");
|
|
4
4
|
var _react = require("@testing-library/react");
|
|
5
|
+
var _react2 = require("react");
|
|
5
6
|
var _Placeholder = require("../../Placeholder");
|
|
6
7
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
7
8
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
@@ -12,7 +13,9 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
|
|
|
12
13
|
describe('PlaceholderControllerDecorator', function () {
|
|
13
14
|
var data;
|
|
14
15
|
var DivComponent = function DivComponent(props) {
|
|
15
|
-
|
|
16
|
+
(0, _react2.useEffect)(function () {
|
|
17
|
+
data = props;
|
|
18
|
+
}, [props]);
|
|
16
19
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread({
|
|
17
20
|
"data-testid": "component"
|
|
18
21
|
}, props));
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
var _Registry = _interopRequireDefault(require("@enact/core/internal/Registry"));
|
|
4
4
|
var _react = require("@testing-library/react");
|
|
5
|
+
var _react2 = require("react");
|
|
5
6
|
var _Resizable = _interopRequireWildcard(require("../Resizable"));
|
|
6
7
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
7
8
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
@@ -9,7 +10,9 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
|
|
|
9
10
|
describe('Resizable', function () {
|
|
10
11
|
var data;
|
|
11
12
|
var DivComponent = function DivComponent(props) {
|
|
12
|
-
|
|
13
|
+
(0, _react2.useEffect)(function () {
|
|
14
|
+
data = props;
|
|
15
|
+
}, [props]);
|
|
13
16
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
14
17
|
"data-testid": "component"
|
|
15
18
|
});
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
var _Registry = _interopRequireDefault(require("@enact/core/internal/Registry"));
|
|
4
4
|
var _react = require("@testing-library/react");
|
|
5
|
+
var _react2 = require("react");
|
|
5
6
|
var _Resizable = require("../Resizable");
|
|
6
7
|
var _useResize = _interopRequireDefault(require("../useResize"));
|
|
7
8
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
@@ -14,7 +15,9 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
|
|
|
14
15
|
describe('useResize', function () {
|
|
15
16
|
var data;
|
|
16
17
|
var DivComponent = function DivComponent(props) {
|
|
17
|
-
|
|
18
|
+
(0, _react2.useEffect)(function () {
|
|
19
|
+
data = props;
|
|
20
|
+
}, [props]);
|
|
18
21
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
19
22
|
"data-testid": "component"
|
|
20
23
|
});
|
package/Routable/Route.js
CHANGED
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports["default"] = exports.Route = void 0;
|
|
7
7
|
var _propTypes = _interopRequireDefault(require("@enact/core/internal/prop-types"));
|
|
8
|
+
var _util = require("@enact/core/util");
|
|
8
9
|
var _propTypes2 = _interopRequireDefault(require("prop-types"));
|
|
9
10
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
10
11
|
/**
|
|
@@ -34,10 +35,11 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
|
|
|
34
35
|
* @memberof ui/Routable
|
|
35
36
|
* @public
|
|
36
37
|
*/
|
|
37
|
-
var
|
|
38
|
+
var _Route = exports.Route = function Route(props) {
|
|
39
|
+
(0, _util.checkPropTypes)(_Route, props);
|
|
38
40
|
return null;
|
|
39
41
|
};
|
|
40
|
-
|
|
42
|
+
_Route.propTypes = {
|
|
41
43
|
/**
|
|
42
44
|
* The component to render when the `path` for this Route matches the path of the
|
|
43
45
|
* {@link ui/Routable.Routable} container.
|
|
@@ -58,4 +60,4 @@ Route.propTypes = {
|
|
|
58
60
|
*/
|
|
59
61
|
path: _propTypes2["default"].string.isRequired
|
|
60
62
|
};
|
|
61
|
-
var _default = exports["default"] =
|
|
63
|
+
var _default = exports["default"] = _Route;
|
package/Routable/Router.js
CHANGED
|
@@ -5,11 +5,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports["default"] = exports.RouterBase = exports.Router = void 0;
|
|
7
7
|
var _propTypes = _interopRequireDefault(require("@enact/core/internal/prop-types"));
|
|
8
|
+
var _util = require("@enact/core/util");
|
|
8
9
|
var _propTypes2 = _interopRequireDefault(require("prop-types"));
|
|
9
10
|
var _react = require("react");
|
|
10
11
|
var _warning = _interopRequireDefault(require("warning"));
|
|
11
12
|
var _ForwardRef = _interopRequireDefault(require("../ForwardRef"));
|
|
12
|
-
var
|
|
13
|
+
var _util2 = require("./util");
|
|
13
14
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
14
15
|
var _excluded = ["path", "children", "component"],
|
|
15
16
|
_excluded2 = ["component", "componentRef"];
|
|
@@ -43,23 +44,31 @@ function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new T
|
|
|
43
44
|
function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
|
|
44
45
|
var RouterBase = exports.RouterBase = (_Class = /*#__PURE__*/function (_ReactComponent) {
|
|
45
46
|
function RouterBase(props) {
|
|
47
|
+
var _this;
|
|
46
48
|
_classCallCheck(this, RouterBase);
|
|
47
|
-
|
|
49
|
+
_this = _callSuper(this, RouterBase, [props]);
|
|
50
|
+
(0, _util.checkPropTypes)(_this, props);
|
|
51
|
+
return _this;
|
|
48
52
|
}
|
|
49
|
-
|
|
50
|
-
/**
|
|
51
|
-
* Generates a set of routes from `children` and appends them to `routes`.
|
|
52
|
-
*
|
|
53
|
-
* @param {React.element[]} children Array of children
|
|
54
|
-
* @param {Object} routes Route configuration object
|
|
55
|
-
*
|
|
56
|
-
* @returns {Object} Route configuration object
|
|
57
|
-
*/
|
|
58
53
|
_inherits(RouterBase, _ReactComponent);
|
|
59
54
|
return _createClass(RouterBase, [{
|
|
55
|
+
key: "componentDidUpdate",
|
|
56
|
+
value: function componentDidUpdate(prevProps) {
|
|
57
|
+
(0, _util.checkPropTypes)(this, this.props, prevProps);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* Generates a set of routes from `children` and appends them to `routes`.
|
|
62
|
+
*
|
|
63
|
+
* @param {React.element[]} children Array of children
|
|
64
|
+
* @param {Object} routes Route configuration object
|
|
65
|
+
*
|
|
66
|
+
* @returns {Object} Route configuration object
|
|
67
|
+
*/
|
|
68
|
+
}, {
|
|
60
69
|
key: "createRoutes",
|
|
61
70
|
value: function createRoutes(children, routes) {
|
|
62
|
-
var
|
|
71
|
+
var _this2 = this;
|
|
63
72
|
_react.Children.forEach(children, function (child) {
|
|
64
73
|
var _child$props = child.props,
|
|
65
74
|
path = _child$props.path,
|
|
@@ -72,7 +81,7 @@ var RouterBase = exports.RouterBase = (_Class = /*#__PURE__*/function (_ReactCom
|
|
|
72
81
|
$props: rest
|
|
73
82
|
};
|
|
74
83
|
if (grandchildren) {
|
|
75
|
-
|
|
84
|
+
_this2.createRoutes(grandchildren, routes[path]);
|
|
76
85
|
}
|
|
77
86
|
}
|
|
78
87
|
});
|
|
@@ -87,7 +96,7 @@ var RouterBase = exports.RouterBase = (_Class = /*#__PURE__*/function (_ReactCom
|
|
|
87
96
|
}, {
|
|
88
97
|
key: "createChildren",
|
|
89
98
|
value: function createChildren() {
|
|
90
|
-
var segments = (0,
|
|
99
|
+
var segments = (0, _util2.toSegments)(this.props.path);
|
|
91
100
|
var _this$props = this.props,
|
|
92
101
|
routes = _this$props.routes,
|
|
93
102
|
children = _this$props.children;
|
|
@@ -106,7 +115,7 @@ var RouterBase = exports.RouterBase = (_Class = /*#__PURE__*/function (_ReactCom
|
|
|
106
115
|
valid = false;
|
|
107
116
|
return null;
|
|
108
117
|
});
|
|
109
|
-
process.env.NODE_ENV !== "production" ? (0, _warning["default"])(valid, "".concat(this.props.path, " does not match the configured routes: ").concat((0,
|
|
118
|
+
process.env.NODE_ENV !== "production" ? (0, _warning["default"])(valid, "".concat(this.props.path, " does not match the configured routes: ").concat((0, _util2.stringifyRoutes)(computedRoutes))) : void 0;
|
|
110
119
|
return valid ? childrenElements : [];
|
|
111
120
|
}
|
|
112
121
|
}, {
|
|
@@ -140,7 +149,7 @@ var RouterBase = exports.RouterBase = (_Class = /*#__PURE__*/function (_ReactCom
|
|
|
140
149
|
* @required
|
|
141
150
|
* @public
|
|
142
151
|
*/
|
|
143
|
-
path:
|
|
152
|
+
path: _util2.RoutablePropTypes.path.isRequired,
|
|
144
153
|
/**
|
|
145
154
|
* The component wrapping the rendered path.
|
|
146
155
|
*
|
|
@@ -80,4 +80,20 @@ describe('Routable', function () {
|
|
|
80
80
|
secondPage = _react.screen.getByTestId('page2');
|
|
81
81
|
expect(secondPage).toBeInTheDocument();
|
|
82
82
|
}));
|
|
83
|
+
});
|
|
84
|
+
describe('Route', function () {
|
|
85
|
+
var consoleWarnMock = null;
|
|
86
|
+
var consoleErrorMock = null;
|
|
87
|
+
beforeEach(function () {
|
|
88
|
+
consoleWarnMock = jest.spyOn(console, 'warn').mockImplementation();
|
|
89
|
+
consoleErrorMock = jest.spyOn(console, 'error').mockImplementation();
|
|
90
|
+
});
|
|
91
|
+
afterEach(function () {
|
|
92
|
+
consoleWarnMock.mockRestore();
|
|
93
|
+
consoleErrorMock.mockRestore();
|
|
94
|
+
});
|
|
95
|
+
test('should return an error if no props are provided to `Route`', /*#__PURE__*/_asyncToGenerator(function* () {
|
|
96
|
+
(0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_Route["default"], {}));
|
|
97
|
+
expect(consoleErrorMock).toHaveBeenCalled();
|
|
98
|
+
}));
|
|
83
99
|
});
|
package/Scroller/Scroller.js
CHANGED
|
@@ -63,7 +63,8 @@ var scrollerDefaultProps = {
|
|
|
63
63
|
* @ui
|
|
64
64
|
* @public
|
|
65
65
|
*/
|
|
66
|
-
var
|
|
66
|
+
var _Scroller = exports.Scroller = function Scroller(props) {
|
|
67
|
+
(0, _util.checkPropTypes)(_Scroller, props);
|
|
67
68
|
// Hooks
|
|
68
69
|
|
|
69
70
|
var scrollerProps = (0, _util.setDefaultProps)(props, scrollerDefaultProps);
|
|
@@ -94,8 +95,8 @@ var Scroller = exports.Scroller = function Scroller(props) {
|
|
|
94
95
|
}))
|
|
95
96
|
}));
|
|
96
97
|
};
|
|
97
|
-
|
|
98
|
-
|
|
98
|
+
_Scroller.displayName = 'ui:Scroller';
|
|
99
|
+
_Scroller.propTypes = /** @lends ui/Scroller.Scroller.prototype */{
|
|
99
100
|
/**
|
|
100
101
|
* A callback function that receives a reference to the `scrollTo` feature.
|
|
101
102
|
*
|
|
@@ -272,5 +273,5 @@ Scroller.propTypes = /** @lends ui/Scroller.Scroller.prototype */{
|
|
|
272
273
|
*/
|
|
273
274
|
verticalScrollbar: _propTypes["default"].oneOf(['auto', 'visible', 'hidden'])
|
|
274
275
|
};
|
|
275
|
-
|
|
276
|
-
var _default = exports["default"] =
|
|
276
|
+
_Scroller.defaultPropValues = scrollerDefaultProps;
|
|
277
|
+
var _default = exports["default"] = _Scroller;
|