@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
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports["default"] = exports.Announce = void 0;
|
|
7
|
+
var _util = require("@enact/core/util");
|
|
7
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
8
9
|
var _react = require("react");
|
|
9
10
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
@@ -60,13 +61,10 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
|
|
|
60
61
|
function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
|
|
61
62
|
function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
|
|
62
63
|
var Announce = exports.Announce = (_Class = /*#__PURE__*/function (_Component) {
|
|
63
|
-
function Announce() {
|
|
64
|
+
function Announce(props) {
|
|
64
65
|
var _this;
|
|
65
66
|
_classCallCheck(this, Announce);
|
|
66
|
-
|
|
67
|
-
args[_key] = arguments[_key];
|
|
68
|
-
}
|
|
69
|
-
_this = _callSuper(this, Announce, [].concat(args));
|
|
67
|
+
_this = _callSuper(this, Announce, [props]);
|
|
70
68
|
_this.resetAlert = function () {
|
|
71
69
|
_this.alertTimeout = null;
|
|
72
70
|
_this.alert.removeAttribute('aria-label');
|
|
@@ -94,10 +92,16 @@ var Announce = exports.Announce = (_Class = /*#__PURE__*/function (_Component) {
|
|
|
94
92
|
_this.setAlertRef = function (node) {
|
|
95
93
|
_this.alert = node;
|
|
96
94
|
};
|
|
95
|
+
(0, _util.checkPropTypes)(_this, props);
|
|
97
96
|
return _this;
|
|
98
97
|
}
|
|
99
98
|
_inherits(Announce, _Component);
|
|
100
99
|
return _createClass(Announce, [{
|
|
100
|
+
key: "componentDidUpdate",
|
|
101
|
+
value: function componentDidUpdate(prevProps) {
|
|
102
|
+
(0, _util.checkPropTypes)(this, this.props, prevProps);
|
|
103
|
+
}
|
|
104
|
+
}, {
|
|
101
105
|
key: "componentWillUnmount",
|
|
102
106
|
value: function componentWillUnmount() {
|
|
103
107
|
this.clearTimeout();
|
|
@@ -17,6 +17,7 @@ Object.defineProperty(exports, "useAnnounce", {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
|
|
20
|
+
var _util = require("@enact/core/util");
|
|
20
21
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
21
22
|
var _Announce = _interopRequireDefault(require("./Announce"));
|
|
22
23
|
var _useAnnounce = _interopRequireDefault(require("./useAnnounce"));
|
|
@@ -95,9 +96,10 @@ var defaultConfig = {
|
|
|
95
96
|
var AnnounceDecorator = exports.AnnounceDecorator = (0, _hoc["default"])(defaultConfig, function (_ref, Wrapped) {
|
|
96
97
|
var prop = _ref.prop;
|
|
97
98
|
// eslint-disable-next-line no-shadow
|
|
98
|
-
function AnnounceDecorator(
|
|
99
|
-
|
|
100
|
-
|
|
99
|
+
function AnnounceDecorator(props) {
|
|
100
|
+
(0, _util.checkPropTypes)(AnnounceDecorator, props);
|
|
101
|
+
var children = props.children,
|
|
102
|
+
rest = _objectWithoutProperties(props, _excluded);
|
|
101
103
|
var announce = (0, _useAnnounce["default"])();
|
|
102
104
|
if (prop) rest[prop] = announce.announce;
|
|
103
105
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Wrapped, _objectSpread(_objectSpread({}, rest), {}, {
|
|
@@ -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 _AnnounceDecorator = _interopRequireDefault(require("../AnnounceDecorator"));
|
|
5
6
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
6
7
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
@@ -9,7 +10,9 @@ describe('AnnounceDecorator', function () {
|
|
|
9
10
|
|
|
10
11
|
// no-op wrapper
|
|
11
12
|
var Div = function Div(props) {
|
|
12
|
-
|
|
13
|
+
(0, _react2.useEffect)(function () {
|
|
14
|
+
announceProps = props;
|
|
15
|
+
}, [props]);
|
|
13
16
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {});
|
|
14
17
|
};
|
|
15
18
|
test('should pass a function in the announce prop', function () {
|
|
@@ -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 _useAnnounce2 = _interopRequireDefault(require("../useAnnounce"));
|
|
5
6
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
6
7
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
@@ -9,7 +10,9 @@ describe('useAnnounce', function () {
|
|
|
9
10
|
function Base(_ref) {
|
|
10
11
|
var children = _ref.children,
|
|
11
12
|
announce = _ref.announce;
|
|
12
|
-
|
|
13
|
+
(0, _react2.useEffect)(function () {
|
|
14
|
+
announceType = typeof announce;
|
|
15
|
+
}, [announce]);
|
|
13
16
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
14
17
|
"data-testid": "announce",
|
|
15
18
|
children: children
|
package/CHANGELOG.md
CHANGED
|
@@ -2,12 +2,42 @@
|
|
|
2
2
|
|
|
3
3
|
The following is a curated list of changes in the Enact ui module, newest changes on the top.
|
|
4
4
|
|
|
5
|
+
## [5.5.1] - 2026-06-01
|
|
6
|
+
|
|
7
|
+
### Changed
|
|
8
|
+
|
|
9
|
+
- `ui/VirtualList.VirtualListBasic` scroll animation method for `scrollMode: native`
|
|
10
|
+
|
|
11
|
+
### Fixed
|
|
12
|
+
|
|
13
|
+
- `ui/Scroller` jumping back when scrolled by long press
|
|
14
|
+
- `ui/VirtualList` overscroll effect at the bottom of the list
|
|
15
|
+
- `ui/VirtualList.VirtualList` overscroll effect at the bottom of the list
|
|
16
|
+
- `ui/VirtualList.VirtualGridList` overscroll effect at the bottom of the list
|
|
17
|
+
|
|
5
18
|
## [5.4.4] - 2026-05-22
|
|
6
19
|
|
|
7
20
|
### Fixed
|
|
8
21
|
|
|
9
22
|
- `ui/Scroller` jumping back when scrolled by long press
|
|
10
23
|
|
|
24
|
+
## [5.5.0] - 2026-05-08
|
|
25
|
+
|
|
26
|
+
### Added
|
|
27
|
+
|
|
28
|
+
- `ui/resolution` Added support for linear scaling type
|
|
29
|
+
- `ui/Slider` support for `colorPicker`
|
|
30
|
+
|
|
31
|
+
### Changed
|
|
32
|
+
|
|
33
|
+
- `ui/Marquee` to reduce redundant lifecycle work during high-frequency re-renders
|
|
34
|
+
|
|
35
|
+
### Fixed
|
|
36
|
+
|
|
37
|
+
- `ui/resolution` to display the components accordingly on wide resolutions
|
|
38
|
+
- `ui/VirtualList.VirtualList` to adjust itemSize properly when resizing window
|
|
39
|
+
- `ui/VirtualList.VirtualList` to scroll properly when another VirtualList exist
|
|
40
|
+
|
|
11
41
|
## [5.4.3] - 2026-02-26
|
|
12
42
|
|
|
13
43
|
### Fixed
|
package/Cancelable/Cancelable.js
CHANGED
|
@@ -20,6 +20,7 @@ Object.defineProperty(exports, "removeCancelHandler", {
|
|
|
20
20
|
var _handle = require("@enact/core/handle");
|
|
21
21
|
var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
|
|
22
22
|
var _keymap = require("@enact/core/keymap");
|
|
23
|
+
var _util = require("@enact/core/util");
|
|
23
24
|
var _invariant = _interopRequireDefault(require("invariant"));
|
|
24
25
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
25
26
|
var _react = require("react");
|
|
@@ -187,10 +188,16 @@ var Cancelable = exports.Cancelable = (0, _hoc["default"])(defaultConfig, functi
|
|
|
187
188
|
// this.handleCancel(), this handler chain will stop too
|
|
188
189
|
_this.handleCancel);
|
|
189
190
|
_this.isFirstRender = true;
|
|
191
|
+
(0, _util.checkPropTypes)(_this, props);
|
|
190
192
|
return _this;
|
|
191
193
|
}
|
|
192
194
|
_inherits(_Class, _ReactComponent);
|
|
193
195
|
return _createClass(_Class, [{
|
|
196
|
+
key: "componentDidUpdate",
|
|
197
|
+
value: function componentDidUpdate(prevProps) {
|
|
198
|
+
(0, _util.checkPropTypes)(this, this.props, prevProps);
|
|
199
|
+
}
|
|
200
|
+
}, {
|
|
194
201
|
key: "componentWillUnmount",
|
|
195
202
|
value: function componentWillUnmount() {
|
|
196
203
|
if (modal) {
|
|
@@ -212,6 +212,32 @@ describe('Cancelable', function () {
|
|
|
212
212
|
_react.fireEvent.keyUp(secondComponent, makeKeyEvent(27));
|
|
213
213
|
expect(handleCancel).not.toHaveBeenCalled();
|
|
214
214
|
});
|
|
215
|
+
test('should not bubble up the component tree when prop handler calls stopPropagation on rerender', function () {
|
|
216
|
+
var handleCancel = jest.fn();
|
|
217
|
+
var Comp = (0, _Cancelable.Cancelable)({
|
|
218
|
+
onCancel: 'onCustomEvent'
|
|
219
|
+
}, Component);
|
|
220
|
+
var _render = (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
|
|
221
|
+
onCustomEvent: handleCancel,
|
|
222
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
|
|
223
|
+
"data-testid": "second",
|
|
224
|
+
className: "second"
|
|
225
|
+
})
|
|
226
|
+
})),
|
|
227
|
+
rerender = _render.rerender;
|
|
228
|
+
var secondComponent = _react.screen.getByTestId('second');
|
|
229
|
+
_react.fireEvent.keyUp(secondComponent, makeKeyEvent(27));
|
|
230
|
+
expect(handleCancel).toHaveBeenCalledTimes(1);
|
|
231
|
+
rerender(/*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
|
|
232
|
+
onCustomEvent: handleCancel,
|
|
233
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
|
|
234
|
+
"data-testid": "second",
|
|
235
|
+
className: "second",
|
|
236
|
+
onCustomEvent: stop
|
|
237
|
+
})
|
|
238
|
+
}));
|
|
239
|
+
expect(handleCancel).toHaveBeenCalledTimes(1);
|
|
240
|
+
});
|
|
215
241
|
describe('modal instances', function () {
|
|
216
242
|
var customEventHandler = function customEventHandler(ev) {
|
|
217
243
|
return ev.keyIdentifier === '27';
|
package/Changeable/Changeable.js
CHANGED
|
@@ -102,6 +102,7 @@ var Changeable = exports.Changeable = (0, _hoc["default"])(defaultConfig, functi
|
|
|
102
102
|
});
|
|
103
103
|
}
|
|
104
104
|
});
|
|
105
|
+
(0, _util.checkPropTypes)(_this, props);
|
|
105
106
|
_this.state = {
|
|
106
107
|
rendered: false,
|
|
107
108
|
value: null,
|
|
@@ -112,6 +113,11 @@ var Changeable = exports.Changeable = (0, _hoc["default"])(defaultConfig, functi
|
|
|
112
113
|
}
|
|
113
114
|
_inherits(_Class, _PureComponent);
|
|
114
115
|
return _createClass(_Class, [{
|
|
116
|
+
key: "componentDidUpdate",
|
|
117
|
+
value: function componentDidUpdate(prevProps) {
|
|
118
|
+
(0, _util.checkPropTypes)(this, this.props, prevProps);
|
|
119
|
+
}
|
|
120
|
+
}, {
|
|
115
121
|
key: "render",
|
|
116
122
|
value: function render() {
|
|
117
123
|
var props = Object.assign({}, this.props);
|
|
@@ -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 _Changeable = _interopRequireDefault(require("../Changeable"));
|
|
6
7
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
7
8
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
@@ -10,7 +11,9 @@ describe('Changeable', function () {
|
|
|
10
11
|
var testValue = 3;
|
|
11
12
|
var DivComponent = function DivComponent(props) {
|
|
12
13
|
var _props$value;
|
|
13
|
-
|
|
14
|
+
(0, _react2.useEffect)(function () {
|
|
15
|
+
data = props;
|
|
16
|
+
}, [props]);
|
|
14
17
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
15
18
|
"data-testid": "changeable",
|
|
16
19
|
children: (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.toString()
|
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports["default"] = exports.FloatingLayerBase = exports.FloatingLayer = void 0;
|
|
7
7
|
var _dispatcher = require("@enact/core/dispatcher");
|
|
8
|
+
var _util = require("@enact/core/util");
|
|
8
9
|
var _handle = require("@enact/core/handle");
|
|
9
10
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
10
11
|
var _invariant = _interopRequireDefault(require("invariant"));
|
|
@@ -69,6 +70,7 @@ var FloatingLayerBase = exports.FloatingLayerBase = /*#__PURE__*/function (_Comp
|
|
|
69
70
|
_this.props.children.props.onClick();
|
|
70
71
|
}
|
|
71
72
|
};
|
|
73
|
+
(0, _util.checkPropTypes)(_this, props);
|
|
72
74
|
_this.node = null;
|
|
73
75
|
_this.state = {
|
|
74
76
|
readyToRender: false
|
|
@@ -94,6 +96,7 @@ var FloatingLayerBase = exports.FloatingLayerBase = /*#__PURE__*/function (_Comp
|
|
|
94
96
|
var _this$props = this.props,
|
|
95
97
|
open = _this$props.open,
|
|
96
98
|
scrimType = _this$props.scrimType;
|
|
99
|
+
(0, _util.checkPropTypes)(this, this.props, prevProps);
|
|
97
100
|
if (prevProps.open && !open) {
|
|
98
101
|
// when open changes to false, forward close
|
|
99
102
|
(0, _handle.forwardCustom)('onClose')(null, this.props);
|
|
@@ -17,6 +17,7 @@ Object.defineProperty(exports, "useFloatingLayerDecorator", {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
|
|
20
|
+
var _util = require("@enact/core/util");
|
|
20
21
|
var _useFloatingLayerDecorator = require("./useFloatingLayerDecorator");
|
|
21
22
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
22
23
|
var _excluded = ["className"];
|
|
@@ -78,6 +79,7 @@ var FloatingLayerDecorator = exports.FloatingLayerDecorator = (0, _hoc["default"
|
|
|
78
79
|
|
|
79
80
|
// eslint-disable-next-line no-shadow
|
|
80
81
|
function FloatingLayerDecorator(props) {
|
|
82
|
+
(0, _util.checkPropTypes)(FloatingLayerDecorator, props);
|
|
81
83
|
var className = props.className,
|
|
82
84
|
rest = _objectWithoutProperties(props, _excluded);
|
|
83
85
|
var hook = (0, _useFloatingLayerDecorator.useFloatingLayerDecorator)({
|
package/FloatingLayer/Scrim.js
CHANGED
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports["default"] = exports.Scrim = void 0;
|
|
7
|
+
var _util = require("@enact/core/util");
|
|
7
8
|
var _react = require("react");
|
|
8
9
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
10
|
var _ScrimModule = _interopRequireDefault(require("./Scrim.module.css"));
|
|
@@ -98,6 +99,7 @@ var Scrim = exports.Scrim = /*#__PURE__*/function (_Component) {
|
|
|
98
99
|
visible: false
|
|
99
100
|
});
|
|
100
101
|
};
|
|
102
|
+
(0, _util.checkPropTypes)(_this, props);
|
|
101
103
|
_this.state = {
|
|
102
104
|
visible: true
|
|
103
105
|
};
|
|
@@ -110,6 +112,7 @@ var Scrim = exports.Scrim = /*#__PURE__*/function (_Component) {
|
|
|
110
112
|
return _createClass(Scrim, [{
|
|
111
113
|
key: "componentDidUpdate",
|
|
112
114
|
value: function componentDidUpdate(prevProps) {
|
|
115
|
+
(0, _util.checkPropTypes)(this, this.props, prevProps);
|
|
113
116
|
if (prevProps.type === 'translucent' && this.props.type !== 'translucent') {
|
|
114
117
|
removeTranslucentScrim(this);
|
|
115
118
|
}
|
|
@@ -422,6 +422,7 @@ var MarqueeDecorator = exports.MarqueeDecorator = (0, _hoc["default"])(defaultCo
|
|
|
422
422
|
_this.cacheNode = function (node) {
|
|
423
423
|
_this.node = node;
|
|
424
424
|
};
|
|
425
|
+
(0, _util.checkPropTypes)(_this, props);
|
|
425
426
|
_this.state = {
|
|
426
427
|
animating: false,
|
|
427
428
|
overflow: 'ellipsis',
|
|
@@ -434,6 +435,7 @@ var MarqueeDecorator = exports.MarqueeDecorator = (0, _hoc["default"])(defaultCo
|
|
|
434
435
|
_this.contentFits = null;
|
|
435
436
|
_this.resizeRegistry = null;
|
|
436
437
|
_this.resizeObserver = null;
|
|
438
|
+
_this.hasStartedRender = false;
|
|
437
439
|
return _this;
|
|
438
440
|
}
|
|
439
441
|
_inherits(_Class, _PureComponent);
|
|
@@ -457,6 +459,9 @@ var MarqueeDecorator = exports.MarqueeDecorator = (0, _hoc["default"])(defaultCo
|
|
|
457
459
|
this.resizeObserver.observe(this.node);
|
|
458
460
|
}
|
|
459
461
|
if (this.props.marqueeOn === 'render') {
|
|
462
|
+
if (!this.props.marqueeDisabled) {
|
|
463
|
+
this.hasStartedRender = true;
|
|
464
|
+
}
|
|
460
465
|
this.startAnimation(this.props.marqueeOnRenderDelay);
|
|
461
466
|
}
|
|
462
467
|
(0, _dispatcher.on)('keydown', this.handlePointerHide, document);
|
|
@@ -475,16 +480,27 @@ var MarqueeDecorator = exports.MarqueeDecorator = (0, _hoc["default"])(defaultCo
|
|
|
475
480
|
marqueeSpeed = _this$props.marqueeSpeed,
|
|
476
481
|
rtl = _this$props.rtl;
|
|
477
482
|
var forceRestartMarquee = false;
|
|
483
|
+
(0, _util.checkPropTypes)(this, this.props, prevProps);
|
|
478
484
|
if (prevProps.locale !== locale || prevProps.rtl !== rtl || prevProps.marqueeSpacing !== marqueeSpacing || !(0, _util.shallowEqual)(prevProps.children, children) || invalidateProps && didPropChange(invalidateProps, prevProps, this.props)) {
|
|
479
|
-
// restart marqueeOn="render" marquees or synced marquees that were animating
|
|
480
485
|
forceRestartMarquee = marqueeOn === 'render' || this.sync && (this.state.animating || this.timerState > TimerState.CLEAR);
|
|
486
|
+
if (forceRestartMarquee && marqueeOn === 'render') {
|
|
487
|
+
this.hasStartedRender = false;
|
|
488
|
+
}
|
|
481
489
|
this.invalidateMetrics();
|
|
482
490
|
this.cancelAnimation(forceRestartMarquee);
|
|
483
491
|
if (forceRestartMarquee && marqueeOn === 'focus') {
|
|
484
492
|
this.resetAnimation();
|
|
485
493
|
}
|
|
486
494
|
} else if (prevProps.marqueeOn !== marqueeOn || prevProps.marqueeDisabled !== marqueeDisabled || prevProps.marqueeSpeed !== marqueeSpeed || prevProps.forceDirection !== forceDirection) {
|
|
487
|
-
|
|
495
|
+
if (prevProps.marqueeDisabled && !marqueeDisabled) {
|
|
496
|
+
this.invalidateMetrics();
|
|
497
|
+
}
|
|
498
|
+
if (this.sync || this.state.animating || this.state.promoted || this.timerState !== TimerState.CLEAR) {
|
|
499
|
+
this.cancelAnimation();
|
|
500
|
+
}
|
|
501
|
+
if (marqueeOn === 'render' && !marqueeDisabled) {
|
|
502
|
+
this.hasStartedRender = false;
|
|
503
|
+
}
|
|
488
504
|
} else if (disabled && this.isHovered && marqueeOn === 'focus' && this.sync) {
|
|
489
505
|
this.context.enter(this);
|
|
490
506
|
}
|
|
@@ -578,7 +594,7 @@ var MarqueeDecorator = exports.MarqueeDecorator = (0, _hoc["default"])(defaultCo
|
|
|
578
594
|
disabled = _this$props2.disabled,
|
|
579
595
|
marqueeDisabled = _this$props2.marqueeDisabled,
|
|
580
596
|
marqueeOn = _this$props2.marqueeOn;
|
|
581
|
-
return !marqueeDisabled && (marqueeOn === 'render' || !this.sync && (this.isFocused && marqueeOn === 'focus' && !disabled || this.isHovered && (marqueeOn === 'hover' || marqueeOn === 'focus' && disabled)));
|
|
597
|
+
return !marqueeDisabled && (marqueeOn === 'render' && !this.hasStartedRender || !this.sync && (this.isFocused && marqueeOn === 'focus' && !disabled || this.isHovered && (marqueeOn === 'hover' || marqueeOn === 'focus' && disabled)));
|
|
582
598
|
}
|
|
583
599
|
|
|
584
600
|
/*
|