@enact/ui 4.9.0-alpha.1 → 4.9.0-alpha.3
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/CHANGELOG.md +22 -0
- package/Layout/Cell.js +6 -2
- package/Marquee/MarqueeController.js +23 -284
- package/Marquee/index.d.ts +18 -18
- package/Marquee/useMarqueeController.js +273 -0
- package/Placeholder/PlaceholderControllerDecorator.js +10 -10
- package/Placeholder/tests/PlaceholderControllerDecorator-specs.js +7 -2
- package/Repeater/Repeater.js +7 -3
- package/Scroller/Scroller.js +20 -18
- package/Scroller/Scroller.module.css +3 -0
- package/Scroller/UiScroller.module.css +3 -0
- package/Slottable/tests/Slottable-specs.js +2 -4
- package/Toggleable/Toggleable.js +11 -5
- package/Touchable/Touchable.js +11 -6
- package/ViewManager/TransitionGroup.js +35 -5
- package/ViewManager/View.js +19 -3
- package/ViewManager/tests/View-specs.js +36 -0
- package/VirtualList/UiVirtualList.module.css +3 -0
- package/VirtualList/VirtualList.d.ts +13 -13
- package/VirtualList/VirtualList.js +25 -21
- package/VirtualList/VirtualList.module.css +3 -0
- package/package.json +5 -5
- package/resolution/ResolutionDecorator.js +2 -3
- package/resolution/resolution.js +14 -12
- package/resolution/tests/resolution-specs.js +503 -13
- package/useScroll/Scrollbar.js +18 -8
- package/useScroll/ScrollbarTrack.js +2 -4
|
@@ -0,0 +1,273 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.useMarqueeController = exports["default"] = exports.MarqueeControllerContext = void 0;
|
|
7
|
+
var _handle = require("@enact/core/handle");
|
|
8
|
+
var _util = require("@enact/core/util");
|
|
9
|
+
var _react = require("react");
|
|
10
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
|
11
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
12
|
+
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; }
|
|
13
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
14
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
|
|
15
|
+
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
16
|
+
var STATE = {
|
|
17
|
+
inactive: 0,
|
|
18
|
+
// Marquee is not necessary (render or focus not happened)
|
|
19
|
+
active: 1,
|
|
20
|
+
// Marquee in progress, awaiting complete
|
|
21
|
+
ready: 2 // Marquee completed or not needed, but state is active
|
|
22
|
+
};
|
|
23
|
+
var MarqueeControllerContext = exports.MarqueeControllerContext = /*#__PURE__*/(0, _react.createContext)(null);
|
|
24
|
+
var forwardBlur = (0, _handle.forward)('onBlur');
|
|
25
|
+
var forwardFocus = (0, _handle.forward)('onFocus');
|
|
26
|
+
var useMarqueeController = exports.useMarqueeController = function useMarqueeController(props) {
|
|
27
|
+
var mutableRef = (0, _react.useRef)({
|
|
28
|
+
controlled: [],
|
|
29
|
+
isFocused: false,
|
|
30
|
+
isHovered: false
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
/*
|
|
34
|
+
* Invokes the `action` handler for each synchronized component except the invoking
|
|
35
|
+
* `component`.
|
|
36
|
+
*
|
|
37
|
+
* @param {String} action `'start'` or `'stop'`
|
|
38
|
+
* @param {Object} component A previously registered component
|
|
39
|
+
*
|
|
40
|
+
* @returns {undefined}
|
|
41
|
+
*/
|
|
42
|
+
var dispatch = (0, _react.useCallback)(function (action, component) {
|
|
43
|
+
mutableRef.current.controlled.forEach(function (controlled) {
|
|
44
|
+
var controlledComponent = controlled.component,
|
|
45
|
+
handler = controlled[action];
|
|
46
|
+
if (component !== controlledComponent && typeof handler === 'function') {
|
|
47
|
+
var complete = handler.call(controlledComponent);
|
|
48
|
+
|
|
49
|
+
// Returning `true` from a start request means that the marqueeing is
|
|
50
|
+
// unnecessary and is therefore not awaiting a finish
|
|
51
|
+
if (action === 'start' && complete) {
|
|
52
|
+
controlled.state = STATE.ready;
|
|
53
|
+
} else if (action === 'start') {
|
|
54
|
+
controlled.state = STATE.active;
|
|
55
|
+
}
|
|
56
|
+
} else if (action === 'start' && component === controlledComponent) {
|
|
57
|
+
controlled.state = STATE.active;
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
}, []);
|
|
61
|
+
|
|
62
|
+
/*
|
|
63
|
+
* Marks all components with the passed-in state
|
|
64
|
+
*
|
|
65
|
+
* @param {Enum} state The state to set
|
|
66
|
+
*
|
|
67
|
+
* @returns {undefined}
|
|
68
|
+
*/
|
|
69
|
+
var markAll = (0, _react.useCallback)(function (state) {
|
|
70
|
+
mutableRef.current.controlled.forEach(function (c) {
|
|
71
|
+
c.state = state;
|
|
72
|
+
});
|
|
73
|
+
}, []);
|
|
74
|
+
|
|
75
|
+
/*
|
|
76
|
+
* Marks `component` as ready for next marquee action
|
|
77
|
+
*
|
|
78
|
+
* @param {Object} component A previously registered component
|
|
79
|
+
*
|
|
80
|
+
* @returns {Boolean} `true` if no components are STATE.active
|
|
81
|
+
*/
|
|
82
|
+
var markReady = (0, _react.useCallback)(function (component) {
|
|
83
|
+
var complete = true;
|
|
84
|
+
mutableRef.current.controlled.forEach(function (c) {
|
|
85
|
+
if (c.component === component) {
|
|
86
|
+
c.state = STATE.ready;
|
|
87
|
+
}
|
|
88
|
+
complete = complete && c.state !== STATE.active;
|
|
89
|
+
});
|
|
90
|
+
return complete;
|
|
91
|
+
}, []);
|
|
92
|
+
|
|
93
|
+
/*
|
|
94
|
+
* Checks that all components are inactive
|
|
95
|
+
*
|
|
96
|
+
* @returns {Boolean} `true` if any components should be running
|
|
97
|
+
*/
|
|
98
|
+
var allInactive = (0, _react.useCallback)(function () {
|
|
99
|
+
var activeOrReady = mutableRef.current.controlled.reduce(function (res, component) {
|
|
100
|
+
return res || !(component.state === STATE.inactive);
|
|
101
|
+
}, false);
|
|
102
|
+
return !activeOrReady;
|
|
103
|
+
}, []);
|
|
104
|
+
|
|
105
|
+
/*
|
|
106
|
+
* Checks for any components currently marqueeing
|
|
107
|
+
*
|
|
108
|
+
* @returns {Boolean} `true` if any component is marqueeing
|
|
109
|
+
*/
|
|
110
|
+
var anyRunning = (0, _react.useCallback)(function () {
|
|
111
|
+
return mutableRef.current.controlled.reduce(function (res, component) {
|
|
112
|
+
return res || component.state === STATE.active;
|
|
113
|
+
}, false);
|
|
114
|
+
}, []);
|
|
115
|
+
var doCancel = (0, _react.useCallback)(function () {
|
|
116
|
+
if (mutableRef.current.isHovered || mutableRef.current.isFocused) {
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
markAll(STATE.inactive);
|
|
120
|
+
dispatch('stop');
|
|
121
|
+
}, [dispatch, markAll]);
|
|
122
|
+
var cancelJob = (0, _react.useMemo)(function () {
|
|
123
|
+
return new _util.Job(function () {
|
|
124
|
+
return doCancel();
|
|
125
|
+
}, 30);
|
|
126
|
+
}, [doCancel]);
|
|
127
|
+
|
|
128
|
+
/*
|
|
129
|
+
* Registers `component` with a set of handlers for `start` and `stop`.
|
|
130
|
+
*
|
|
131
|
+
* @param {Object} component A component, typically a React component instance, on
|
|
132
|
+
* which handlers will be dispatched.
|
|
133
|
+
* @param {Object} handlers An object containing `start` and `stop` functions
|
|
134
|
+
*
|
|
135
|
+
* @returns {undefined}
|
|
136
|
+
*/
|
|
137
|
+
var handleRegister = (0, _react.useCallback)(function (component, handlers) {
|
|
138
|
+
var needStart = !allInactive() || mutableRef.current.isFocused;
|
|
139
|
+
mutableRef.current.controlled.push(_objectSpread(_objectSpread({}, handlers), {}, {
|
|
140
|
+
state: STATE.inactive,
|
|
141
|
+
component: component
|
|
142
|
+
}));
|
|
143
|
+
if (needStart) {
|
|
144
|
+
dispatch('start');
|
|
145
|
+
}
|
|
146
|
+
}, [allInactive, dispatch]);
|
|
147
|
+
|
|
148
|
+
/*
|
|
149
|
+
* Unregisters `component` for synchronization
|
|
150
|
+
*
|
|
151
|
+
* @param {Object} component A previously registered component
|
|
152
|
+
*
|
|
153
|
+
* @returns {undefined}
|
|
154
|
+
*/
|
|
155
|
+
var handleUnregister = (0, _react.useCallback)(function (component) {
|
|
156
|
+
var wasRunning = false;
|
|
157
|
+
for (var i = 0; i < mutableRef.current.controlled.length; i++) {
|
|
158
|
+
if (mutableRef.current.controlled[i].component === component) {
|
|
159
|
+
wasRunning = mutableRef.current.controlled[i].state === STATE.active;
|
|
160
|
+
mutableRef.current.controlled.splice(i, 1);
|
|
161
|
+
break;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
if (wasRunning && !anyRunning()) {
|
|
165
|
+
dispatch('start');
|
|
166
|
+
}
|
|
167
|
+
}, [anyRunning, dispatch]);
|
|
168
|
+
|
|
169
|
+
/*
|
|
170
|
+
* Handler for the `start` context function
|
|
171
|
+
*
|
|
172
|
+
* @param {Object} component A previously registered component
|
|
173
|
+
*
|
|
174
|
+
* @returns {undefined}f
|
|
175
|
+
*/
|
|
176
|
+
var handleStart = (0, _react.useCallback)(function (component) {
|
|
177
|
+
cancelJob.stop();
|
|
178
|
+
if (!anyRunning()) {
|
|
179
|
+
markAll(STATE.ready);
|
|
180
|
+
dispatch('start', component);
|
|
181
|
+
}
|
|
182
|
+
}, [anyRunning, cancelJob, dispatch, markAll]);
|
|
183
|
+
|
|
184
|
+
/*
|
|
185
|
+
* Handler for the `cancel` context function
|
|
186
|
+
*
|
|
187
|
+
* @param {Object} component A previously registered component
|
|
188
|
+
*
|
|
189
|
+
* @returns {undefined}
|
|
190
|
+
*/
|
|
191
|
+
var handleCancel = (0, _react.useCallback)(function () {
|
|
192
|
+
if (anyRunning()) {
|
|
193
|
+
cancelJob.start();
|
|
194
|
+
}
|
|
195
|
+
}, [anyRunning, cancelJob]);
|
|
196
|
+
|
|
197
|
+
/*
|
|
198
|
+
* Handler for the `complete` context function
|
|
199
|
+
*
|
|
200
|
+
* @param {Object} component A previously registered component
|
|
201
|
+
*
|
|
202
|
+
* @returns {undefined}
|
|
203
|
+
*/
|
|
204
|
+
var handleComplete = (0, _react.useCallback)(function (component) {
|
|
205
|
+
var complete = markReady(component);
|
|
206
|
+
if (complete) {
|
|
207
|
+
markAll(STATE.ready);
|
|
208
|
+
dispatch('start');
|
|
209
|
+
}
|
|
210
|
+
}, [dispatch, markAll, markReady]);
|
|
211
|
+
var handleEnter = (0, _react.useCallback)(function () {
|
|
212
|
+
mutableRef.current.isHovered = true;
|
|
213
|
+
if (!anyRunning()) {
|
|
214
|
+
dispatch('start');
|
|
215
|
+
}
|
|
216
|
+
cancelJob.stop();
|
|
217
|
+
}, [anyRunning, cancelJob, dispatch]);
|
|
218
|
+
var handleLeave = (0, _react.useCallback)(function () {
|
|
219
|
+
mutableRef.current.isHovered = false;
|
|
220
|
+
cancelJob.start();
|
|
221
|
+
}, [cancelJob]);
|
|
222
|
+
|
|
223
|
+
/*
|
|
224
|
+
* Handler for the focus event
|
|
225
|
+
*/
|
|
226
|
+
var handleFocus = (0, _react.useCallback)(function (ev) {
|
|
227
|
+
mutableRef.current.isFocused = true;
|
|
228
|
+
if (!anyRunning()) {
|
|
229
|
+
dispatch('start');
|
|
230
|
+
}
|
|
231
|
+
cancelJob.stop();
|
|
232
|
+
forwardFocus(ev, props);
|
|
233
|
+
}, [anyRunning, cancelJob, dispatch, props]);
|
|
234
|
+
|
|
235
|
+
/*
|
|
236
|
+
* Handler for the blur event
|
|
237
|
+
*/
|
|
238
|
+
var handleBlur = (0, _react.useCallback)(function (ev) {
|
|
239
|
+
mutableRef.current.isFocused = false;
|
|
240
|
+
if (anyRunning()) {
|
|
241
|
+
cancelJob.start();
|
|
242
|
+
}
|
|
243
|
+
forwardBlur(ev, props);
|
|
244
|
+
}, [anyRunning, cancelJob, props]);
|
|
245
|
+
(0, _react.useEffect)(function () {
|
|
246
|
+
return function () {
|
|
247
|
+
cancelJob.stop();
|
|
248
|
+
};
|
|
249
|
+
}, [cancelJob]);
|
|
250
|
+
var value = (0, _react.useMemo)(function () {
|
|
251
|
+
return {
|
|
252
|
+
cancel: handleCancel,
|
|
253
|
+
complete: handleComplete,
|
|
254
|
+
enter: handleEnter,
|
|
255
|
+
leave: handleLeave,
|
|
256
|
+
register: handleRegister,
|
|
257
|
+
start: handleStart,
|
|
258
|
+
unregister: handleUnregister
|
|
259
|
+
};
|
|
260
|
+
}, [handleCancel, handleComplete, handleEnter, handleLeave, handleRegister, handleStart, handleUnregister]);
|
|
261
|
+
var provideMarqueeControllerContext = (0, _react.useCallback)(function (children) {
|
|
262
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(MarqueeControllerContext.Provider, {
|
|
263
|
+
value: value,
|
|
264
|
+
children: children
|
|
265
|
+
});
|
|
266
|
+
}, [value]);
|
|
267
|
+
return {
|
|
268
|
+
handleBlur: handleBlur,
|
|
269
|
+
handleFocus: handleFocus,
|
|
270
|
+
provideMarqueeControllerContext: provideMarqueeControllerContext
|
|
271
|
+
};
|
|
272
|
+
};
|
|
273
|
+
var _default = exports["default"] = useMarqueeController;
|
|
@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports["default"] = exports.PlaceholderControllerDecorator = exports.PlaceholderContext = void 0;
|
|
7
7
|
var _handle = require("@enact/core/handle");
|
|
8
8
|
var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
|
|
9
|
+
var _WithRef = require("@enact/core/internal/WithRef");
|
|
9
10
|
var _util = require("@enact/core/util");
|
|
10
11
|
var _Registry = _interopRequireDefault(require("@enact/core/internal/Registry"));
|
|
11
12
|
var _react = require("react");
|
|
12
|
-
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
13
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
14
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
15
15
|
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; }
|
|
@@ -85,13 +85,10 @@ var PlaceholderControllerDecorator = exports.PlaceholderControllerDecorator = (0
|
|
|
85
85
|
return _class = /*#__PURE__*/function (_Component) {
|
|
86
86
|
_inherits(_class, _Component);
|
|
87
87
|
var _super = _createSuper(_class);
|
|
88
|
-
function _class() {
|
|
88
|
+
function _class(props) {
|
|
89
89
|
var _this;
|
|
90
90
|
_classCallCheck(this, _class);
|
|
91
|
-
|
|
92
|
-
args[_key] = arguments[_key];
|
|
93
|
-
}
|
|
94
|
-
_this = _super.call.apply(_super, [this].concat(args));
|
|
91
|
+
_this = _super.call(this, props);
|
|
95
92
|
_this.bounds = null;
|
|
96
93
|
_this.leftThreshold = -1;
|
|
97
94
|
_this.node = null;
|
|
@@ -111,6 +108,7 @@ var PlaceholderControllerDecorator = exports.PlaceholderControllerDecorator = (0
|
|
|
111
108
|
scrollTop = _ref.scrollTop;
|
|
112
109
|
_this.setThresholds(scrollTop, scrollLeft);
|
|
113
110
|
});
|
|
111
|
+
_this.nodeRef = /*#__PURE__*/(0, _react.createRef)();
|
|
114
112
|
return _this;
|
|
115
113
|
}
|
|
116
114
|
_createClass(_class, [{
|
|
@@ -130,9 +128,7 @@ var PlaceholderControllerDecorator = exports.PlaceholderControllerDecorator = (0
|
|
|
130
128
|
if (bounds != null) {
|
|
131
129
|
this.bounds = Object.assign({}, bounds);
|
|
132
130
|
} else {
|
|
133
|
-
|
|
134
|
-
// eslint-disable-next-line react/no-find-dom-node
|
|
135
|
-
this.node = _reactDom["default"].findDOMNode(this);
|
|
131
|
+
this.node = this.nodeRef.current;
|
|
136
132
|
this.bounds = {
|
|
137
133
|
height: this.node.offsetHeight,
|
|
138
134
|
width: this.node.offsetWidth
|
|
@@ -167,10 +163,14 @@ var PlaceholderControllerDecorator = exports.PlaceholderControllerDecorator = (0
|
|
|
167
163
|
key: "render",
|
|
168
164
|
value: function render() {
|
|
169
165
|
var props = Object.assign({}, this.props);
|
|
166
|
+
var WrappedWithRef = (0, _WithRef.WithRef)(Wrapped);
|
|
170
167
|
if (notify) props[notify] = this.handleNotify;
|
|
171
168
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(PlaceholderContext.Provider, {
|
|
172
169
|
value: this.registry.register,
|
|
173
|
-
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
|
170
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(WrappedWithRef, _objectSpread(_objectSpread({}, props), {}, {
|
|
171
|
+
outermostRef: this.nodeRef,
|
|
172
|
+
referrerName: "Placeholder"
|
|
173
|
+
}))
|
|
174
174
|
});
|
|
175
175
|
}
|
|
176
176
|
}]);
|
|
@@ -4,13 +4,18 @@ require("@testing-library/jest-dom");
|
|
|
4
4
|
var _react = require("@testing-library/react");
|
|
5
5
|
var _Placeholder = require("../../Placeholder");
|
|
6
6
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
7
|
+
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; }
|
|
8
|
+
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; }
|
|
9
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
10
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
|
|
11
|
+
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); }
|
|
7
12
|
describe('PlaceholderControllerDecorator', function () {
|
|
8
13
|
var data;
|
|
9
14
|
var DivComponent = function DivComponent(props) {
|
|
10
15
|
data = props;
|
|
11
|
-
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
16
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread({
|
|
12
17
|
"data-testid": "component"
|
|
13
|
-
});
|
|
18
|
+
}, props));
|
|
14
19
|
};
|
|
15
20
|
var Component = (0, _Placeholder.PlaceholderControllerDecorator)(DivComponent);
|
|
16
21
|
describe('config', function () {
|
package/Repeater/Repeater.js
CHANGED
|
@@ -9,7 +9,8 @@ var _kind = _interopRequireDefault(require("@enact/core/kind"));
|
|
|
9
9
|
var _propTypes2 = _interopRequireDefault(require("prop-types"));
|
|
10
10
|
var _ForwardRef = _interopRequireDefault(require("../ForwardRef"));
|
|
11
11
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
12
|
-
var _excluded = ["
|
|
12
|
+
var _excluded = ["key"],
|
|
13
|
+
_excluded2 = ["component", "componentRef"];
|
|
13
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
14
15
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
15
16
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
@@ -129,14 +130,17 @@ var RepeaterBase = exports.RepeaterBase = (0, _kind["default"])({
|
|
|
129
130
|
}, itemProps), {}, _defineProperty({}, childProp, data));
|
|
130
131
|
}
|
|
131
132
|
if (indexProp) props[indexProp] = index;
|
|
132
|
-
|
|
133
|
+
var _props = _objectSpread({}, props),
|
|
134
|
+
key = _props.key,
|
|
135
|
+
rest = _objectWithoutProperties(_props, _excluded);
|
|
136
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread({}, rest), key);
|
|
133
137
|
});
|
|
134
138
|
}
|
|
135
139
|
},
|
|
136
140
|
render: function render(_ref2) {
|
|
137
141
|
var Component = _ref2.component,
|
|
138
142
|
componentRef = _ref2.componentRef,
|
|
139
|
-
rest = _objectWithoutProperties(_ref2,
|
|
143
|
+
rest = _objectWithoutProperties(_ref2, _excluded2);
|
|
140
144
|
delete rest.childComponent;
|
|
141
145
|
delete rest.childProp;
|
|
142
146
|
delete rest.indexProp;
|
package/Scroller/Scroller.js
CHANGED
|
@@ -38,6 +38,23 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
|
|
|
38
38
|
* @exports ScrollerBasic
|
|
39
39
|
*/
|
|
40
40
|
var nop = function nop() {};
|
|
41
|
+
var scrollerDefaultProps = {
|
|
42
|
+
cbScrollTo: nop,
|
|
43
|
+
direction: 'both',
|
|
44
|
+
horizontalScrollbar: 'auto',
|
|
45
|
+
noScrollByDrag: false,
|
|
46
|
+
noScrollByWheel: false,
|
|
47
|
+
onScroll: nop,
|
|
48
|
+
onScrollStart: nop,
|
|
49
|
+
onScrollStop: nop,
|
|
50
|
+
overscrollEffectOn: {
|
|
51
|
+
drag: false,
|
|
52
|
+
pageKey: false,
|
|
53
|
+
wheel: false
|
|
54
|
+
},
|
|
55
|
+
scrollMode: 'translate',
|
|
56
|
+
verticalScrollbar: 'auto'
|
|
57
|
+
};
|
|
41
58
|
|
|
42
59
|
/**
|
|
43
60
|
* An unstyled scroller.
|
|
@@ -56,7 +73,8 @@ var nop = function nop() {};
|
|
|
56
73
|
var Scroller = exports.Scroller = function Scroller(props) {
|
|
57
74
|
// Hooks
|
|
58
75
|
|
|
59
|
-
var
|
|
76
|
+
var scrollerProps = Object.assign({}, scrollerDefaultProps, props);
|
|
77
|
+
var _useScroll = (0, _useScroll2["default"])(scrollerProps),
|
|
60
78
|
scrollContentHandle = _useScroll.scrollContentHandle,
|
|
61
79
|
ScrollContentWrapper = _useScroll.scrollContentWrapper,
|
|
62
80
|
isHorizontalScrollbarVisible = _useScroll.isHorizontalScrollbarVisible,
|
|
@@ -261,21 +279,5 @@ Scroller.propTypes = /** @lends ui/Scroller.Scroller.prototype */{
|
|
|
261
279
|
*/
|
|
262
280
|
verticalScrollbar: _propTypes["default"].oneOf(['auto', 'visible', 'hidden'])
|
|
263
281
|
};
|
|
264
|
-
Scroller.
|
|
265
|
-
cbScrollTo: nop,
|
|
266
|
-
direction: 'both',
|
|
267
|
-
horizontalScrollbar: 'auto',
|
|
268
|
-
noScrollByDrag: false,
|
|
269
|
-
noScrollByWheel: false,
|
|
270
|
-
onScroll: nop,
|
|
271
|
-
onScrollStart: nop,
|
|
272
|
-
onScrollStop: nop,
|
|
273
|
-
overscrollEffectOn: {
|
|
274
|
-
drag: false,
|
|
275
|
-
pageKey: false,
|
|
276
|
-
wheel: false
|
|
277
|
-
},
|
|
278
|
-
scrollMode: 'translate',
|
|
279
|
-
verticalScrollbar: 'auto'
|
|
280
|
-
};
|
|
282
|
+
Scroller.defaultPropValues = scrollerDefaultProps;
|
|
281
283
|
var _default = exports["default"] = Scroller;
|
|
@@ -285,15 +285,13 @@ describe('Slottable Specs', function () {
|
|
|
285
285
|
});
|
|
286
286
|
test('should allow downstream component to have default value for unset slot', function () {
|
|
287
287
|
function ComponentBase(_ref11) {
|
|
288
|
-
var a = _ref11.a
|
|
288
|
+
var _ref11$a = _ref11.a,
|
|
289
|
+
a = _ref11$a === void 0 ? 'Default A' : _ref11$a;
|
|
289
290
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
290
291
|
"data-testid": "slottable",
|
|
291
292
|
children: a
|
|
292
293
|
});
|
|
293
294
|
}
|
|
294
|
-
ComponentBase.defaultProps = {
|
|
295
|
-
a: 'Default A'
|
|
296
|
-
};
|
|
297
295
|
var Component = (0, _Slottable["default"])({
|
|
298
296
|
slots: ['a']
|
|
299
297
|
}, ComponentBase);
|
package/Toggleable/Toggleable.js
CHANGED
|
@@ -20,9 +20,12 @@ var _react = require("react");
|
|
|
20
20
|
var _warning = _interopRequireDefault(require("warning"));
|
|
21
21
|
var _useToggle = require("./useToggle");
|
|
22
22
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
23
|
+
var _excluded = ["disabled"];
|
|
23
24
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
24
25
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
25
26
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
|
|
27
|
+
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
28
|
+
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
26
29
|
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; }
|
|
27
30
|
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; }
|
|
28
31
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
@@ -165,12 +168,18 @@ var ToggleableHOC = exports.Toggleable = (0, _hoc["default"])(defaultConfig, fun
|
|
|
165
168
|
return context.deactivate();
|
|
166
169
|
}, (0, _handle.forwardCustom)(deactivate, adapter))
|
|
167
170
|
};
|
|
168
|
-
function Toggleable(
|
|
171
|
+
function Toggleable(_ref) {
|
|
172
|
+
var _ref$disabled = _ref.disabled,
|
|
173
|
+
disabled = _ref$disabled === void 0 ? false : _ref$disabled,
|
|
174
|
+
rest = _objectWithoutProperties(_ref, _excluded);
|
|
175
|
+
var props = _objectSpread({
|
|
176
|
+
disabled: disabled
|
|
177
|
+
}, rest);
|
|
169
178
|
var updated = _objectSpread({}, props);
|
|
170
179
|
var propSelected = props[prop];
|
|
171
180
|
var hook = (0, _useToggle.useToggle)({
|
|
172
181
|
defaultSelected: props[defaultPropKey],
|
|
173
|
-
disabled:
|
|
182
|
+
disabled: disabled,
|
|
174
183
|
onToggle: function onToggle(ev) {
|
|
175
184
|
return (0, _handle.forwardCustom)(toggle, adapter)(ev, props);
|
|
176
185
|
},
|
|
@@ -208,9 +217,6 @@ var ToggleableHOC = exports.Toggleable = (0, _hoc["default"])(defaultConfig, fun
|
|
|
208
217
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread({}, updated));
|
|
209
218
|
}
|
|
210
219
|
Toggleable.propTypes = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, defaultPropKey, _propTypes["default"].bool), "disabled", _propTypes["default"].bool), prop, _propTypes["default"].bool), toggle, _propTypes["default"].func);
|
|
211
|
-
Toggleable.defaultProps = {
|
|
212
|
-
disabled: false
|
|
213
|
-
};
|
|
214
220
|
return Toggleable;
|
|
215
221
|
});
|
|
216
222
|
var _default = exports["default"] = ToggleableHOC;
|
package/Touchable/Touchable.js
CHANGED
|
@@ -27,7 +27,8 @@ var _Hold = require("./Hold");
|
|
|
27
27
|
var _Pinch = require("./Pinch");
|
|
28
28
|
var _useTouch = _interopRequireDefault(require("./useTouch"));
|
|
29
29
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
30
|
-
var _excluded = ["dragConfig", "flickConfig", "holdConfig", "pinchConfig", "disabled", "noResume", "onBlur", "onClick", "onMouseDown", "onMouseEnter", "onMouseLeave", "onMouseMove", "onMouseUp", "onTouchEnd", "onTouchMove", "onTouchStart", "onDown", "onDrag", "onDragEnd", "onDragStart", "onFlick", "onHold", "onHoldEnd", "onHoldStart", "onMove", "onPinch", "onPinchEnd", "onPinchStart", "onTap", "onUp"]
|
|
30
|
+
var _excluded = ["dragConfig", "flickConfig", "holdConfig", "pinchConfig", "disabled", "noResume", "onBlur", "onClick", "onMouseDown", "onMouseEnter", "onMouseLeave", "onMouseMove", "onMouseUp", "onTouchEnd", "onTouchMove", "onTouchStart", "onDown", "onDrag", "onDragEnd", "onDragStart", "onFlick", "onHold", "onHoldEnd", "onHoldStart", "onMove", "onPinch", "onPinchEnd", "onPinchStart", "onTap", "onUp"],
|
|
31
|
+
_excluded2 = ["disabled", "noResume"];
|
|
31
32
|
/**
|
|
32
33
|
* Application support for gestures.
|
|
33
34
|
*
|
|
@@ -153,7 +154,15 @@ var Touchable = exports.Touchable = (0, _hoc["default"])(defaultConfig, function
|
|
|
153
154
|
|
|
154
155
|
// eslint-disable-next-line no-shadow
|
|
155
156
|
var Touchable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
156
|
-
var
|
|
157
|
+
var _props$disabled = props.disabled,
|
|
158
|
+
disabled = _props$disabled === void 0 ? false : _props$disabled,
|
|
159
|
+
_props$noResume = props.noResume,
|
|
160
|
+
noResume = _props$noResume === void 0 ? false : _props$noResume,
|
|
161
|
+
rest = _objectWithoutProperties(props, _excluded2);
|
|
162
|
+
var _selectProps = selectProps(_objectSpread({
|
|
163
|
+
disabled: disabled,
|
|
164
|
+
noResume: noResume
|
|
165
|
+
}, rest)),
|
|
157
166
|
configForHook = _selectProps.configForHook,
|
|
158
167
|
propsForWrapped = _selectProps.propsForWrapped;
|
|
159
168
|
var hook = (0, _useTouch["default"])(_objectSpread({
|
|
@@ -393,10 +402,6 @@ var Touchable = exports.Touchable = (0, _hoc["default"])(defaultConfig, function
|
|
|
393
402
|
*/
|
|
394
403
|
pinchConfig: _Pinch.pinchConfigPropType
|
|
395
404
|
};
|
|
396
|
-
Touchable.defaultProps = {
|
|
397
|
-
disabled: false,
|
|
398
|
-
noResume: false
|
|
399
|
-
};
|
|
400
405
|
Touchable.displayName = 'Touchable';
|
|
401
406
|
return Touchable;
|
|
402
407
|
});
|
|
@@ -16,6 +16,7 @@ var _remove = _interopRequireDefault(require("ramda/src/remove"));
|
|
|
16
16
|
var _unionWith = _interopRequireDefault(require("ramda/src/unionWith"));
|
|
17
17
|
var _useWith = _interopRequireDefault(require("ramda/src/useWith"));
|
|
18
18
|
var _react = require("react");
|
|
19
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
|
19
20
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
20
21
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
21
22
|
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
|
|
@@ -39,8 +40,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
|
|
|
39
40
|
* @returns {Number} Index of child
|
|
40
41
|
* @method
|
|
41
42
|
* @private
|
|
42
|
-
*/
|
|
43
|
-
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
43
|
+
*/ // eslint-disable-next-line react-hooks/rules-of-hooks
|
|
44
44
|
var indexOfChild = (0, _useWith["default"])(_findIndex["default"], [(0, _propEq["default"])('key'), _identity["default"]]);
|
|
45
45
|
|
|
46
46
|
/**
|
|
@@ -200,6 +200,23 @@ var TransitionGroup = exports.TransitionGroup = /*#__PURE__*/function (_Componen
|
|
|
200
200
|
_this.groupRefs[key] = node;
|
|
201
201
|
};
|
|
202
202
|
};
|
|
203
|
+
/* This code is the same as @enact/core/WithRef. */
|
|
204
|
+
_this.getNodeRef = function () {
|
|
205
|
+
var _refNode$parentElemen;
|
|
206
|
+
var refNode = _this.nodeRef.current;
|
|
207
|
+
var attributeSelector = "[data-transitiongroup-id=\"".concat(refNode.getAttribute('data-transitiongroup-target'), "\"]");
|
|
208
|
+
/* The intended code is to search for the referrer element via a single querySelector call. But unit tests cannot handle :has() properly.
|
|
209
|
+
const selector = `:scope ${attributeSelector}, :scope :has(${attributeSelector})`;
|
|
210
|
+
return refNode?.parentElement?.querySelector(selector) || null;
|
|
211
|
+
*/
|
|
212
|
+
var targetNode = (refNode === null || refNode === void 0 || (_refNode$parentElemen = refNode.parentElement) === null || _refNode$parentElemen === void 0 ? void 0 : _refNode$parentElemen.querySelector(attributeSelector)) || null;
|
|
213
|
+
for (var current = targetNode; current; current = current.parentElement) {
|
|
214
|
+
var _current;
|
|
215
|
+
if (((_current = current) === null || _current === void 0 ? void 0 : _current.parentElement) === (refNode === null || refNode === void 0 ? void 0 : refNode.parentElement)) {
|
|
216
|
+
return current;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
};
|
|
203
220
|
_this.state = {
|
|
204
221
|
firstRender: true,
|
|
205
222
|
children: []
|
|
@@ -210,6 +227,8 @@ var TransitionGroup = exports.TransitionGroup = /*#__PURE__*/function (_Componen
|
|
|
210
227
|
_this.keysToLeave = [];
|
|
211
228
|
_this.keysToStay = [];
|
|
212
229
|
_this.groupRefs = {};
|
|
230
|
+
_this.nodeRef = /*#__PURE__*/(0, _react.createRef)();
|
|
231
|
+
_this.refNodeId = '#transition#group#';
|
|
213
232
|
return _this;
|
|
214
233
|
}
|
|
215
234
|
_createClass(TransitionGroup, [{
|
|
@@ -343,19 +362,22 @@ var TransitionGroup = exports.TransitionGroup = /*#__PURE__*/function (_Componen
|
|
|
343
362
|
var _this5 = this;
|
|
344
363
|
// support wrapping arbitrary children with a component that supports the necessary
|
|
345
364
|
// lifecycle methods to animate transitions
|
|
346
|
-
var childrenToRender = this.state.children.map(function (child) {
|
|
365
|
+
var childrenToRender = this.state.children.map(function (child, index) {
|
|
347
366
|
var isLeaving = child.props['data-index'] !== _this5.props.currentIndex && typeof child.props['data-index'] !== 'undefined';
|
|
348
367
|
return /*#__PURE__*/(0, _react.cloneElement)(_this5.props.childFactory(child), {
|
|
349
368
|
key: child.key,
|
|
350
369
|
ref: _this5.storeRefs(child.key),
|
|
351
370
|
leaving: isLeaving,
|
|
352
|
-
appearing: !_this5.hasMounted
|
|
371
|
+
appearing: !_this5.hasMounted,
|
|
372
|
+
getParentRef: _this5.getNodeRef,
|
|
373
|
+
renderedIndex: index
|
|
353
374
|
});
|
|
354
375
|
});
|
|
355
376
|
|
|
356
377
|
// Do not forward TransitionGroup props to primitive DOM nodes
|
|
357
378
|
var props = Object.assign({}, this.props);
|
|
358
379
|
props.ref = this.props.componentRef;
|
|
380
|
+
props['data-transitiongroup-id'] = this.refNodeId;
|
|
359
381
|
delete props.childFactory;
|
|
360
382
|
delete props.component;
|
|
361
383
|
delete props.componentRef;
|
|
@@ -367,7 +389,15 @@ var TransitionGroup = exports.TransitionGroup = /*#__PURE__*/function (_Componen
|
|
|
367
389
|
delete props.onTransition;
|
|
368
390
|
delete props.onWillTransition;
|
|
369
391
|
delete props.size;
|
|
370
|
-
return /*#__PURE__*/(0,
|
|
392
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
|
|
393
|
+
children: [/*#__PURE__*/(0, _react.createElement)(this.props.component, props, childrenToRender), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
394
|
+
"data-transitiongroup-target": this.refNodeId,
|
|
395
|
+
ref: this.nodeRef,
|
|
396
|
+
style: {
|
|
397
|
+
display: 'none'
|
|
398
|
+
}
|
|
399
|
+
})]
|
|
400
|
+
});
|
|
371
401
|
}
|
|
372
402
|
}], [{
|
|
373
403
|
key: "getDerivedStateFromProps",
|