@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.
Files changed (65) hide show
  1. package/AnnounceDecorator/Announce.js +9 -5
  2. package/AnnounceDecorator/AnnounceDecorator.js +5 -3
  3. package/AnnounceDecorator/tests/AnnounceDecorator-specs.js +4 -1
  4. package/AnnounceDecorator/tests/useAnnounce-specs.js +4 -1
  5. package/CHANGELOG.md +17 -0
  6. package/Cancelable/Cancelable.js +7 -0
  7. package/Cancelable/tests/Cancelable-specs.js +26 -0
  8. package/Changeable/Changeable.js +6 -0
  9. package/Changeable/tests/Changeable-specs.js +4 -1
  10. package/FloatingLayer/FloatingLayer.js +3 -0
  11. package/FloatingLayer/FloatingLayerDecorator.js +2 -0
  12. package/FloatingLayer/Scrim.js +3 -0
  13. package/Marquee/Marquee.module.css +1 -1
  14. package/Marquee/MarqueeDecorator.js +19 -3
  15. package/Marquee/tests/Marquee-specs.js +306 -1
  16. package/Marquee/useMarqueeController.js +6 -4
  17. package/Measurable/tests/Measurable-specs.js +6 -2
  18. package/Media/Media.js +5 -2
  19. package/Placeholder/tests/PlaceholderControllerDecorator-specs.js +4 -1
  20. package/Resizable/tests/Resizable-specs.js +4 -1
  21. package/Resizable/tests/useResize-specs.js +4 -1
  22. package/Routable/Route.js +5 -3
  23. package/Routable/Router.js +25 -16
  24. package/Routable/tests/Routable-specs.js +16 -0
  25. package/Scroller/Scroller.js +6 -5
  26. package/Scroller/ScrollerBasic.js +5 -5
  27. package/Skinnable/Skinnable.js +9 -7
  28. package/Skinnable/tests/Skinnable-specs.js +7 -2
  29. package/Skinnable/useSkins.js +6 -2
  30. package/Slider/PositionDecorator.js +20 -5
  31. package/Slider/Slider.d.ts +4 -0
  32. package/Slider/Slider.js +10 -0
  33. package/Slider/tests/Slider-specs.js +18 -0
  34. package/Slider/utils.js +9 -1
  35. package/Toggleable/Toggleable.js +4 -2
  36. package/Toggleable/tests/Toggleable-specs.js +4 -1
  37. package/Touchable/Touchable.js +6 -4
  38. package/Touchable/tests/Touchable-specs.js +4 -1
  39. package/Touchable/tests/useTouch-specs.js +4 -1
  40. package/Touchable/useTouch.js +7 -2
  41. package/Transition/Transition.js +2 -0
  42. package/ViewManager/TransitionGroup.js +3 -0
  43. package/ViewManager/View.js +2 -0
  44. package/ViewManager/ViewManager.js +7 -0
  45. package/VirtualList/VirtualList.js +7 -5
  46. package/VirtualList/VirtualListBasic.js +59 -8
  47. package/VirtualList/tests/VirtualList-native-specs.js +14 -0
  48. package/VirtualList/tests/VirtualList-specs.js +13 -0
  49. package/internal/IdProvider/IdProvider.js +2 -0
  50. package/internal/IdProvider/tests/IdProvider-specs.js +4 -1
  51. package/internal/Pure/tests/Pure-specs.js +7 -0
  52. package/package.json +12 -7
  53. package/resolution/ResolutionDecorator.js +21 -18
  54. package/resolution/index.d.ts +63 -4
  55. package/resolution/index.js +18 -2
  56. package/resolution/resolution.js +209 -29
  57. package/resolution/tests/ResolutionDecorator-specs.js +84 -4
  58. package/resolution/tests/resolution-specs.js +217 -599
  59. package/useControlledState/tests/useControlledState-specs.js +4 -1
  60. package/useControlledState/useControlledState.js +11 -7
  61. package/useScroll/Scrollbar.js +27 -24
  62. package/useScroll/ScrollbarTrack.js +5 -3
  63. package/useScroll/tests/useScroll-specs.js +402 -25
  64. package/useScroll/useScroll.js +117 -26
  65. package/useScroll/utilEvent.js +18 -0
@@ -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 _useControlledState3 = _interopRequireDefault(require("../useControlledState"));
6
7
  var _jsxRuntime = require("react/jsx-runtime");
