@enact/ui 5.4.4 → 5.5.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.
- 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 +30 -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 +170 -32
- package/VirtualList/tests/VirtualList-native-specs.js +233 -3
- 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 +8 -3
- 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 +408 -42
- package/useScroll/useScroll.js +132 -27
- 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
|
-
|
|
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
|
|
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
|
|
46
|
-
|
|
47
|
-
value =
|
|
48
|
-
onChange =
|
|
49
|
-
var memoOnChange = (0, _react.useMemo)(
|
|
50
|
-
|
|
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;
|
package/useScroll/Scrollbar.js
CHANGED
|
@@ -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
|
-
|
|
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
|
-
|
|
79
|
-
function hideScrollbarTrack() {
|
|
78
|
+
var hideScrollbarTrack = (0, _react.useCallback)(function () {
|
|
80
79
|
removeClass(scrollbarTrackRef.current, css.scrollbarTrackShown);
|
|
81
|
-
}
|
|
82
|
-
(0, _react.
|
|
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
|
-
|
|
83
|
+
}, []);
|
|
84
|
+
var showScrollbarTrack = (0, _react.useCallback)(function () {
|
|
91
85
|
hideScrollbarTrackJob.current.stop();
|
|
92
86
|
addClass(scrollbarTrackRef.current, css.scrollbarTrackShown);
|
|
93
|
-
}
|
|
94
|
-
|
|
87
|
+
}, [css.scrollbarTrackShown]);
|
|
88
|
+
var startHidingScrollbarTrack = (0, _react.useCallback)(function () {
|
|
95
89
|
hideScrollbarTrackJob.current.start();
|
|
96
|
-
}
|
|
97
|
-
|
|
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
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
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
|
|
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
|
-
|
|
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)(
|
|
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;
|
|
@@ -3,66 +3,364 @@
|
|
|
3
3
|
require("@testing-library/jest-dom");
|
|
4
4
|
var _react = require("@testing-library/react");
|
|
5
5
|
var _useScroll = require("../useScroll");
|
|
6
|
+
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
7
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
8
|
+
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
9
|
+
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
10
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
11
|
+
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
6
12
|
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
13
|
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
14
|
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; }
|
|
15
|
+
function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
|
|
16
|
+
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); } }
|
|
17
|
+
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
9
18
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
10
19
|
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); }
|
|
20
|
+
// Mock all dependencies at the top level BEFORE importing useScroll
|
|
21
|
+
var mockRiScale;
|
|
11
22
|
var mockPlatform;
|
|
23
|
+
jest.mock('../../resolution', function () {
|
|
24
|
+
return {
|
|
25
|
+
__esModule: true,
|
|
26
|
+
"default": {
|
|
27
|
+
get scale() {
|
|
28
|
+
return mockRiScale || function (val) {
|
|
29
|
+
return val;
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
});
|
|
12
35
|
jest.mock('@enact/core/platform', function () {
|
|
13
36
|
return {
|
|
14
37
|
__esModule: true,
|
|
15
38
|
get platform() {
|
|
16
|
-
return mockPlatform
|
|
39
|
+
return mockPlatform || {
|
|
40
|
+
chrome: 120
|
|
41
|
+
};
|
|
17
42
|
}
|
|
18
43
|
};
|
|
19
44
|
});
|
|
45
|
+
global.ResizeObserver = /*#__PURE__*/function () {
|
|
46
|
+
function ResizeObserver() {
|
|
47
|
+
_classCallCheck(this, ResizeObserver);
|
|
48
|
+
}
|
|
49
|
+
return _createClass(ResizeObserver, [{
|
|
50
|
+
key: "observe",
|
|
51
|
+
value: function observe() {}
|
|
52
|
+
}, {
|
|
53
|
+
key: "unobserve",
|
|
54
|
+
value: function unobserve() {}
|
|
55
|
+
}, {
|
|
56
|
+
key: "disconnect",
|
|
57
|
+
value: function disconnect() {}
|
|
58
|
+
}]);
|
|
59
|
+
}();
|
|
60
|
+
|
|
61
|
+
// Import AFTER all mocks
|
|
62
|
+
|
|
63
|
+
// Helper function to create complete mock refs
|
|
20
64
|
function createMockRefs() {
|
|
21
|
-
var el = document.createElement('div');
|
|
22
|
-
document.body.appendChild(el);
|
|
23
65
|
return {
|
|
24
|
-
scrollContainerRef: {
|
|
25
|
-
current: el
|
|
26
|
-
},
|
|
27
66
|
scrollContentHandle: {
|
|
28
67
|
current: {
|
|
29
|
-
getScrollBounds: function
|
|
68
|
+
getScrollBounds: jest.fn(function () {
|
|
30
69
|
return {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
70
|
+
clientWidth: 1920,
|
|
71
|
+
clientHeight: 1080,
|
|
72
|
+
scrollWidth: 2000,
|
|
73
|
+
// greater than clientWidth
|
|
74
|
+
scrollHeight: 2000,
|
|
75
|
+
// greater than clientHeight
|
|
76
|
+
maxTop: 920,
|
|
77
|
+
// 2000 - 1080 = 920
|
|
78
|
+
maxLeft: 80 // 2000 - 1920 = 80
|
|
37
79
|
};
|
|
38
|
-
}
|
|
80
|
+
}),
|
|
81
|
+
getMoreInfo: jest.fn(function () {
|
|
82
|
+
return {};
|
|
83
|
+
}),
|
|
84
|
+
hasDataSizeChanged: false,
|
|
85
|
+
syncClientSize: jest.fn(function () {
|
|
86
|
+
return false;
|
|
87
|
+
}),
|
|
88
|
+
getRtlPositionX: jest.fn(function (x) {
|
|
89
|
+
return x;
|
|
90
|
+
}),
|
|
91
|
+
calculateMetrics: jest.fn(),
|
|
92
|
+
didScroll: jest.fn(),
|
|
93
|
+
props: {}
|
|
39
94
|
}
|
|
40
95
|
},
|
|
96
|
+
scrollContainerRef: {
|
|
97
|
+
current: document.createElement('div')
|
|
98
|
+
},
|
|
41
99
|
scrollContentRef: {
|
|
42
|
-
current:
|
|
100
|
+
current: document.createElement('div')
|
|
43
101
|
},
|
|
44
102
|
horizontalScrollbarHandle: {
|
|
45
|
-
current: {
|
|
103
|
+
current: {
|
|
104
|
+
update: jest.fn(),
|
|
105
|
+
getContainerRef: jest.fn(function () {
|
|
106
|
+
return document.createElement('div');
|
|
107
|
+
}),
|
|
108
|
+
startHidingScrollbarTrack: jest.fn(),
|
|
109
|
+
showScrollbarTrack: jest.fn()
|
|
110
|
+
}
|
|
46
111
|
},
|
|
47
112
|
verticalScrollbarHandle: {
|
|
48
|
-
current: {
|
|
113
|
+
current: {
|
|
114
|
+
update: jest.fn(),
|
|
115
|
+
getContainerRef: jest.fn(function () {
|
|
116
|
+
return document.createElement('div');
|
|
117
|
+
}),
|
|
118
|
+
startHidingScrollbarTrack: jest.fn(),
|
|
119
|
+
showScrollbarTrack: jest.fn()
|
|
120
|
+
}
|
|
49
121
|
}
|
|
50
122
|
};
|
|
51
123
|
}
|
|
52
124
|
describe('useScroll', function () {
|
|
125
|
+
describe('riRatio itemSize scaling on window resize', function () {
|
|
126
|
+
beforeEach(function () {
|
|
127
|
+
jest.useFakeTimers();
|
|
128
|
+
mockPlatform = {
|
|
129
|
+
chrome: 132
|
|
130
|
+
};
|
|
131
|
+
});
|
|
132
|
+
afterEach(function () {
|
|
133
|
+
jest.runOnlyPendingTimers();
|
|
134
|
+
jest.useRealTimers();
|
|
135
|
+
});
|
|
136
|
+
test('should scale itemSize when ri.scale(1) changes from 1 to 2', function () {
|
|
137
|
+
var _scrollContentPropsCa;
|
|
138
|
+
mockRiScale = jest.fn(function (val) {
|
|
139
|
+
return val;
|
|
140
|
+
});
|
|
141
|
+
var itemSize = {
|
|
142
|
+
minWidth: 100,
|
|
143
|
+
minHeight: 50
|
|
144
|
+
};
|
|
145
|
+
var mocks = createMockRefs();
|
|
146
|
+
var assignProperties = jest.fn();
|
|
147
|
+
var props = _objectSpread(_objectSpread({
|
|
148
|
+
itemRenderer: jest.fn(),
|
|
149
|
+
itemSize: itemSize,
|
|
150
|
+
direction: 'vertical',
|
|
151
|
+
scrollMode: 'translate'
|
|
152
|
+
}, mocks), {}, {
|
|
153
|
+
assignProperties: assignProperties,
|
|
154
|
+
horizontalScrollbar: 'auto',
|
|
155
|
+
verticalScrollbar: 'auto'
|
|
156
|
+
});
|
|
157
|
+
(0, _react.renderHook)(function () {
|
|
158
|
+
return (0, _useScroll.useScrollBase)(props);
|
|
159
|
+
});
|
|
160
|
+
mockRiScale = jest.fn(function () {
|
|
161
|
+
return 2;
|
|
162
|
+
});
|
|
163
|
+
|
|
164
|
+
// eslint-disable-next-line testing-library/no-unnecessary-act
|
|
165
|
+
(0, _react.act)(function () {
|
|
166
|
+
(0, _react.fireEvent)(window, new Event('resize'));
|
|
167
|
+
jest.runAllTimers();
|
|
168
|
+
});
|
|
169
|
+
|
|
170
|
+
// Original props object must not be mutated
|
|
171
|
+
expect(itemSize.minWidth).toBe(100);
|
|
172
|
+
expect(itemSize.minHeight).toBe(50);
|
|
173
|
+
|
|
174
|
+
// The scaled values should be passed to scrollContentProps via assignProperties
|
|
175
|
+
var scrollContentPropsCall = assignProperties.mock.calls.findLast(function (_ref) {
|
|
176
|
+
var _ref2 = _slicedToArray(_ref, 1),
|
|
177
|
+
name = _ref2[0];
|
|
178
|
+
return name === 'scrollContentProps';
|
|
179
|
+
});
|
|
180
|
+
var passedItemSize = scrollContentPropsCall === null || scrollContentPropsCall === void 0 || (_scrollContentPropsCa = scrollContentPropsCall[1]) === null || _scrollContentPropsCa === void 0 ? void 0 : _scrollContentPropsCa.itemSize;
|
|
181
|
+
expect(passedItemSize === null || passedItemSize === void 0 ? void 0 : passedItemSize.minWidth).toBe(200);
|
|
182
|
+
expect(passedItemSize === null || passedItemSize === void 0 ? void 0 : passedItemSize.minHeight).toBe(100);
|
|
183
|
+
});
|
|
184
|
+
test('should scale itemSizes when ri.scale(1) changes from 1 to 2', function () {
|
|
185
|
+
var _scrollContentPropsCa2;
|
|
186
|
+
mockRiScale = jest.fn(function (val) {
|
|
187
|
+
return val;
|
|
188
|
+
});
|
|
189
|
+
var itemSize = 100;
|
|
190
|
+
var itemSizes = [100, 100, 100, 100, 100];
|
|
191
|
+
var mocks = createMockRefs();
|
|
192
|
+
var assignProperties = jest.fn();
|
|
193
|
+
var props = _objectSpread(_objectSpread({
|
|
194
|
+
itemRenderer: jest.fn(),
|
|
195
|
+
itemSize: itemSize,
|
|
196
|
+
itemSizes: itemSizes,
|
|
197
|
+
direction: 'vertical',
|
|
198
|
+
scrollMode: 'translate'
|
|
199
|
+
}, mocks), {}, {
|
|
200
|
+
assignProperties: assignProperties,
|
|
201
|
+
horizontalScrollbar: 'auto',
|
|
202
|
+
verticalScrollbar: 'auto'
|
|
203
|
+
});
|
|
204
|
+
(0, _react.renderHook)(function () {
|
|
205
|
+
return (0, _useScroll.useScrollBase)(props);
|
|
206
|
+
});
|
|
207
|
+
mockRiScale = jest.fn(function () {
|
|
208
|
+
return 2;
|
|
209
|
+
});
|
|
210
|
+
|
|
211
|
+
// eslint-disable-next-line testing-library/no-unnecessary-act
|
|
212
|
+
(0, _react.act)(function () {
|
|
213
|
+
(0, _react.fireEvent)(window, new Event('resize'));
|
|
214
|
+
jest.runAllTimers();
|
|
215
|
+
});
|
|
216
|
+
|
|
217
|
+
// Original props array must not be mutated
|
|
218
|
+
expect(itemSizes[1]).toBe(100);
|
|
219
|
+
|
|
220
|
+
// The scaled values should be passed to scrollContentProps via assignProperties
|
|
221
|
+
var scrollContentPropsCall = assignProperties.mock.calls.findLast(function (_ref3) {
|
|
222
|
+
var _ref4 = _slicedToArray(_ref3, 1),
|
|
223
|
+
name = _ref4[0];
|
|
224
|
+
return name === 'scrollContentProps';
|
|
225
|
+
});
|
|
226
|
+
var passedItemSizes = scrollContentPropsCall === null || scrollContentPropsCall === void 0 || (_scrollContentPropsCa2 = scrollContentPropsCall[1]) === null || _scrollContentPropsCa2 === void 0 ? void 0 : _scrollContentPropsCa2.itemSizes;
|
|
227
|
+
expect(passedItemSizes === null || passedItemSizes === void 0 ? void 0 : passedItemSizes[1]).toBe(200);
|
|
228
|
+
});
|
|
229
|
+
test('should NOT scale itemSize when ri.scale(1) remains unchanged', function () {
|
|
230
|
+
mockRiScale = jest.fn(function (val) {
|
|
231
|
+
return val;
|
|
232
|
+
});
|
|
233
|
+
var itemSize = {
|
|
234
|
+
minWidth: 100,
|
|
235
|
+
minHeight: 50
|
|
236
|
+
};
|
|
237
|
+
var mocks = createMockRefs();
|
|
238
|
+
var props = _objectSpread(_objectSpread({
|
|
239
|
+
itemRenderer: jest.fn(),
|
|
240
|
+
itemSize: itemSize,
|
|
241
|
+
direction: 'vertical',
|
|
242
|
+
scrollMode: 'translate'
|
|
243
|
+
}, mocks), {}, {
|
|
244
|
+
assignProperties: jest.fn(),
|
|
245
|
+
horizontalScrollbar: 'auto',
|
|
246
|
+
verticalScrollbar: 'auto'
|
|
247
|
+
});
|
|
248
|
+
(0, _react.renderHook)(function () {
|
|
249
|
+
return (0, _useScroll.useScrollBase)(props);
|
|
250
|
+
});
|
|
251
|
+
|
|
252
|
+
// eslint-disable-next-line testing-library/no-unnecessary-act
|
|
253
|
+
(0, _react.act)(function () {
|
|
254
|
+
(0, _react.fireEvent)(window, new Event('resize'));
|
|
255
|
+
jest.runAllTimers();
|
|
256
|
+
});
|
|
257
|
+
expect(itemSize.minWidth).toBe(100);
|
|
258
|
+
expect(itemSize.minHeight).toBe(50);
|
|
259
|
+
});
|
|
260
|
+
test('should NOT scale itemSizes when ri.scale(1) remains unchanged', function () {
|
|
261
|
+
mockRiScale = jest.fn(function (val) {
|
|
262
|
+
return val;
|
|
263
|
+
});
|
|
264
|
+
var itemSize = 100;
|
|
265
|
+
var itemSizes = [100, 100, 100, 100, 100];
|
|
266
|
+
var mocks = createMockRefs();
|
|
267
|
+
var props = _objectSpread(_objectSpread({
|
|
268
|
+
itemRenderer: jest.fn(),
|
|
269
|
+
itemSize: itemSize,
|
|
270
|
+
itemSizes: itemSizes,
|
|
271
|
+
direction: 'vertical',
|
|
272
|
+
scrollMode: 'translate'
|
|
273
|
+
}, mocks), {}, {
|
|
274
|
+
assignProperties: jest.fn(),
|
|
275
|
+
horizontalScrollbar: 'auto',
|
|
276
|
+
verticalScrollbar: 'auto'
|
|
277
|
+
});
|
|
278
|
+
(0, _react.renderHook)(function () {
|
|
279
|
+
return (0, _useScroll.useScrollBase)(props);
|
|
280
|
+
});
|
|
281
|
+
|
|
282
|
+
// eslint-disable-next-line testing-library/no-unnecessary-act
|
|
283
|
+
(0, _react.act)(function () {
|
|
284
|
+
(0, _react.fireEvent)(window, new Event('resize'));
|
|
285
|
+
jest.runAllTimers();
|
|
286
|
+
});
|
|
287
|
+
expect(itemSizes[1]).toBe(100);
|
|
288
|
+
});
|
|
289
|
+
test('should NOT scale when minWidth is missing', function () {
|
|
290
|
+
mockRiScale = jest.fn(function (val) {
|
|
291
|
+
return val;
|
|
292
|
+
});
|
|
293
|
+
var itemSize = {
|
|
294
|
+
minHeight: 50
|
|
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.minHeight).toBe(50);
|
|
320
|
+
expect(itemSize.minWidth).toBeUndefined();
|
|
321
|
+
});
|
|
322
|
+
test('should NOT scale when minHeight is missing', function () {
|
|
323
|
+
mockRiScale = jest.fn(function (val) {
|
|
324
|
+
return val;
|
|
325
|
+
});
|
|
326
|
+
var itemSize = {
|
|
327
|
+
minWidth: 100
|
|
328
|
+
};
|
|
329
|
+
var mocks = createMockRefs();
|
|
330
|
+
var props = _objectSpread(_objectSpread({
|
|
331
|
+
itemRenderer: jest.fn(),
|
|
332
|
+
itemSize: itemSize,
|
|
333
|
+
direction: 'vertical',
|
|
334
|
+
scrollMode: 'translate'
|
|
335
|
+
}, mocks), {}, {
|
|
336
|
+
assignProperties: jest.fn(),
|
|
337
|
+
horizontalScrollbar: 'auto',
|
|
338
|
+
verticalScrollbar: 'auto'
|
|
339
|
+
});
|
|
340
|
+
(0, _react.renderHook)(function () {
|
|
341
|
+
return (0, _useScroll.useScrollBase)(props);
|
|
342
|
+
});
|
|
343
|
+
mockRiScale = jest.fn(function () {
|
|
344
|
+
return 2;
|
|
345
|
+
});
|
|
346
|
+
|
|
347
|
+
// eslint-disable-next-line testing-library/no-unnecessary-act
|
|
348
|
+
(0, _react.act)(function () {
|
|
349
|
+
(0, _react.fireEvent)(window, new Event('resize'));
|
|
350
|
+
jest.runAllTimers();
|
|
351
|
+
});
|
|
352
|
+
expect(itemSize.minWidth).toBe(100);
|
|
353
|
+
expect(itemSize.minHeight).toBeUndefined();
|
|
354
|
+
});
|
|
355
|
+
});
|
|
53
356
|
describe('Rounding target scroll position', function () {
|
|
54
357
|
beforeEach(function () {
|
|
55
358
|
jest.resetModules(); // important! clears cached modules
|
|
56
359
|
});
|
|
57
360
|
test('should round target position upwards when target is bigger than current position', function () {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
platform: {
|
|
62
|
-
chrome: 132
|
|
63
|
-
}
|
|
64
|
-
};
|
|
65
|
-
});
|
|
361
|
+
mockPlatform = {
|
|
362
|
+
chrome: 132
|
|
363
|
+
};
|
|
66
364
|
var _require = require('../useScroll'),
|
|
67
365
|
roundTarget = _require.roundTarget;
|
|
68
366
|
var currentPosition = {
|
|
@@ -77,15 +375,10 @@ describe('useScroll', function () {
|
|
|
77
375
|
expect(roundedTargetX).toEqual(121);
|
|
78
376
|
expect(roundedTargetY).toEqual(121);
|
|
79
377
|
});
|
|
80
|
-
test('should round target position downwards when target is
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
platform: {
|
|
85
|
-
chrome: 132
|
|
86
|
-
}
|
|
87
|
-
};
|
|
88
|
-
});
|
|
378
|
+
test('should round target position downwards when target is less than current position', function () {
|
|
379
|
+
mockPlatform = {
|
|
380
|
+
chrome: 132
|
|
381
|
+
};
|
|
89
382
|
var _require2 = require('../useScroll'),
|
|
90
383
|
roundTarget = _require2.roundTarget;
|
|
91
384
|
var currentPosition = {
|
|
@@ -101,14 +394,9 @@ describe('useScroll', function () {
|
|
|
101
394
|
expect(roundedTargetY).toEqual(80);
|
|
102
395
|
});
|
|
103
396
|
test('should not round target position when chrome <= 120', function () {
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
platform: {
|
|
108
|
-
chrome: 119
|
|
109
|
-
}
|
|
110
|
-
};
|
|
111
|
-
});
|
|
397
|
+
mockPlatform = {
|
|
398
|
+
chrome: 119
|
|
399
|
+
};
|
|
112
400
|
var _require3 = require('../useScroll'),
|
|
113
401
|
roundTarget = _require3.roundTarget;
|
|
114
402
|
var currentPosition = {
|
|
@@ -124,12 +412,90 @@ describe('useScroll', function () {
|
|
|
124
412
|
expect(roundedTargetY).toEqual(80.8);
|
|
125
413
|
});
|
|
126
414
|
});
|
|
415
|
+
describe('Native scroll behavior', function () {
|
|
416
|
+
beforeEach(function () {
|
|
417
|
+
jest.useFakeTimers();
|
|
418
|
+
mockPlatform = {
|
|
419
|
+
chrome: 132
|
|
420
|
+
};
|
|
421
|
+
mockRiScale = jest.fn(function (val) {
|
|
422
|
+
return val;
|
|
423
|
+
});
|
|
424
|
+
});
|
|
425
|
+
afterEach(function () {
|
|
426
|
+
jest.runOnlyPendingTimers();
|
|
427
|
+
jest.useRealTimers();
|
|
428
|
+
});
|
|
429
|
+
test('should update scroll position from scroll event', function () {
|
|
430
|
+
var mocks = createMockRefs();
|
|
431
|
+
var props = _objectSpread(_objectSpread({
|
|
432
|
+
direction: 'vertical',
|
|
433
|
+
scrollMode: 'native'
|
|
434
|
+
}, mocks), {}, {
|
|
435
|
+
assignProperties: jest.fn(),
|
|
436
|
+
horizontalScrollbar: 'auto',
|
|
437
|
+
verticalScrollbar: 'auto'
|
|
438
|
+
});
|
|
439
|
+
(0, _react.renderHook)(function () {
|
|
440
|
+
return (0, _useScroll.useScrollBase)(props);
|
|
441
|
+
});
|
|
442
|
+
var scrollEvent = new Event('scroll');
|
|
443
|
+
Object.defineProperty(scrollEvent, 'target', {
|
|
444
|
+
value: {
|
|
445
|
+
scrollLeft: 50,
|
|
446
|
+
scrollTop: 150
|
|
447
|
+
},
|
|
448
|
+
writable: false
|
|
449
|
+
});
|
|
450
|
+
|
|
451
|
+
// eslint-disable-next-line testing-library/no-unnecessary-act
|
|
452
|
+
(0, _react.act)(function () {
|
|
453
|
+
(0, _react.fireEvent)(mocks.scrollContentRef.current, scrollEvent);
|
|
454
|
+
});
|
|
455
|
+
expect(mocks.scrollContentHandle.current.didScroll).toHaveBeenCalledWith(50, 150);
|
|
456
|
+
});
|
|
457
|
+
test('should handle RTL scroll position correctly', function () {
|
|
458
|
+
var mocks = createMockRefs();
|
|
459
|
+
mockPlatform = {
|
|
460
|
+
chrome: 132
|
|
461
|
+
};
|
|
462
|
+
var props = _objectSpread(_objectSpread({
|
|
463
|
+
direction: 'horizontal',
|
|
464
|
+
scrollMode: 'native',
|
|
465
|
+
rtl: true
|
|
466
|
+
}, mocks), {}, {
|
|
467
|
+
addEventListeners: jest.fn(),
|
|
468
|
+
assignProperties: jest.fn(),
|
|
469
|
+
horizontalScrollbar: 'auto',
|
|
470
|
+
verticalScrollbar: 'auto'
|
|
471
|
+
});
|
|
472
|
+
(0, _react.renderHook)(function () {
|
|
473
|
+
return (0, _useScroll.useScrollBase)(props);
|
|
474
|
+
});
|
|
475
|
+
var scrollEvent = new Event('scroll');
|
|
476
|
+
Object.defineProperty(scrollEvent, 'target', {
|
|
477
|
+
value: {
|
|
478
|
+
scrollLeft: -50,
|
|
479
|
+
scrollTop: 0
|
|
480
|
+
}
|
|
481
|
+
});
|
|
482
|
+
|
|
483
|
+
// eslint-disable-next-line testing-library/no-unnecessary-act
|
|
484
|
+
(0, _react.act)(function () {
|
|
485
|
+
(0, _react.fireEvent)(mocks.scrollContentRef.current, scrollEvent);
|
|
486
|
+
});
|
|
487
|
+
expect(mocks.scrollContentHandle.current.didScroll).toHaveBeenCalledWith(50, 0);
|
|
488
|
+
});
|
|
489
|
+
});
|
|
127
490
|
describe('onKeyDown repeat handling (native scroll mode)', function () {
|
|
128
491
|
beforeEach(function () {
|
|
129
492
|
jest.useFakeTimers();
|
|
130
493
|
mockPlatform = {
|
|
131
494
|
chrome: 132
|
|
132
495
|
};
|
|
496
|
+
mockRiScale = jest.fn(function (val) {
|
|
497
|
+
return val;
|
|
498
|
+
});
|
|
133
499
|
});
|
|
134
500
|
afterEach(function () {
|
|
135
501
|
jest.runOnlyPendingTimers();
|