@enact/ui 4.6.0 → 4.6.2
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 +4 -2
- package/AnnounceDecorator/AnnounceDecorator.js +3 -1
- package/BodyText/BodyText.js +3 -1
- package/Button/Button.js +3 -1
- package/CHANGELOG.md +19 -0
- package/Cancelable/Cancelable.js +4 -2
- package/Cancelable/tests/Cancelable-specs.js +3 -1
- package/Changeable/Changeable.js +4 -2
- package/ComponentOverride/ComponentOverride.js +3 -1
- package/FloatingLayer/FloatingLayer.js +4 -2
- package/FloatingLayer/FloatingLayerContainer.js +3 -1
- package/FloatingLayer/FloatingLayerDecorator.js +3 -1
- package/FloatingLayer/Scrim.js +4 -2
- package/FloatingLayer/index.d.ts +100 -0
- package/FloatingLayer/package.json +3 -0
- package/FloatingLayer/tests/useFloatingLayerDecorator-specs.js +3 -1
- package/FloatingLayer/useFloatingLayer.js +2 -2
- package/ForwardRef/ForwardRef.js +3 -1
- package/GridListImageItem/GridListImageItem.js +3 -1
- package/Group/Group.js +3 -1
- package/Group/GroupItem.js +3 -1
- package/Heading/Heading.d.ts +1 -2
- package/Heading/Heading.js +3 -1
- package/Icon/Icon.js +3 -1
- package/IconButton/IconButton.js +11 -4
- package/Image/Image.js +3 -1
- package/ImageItem/ImageItem.js +3 -1
- package/ImageItem/tests/ImageItem-specs.js +3 -1
- package/Item/Item.js +3 -1
- package/LabeledIcon/LabeledIcon.js +3 -1
- package/Layout/Cell.js +3 -1
- package/Layout/Layout.d.ts +24 -4
- package/Layout/Layout.js +28 -5
- package/Layout/tests/Layout-specs.js +5 -3
- package/Marquee/MarqueeBase.js +3 -1
- package/Marquee/MarqueeController.js +4 -2
- package/Marquee/MarqueeDecorator.js +4 -2
- package/Marquee/tests/Marquee-specs.js +3 -1
- package/Measurable/Measurable.js +5 -3
- package/Measurable/tests/Measurable-specs.js +8 -6
- package/Media/Media.js +6 -4
- package/Placeholder/PlaceholderControllerDecorator.js +4 -2
- package/Placeholder/PlaceholderDecorator.js +4 -2
- package/ProgressBar/ProgressBar.js +3 -1
- package/README.md +1 -1
- package/RadioDecorator/RadioControllerDecorator.js +10 -2
- package/RadioDecorator/RadioDecorator.js +9 -2
- package/Repeater/Repeater.d.ts +1 -2
- package/Repeater/Repeater.js +3 -1
- package/Repeater/tests/Repeater-specs.js +3 -1
- package/Resizable/Resizable.js +4 -2
- package/Routable/Link.js +4 -2
- package/Routable/Routable.js +3 -1
- package/Routable/Router.js +4 -2
- package/Routable/tests/Routable-specs.js +5 -3
- package/Scrollable/ScrollAnimator.js +3 -1
- package/Scrollable/ScrollThumb.js +3 -1
- package/Scrollable/Scrollable.js +4 -2
- package/Scrollable/ScrollableNative.js +4 -2
- package/Scrollable/Scrollbar.js +4 -2
- package/Scroller/Scroller.js +3 -1
- package/Scroller/ScrollerBasic.js +4 -2
- package/Scroller/UiScrollerBase.js +10 -2
- package/Skinnable/Skinnable.js +3 -1
- package/Skinnable/tests/Skinnable-specs.js +3 -1
- package/Skinnable/tests/useSkins-specs.js +3 -1
- package/Slider/Knob.js +3 -1
- package/Slider/PositionDecorator.js +4 -2
- package/Slider/Slider.js +3 -1
- package/SlotItem/SlotItem.js +9 -3
- package/Slottable/Slottable.js +3 -1
- package/Slottable/useSlots.js +3 -1
- package/Spinner/Spinner.js +3 -1
- package/ToggleIcon/ToggleIcon.js +3 -1
- package/ToggleItem/ToggleItem.d.ts +8 -10
- package/ToggleItem/ToggleItem.js +9 -3
- package/ToggleItem/tests/ToggleItem-specs.js +3 -1
- package/Toggleable/Toggle.js +4 -2
- package/Toggleable/Toggleable.js +3 -1
- package/Toggleable/useToggle.js +1 -1
- package/Touchable/ClickAllow.js +3 -1
- package/Touchable/Drag.js +4 -2
- package/Touchable/Flick.js +4 -2
- package/Touchable/Hold.js +4 -2
- package/Touchable/Pinch.js +187 -0
- package/Touchable/Touch.js +37 -12
- package/Touchable/Touchable.d.ts +42 -0
- package/Touchable/Touchable.js +66 -5
- package/Touchable/config.js +22 -3
- package/Touchable/tests/Touchable-specs.js +96 -6
- package/Touchable/tests/useTouch-specs.js +3 -1
- package/Touchable/useTouch.js +46 -35
- package/Transition/Transition.d.ts +5 -7
- package/Transition/Transition.js +4 -2
- package/Transition/tests/Transition-specs.js +5 -3
- package/ViewManager/Arranger.js +3 -1
- package/ViewManager/TransitionGroup.js +3 -1
- package/ViewManager/View.js +4 -2
- package/ViewManager/ViewManager.js +4 -2
- package/ViewManager/tests/ViewManager-specs.js +3 -1
- package/VirtualList/UiVirtualListBase.js +11 -3
- package/VirtualList/VirtualList.d.ts +2 -4
- package/VirtualList/VirtualList.js +3 -1
- package/VirtualList/VirtualListBasic.js +5 -3
- package/VirtualList/tests/VirtualGridList-native-specs.js +3 -1
- package/VirtualList/tests/VirtualGridList-specs.js +3 -1
- package/VirtualList/tests/VirtualList-native-specs.js +3 -1
- package/VirtualList/tests/VirtualList-specs.js +3 -1
- package/internal/IdProvider/IdProvider.js +3 -1
- package/internal/IdProvider/Provider.js +3 -1
- package/internal/IdProvider/tests/IdProvider-specs.js +3 -1
- package/internal/IdProvider/tests/useId-specs.js +4 -3
- package/internal/Pure/Pure.js +4 -2
- package/internal/Pure/tests/Pure-specs.js +4 -2
- package/internal/localized-fonts/localized-fonts.js +2 -2
- package/package.json +2 -2
- package/resolution/ResolutionDecorator.js +4 -2
- package/useControlledState/tests/useControlledState-specs.js +2 -2
- package/useControlledState/useControlledState.js +2 -2
- package/useScroll/ScrollAnimator.js +3 -1
- package/useScroll/Scrollbar.js +6 -4
- package/useScroll/ScrollbarTrack.js +3 -1
- package/useScroll/useScroll.js +64 -52
package/Touchable/config.js
CHANGED
|
@@ -7,12 +7,16 @@ exports.resetDefaultConfig = exports.mergeConfig = exports.getConfig = exports["
|
|
|
7
7
|
var _Drag = require("./Drag.js");
|
|
8
8
|
var _Flick = require("./Flick.js");
|
|
9
9
|
var _Hold = require("./Hold.js");
|
|
10
|
+
var _Pinch = require("./Pinch");
|
|
10
11
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
11
12
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
12
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
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(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
15
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
13
16
|
var allowedDragKeys = Object.keys(_Drag.defaultDragConfig);
|
|
14
17
|
var allowedFlickKeys = Object.keys(_Flick.defaultFlickConfig);
|
|
15
18
|
var allowedHoldKeys = Object.keys(_Hold.defaultHoldConfig);
|
|
19
|
+
var allowedPinchKeys = Object.keys(_Pinch.defaultPinchConfig);
|
|
16
20
|
|
|
17
21
|
/**
|
|
18
22
|
* The Global Gesture Configuration Object
|
|
@@ -43,7 +47,8 @@ var mergeConfig = function mergeConfig(cfg) {
|
|
|
43
47
|
var merged = {
|
|
44
48
|
drag: mergeGestureConfig(config.drag, cfg.drag, allowedDragKeys),
|
|
45
49
|
flick: mergeGestureConfig(config.flick, cfg.flick, allowedFlickKeys),
|
|
46
|
-
hold: mergeGestureConfig(config.hold, cfg.hold, allowedHoldKeys)
|
|
50
|
+
hold: mergeGestureConfig(config.hold, cfg.hold, allowedHoldKeys),
|
|
51
|
+
pinch: mergeGestureConfig(config.pinch, cfg.pinch, allowedPinchKeys)
|
|
47
52
|
};
|
|
48
53
|
merged.hold.events = merged.hold.events.map(clone);
|
|
49
54
|
return merged;
|
|
@@ -104,6 +109,19 @@ var mergeConfig = function mergeConfig(cfg) {
|
|
|
104
109
|
* controls the amount of time that must pass before this `onHoldStart` event is fired and should
|
|
105
110
|
* be a multiple of `frequency`.
|
|
106
111
|
*
|
|
112
|
+
* `pinch`
|
|
113
|
+
*
|
|
114
|
+
* * `boxSizing` - The part of the component's box model is used as the bounds of the constraint.
|
|
115
|
+
* Only applies when `global` is `false`.
|
|
116
|
+
* * `'border-box'` - the default, includes the padding and border but excludes the margin.
|
|
117
|
+
* * `'content-box'` - excludes the padding, border, and margin.
|
|
118
|
+
* * `global` - When `true`, pinch gestures will continue when leaving the bounds of the component
|
|
119
|
+
* or blurring the component.
|
|
120
|
+
* * `maxScale` - The maximum scale value. Defaults to `4`.
|
|
121
|
+
* * `minScale` - The minimum scale value. Defaults to `0.5`.
|
|
122
|
+
* * `moveTolerance` - The distance difference from the previous distance that the pointer may move
|
|
123
|
+
* before cancelling the scaling. Defaults to `16`.
|
|
124
|
+
*
|
|
107
125
|
* @function
|
|
108
126
|
* @param {Object} cfg A partial or complete configuration object
|
|
109
127
|
*
|
|
@@ -123,8 +141,9 @@ exports.getConfig = getConfig;
|
|
|
123
141
|
var resetDefaultConfig = function resetDefaultConfig() {
|
|
124
142
|
return configure({
|
|
125
143
|
drag: _Drag.defaultDragConfig,
|
|
144
|
+
flick: _Flick.defaultFlickConfig,
|
|
126
145
|
hold: _Hold.defaultHoldConfig,
|
|
127
|
-
|
|
146
|
+
pinch: _Pinch.defaultPinchConfig
|
|
128
147
|
});
|
|
129
148
|
};
|
|
130
149
|
exports.resetDefaultConfig = resetDefaultConfig;
|
|
@@ -203,6 +203,96 @@ describe('Touchable', function () {
|
|
|
203
203
|
expect(handler).toHaveBeenCalled();
|
|
204
204
|
done();
|
|
205
205
|
});
|
|
206
|
+
test('should update state configurations onPinchStart events', function (done) {
|
|
207
|
+
var pinchConfig = {
|
|
208
|
+
global: true,
|
|
209
|
+
moveTolerance: 0
|
|
210
|
+
};
|
|
211
|
+
var Component = (0, _Touchable["default"])(DivComponent);
|
|
212
|
+
var handler = jest.fn();
|
|
213
|
+
var _render6 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
214
|
+
pinchConfig: pinchConfig,
|
|
215
|
+
onPinch: function onPinch() {}
|
|
216
|
+
})),
|
|
217
|
+
rerender = _render6.rerender;
|
|
218
|
+
var component = _react.screen.getByTestId('component');
|
|
219
|
+
var touchEvent = {
|
|
220
|
+
timeStamp: 1,
|
|
221
|
+
type: 'touch',
|
|
222
|
+
clientX: 0,
|
|
223
|
+
clientY: 0,
|
|
224
|
+
changedTouches: [{
|
|
225
|
+
clientX: 0,
|
|
226
|
+
clientY: 0
|
|
227
|
+
}, {
|
|
228
|
+
clientX: 10,
|
|
229
|
+
clientY: 10
|
|
230
|
+
}],
|
|
231
|
+
targetTouches: [{
|
|
232
|
+
clientX: 0,
|
|
233
|
+
clientY: 0
|
|
234
|
+
}, {
|
|
235
|
+
clientX: 10,
|
|
236
|
+
clientY: 10
|
|
237
|
+
}]
|
|
238
|
+
};
|
|
239
|
+
rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
240
|
+
pinchConfig: pinchConfig,
|
|
241
|
+
onPinch: function onPinch() {},
|
|
242
|
+
onPinchStart: handler
|
|
243
|
+
}));
|
|
244
|
+
_react.fireEvent.touchStart(component, touchEvent);
|
|
245
|
+
_react.fireEvent.mouseDown(component, touchEvent);
|
|
246
|
+
jest.runOnlyPendingTimers();
|
|
247
|
+
expect(handler).toHaveBeenCalled();
|
|
248
|
+
done();
|
|
249
|
+
});
|
|
250
|
+
test('should update state configurations onPinchEnd events', function (done) {
|
|
251
|
+
var pinchConfig = {
|
|
252
|
+
global: true,
|
|
253
|
+
moveTolerance: 0
|
|
254
|
+
};
|
|
255
|
+
var Component = (0, _Touchable["default"])(DivComponent);
|
|
256
|
+
var handler = jest.fn();
|
|
257
|
+
var _render7 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
258
|
+
pinchConfig: pinchConfig,
|
|
259
|
+
onPinch: function onPinch() {}
|
|
260
|
+
})),
|
|
261
|
+
rerender = _render7.rerender;
|
|
262
|
+
var component = _react.screen.getByTestId('component');
|
|
263
|
+
var touchEvent = {
|
|
264
|
+
timeStamp: 1,
|
|
265
|
+
type: 'touch',
|
|
266
|
+
clientX: 0,
|
|
267
|
+
clientY: 0,
|
|
268
|
+
changedTouches: [{
|
|
269
|
+
clientX: 0,
|
|
270
|
+
clientY: 0
|
|
271
|
+
}, {
|
|
272
|
+
clientX: 10,
|
|
273
|
+
clientY: 10
|
|
274
|
+
}],
|
|
275
|
+
targetTouches: [{
|
|
276
|
+
clientX: 0,
|
|
277
|
+
clientY: 0
|
|
278
|
+
}, {
|
|
279
|
+
clientX: 10,
|
|
280
|
+
clientY: 10
|
|
281
|
+
}]
|
|
282
|
+
};
|
|
283
|
+
_react.fireEvent.touchStart(component, touchEvent);
|
|
284
|
+
_react.fireEvent.mouseDown(component, touchEvent);
|
|
285
|
+
rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
286
|
+
pinchConfig: pinchConfig,
|
|
287
|
+
onPinch: function onPinch() {},
|
|
288
|
+
onPinchEnd: handler
|
|
289
|
+
}));
|
|
290
|
+
jest.runOnlyPendingTimers();
|
|
291
|
+
_react.fireEvent.touchEnd(component, touchEvent);
|
|
292
|
+
_react.fireEvent.mouseUp(component, touchEvent);
|
|
293
|
+
expect(handler).toHaveBeenCalled();
|
|
294
|
+
done();
|
|
295
|
+
});
|
|
206
296
|
test('should merge configurations', function () {
|
|
207
297
|
(0, _config.configure)({
|
|
208
298
|
flick: {
|
|
@@ -298,10 +388,10 @@ describe('Touchable', function () {
|
|
|
298
388
|
test('should call onDragStart event', function (done) {
|
|
299
389
|
var Component = (0, _Touchable["default"])(DivComponent);
|
|
300
390
|
var handler = jest.fn();
|
|
301
|
-
var
|
|
391
|
+
var _render8 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
302
392
|
onDrag: function onDrag() {}
|
|
303
393
|
})),
|
|
304
|
-
rerender =
|
|
394
|
+
rerender = _render8.rerender;
|
|
305
395
|
var component = _react.screen.getByTestId('component');
|
|
306
396
|
_react.fireEvent.mouseDown(component, {
|
|
307
397
|
clientX: 10,
|
|
@@ -347,10 +437,10 @@ describe('Touchable', function () {
|
|
|
347
437
|
test('should call onDragEnd event', function (done) {
|
|
348
438
|
var Component = (0, _Touchable["default"])(DivComponent);
|
|
349
439
|
var handler = jest.fn();
|
|
350
|
-
var
|
|
440
|
+
var _render9 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
351
441
|
onDrag: function onDrag() {}
|
|
352
442
|
})),
|
|
353
|
-
rerender =
|
|
443
|
+
rerender = _render9.rerender;
|
|
354
444
|
var component = _react.screen.getByTestId('component');
|
|
355
445
|
_react.fireEvent.mouseDown(component, {
|
|
356
446
|
clientX: 10,
|
|
@@ -392,10 +482,10 @@ describe('Touchable', function () {
|
|
|
392
482
|
test('should not call onDragEnd on mouseLeave', function (done) {
|
|
393
483
|
var Component = (0, _Touchable["default"])(DivComponent);
|
|
394
484
|
var handler = jest.fn();
|
|
395
|
-
var
|
|
485
|
+
var _render10 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
396
486
|
onDrag: function onDrag() {}
|
|
397
487
|
})),
|
|
398
|
-
rerender =
|
|
488
|
+
rerender = _render10.rerender;
|
|
399
489
|
var component = _react.screen.getByTestId('component');
|
|
400
490
|
_react.fireEvent.mouseDown(component, {
|
|
401
491
|
clientX: 10,
|
|
@@ -8,7 +8,9 @@ var _excluded = ["activeProp", "id"];
|
|
|
8
8
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
9
9
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
10
10
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
11
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
11
|
+
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; }
|
|
12
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
13
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
12
14
|
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; }
|
|
13
15
|
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; }
|
|
14
16
|
describe('useTouch', function () {
|
package/Touchable/useTouch.js
CHANGED
|
@@ -12,45 +12,51 @@ var _Touch = _interopRequireDefault(require("./Touch"));
|
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
13
13
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
14
14
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
15
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
15
|
+
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; }
|
|
16
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
17
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
16
18
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
17
19
|
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."); }
|
|
18
20
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
19
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++)
|
|
20
|
-
function _iterableToArrayLimit(arr, i) { var _i =
|
|
21
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
22
|
+
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
21
23
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
22
24
|
/**
|
|
23
25
|
* Configuration for `useTouch`
|
|
24
26
|
*
|
|
25
27
|
* @typedef {Object} useTouchConfig
|
|
26
28
|
* @memberof ui/Touchable
|
|
27
|
-
* @property {Object} dragConfig
|
|
28
|
-
* @property {Object} flickConfig
|
|
29
|
-
* @property {Object} holdConfig
|
|
30
|
-
* @property {
|
|
31
|
-
* @property {Boolean}
|
|
32
|
-
* @property {Boolean}
|
|
33
|
-
* @property {
|
|
34
|
-
* @property {Function}
|
|
35
|
-
* @property {Function}
|
|
36
|
-
* @property {Function}
|
|
37
|
-
* @property {Function}
|
|
38
|
-
* @property {Function}
|
|
39
|
-
* @property {Function}
|
|
40
|
-
* @property {Function}
|
|
41
|
-
* @property {Function}
|
|
42
|
-
* @property {Function}
|
|
43
|
-
* @property {Function}
|
|
44
|
-
* @property {Function}
|
|
45
|
-
* @property {Function}
|
|
46
|
-
* @property {Function}
|
|
47
|
-
* @property {Function}
|
|
48
|
-
* @property {Function}
|
|
49
|
-
* @property {Function}
|
|
50
|
-
* @property {Function}
|
|
51
|
-
* @property {Function}
|
|
52
|
-
* @property {Function}
|
|
53
|
-
* @property {Function}
|
|
29
|
+
* @property {Object} dragConfig Instance-specific overrides of the drag configuration
|
|
30
|
+
* @property {Object} flickConfig Instance-specific overrides of the flick configuration
|
|
31
|
+
* @property {Object} holdConfig Instance-specific overrides of the hold configuration
|
|
32
|
+
* @property {Object} pinchConfig Instance-specific overrides of the pinch configuration
|
|
33
|
+
* @property {Boolean} getActive Enables active state management
|
|
34
|
+
* @property {Boolean} disabled Disables a hook
|
|
35
|
+
* @property {Boolean} noResume Prevents resuming the touch events and gestures when re-entering the component
|
|
36
|
+
* @property {Function} onBlur Event handler for a blur event
|
|
37
|
+
* @property {Function} onClick Event handler for a click event
|
|
38
|
+
* @property {Function} onMouseDown Event handler for a mousedown event
|
|
39
|
+
* @property {Function} onMouseEnter Event handler for a mouseenter event
|
|
40
|
+
* @property {Function} onMouseLeave Event handler for a mouseleave event
|
|
41
|
+
* @property {Function} onMouseMove Event handler for a mousemove event
|
|
42
|
+
* @property {Function} onMouseUp Event handler for a mouseup event
|
|
43
|
+
* @property {Function} onTouchEnd Event handler for a touchend event
|
|
44
|
+
* @property {Function} onTouchMove Event handler for a touchmove event
|
|
45
|
+
* @property {Function} onTouchStart Event handler for a touchstart event
|
|
46
|
+
* @property {Function} onDown Event handler for 'down' pointer events
|
|
47
|
+
* @property {Function} onDrag Event handler for a drag gesture
|
|
48
|
+
* @property {Function} onDragEnd Event handler for the end of a drag gesture
|
|
49
|
+
* @property {Function} onDragStart Event handler for the start of a drag gesture
|
|
50
|
+
* @property {Function} onFlick Event handler for a flick gesture
|
|
51
|
+
* @property {Function} onHold Event handler for hold pulse events
|
|
52
|
+
* @property {Function} onHoldEnd Event handler for the end of hold events
|
|
53
|
+
* @property {Function} onHoldStart Event handler for hold events
|
|
54
|
+
* @property {Function} onPinch Event handler for pinch gesture
|
|
55
|
+
* @property {Function} onPinchEnd Event handler for the end of pinch gesture
|
|
56
|
+
* @property {Function} onPinchStart Event handler for pinch gesture
|
|
57
|
+
* @property {Function} onMove Event handler for a pointer moving
|
|
58
|
+
* @property {Function} onTap Event handler for 'tap' pointer events
|
|
59
|
+
* @property {Function} onUp Event handler for 'up' pointer events
|
|
54
60
|
* @see {@link ui/Touchable.configure}
|
|
55
61
|
* @private
|
|
56
62
|
*/
|
|
@@ -68,7 +74,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
68
74
|
/**
|
|
69
75
|
* Provides a consistent set of pointer events -- `onDown`, `onUp`, and `onTap` --
|
|
70
76
|
* across mouse and touch interfaces along with support for common gestures including
|
|
71
|
-
* `onFlick`, `onDrag`, `onHoldStart`, `onHold`,
|
|
77
|
+
* `onFlick`, `onDragStart`, `onDrag`, `onDragEnd`, `onHoldStart`, `onHold`, `onHoldEnd`,
|
|
78
|
+
* `onPinchStart`, `onPinch`, and `onPinchEnd`.
|
|
72
79
|
* @param {useTouchConfig} config Configuration options
|
|
73
80
|
* @returns {useTouchInterface}
|
|
74
81
|
* @private
|
|
@@ -81,13 +88,17 @@ function useTouch() {
|
|
|
81
88
|
dragConfig = config.dragConfig,
|
|
82
89
|
flickConfig = config.flickConfig,
|
|
83
90
|
holdConfig = config.holdConfig,
|
|
91
|
+
pinchConfig = config.pinchConfig,
|
|
84
92
|
onDrag = config.onDrag,
|
|
85
93
|
onDragEnd = config.onDragEnd,
|
|
86
94
|
onDragStart = config.onDragStart,
|
|
87
95
|
onHold = config.onHold,
|
|
88
96
|
onHoldEnd = config.onHoldEnd,
|
|
89
97
|
onHoldStart = config.onHoldStart,
|
|
90
|
-
onFlick = config.onFlick
|
|
98
|
+
onFlick = config.onFlick,
|
|
99
|
+
onPinch = config.onPinch,
|
|
100
|
+
onPinchEnd = config.onPinchEnd,
|
|
101
|
+
onPinchStart = config.onPinchStart;
|
|
91
102
|
var touch = (0, _useClass["default"])(_Touch["default"]);
|
|
92
103
|
var _useState = (0, _react.useState)(_state.States.Inactive),
|
|
93
104
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -107,12 +118,12 @@ function useTouch() {
|
|
|
107
118
|
}, []); // eslint-disable-line react-hooks/exhaustive-deps
|
|
108
119
|
|
|
109
120
|
(0, _react.useEffect)(function () {
|
|
110
|
-
touch.updateGestureConfig(dragConfig, flickConfig, holdConfig);
|
|
111
|
-
}, [dragConfig, flickConfig, holdConfig]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
121
|
+
touch.updateGestureConfig(dragConfig, flickConfig, holdConfig, pinchConfig);
|
|
122
|
+
}, [dragConfig, flickConfig, holdConfig, pinchConfig]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
112
123
|
|
|
113
124
|
(0, _react.useEffect)(function () {
|
|
114
125
|
touch.updateProps(config);
|
|
115
|
-
}, [onDrag, onDragEnd, onDragStart, onHold, onHoldEnd, onHoldStart, onFlick]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
126
|
+
}, [onDrag, onDragEnd, onDragStart, onHold, onHoldEnd, onHoldStart, onFlick, onPinch, onPinchEnd, onPinchStart]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
116
127
|
|
|
117
128
|
(0, _react.useEffect)(function () {
|
|
118
129
|
if (disabled) {
|
|
@@ -75,11 +75,10 @@ are also supported and treated as milliseconds.
|
|
|
75
75
|
*/
|
|
76
76
|
noAnimation?: boolean;
|
|
77
77
|
/**
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
*/
|
|
78
|
+
* The transition timing function.
|
|
79
|
+
* * Supported function names are: `ease` , `ease-in` , `ease-out` , `ease-in-out` , `ease-in-quart` ,
|
|
80
|
+
`ease-out-quart` , and `linear` .
|
|
81
|
+
*/
|
|
83
82
|
timingFunction?: string;
|
|
84
83
|
/**
|
|
85
84
|
* The type of transition to affect the content.
|
|
@@ -131,8 +130,7 @@ export interface TransitionProps {
|
|
|
131
130
|
/**
|
|
132
131
|
* Controls how long the transition should take.
|
|
133
132
|
* * Supported preset durations are: `'short'` (250ms), `'medium'` (500ms), and `'long'` (1s).
|
|
134
|
-
|
|
135
|
-
* `'medium'` (500ms) is default when no others are specified.
|
|
133
|
+
`'medium'` (500ms) is default when no others are specified.
|
|
136
134
|
*
|
|
137
135
|
* Any valid CSS duration value is also accepted, e.g. "200ms" or "3s". Pure numeric values
|
|
138
136
|
are also supported and treated as miliseconds.
|
package/Transition/Transition.js
CHANGED
|
@@ -17,7 +17,7 @@ var _excluded = ["css", "childRef", "children", "innerStyle"],
|
|
|
17
17
|
_excluded2 = ["visible"];
|
|
18
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
19
19
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
20
|
-
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, descriptor.key, descriptor); } }
|
|
20
|
+
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); } }
|
|
21
21
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
22
22
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
|
|
23
23
|
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
|
|
@@ -30,7 +30,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
|
|
|
30
30
|
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; }
|
|
31
31
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
32
32
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
33
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
33
|
+
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; }
|
|
34
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
35
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
34
36
|
var formatter = function formatter(duration) {
|
|
35
37
|
return typeof duration === 'number' ? duration + 'ms' : duration;
|
|
36
38
|
};
|
|
@@ -9,12 +9,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
9
9
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
10
10
|
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."); }
|
|
11
11
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
12
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++)
|
|
13
|
-
function _iterableToArrayLimit(arr, i) { var _i =
|
|
12
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
13
|
+
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
14
14
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
15
15
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
16
16
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
17
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
17
|
+
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; }
|
|
18
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
19
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
18
20
|
describe('Transition Specs', function () {
|
|
19
21
|
// NOTE: Feature not yet implemented
|
|
20
22
|
test.skip('should apply author classes', function () {
|
package/ViewManager/Arranger.js
CHANGED
|
@@ -8,7 +8,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
8
8
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
9
9
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
10
10
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
11
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
11
|
+
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; }
|
|
12
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
13
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
12
14
|
var slideInOut = function slideInOut(direction, total, orientation) {
|
|
13
15
|
var p = direction === 'out' ? total : -total;
|
|
14
16
|
return orientation === 'top' && 'translateY(' + -p + '%)' || orientation === 'bottom' && 'translateY(' + p + '%)' || orientation === 'left' && 'translateX(' + -p + '%)' || orientation === 'right' && 'translateX(' + p + '%)';
|
|
@@ -18,8 +18,10 @@ var _useWith = _interopRequireDefault(require("ramda/src/useWith"));
|
|
|
18
18
|
var _react = require("react");
|
|
19
19
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
20
20
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
21
|
-
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, descriptor.key, descriptor); } }
|
|
21
|
+
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); } }
|
|
22
22
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
23
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
24
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
23
25
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
|
|
24
26
|
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
|
|
25
27
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
package/ViewManager/View.js
CHANGED
|
@@ -13,10 +13,12 @@ var _jsxRuntime = require("react/jsx-runtime");
|
|
|
13
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
14
14
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
15
15
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
16
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
16
|
+
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; }
|
|
17
17
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
18
|
-
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, descriptor.key, descriptor); } }
|
|
18
|
+
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); } }
|
|
19
19
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
20
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
21
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
20
22
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
|
|
21
23
|
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
|
|
22
24
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
@@ -36,12 +36,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
36
36
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
37
37
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
38
38
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
39
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
39
|
+
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; }
|
|
40
40
|
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; }
|
|
41
41
|
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; }
|
|
42
42
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
43
|
-
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, descriptor.key, descriptor); } }
|
|
43
|
+
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); } }
|
|
44
44
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
45
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
46
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
45
47
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
|
|
46
48
|
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
|
|
47
49
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
@@ -10,8 +10,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
|
|
|
10
10
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
11
11
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
12
12
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
13
|
-
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, descriptor.key, descriptor); } }
|
|
13
|
+
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); } }
|
|
14
14
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
15
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
16
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
15
17
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
|
|
16
18
|
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
|
|
17
19
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports["default"] = exports.UiVirtualListBaseNative = exports.UiVirtualListBase = void 0;
|
|
7
7
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
8
8
|
var _handle = require("@enact/core/handle");
|
|
9
|
+
var _deprecate = _interopRequireDefault(require("@enact/core/internal/deprecate"));
|
|
9
10
|
var _platform = require("@enact/core/platform");
|
|
10
11
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
11
12
|
var _equals = _interopRequireDefault(require("ramda/src/equals"));
|
|
@@ -21,13 +22,15 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
|
|
|
21
22
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
22
23
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
23
24
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
24
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++)
|
|
25
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
25
26
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
26
27
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
27
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
28
|
+
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; }
|
|
28
29
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
29
|
-
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, descriptor.key, descriptor); } }
|
|
30
|
+
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); } }
|
|
30
31
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
32
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
33
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
31
34
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
|
|
32
35
|
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
|
|
33
36
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
@@ -983,6 +986,10 @@ var VirtualListBaseFactory = function VirtualListBaseFactory(type) {
|
|
|
983
986
|
}, {
|
|
984
987
|
key: "render",
|
|
985
988
|
value: function render() {
|
|
989
|
+
(0, _deprecate["default"])({
|
|
990
|
+
name: 'ui/VirtualList.VirtualListBase',
|
|
991
|
+
until: '5.0.0'
|
|
992
|
+
});
|
|
986
993
|
var _this$props7 = this.props,
|
|
987
994
|
className = _this$props7.className,
|
|
988
995
|
containerProps = _this$props7.containerProps,
|
|
@@ -1231,6 +1238,7 @@ var VirtualListBaseFactory = function VirtualListBaseFactory(type) {
|
|
|
1231
1238
|
* @memberof ui/VirtualList
|
|
1232
1239
|
* @ui
|
|
1233
1240
|
* @public
|
|
1241
|
+
* @deprecated Will be removed in 5.0.0.
|
|
1234
1242
|
*/
|
|
1235
1243
|
var VirtualListBase = VirtualListBaseFactory(JS);
|
|
1236
1244
|
exports.UiVirtualListBase = VirtualListBase;
|
|
@@ -173,8 +173,7 @@ export interface VirtualListBasicProps {
|
|
|
173
173
|
* The rendering function called for each item in the list.
|
|
174
174
|
*
|
|
175
175
|
* Note : The list does not always render a component whenever its render function is called
|
|
176
|
-
|
|
177
|
-
* due to performance optimization.
|
|
176
|
+
due to performance optimization.
|
|
178
177
|
*
|
|
179
178
|
* Example:
|
|
180
179
|
* ```
|
|
@@ -238,8 +237,7 @@ export interface VirtualListBaseProps {
|
|
|
238
237
|
* The rendering function called for each item in the list.
|
|
239
238
|
*
|
|
240
239
|
* Note : The list does not always render a component whenever its render function is called
|
|
241
|
-
|
|
242
|
-
* due to performance optimization.
|
|
240
|
+
due to performance optimization.
|
|
243
241
|
*
|
|
244
242
|
* Example:
|
|
245
243
|
* ```
|
|
@@ -45,7 +45,9 @@ var _jsxRuntime = require("react/jsx-runtime");
|
|
|
45
45
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
46
46
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
47
47
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
48
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
48
|
+
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; }
|
|
49
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
50
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
49
51
|
var nop = function nop() {};
|
|
50
52
|
|
|
51
53
|
/**
|