7
8
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
@@ -21,7 +22,9 @@ describe('useControlledState', function () {
21
22
  var handleChange = function handleChange(ev) {
22
23
  return setValue(ev.value);
23
24
  };
24
- data = setValue;
25
+ (0, _react2.useEffect)(function () {
26
+ data = setValue;
27
+ }, [setValue]);
25
28
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
26
29
  onChange: handleChange,
27
30
  children: value
@@ -39,14 +39,18 @@ function calcValue(defaultValue, propValue, stateValue, controlled) {
39
39
  return propValue !== undefined ? propValue : defaultValue;
40
40
  }
41
41
  function useControlledState(defaultValue, propValue, controlled) {
42
- var isControlled = (0, _react.useRef)(controlled);
42
+ var _useState = (0, _react.useState)(controlled),
43
+ _useState2 = _slicedToArray(_useState, 1),
44
+ isControlled = _useState2[0];
43
45
 
44
46
  // Store both the value and the "controlled" flag in a state hook
45
- var _useState = (0, _react.useState)(defaultValue),
46
- _useState2 = _slicedToArray(_useState, 2),
47
- value = _useState2[0],
48
- onChange = _useState2[1];
49
- var memoOnChange = (0, _react.useMemo)(createHandler, [onChange, value, isControlled.current]);
50
- return [calcValue(defaultValue, propValue, value, isControlled.current), memoOnChange(onChange, value, isControlled.current)];
47
+ var _useState3 = (0, _react.useState)(defaultValue),
48
+ _useState4 = _slicedToArray(_useState3, 2),
49
+ value = _useState4[0],
50
+ onChange = _useState4[1];
51
+ var memoOnChange = (0, _react.useMemo)(function () {
52
+ return createHandler();
53
+ }, []);
54
+ return [calcValue(defaultValue, propValue, value, isControlled), memoOnChange(onChange, value, isControlled)];
51
55
  }
52
56
  var _default = exports["default"] = useControlledState;
@@ -68,33 +68,27 @@ var useScrollbar = exports.useScrollbar = function useScrollbar(props) {
68
68
  corner = props.corner,
69
69
  css = props.css,
70
70
  minThumbSize = props.minThumbSize,
71
- scrollbarHandle = props.scrollbarHandle,
71
+ scrollbarHandleRef = props.scrollbarHandle,
72
72
  vertical = props.vertical,
73
73
  rest = _objectWithoutProperties(props, _excluded);
74
74
  // Refs
75
75
  var scrollbarContainerRef = (0, _react.useRef)();
76
76
  var scrollbarTrackRef = (0, _react.useRef)();
77
77
  var hideScrollbarTrackJob = (0, _react.useRef)(null);
78
- hideScrollbarTrackJob.current = hideScrollbarTrackJob.current || new _util.Job(hideScrollbarTrack, scrollbarTrackHidingDelay);
79
- function hideScrollbarTrack() {
78
+ var hideScrollbarTrack = (0, _react.useCallback)(function () {
80
79
  removeClass(scrollbarTrackRef.current, css.scrollbarTrackShown);
81
- }
82
- (0, _react.useEffect)(function () {
83
- return function () {
84
- hideScrollbarTrackJob.current.stop();
85
- };
86
- }, []);
87
- function getContainerRef() {
80
+ }, [css.scrollbarTrackShown]);
81
+ var getContainerRef = (0, _react.useCallback)(function () {
88
82
  return scrollbarContainerRef;
89
- }
90
- function showScrollbarTrack() {
83
+ }, []);
84
+ var showScrollbarTrack = (0, _react.useCallback)(function () {
91
85
  hideScrollbarTrackJob.current.stop();
92
86
  addClass(scrollbarTrackRef.current, css.scrollbarTrackShown);
93
- }
94
- function startHidingScrollbarTrack() {
87
+ }, [css.scrollbarTrackShown]);
88
+ var startHidingScrollbarTrack = (0, _react.useCallback)(function () {
95
89
  hideScrollbarTrackJob.current.start();
96
- }
97
- function update(bounds) {
90
+ }, []);
91
+ var update = (0, _react.useCallback)(function (bounds) {
98
92
  var primaryDimension = vertical ? 'clientHeight' : 'clientWidth',
99
93
  trackSize = clientSize ? clientSize[primaryDimension] : scrollbarContainerRef.current[primaryDimension],
100
94
  scrollViewSize = vertical ? bounds.clientHeight : bounds.clientWidth,
@@ -105,15 +99,23 @@ var useScrollbar = exports.useScrollbar = function useScrollbar(props) {
105
99
  scrollbarThumbSizeRatio = trackSize !== 0 ? Math.max(_resolution["default"].scale(minThumbSize) / trackSize, Math.min(1, scrollbarThumbSizeRatioBase)) : 1;
106
100
  setCSSVariable(scrollbarTrackRef.current, '--scrollbar-thumb-size-ratio', scrollbarThumbSizeRatio);
107
101
  setCSSVariable(scrollbarTrackRef.current, '--scrollbar-thumb-progress-ratio', scrollbarThumbProgressRatio);
108
- }
109
- if (scrollbarHandle) {
110
- scrollbarHandle.current = {
111
- getContainerRef: getContainerRef,
112
- showScrollbarTrack: showScrollbarTrack,
113
- startHidingScrollbarTrack: startHidingScrollbarTrack,
114
- update: update
102
+ }, [clientSize, minThumbSize, vertical]);
103
+ (0, _react.useLayoutEffect)(function () {
104
+ if (scrollbarHandleRef) {
105
+ scrollbarHandleRef.current = {
106
+ getContainerRef: getContainerRef,
107
+ showScrollbarTrack: showScrollbarTrack,
108
+ startHidingScrollbarTrack: startHidingScrollbarTrack,
109
+ update: update
110
+ };
111
+ }
112
+ hideScrollbarTrackJob.current = hideScrollbarTrackJob.current || new _util.Job(hideScrollbarTrack, scrollbarTrackHidingDelay);
113
+ }, [getContainerRef, hideScrollbarTrack, scrollbarHandleRef, showScrollbarTrack, startHidingScrollbarTrack, update]);
114
+ (0, _react.useEffect)(function () {
115
+ return function () {
116
+ hideScrollbarTrackJob.current.stop();
115
117
  };
116
- }
118
+ }, []);
117
119
  return {
118
120
  restProps: rest,
119
121
  scrollbarProps: {
@@ -155,6 +157,7 @@ var Scrollbar = exports.ScrollbarBase = exports.Scrollbar = /*#__PURE__*/(0, _re
155
157
  restProps = _useScrollbar.restProps,
156
158
  scrollbarProps = _useScrollbar.scrollbarProps,
157
159
  scrollbarTrackProps = _useScrollbar.scrollbarTrackProps;
160
+ (0, _util.checkPropTypes)(Scrollbar, props);
158
161
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread(_objectSpread({}, restProps), scrollbarProps), {}, {
159
162
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ScrollbarTrack["default"], _objectSpread({}, scrollbarTrackProps))
160
163
  }));
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports["default"] = exports.ScrollbarTrackBase = exports.MemoizedScrollbarTrack = void 0;
7
+ var _util = require("@enact/core/util");
7
8
  var _classnames = _interopRequireDefault(require("classnames"));
8
9
  var _propTypes = _interopRequireDefault(require("prop-types"));
9
10
  var _react = require("react");
@@ -26,7 +27,8 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
26
27
  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); }
27
28
  function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
28
29
  function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
29
- var ScrollbarTrack = function ScrollbarTrack(props) {
30
+ var _ScrollbarTrack = function ScrollbarTrack(props) {
31
+ (0, _util.checkPropTypes)(_ScrollbarTrack, props);
30
32
  var _props$ref = props.ref,
31
33
  ref = _props$ref === void 0 ? null : _props$ref,
32
34
  _props$vertical = props.vertical,
@@ -38,7 +40,7 @@ var ScrollbarTrack = function ScrollbarTrack(props) {
38
40
  ref: ref
39
41
  }));
40
42
  };
41
- ScrollbarTrack.propTypes = /** @lends ui/useScroll.ScrollbarTrack.prototype */{
43
+ _ScrollbarTrack.propTypes = /** @lends ui/useScroll.ScrollbarTrack.prototype */{
42
44
  /**
43
45
  * Forwards a reference to the DOM element.
44
46
  *
@@ -57,6 +59,6 @@ ScrollbarTrack.propTypes = /** @lends ui/useScroll.ScrollbarTrack.prototype */{
57
59
  */
58
60
  vertical: _propTypes["default"].bool
59
61
  };
60
- var MemoizedScrollbarTrack = exports.ScrollbarTrackBase = exports.MemoizedScrollbarTrack = /*#__PURE__*/(0, _react.memo)(ScrollbarTrack);
62
+ var MemoizedScrollbarTrack = exports.ScrollbarTrackBase = exports.MemoizedScrollbarTrack = /*#__PURE__*/(0, _react.memo)(_ScrollbarTrack);
61
63
  MemoizedScrollbarTrack.displayName = 'ui:ScrollbarTrack';
62
64
  var _default = exports["default"] = MemoizedScrollbarTrack;
@@ -1,20 +1,333 @@
1
1
  "use strict";
2
2
 
3
3
  require("@testing-library/jest-dom");
4
+ var _react = require("@testing-library/react");
5
+ var _useScroll = require("../useScroll");
6
+ 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; }
7
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
8
+ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
9
+ function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
10
+ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
11
+ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
12
+ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
13
+ 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); }
14
+ // Mock all dependencies at the top level BEFORE importing useScroll
15
+ var mockRiScale;
16
+ var mockPlatform;
17
+ jest.mock('../../resolution', function () {
18
+ return {
19
+ __esModule: true,
20
+ "default": {
21
+ get scale() {
22
+ return mockRiScale || function (val) {
23
+ return val;
24
+ };
25
+ }
26
+ }
27
+ };
28
+ });
29
+ jest.mock('@enact/core/platform', function () {
30
+ return {
31
+ __esModule: true,
32
+ get platform() {
33
+ return mockPlatform || {
34
+ chrome: 120
35
+ };
36
+ }
37
+ };
38
+ });
39
+ global.ResizeObserver = /*#__PURE__*/function () {
40
+ function ResizeObserver() {
41
+ _classCallCheck(this, ResizeObserver);
42
+ }
43
+ return _createClass(ResizeObserver, [{
44
+ key: "observe",
45
+ value: function observe() {}
46
+ }, {
47
+ key: "unobserve",
48
+ value: function unobserve() {}
49
+ }, {
50
+ key: "disconnect",
51
+ value: function disconnect() {}
52
+ }]);
53
+ }();
54
+
55
+ // Import AFTER all mocks
56
+
57
+ // Helper function to create complete mock refs
58
+ function createMockRefs() {
59
+ return {
60
+ scrollContentHandle: {
61
+ current: {
62
+ getScrollBounds: jest.fn(function () {
63
+ return {
64
+ clientWidth: 1920,
65
+ clientHeight: 1080,
66
+ scrollWidth: 2000,
67
+ // greater than clientWidth
68
+ scrollHeight: 2000,
69
+ // greater than clientHeight
70
+ maxTop: 920,
71
+ // 2000 - 1080 = 920
72
+ maxLeft: 80 // 2000 - 1920 = 80
73
+ };
74
+ }),
75
+ getMoreInfo: jest.fn(function () {
76
+ return {};
77
+ }),
78
+ hasDataSizeChanged: false,
79
+ syncClientSize: jest.fn(function () {
80
+ return false;
81
+ }),
82
+ getRtlPositionX: jest.fn(function (x) {
83
+ return x;
84
+ }),
85
+ calculateMetrics: jest.fn(),
86
+ didScroll: jest.fn(),
87
+ props: {}
88
+ }
89
+ },
90
+ scrollContainerRef: {
91
+ current: document.createElement('div')
92
+ },
93
+ scrollContentRef: {
94
+ current: document.createElement('div')
95
+ },
96
+ horizontalScrollbarHandle: {
97
+ current: {
98
+ update: jest.fn(),
99
+ getContainerRef: jest.fn(function () {
100
+ return document.createElement('div');
101
+ }),
102
+ startHidingScrollbarTrack: jest.fn(),
103
+ showScrollbarTrack: jest.fn()
104
+ }
105
+ },
106
+ verticalScrollbarHandle: {
107
+ current: {
108
+ update: jest.fn(),
109
+ getContainerRef: jest.fn(function () {
110
+ return document.createElement('div');
111
+ }),
112
+ startHidingScrollbarTrack: jest.fn(),
113
+ showScrollbarTrack: jest.fn()
114
+ }
115
+ }
116
+ };
117
+ }
4
118
  describe('useScroll', function () {
119
+ describe('riRatio itemSize scaling on window resize', function () {
120
+ beforeEach(function () {
121
+ jest.useFakeTimers();
122
+ mockPlatform = {
123
+ chrome: 132
124
+ };
125
+ });
126
+ afterEach(function () {
127
+ jest.runOnlyPendingTimers();
128
+ jest.useRealTimers();
129
+ });
130
+ test('should scale itemSize when ri.scale(1) changes from 1 to 2', function () {
131
+ mockRiScale = jest.fn(function (val) {
132
+ return val;
133
+ });
134
+ var itemSize = {
135
+ minWidth: 100,
136
+ minHeight: 50
137
+ };
138
+ var mocks = createMockRefs();
139
+ var props = _objectSpread(_objectSpread({
140
+ itemRenderer: jest.fn(),
141
+ itemSize: itemSize,
142
+ direction: 'vertical',
143
+ scrollMode: 'translate'
144
+ }, mocks), {}, {
145
+ assignProperties: jest.fn(),
146
+ horizontalScrollbar: 'auto',
147
+ verticalScrollbar: 'auto'
148
+ });
149
+ (0, _react.renderHook)(function () {
150
+ return (0, _useScroll.useScrollBase)(props);
151
+ });
152
+ mockRiScale = jest.fn(function () {
153
+ return 2;
154
+ });
155
+
156
+ // eslint-disable-next-line testing-library/no-unnecessary-act
157
+ (0, _react.act)(function () {
158
+ (0, _react.fireEvent)(window, new Event('resize'));
159
+ jest.runAllTimers();
160
+ });
161
+ expect(itemSize.minWidth).toBe(200);
162
+ expect(itemSize.minHeight).toBe(100);
163
+ });
164
+ test('should scale itemSizes when ri.scale(1) changes from 1 to 2', function () {
165
+ mockRiScale = jest.fn(function (val) {
166
+ return val;
167
+ });
168
+ var itemSize = 100;
169
+ var itemSizes = [100, 100, 100, 100, 100];
170
+ var mocks = createMockRefs();
171
+ var props = _objectSpread(_objectSpread({
172
+ itemRenderer: jest.fn(),
173
+ itemSize: itemSize,
174
+ itemSizes: itemSizes,
175
+ direction: 'vertical',
176
+ scrollMode: 'translate'
177
+ }, mocks), {}, {
178
+ assignProperties: jest.fn(),
179
+ horizontalScrollbar: 'auto',
180
+ verticalScrollbar: 'auto'
181
+ });
182
+ (0, _react.renderHook)(function () {
183
+ return (0, _useScroll.useScrollBase)(props);
184
+ });
185
+ mockRiScale = jest.fn(function () {
186
+ return 2;
187
+ });
188
+
189
+ // eslint-disable-next-line testing-library/no-unnecessary-act
190
+ (0, _react.act)(function () {
191
+ (0, _react.fireEvent)(window, new Event('resize'));
192
+ jest.runAllTimers();
193
+ });
194
+ expect(itemSizes[1]).toBe(200);
195
+ });
196
+ test('should NOT scale itemSize when ri.scale(1) remains unchanged', function () {
197
+ mockRiScale = jest.fn(function (val) {
198
+ return val;
199
+ });
200
+ var itemSize = {
201
+ minWidth: 100,
202
+ minHeight: 50
203
+ };
204
+ var mocks = createMockRefs();
205
+ var props = _objectSpread(_objectSpread({
206
+ itemRenderer: jest.fn(),
207
+ itemSize: itemSize,
208
+ direction: 'vertical',
209
+ scrollMode: 'translate'
210
+ }, mocks), {}, {
211
+ assignProperties: jest.fn(),
212
+ horizontalScrollbar: 'auto',
213
+ verticalScrollbar: 'auto'
214
+ });
215
+ (0, _react.renderHook)(function () {
216
+ return (0, _useScroll.useScrollBase)(props);
217
+ });
218
+
219
+ // eslint-disable-next-line testing-library/no-unnecessary-act
220
+ (0, _react.act)(function () {
221
+ (0, _react.fireEvent)(window, new Event('resize'));
222
+ jest.runAllTimers();
223
+ });
224
+ expect(itemSize.minWidth).toBe(100);
225
+ expect(itemSize.minHeight).toBe(50);
226
+ });
227
+ test('should NOT scale itemSizes when ri.scale(1) remains unchanged', function () {
228
+ mockRiScale = jest.fn(function (val) {
229
+ return val;
230
+ });
231
+ var itemSize = 100;
232
+ var itemSizes = [100, 100, 100, 100, 100];
233
+ var mocks = createMockRefs();
234
+ var props = _objectSpread(_objectSpread({
235
+ itemRenderer: jest.fn(),
236
+ itemSize: itemSize,
237
+ itemSizes: itemSizes,
238
+ direction: 'vertical',
239
+ scrollMode: 'translate'
240
+ }, mocks), {}, {
241
+ assignProperties: jest.fn(),
242
+ horizontalScrollbar: 'auto',
243
+ verticalScrollbar: 'auto'
244
+ });
245
+ (0, _react.renderHook)(function () {
246
+ return (0, _useScroll.useScrollBase)(props);
247
+ });
248
+
249
+ // eslint-disable-next-line testing-library/no-unnecessary-act
250
+ (0, _react.act)(function () {
251
+ (0, _react.fireEvent)(window, new Event('resize'));
252
+ jest.runAllTimers();
253
+ });
254
+ expect(itemSizes[1]).toBe(100);
255
+ });
256
+ test('should NOT scale when minWidth is missing', function () {
257
+ mockRiScale = jest.fn(function (val) {
258
+ return val;
259
+ });
260
+ var itemSize = {
261
+ minHeight: 50
262
+ };
263
+ var mocks = createMockRefs();
264
+ var props = _objectSpread(_objectSpread({
265
+ itemRenderer: jest.fn(),
266
+ itemSize: itemSize,
267
+ direction: 'vertical',
268
+ scrollMode: 'translate'
269
+ }, mocks), {}, {
270
+ assignProperties: jest.fn(),
271
+ horizontalScrollbar: 'auto',
272
+ verticalScrollbar: 'auto'
273
+ });
274
+ (0, _react.renderHook)(function () {
275
+ return (0, _useScroll.useScrollBase)(props);
276
+ });
277
+ mockRiScale = jest.fn(function () {
278
+ return 2;
279
+ });
280
+
281
+ // eslint-disable-next-line testing-library/no-unnecessary-act
282
+ (0, _react.act)(function () {
283
+ (0, _react.fireEvent)(window, new Event('resize'));
284
+ jest.runAllTimers();
285
+ });
286
+ expect(itemSize.minHeight).toBe(50);
287
+ expect(itemSize.minWidth).toBeUndefined();
288
+ });
289
+ test('should NOT scale when minHeight is missing', function () {
290
+ mockRiScale = jest.fn(function (val) {
291
+ return val;
292
+ });
293
+ var itemSize = {
294
+ minWidth: 100
295
+ };
296
+ var mocks = createMockRefs();
297
+ var props = _objectSpread(_objectSpread({
298
+ itemRenderer: jest.fn(),
299
+ itemSize: itemSize,
300
+ direction: 'vertical',
301
+ scrollMode: 'translate'
302
+ }, mocks), {}, {
303
+ assignProperties: jest.fn(),
304
+ horizontalScrollbar: 'auto',
305
+ verticalScrollbar: 'auto'
306
+ });
307
+ (0, _react.renderHook)(function () {
308
+ return (0, _useScroll.useScrollBase)(props);
309
+ });
310
+ mockRiScale = jest.fn(function () {
311
+ return 2;
312
+ });
313
+
314
+ // eslint-disable-next-line testing-library/no-unnecessary-act
315
+ (0, _react.act)(function () {
316
+ (0, _react.fireEvent)(window, new Event('resize'));
317
+ jest.runAllTimers();
318
+ });
319
+ expect(itemSize.minWidth).toBe(100);
320
+ expect(itemSize.minHeight).toBeUndefined();
321
+ });
322
+ });
5
323
  describe('Rounding target scroll position', function () {
6
324
  beforeEach(function () {
7
325
  jest.resetModules(); // important! clears cached modules
8
326
  });
9
327
  test('should round target position upwards when target is bigger than current position', function () {
10
- jest.doMock('@enact/core/platform', function () {
11
- return {
12
- __esModule: true,
13
- platform: {
14
- chrome: 132
15
- }
16
- };
17
- });
328
+ mockPlatform = {
329
+ chrome: 132
330
+ };
18
331
  var _require = require('../useScroll'),
19
332
  roundTarget = _require.roundTarget;
20
333
  var currentPosition = {
@@ -29,15 +342,10 @@ describe('useScroll', function () {
29
342
  expect(roundedTargetX).toEqual(121);
30
343
  expect(roundedTargetY).toEqual(121);
31
344
  });
32
- test('should round target position downwards when target is bigger than current position', function () {
33
- jest.doMock('@enact/core/platform', function () {
34
- return {
35
- __esModule: true,
36
- platform: {
37
- chrome: 132
38
- }
39
- };
40
- });
345
+ test('should round target position downwards when target is bi than current position', function () {
346
+ mockPlatform = {
347
+ chrome: 132
348
+ };
41
349
  var _require2 = require('../useScroll'),
42
350
  roundTarget = _require2.roundTarget;
43
351
  var currentPosition = {
@@ -53,14 +361,9 @@ describe('useScroll', function () {
53
361
  expect(roundedTargetY).toEqual(80);
54
362
  });
55
363
  test('should not round target position when chrome <= 120', function () {
56
- jest.doMock('@enact/core/platform', function () {
57
- return {
58
- __esModule: true,
59
- platform: {
60
- chrome: 119
61
- }
62
- };
63
- });
364
+ mockPlatform = {
365
+ chrome: 119
366
+ };
64
367
  var _require3 = require('../useScroll'),
65
368
  roundTarget = _require3.roundTarget;
66
369
  var currentPosition = {
@@ -76,4 +379,78 @@ describe('useScroll', function () {
76
379
  expect(roundedTargetY).toEqual(80.8);
77
380
  });
78
381
  });
382
+ describe('Native scroll behavior', function () {
383
+ beforeEach(function () {
384
+ jest.useFakeTimers();
385
+ mockPlatform = {
386
+ chrome: 132
387
+ };
388
+ mockRiScale = jest.fn(function (val) {
389
+ return val;
390
+ });
391
+ });
392
+ afterEach(function () {
393
+ jest.runOnlyPendingTimers();
394
+ jest.useRealTimers();
395
+ });
396
+ test('should update scroll position from scroll event', function () {
397
+ var mocks = createMockRefs();
398
+ var props = _objectSpread(_objectSpread({
399
+ direction: 'vertical',
400
+ scrollMode: 'native'
401
+ }, mocks), {}, {
402
+ assignProperties: jest.fn(),
403
+ horizontalScrollbar: 'auto',
404
+ verticalScrollbar: 'auto'
405
+ });
406
+ (0, _react.renderHook)(function () {
407
+ return (0, _useScroll.useScrollBase)(props);
408
+ });
409
+ var scrollEvent = new Event('scroll');
410
+ Object.defineProperty(scrollEvent, 'target', {
411
+ value: {
412
+ scrollLeft: 50,
413
+ scrollTop: 150
414
+ },
415
+ writable: false
416
+ });
417
+
418
+ // eslint-disable-next-line testing-library/no-unnecessary-act
419
+ (0, _react.act)(function () {
420
+ (0, _react.fireEvent)(mocks.scrollContentRef.current, scrollEvent);
421
+ });
422
+ expect(mocks.scrollContentHandle.current.didScroll).toHaveBeenCalledWith(50, 150);
423
+ });
424
+ test('should handle RTL scroll position correctly', function () {
425
+ var mocks = createMockRefs();
426
+ mockPlatform = {
427
+ chrome: 132
428
+ };
429
+ var props = _objectSpread(_objectSpread({
430
+ direction: 'horizontal',
431
+ scrollMode: 'native',
432
+ rtl: true
433
+ }, mocks), {}, {
434
+ assignProperties: jest.fn(),
435
+ horizontalScrollbar: 'auto',
436
+ verticalScrollbar: 'auto'
437
+ });
438
+ (0, _react.renderHook)(function () {
439
+ return (0, _useScroll.useScrollBase)(props);
440
+ });
441
+ var scrollEvent = new Event('scroll');
442
+ Object.defineProperty(scrollEvent, 'target', {
443
+ value: {
444
+ scrollLeft: -50,
445
+ scrollTop: 0
446
+ }
447
+ });
448
+
449
+ // eslint-disable-next-line testing-library/no-unnecessary-act
450
+ (0, _react.act)(function () {
451
+ (0, _react.fireEvent)(mocks.scrollContentRef.current, scrollEvent);
452
+ });
453
+ expect(mocks.scrollContentHandle.current.didScroll).toHaveBeenCalledWith(50, 0);
454
+ });
455
+ });
79
456
  });