@enact/ui 4.1.1 → 4.1.4
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/tests/Announce-specs.js +13 -5
- package/AnnounceDecorator/tests/AnnounceDecorator-specs.js +9 -7
- package/AnnounceDecorator/tests/useAnnounce-specs.js +25 -17
- package/BodyText/BodyText.d.ts +1 -1
- package/BodyText/tests/BodyText-specs.js +49 -35
- package/Button/Button.d.ts +6 -6
- package/Button/Button.js +5 -3
- package/Button/tests/Button-specs.js +104 -3
- package/CHANGELOG.md +26 -0
- package/Cancelable/Cancelable.js +1 -1
- package/Cancelable/tests/Cancelable-specs.js +131 -70
- package/Changeable/tests/Changeable-specs.js +162 -110
- package/FloatingLayer/FloatingLayer.js +5 -17
- package/FloatingLayer/tests/FloatingLayer-specs.js +83 -8
- package/FloatingLayer/tests/Scrim-specs.js +20 -11
- package/FloatingLayer/tests/useFloatingLayerDecorator-specs.js +15 -9
- package/GridListImageItem/GridListImageItem.d.ts +1 -1
- package/Group/Group.d.ts +2 -2
- package/Group/tests/Group-specs.js +71 -41
- package/Heading/Heading.d.ts +2 -1
- package/Heading/tests/Heading-specs.js +27 -20
- package/Icon/Icon.d.ts +4 -4
- package/Icon/tests/Icon-specs.js +52 -31
- package/IconButton/IconButton.d.ts +4 -4
- package/IconButton/tests/IconButton-specs.js +2 -2
- package/Image/tests/Image-specs.js +39 -29
- package/ImageItem/tests/ImageItem-specs.js +71 -68
- package/Item/tests/Item-specs.js +59 -35
- package/LabeledIcon/LabeledIcon.d.ts +4 -4
- package/LabeledIcon/tests/LabeledIcon-specs.js +30 -19
- package/Layout/Layout.d.ts +16 -16
- package/Layout/tests/Layout-specs.js +37 -25
- package/Marquee/MarqueeBase.js +1 -5
- package/Marquee/MarqueeDecorator.js +6 -3
- package/Marquee/index.d.ts +4 -1
- package/Marquee/tests/Marquee-specs.js +242 -116
- package/Media/Media.js +1 -3
- package/ProgressBar/tests/ProgressBar-specs.js +60 -42
- package/README.md +1 -1
- package/RadioDecorator/RadioDecorator.js +3 -5
- package/RadioDecorator/tests/RadioDecorator-specs.js +179 -65
- package/Repeater/Repeater.d.ts +2 -1
- package/Repeater/tests/Repeater-specs.js +86 -45
- package/Routable/Routable.d.ts +2 -2
- package/Routable/tests/Routable-specs.js +26 -17
- package/Routable/tests/Router-specs.js +65 -41
- package/Scrollable/Scrollable.js +2 -1
- package/Scrollable/ScrollableNative.js +2 -1
- package/Scroller/Scroller.d.ts +2 -14
- package/Scroller/ScrollerBasic.js +10 -29
- package/Scroller/UiScrollerBase.js +1 -1
- package/Skinnable/tests/Skinnable-specs.js +102 -54
- package/Skinnable/tests/useSkins-specs.js +37 -42
- package/Slider/Slider.d.ts +3 -3
- package/Slider/tests/Slider-specs.js +4 -4
- package/SlotItem/SlotItem.d.ts +2 -2
- package/SlotItem/tests/SlotItem-specs.js +4 -4
- package/Slottable/tests/Slottable-specs.js +67 -36
- package/Slottable/tests/useSlots-specs.js +68 -35
- package/Spinner/Spinner.d.ts +1 -1
- package/Spinner/tests/Spinner-specs.js +46 -31
- package/ToggleIcon/tests/ToggleIcon-specs.js +32 -20
- package/ToggleItem/ToggleItem.d.ts +13 -11
- package/ToggleItem/tests/ToggleItem-specs.js +51 -34
- package/Toggleable/Toggle.js +6 -6
- package/Toggleable/Toggleable.js +6 -12
- package/Toggleable/tests/Toggleable-specs.js +428 -324
- package/Touchable/Drag.js +13 -17
- package/Touchable/Flick.js +20 -16
- package/Touchable/Hold.js +14 -19
- package/Touchable/Touchable.d.ts +3 -3
- package/Touchable/tests/Touchable-specs.js +223 -109
- package/Touchable/tests/useTouch-specs.js +159 -84
- package/Transition/Transition.d.ts +29 -27
- package/Transition/Transition.js +11 -9
- package/Transition/tests/Transition-specs.js +111 -31
- package/ViewManager/TransitionGroup.js +6 -5
- package/ViewManager/View.js +1 -1
- package/ViewManager/ViewManager.d.ts +4 -4
- package/ViewManager/ViewManager.js +10 -10
- package/ViewManager/tests/View-specs.js +109 -81
- package/ViewManager/tests/ViewManager-specs.js +471 -185
- package/VirtualList/UiVirtualListBase.js +11 -21
- package/VirtualList/VirtualList.d.ts +11 -29
- package/VirtualList/VirtualListBasic.js +33 -49
- package/VirtualList/tests/VirtualList-specs.js +29 -61
- package/internal/IdProvider/tests/useId-specs.js +35 -18
- package/package.json +11 -11
- package/resolution/tests/ResolutionDecorator-specs.js +17 -8
- package/styles/mixins.less +14 -2
- package/useControlledState/tests/useControlledState-specs.js +67 -42
- package/useScroll/useScroll.js +12 -26
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
require("@testing-library/jest-dom");
|
|
4
|
+
|
|
5
|
+
var _react = require("@testing-library/react");
|
|
4
6
|
|
|
5
7
|
var _ResolutionDecorator = _interopRequireDefault(require("../ResolutionDecorator"));
|
|
6
8
|
|
|
@@ -11,10 +13,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
|
|
|
11
13
|
describe('ResolutionDecorator Specs', function () {
|
|
12
14
|
test('should apply resolution classes to the wrapped component', function () {
|
|
13
15
|
var Component = (0, _ResolutionDecorator["default"])('div');
|
|
14
|
-
|
|
15
|
-
|
|
16
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
17
|
+
"data-testid": "component"
|
|
18
|
+
}));
|
|
19
|
+
|
|
20
|
+
var div = _react.screen.getByTestId('component').className;
|
|
21
|
+
|
|
16
22
|
var expected = true;
|
|
17
|
-
var actual = div.
|
|
23
|
+
var actual = div.includes('enact-res-standard') && (div.includes('enact-orientation-landscape') || div.includes('enact-orientation-portrait'));
|
|
18
24
|
expect(actual).toBe(expected);
|
|
19
25
|
});
|
|
20
26
|
test('should allow custom screen types', function () {
|
|
@@ -30,10 +36,13 @@ describe('ResolutionDecorator Specs', function () {
|
|
|
30
36
|
var Component = (0, _ResolutionDecorator["default"])({
|
|
31
37
|
screenTypes: screens
|
|
32
38
|
}, 'div');
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
39
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
40
|
+
"data-testid": "component"
|
|
41
|
+
}));
|
|
42
|
+
|
|
43
|
+
var div = _react.screen.getByTestId('component');
|
|
44
|
+
|
|
45
|
+
expect(div).toHaveClass('enact-res-mhd');
|
|
37
46
|
});
|
|
38
47
|
test.skip('should update the resolution when the screen is resized', function () {// TODO: write a test
|
|
39
48
|
});
|
package/styles/mixins.less
CHANGED
|
@@ -356,12 +356,24 @@
|
|
|
356
356
|
@rules();
|
|
357
357
|
}
|
|
358
358
|
}
|
|
359
|
+
|
|
360
|
+
// `length()` below refers to specifying font-weight ranges: `600 900`.
|
|
361
|
+
// Ex:
|
|
362
|
+
// .buildFontFace("fontName"; local("name"); 400 600);
|
|
363
|
+
// -> .buildFontFace("fontName"; local("name"); 400); .buildFontFace("fontName"; local("name"); 600);
|
|
364
|
+
// .buildFontFace("fontName"; local("name"); 400 600; normal);
|
|
365
|
+
// -> .buildFontFace("fontName"; local("name"); 400; normal); .buildFontFace("fontName"; local("name"); 600; normal);
|
|
366
|
+
.buildFontFace(@name; @src; @weight: normal; @style: "") when (length(@weight) > 1) {
|
|
367
|
+
each(@weight, {
|
|
368
|
+
.buildFontFace(@name; @src; @value; @style);
|
|
369
|
+
});
|
|
370
|
+
}
|
|
371
|
+
|
|
359
372
|
// The default version of this mixin (below) is the shorthand version, which rearranges its arguments into the format the above mixin expects.
|
|
360
373
|
.buildFontFace(@name; @src; @weight: normal; @style: "") when (default()) {
|
|
361
374
|
.buildFontFace(@name; @src; {
|
|
362
375
|
// Conditionally add the following
|
|
363
|
-
|
|
364
|
-
& when ((iskeyword(@weight)) or (isnumber(@weight)) or (length(@weight) > 1)) {
|
|
376
|
+
& when ((iskeyword(@weight)) or (isnumber(@weight))) {
|
|
365
377
|
font-weight: @weight;
|
|
366
378
|
}
|
|
367
379
|
& when (iskeyword(@style)) {
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
require("@testing-library/jest-dom");
|
|
4
|
+
|
|
5
|
+
var _react = require("@testing-library/react");
|
|
4
6
|
|
|
5
7
|
var _useControlledState3 = _interopRequireDefault(require("../useControlledState"));
|
|
6
8
|
|
|
@@ -21,80 +23,103 @@ function _iterableToArrayLimit(arr, i) { var _i = arr && (typeof Symbol !== "und
|
|
|
21
23
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
22
24
|
|
|
23
25
|
describe('useControlledState', function () {
|
|
26
|
+
var data;
|
|
27
|
+
|
|
24
28
|
function Component(props) {
|
|
25
29
|
var _useControlledState = (0, _useControlledState3["default"])(props.defaultValue, props.value, 'value' in props),
|
|
26
30
|
_useControlledState2 = _slicedToArray(_useControlledState, 2),
|
|
27
31
|
value = _useControlledState2[0],
|
|
28
32
|
setValue = _useControlledState2[1];
|
|
29
33
|
|
|
34
|
+
var handleChange = function handleChange(ev) {
|
|
35
|
+
return setValue(ev.value);
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
data = setValue;
|
|
30
39
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
31
|
-
|
|
40
|
+
onChange: handleChange,
|
|
32
41
|
children: value
|
|
33
42
|
});
|
|
34
43
|
}
|
|
35
44
|
|
|
36
45
|
test('should use the default value when the value is undefined', function () {
|
|
37
|
-
|
|
46
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
38
47
|
defaultValue: "abc"
|
|
39
48
|
}));
|
|
40
|
-
|
|
41
|
-
var actual =
|
|
42
|
-
|
|
49
|
+
|
|
50
|
+
var actual = _react.screen.queryByText('abc');
|
|
51
|
+
|
|
52
|
+
expect(actual).toBeInTheDocument();
|
|
43
53
|
});
|
|
44
54
|
test('should not change default value', function () {
|
|
45
|
-
var
|
|
55
|
+
var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
46
56
|
defaultValue: "abc"
|
|
57
|
+
})),
|
|
58
|
+
rerender = _render.rerender;
|
|
59
|
+
|
|
60
|
+
rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
61
|
+
defaultValue: "def"
|
|
47
62
|
}));
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
var actual = subject.find('div').prop('children');
|
|
53
|
-
expect(actual).toBe(expected);
|
|
63
|
+
|
|
64
|
+
var actual = _react.screen.queryByText('abc');
|
|
65
|
+
|
|
66
|
+
expect(actual).toBeInTheDocument();
|
|
54
67
|
});
|
|
55
68
|
test('should not change uncontrolled setting', function () {
|
|
56
|
-
var
|
|
69
|
+
var _render2 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
57
70
|
defaultValue: "abc"
|
|
58
|
-
}))
|
|
59
|
-
|
|
71
|
+
})),
|
|
72
|
+
rerender = _render2.rerender;
|
|
73
|
+
|
|
74
|
+
rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
60
75
|
defaultValue: null,
|
|
61
|
-
value:
|
|
62
|
-
});
|
|
63
|
-
|
|
64
|
-
var actual =
|
|
65
|
-
|
|
76
|
+
value: "def"
|
|
77
|
+
}));
|
|
78
|
+
|
|
79
|
+
var actual = _react.screen.queryByText('abc');
|
|
80
|
+
|
|
81
|
+
expect(actual).toBeInTheDocument();
|
|
66
82
|
});
|
|
67
83
|
test('should update controlled value', function () {
|
|
68
|
-
var
|
|
84
|
+
var _render3 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
69
85
|
value: "abc"
|
|
86
|
+
})),
|
|
87
|
+
rerender = _render3.rerender;
|
|
88
|
+
|
|
89
|
+
rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
90
|
+
value: "def"
|
|
70
91
|
}));
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
var actual = subject.find('div').prop('children');
|
|
76
|
-
expect(actual).toBe(expected);
|
|
92
|
+
|
|
93
|
+
var actual = _react.screen.queryByText('def');
|
|
94
|
+
|
|
95
|
+
expect(actual).toBeInTheDocument();
|
|
77
96
|
});
|
|
78
97
|
test('should not change controlled setting', function () {
|
|
79
|
-
var
|
|
98
|
+
var _render4 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
80
99
|
value: "abc"
|
|
100
|
+
})),
|
|
101
|
+
rerender = _render4.rerender;
|
|
102
|
+
|
|
103
|
+
rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
104
|
+
defaultValue: "def",
|
|
105
|
+
value: "ghi"
|
|
81
106
|
}));
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
var expected = 'ghi';
|
|
87
|
-
var actual = subject.find('div').prop('children');
|
|
88
|
-
expect(actual).toBe(expected);
|
|
107
|
+
|
|
108
|
+
var actual = _react.screen.queryByText('ghi');
|
|
109
|
+
|
|
110
|
+
expect(actual).toBeInTheDocument();
|
|
89
111
|
});
|
|
90
112
|
test('should not allow setting a value when controlled', function () {
|
|
91
|
-
var
|
|
113
|
+
var handleChange = jest.fn();
|
|
114
|
+
var value = 'ghi';
|
|
115
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
116
|
+
onChange: handleChange,
|
|
92
117
|
value: "abc"
|
|
93
118
|
}));
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
expect(
|
|
119
|
+
|
|
120
|
+
var component = _react.screen.queryByText('abc');
|
|
121
|
+
|
|
122
|
+
data(value);
|
|
123
|
+
expect(component).toBeInTheDocument();
|
|
99
124
|
});
|
|
100
125
|
});
|
package/useScroll/useScroll.js
CHANGED
|
@@ -132,9 +132,6 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
132
132
|
children = props.children,
|
|
133
133
|
className = props.className,
|
|
134
134
|
clientSize = props.clientSize,
|
|
135
|
-
voiceDisabled = props['data-webos-voice-disabled'],
|
|
136
|
-
voiceFocused = props['data-webos-voice-focused'],
|
|
137
|
-
voiceGroupLabel = props['data-webos-voice-group-label'],
|
|
138
135
|
assignProperties = props.assignProperties,
|
|
139
136
|
dataSize = props.dataSize,
|
|
140
137
|
direction = props.direction,
|
|
@@ -161,7 +158,7 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
161
158
|
verticalScrollbar = props.verticalScrollbar,
|
|
162
159
|
verticalScrollbarHandle = props.verticalScrollbarHandle,
|
|
163
160
|
wrap = props.wrap,
|
|
164
|
-
rest = _objectWithoutProperties(props, ["childProps", "children", "className", "clientSize", "
|
|
161
|
+
rest = _objectWithoutProperties(props, ["childProps", "children", "className", "clientSize", "assignProperties", "dataSize", "direction", "horizontalScrollbar", "horizontalScrollbarHandle", "itemRenderer", "itemSize", "itemSizes", "noScrollByDrag", "noScrollByWheel", "overhang", "overscrollEffectOn", "pageScroll", "role", "rtl", "scrollContainerRef", "scrollContentHandle", "scrollContentRef", "scrollMode", "setScrollContainerHandle", "snapToCenter", "spacing", "spotlightContainerDisabled", "verticalScrollbar", "verticalScrollbarHandle", "wrap"]),
|
|
165
162
|
scrollClasses = (0, _classnames["default"])(_useScrollModule["default"].scroll, className); // The following props are the one having the same naming function in this scope.
|
|
166
163
|
// So it is better to use props[propName]
|
|
167
164
|
// instead of extracting it from the `props` and renaming it
|
|
@@ -430,7 +427,7 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
430
427
|
var enqueueForceUpdate = (0, _react.useCallback)(function () {
|
|
431
428
|
scrollContentHandle.current.calculateMetrics(scrollContentHandle.current.props);
|
|
432
429
|
forceUpdate();
|
|
433
|
-
}, [forceUpdate, scrollContentHandle]);
|
|
430
|
+
}, [forceUpdate, scrollContentHandle]); // scrollMode 'translate' ]]
|
|
434
431
|
|
|
435
432
|
function handleResizeWindow() {
|
|
436
433
|
var propsHandleResizeWindow = props.handleResizeWindow; // `handleSize` in `ui/resolution.ResolutionDecorator` should be executed first.
|
|
@@ -449,14 +446,13 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
449
446
|
animate: false
|
|
450
447
|
});
|
|
451
448
|
} else {
|
|
452
|
-
|
|
453
|
-
scrollContentHandle.current.scrollToPosition(0, 0);
|
|
454
|
-
scrollContentRef.current.style.scrollBehavior = 'smooth';
|
|
449
|
+
scrollContentHandle.current.scrollToPosition(0, 0, 'instant');
|
|
455
450
|
}
|
|
456
451
|
|
|
457
452
|
enqueueForceUpdate();
|
|
458
453
|
});
|
|
459
|
-
}
|
|
454
|
+
} // scrollMode 'translate' [[
|
|
455
|
+
|
|
460
456
|
|
|
461
457
|
var handleResize = (0, _react.useCallback)(function (ev) {
|
|
462
458
|
if (ev.action === 'invalidateBounds') {
|
|
@@ -866,7 +862,7 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
866
862
|
}
|
|
867
863
|
|
|
868
864
|
if (rtl && canScrollH) {
|
|
869
|
-
scrollLeft = _platform.platform.ios || _platform.platform.safari || _platform.platform.chrome >= 85 ? -scrollLeft : bounds.maxLeft - scrollLeft;
|
|
865
|
+
scrollLeft = _platform.platform.ios || _platform.platform.safari || _platform.platform.chrome >= 85 || _platform.platform.androidChrome >= 85 ? -scrollLeft : bounds.maxLeft - scrollLeft;
|
|
870
866
|
}
|
|
871
867
|
|
|
872
868
|
if (scrollLeft !== mutableRef.current.scrollLeft) {
|
|
@@ -1247,11 +1243,9 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
1247
1243
|
} else {
|
|
1248
1244
|
// scrollMode 'native'
|
|
1249
1245
|
if (animate) {
|
|
1250
|
-
scrollContentHandle.current.scrollToPosition(targetX, targetY);
|
|
1246
|
+
scrollContentHandle.current.scrollToPosition(targetX, targetY, 'smooth');
|
|
1251
1247
|
} else {
|
|
1252
|
-
|
|
1253
|
-
scrollContentHandle.current.scrollToPosition(targetX, targetY);
|
|
1254
|
-
scrollContentRef.current.style.scrollBehavior = 'smooth';
|
|
1248
|
+
scrollContentHandle.current.scrollToPosition(targetX, targetY, 'instant');
|
|
1255
1249
|
}
|
|
1256
1250
|
|
|
1257
1251
|
if (props.start) {
|
|
@@ -1316,7 +1310,7 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
1316
1310
|
setScrollTop(top);
|
|
1317
1311
|
}
|
|
1318
1312
|
|
|
1319
|
-
scrollContentHandle.current.setScrollPosition(mutableRef.current.scrollLeft, mutableRef.current.scrollTop
|
|
1313
|
+
scrollContentHandle.current.setScrollPosition(mutableRef.current.scrollLeft, mutableRef.current.scrollTop);
|
|
1320
1314
|
forwardScrollEvent('onScroll');
|
|
1321
1315
|
} // scrollMode 'translate' ]]
|
|
1322
1316
|
|
|
@@ -1342,9 +1336,7 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
1342
1336
|
}
|
|
1343
1337
|
|
|
1344
1338
|
function stopForNative() {
|
|
1345
|
-
|
|
1346
|
-
scrollContentHandle.current.scrollToPosition(mutableRef.current.scrollLeft + (rtl ? -0.1 : 0.1), mutableRef.current.scrollTop + 0.1);
|
|
1347
|
-
scrollContentRef.current.style.scrollBehavior = 'smooth';
|
|
1339
|
+
scrollContentHandle.current.scrollToPosition(mutableRef.current.scrollLeft + (rtl ? -0.1 : 0.1), mutableRef.current.scrollTop + 0.1, 'instant');
|
|
1348
1340
|
}
|
|
1349
1341
|
|
|
1350
1342
|
function stop() {
|
|
@@ -1558,7 +1550,6 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
1558
1550
|
(0, _utilEvent["default"])('scroll').addEventListener(scrollContentRef, onScroll, {
|
|
1559
1551
|
passive: true
|
|
1560
1552
|
});
|
|
1561
|
-
scrollContentRef.current.style.scrollBehavior = 'smooth';
|
|
1562
1553
|
} // scrollMode 'native' ]]
|
|
1563
1554
|
|
|
1564
1555
|
|
|
@@ -1594,7 +1585,7 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
1594
1585
|
// Prevent scroll by focus.
|
|
1595
1586
|
// VirtualList and VirtualGridList DO NOT receive `onscroll` event.
|
|
1596
1587
|
// Only Scroller could get `onscroll` event.
|
|
1597
|
-
if (!mutableRef.current.animator.isAnimating() && scrollContentHandle.current && scrollContentRef.current && scrollContentHandle.current.getRtlPositionX) {
|
|
1588
|
+
if (!mutableRef.current.animator.isAnimating() && scrollContentHandle.current && scrollContentRef.current && scrollContentHandle.current.getRtlPositionX && !mutableRef.current.isDragging) {
|
|
1598
1589
|
// For Scroller
|
|
1599
1590
|
scrollContentRef.current.scrollTop = mutableRef.current.scrollTop;
|
|
1600
1591
|
scrollContentRef.current.scrollLeft = scrollContentHandle.current.getRtlPositionX(mutableRef.current.scrollLeft);
|
|
@@ -1623,11 +1614,6 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
1623
1614
|
onTouchStart: scrollMode === 'native' ? onTouchStart : null // scrollMode 'native'
|
|
1624
1615
|
|
|
1625
1616
|
}));
|
|
1626
|
-
var voiceProps = {
|
|
1627
|
-
'data-webos-voice-disabled': voiceDisabled,
|
|
1628
|
-
'data-webos-voice-focused': voiceFocused,
|
|
1629
|
-
'data-webos-voice-group-label': voiceGroupLabel
|
|
1630
|
-
};
|
|
1631
1617
|
var scrollContentProps = props.itemRenderer ? // If the child component is a VirtualList
|
|
1632
1618
|
{
|
|
1633
1619
|
childProps: childProps,
|
|
@@ -1643,7 +1629,7 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
1643
1629
|
} : {
|
|
1644
1630
|
children: children
|
|
1645
1631
|
};
|
|
1646
|
-
assignProperties('scrollContentProps', _objectSpread(_objectSpread(
|
|
1632
|
+
assignProperties('scrollContentProps', _objectSpread(_objectSpread({}, scrollContentProps), {}, {
|
|
1647
1633
|
cbScrollTo: scrollTo,
|
|
1648
1634
|
className: [_useScrollModule["default"].scrollFill],
|
|
1649
1635
|
direction: direction,
|