@enact/ui 4.5.2 → 4.6.0
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 +1 -40
- package/AnnounceDecorator/AnnounceDecorator.js +3 -21
- package/AnnounceDecorator/tests/Announce-specs.js +2 -7
- package/AnnounceDecorator/tests/AnnounceDecorator-specs.js +2 -6
- package/AnnounceDecorator/tests/useAnnounce-specs.js +8 -19
- package/AnnounceDecorator/useAnnounce.js +0 -6
- package/BodyText/BodyText.d.ts +1 -1
- package/BodyText/BodyText.js +8 -28
- package/BodyText/tests/BodyText-specs.js +0 -19
- package/Button/Button.d.ts +6 -6
- package/Button/Button.js +33 -63
- package/Button/tests/Button-specs.js +0 -26
- package/CHANGELOG.md +30 -0
- package/Cancelable/Cancelable.js +8 -47
- package/Cancelable/cancelHandler.js +5 -12
- package/Cancelable/modalHandler.js +3 -11
- package/Cancelable/tests/Cancelable-specs.js +3 -57
- package/Changeable/Changeable.js +2 -34
- package/Changeable/tests/Changeable-specs.js +20 -66
- package/ComponentOverride/ComponentOverride.js +1 -13
- package/FloatingLayer/FloatingLayer.js +17 -73
- package/FloatingLayer/FloatingLayerContainer.js +0 -15
- package/FloatingLayer/FloatingLayerDecorator.js +4 -17
- package/FloatingLayer/Scrim.js +9 -53
- package/FloatingLayer/index.js +0 -4
- package/FloatingLayer/tests/FloatingLayer-specs.js +8 -22
- package/FloatingLayer/tests/Scrim-specs.js +0 -9
- package/FloatingLayer/tests/useFloatingLayerDecorator-specs.js +0 -13
- package/FloatingLayer/useFloatingLayer.js +3 -14
- package/FloatingLayer/useFloatingLayerDecorator.js +3 -11
- package/ForwardRef/ForwardRef.js +1 -10
- package/GridListImageItem/GridListImageItem.d.ts +1 -1
- package/GridListImageItem/GridListImageItem.js +18 -51
- package/Group/Group.js +5 -36
- package/Group/GroupItem.js +16 -33
- package/Group/tests/Group-specs.js +0 -32
- package/Heading/Heading.js +8 -36
- package/Heading/tests/Heading-specs.js +81 -14
- package/Icon/Icon.d.ts +4 -4
- package/Icon/Icon.js +19 -53
- package/Icon/tests/Icon-specs.js +0 -22
- package/IconButton/IconButton.d.ts +4 -4
- package/IconButton/IconButton.js +17 -55
- package/IconButton/tests/IconButton-specs.js +0 -7
- package/Image/Image.js +17 -46
- package/Image/tests/Image-specs.js +0 -14
- package/ImageItem/ImageItem.js +18 -47
- package/ImageItem/tests/ImageItem-specs.js +0 -25
- package/Item/Item.js +9 -33
- package/Item/tests/Item-specs.js +0 -24
- package/LabeledIcon/LabeledIcon.d.ts +2 -2
- package/LabeledIcon/LabeledIcon.js +22 -53
- package/LabeledIcon/tests/LabeledIcon-specs.js +0 -14
- package/Layout/Cell.js +18 -44
- package/Layout/Layout.d.ts +16 -16
- package/Layout/Layout.js +23 -46
- package/Layout/tests/Layout-specs.js +10 -39
- package/Marquee/MarqueeBase.js +29 -63
- package/Marquee/MarqueeController.js +11 -72
- package/Marquee/MarqueeDecorator.js +70 -196
- package/Marquee/index.js +1 -5
- package/Marquee/tests/Marquee-specs.js +295 -87
- package/Measurable/Measurable.js +12 -34
- package/Measurable/tests/Measurable-specs.js +115 -0
- package/Media/Media.js +15 -65
- package/Media/tests/Media-specs.js +168 -0
- package/Placeholder/PlaceholderControllerDecorator.js +7 -43
- package/Placeholder/PlaceholderDecorator.js +7 -38
- package/Placeholder/index.js +1 -5
- package/Placeholder/tests/PlaceholderControllerDecorator-specs.js +25 -0
- package/Placeholder/tests/PlaceholderDecorator-specs.js +28 -0
- package/ProgressBar/ProgressBar.js +14 -45
- package/ProgressBar/tests/ProgressBar-specs.js +0 -17
- package/RadioDecorator/RadioControllerDecorator.js +1 -29
- package/RadioDecorator/RadioDecorator.js +4 -42
- package/RadioDecorator/tests/RadioDecorator-specs.js +12 -49
- package/Repeater/Repeater.js +9 -33
- package/Repeater/tests/Repeater-specs.js +0 -38
- package/Resizable/Resizable.js +9 -37
- package/Resizable/tests/Resizable-specs.js +34 -0
- package/Routable/Link.js +11 -47
- package/Routable/Routable.d.ts +2 -2
- package/Routable/Routable.js +12 -35
- package/Routable/Route.js +0 -6
- package/Routable/Router.js +15 -58
- package/Routable/tests/Routable-specs.js +7 -33
- package/Routable/tests/Router-specs.js +18 -44
- package/Routable/useLink.js +4 -8
- package/Routable/util.js +18 -24
- package/Scrollable/ScrollAnimator.js +49 -65
- package/Scrollable/ScrollThumb.js +2 -13
- package/Scrollable/Scrollable.js +180 -387
- package/Scrollable/ScrollableNative.js +189 -392
- package/Scrollable/Scrollbar.js +30 -102
- package/Scroller/Scroller.js +15 -39
- package/Scroller/ScrollerBasic.js +34 -89
- package/Scroller/UiScrollerBase.js +31 -84
- package/Scroller/tests/Scroller-specs.js +56 -0
- package/Skinnable/Skinnable.js +11 -38
- package/Skinnable/tests/Skinnable-specs.js +3 -74
- package/Skinnable/tests/useSkins-specs.js +1 -13
- package/Skinnable/tests/util-specs.js +0 -14
- package/Skinnable/useSkins.js +8 -15
- package/Skinnable/util.js +9 -20
- package/Slider/Knob.js +5 -24
- package/Slider/PositionDecorator.js +16 -54
- package/Slider/Slider.d.ts +2 -2
- package/Slider/Slider.js +29 -67
- package/Slider/tests/Slider-specs.js +94 -7
- package/Slider/utils.js +0 -2
- package/SlotItem/SlotItem.d.ts +1 -1
- package/SlotItem/SlotItem.js +17 -43
- package/SlotItem/tests/SlotItem-specs.js +0 -5
- package/Slottable/Slottable.js +4 -12
- package/Slottable/tests/Slottable-specs.js +19 -46
- package/Slottable/tests/useSlots-specs.js +27 -65
- package/Slottable/useSlots.js +8 -33
- package/Spinner/Spinner.d.ts +1 -1
- package/Spinner/Spinner.js +16 -43
- package/Spinner/tests/Spinner-specs.js +0 -15
- package/ToggleIcon/ToggleIcon.js +10 -36
- package/ToggleIcon/tests/ToggleIcon-specs.js +0 -16
- package/ToggleItem/ToggleItem.d.ts +3 -3
- package/ToggleItem/ToggleItem.js +18 -55
- package/ToggleItem/tests/ToggleItem-specs.js +0 -30
- package/Toggleable/Toggle.js +1 -15
- package/Toggleable/Toggleable.js +12 -45
- package/Toggleable/tests/Toggleable-specs.js +28 -96
- package/Toggleable/useToggle.js +3 -19
- package/Touchable/ClickAllow.js +5 -14
- package/Touchable/Drag.js +16 -54
- package/Touchable/Flick.js +11 -42
- package/Touchable/Hold.js +21 -68
- package/Touchable/Touch.js +37 -65
- package/Touchable/Touchable.js +32 -71
- package/Touchable/config.js +8 -22
- package/Touchable/tests/Touchable-specs.js +270 -119
- package/Touchable/tests/useTouch-specs.js +6 -80
- package/Touchable/useTouch.js +17 -34
- package/Transition/Transition.js +37 -118
- package/Transition/tests/Transition-specs.js +20 -60
- package/ViewManager/Arranger.js +10 -22
- package/ViewManager/TransitionGroup.js +32 -107
- package/ViewManager/View.js +35 -91
- package/ViewManager/ViewManager.d.ts +1 -1
- package/ViewManager/ViewManager.js +20 -84
- package/ViewManager/tests/View-specs.js +0 -17
- package/ViewManager/tests/ViewManager-specs.js +236 -305
- package/ViewManager/tests/test-utils.js +0 -8
- package/VirtualList/UiVirtualListBase.js +259 -409
- package/VirtualList/VirtualList.d.ts +4 -4
- package/VirtualList/VirtualList.js +29 -69
- package/VirtualList/VirtualListBase.js +0 -3
- package/VirtualList/VirtualListBasic.js +273 -431
- package/VirtualList/tests/VirtualGridList-native-specs.js +161 -0
- package/VirtualList/tests/VirtualGridList-specs.js +614 -0
- package/VirtualList/tests/VirtualList-native-specs.js +152 -0
- package/VirtualList/tests/VirtualList-specs.js +423 -95
- package/internal/IdProvider/IdProvider.js +7 -21
- package/internal/IdProvider/Provider.js +4 -17
- package/internal/IdProvider/tests/IdProvider-specs.js +44 -0
- package/internal/IdProvider/tests/useId-specs.js +6 -20
- package/internal/IdProvider/useId.js +0 -6
- package/internal/Pure/Pure.js +3 -30
- package/internal/Pure/tests/Pure-specs.js +88 -0
- package/internal/localized-fonts/localized-fonts.js +33 -62
- package/internal/localized-fonts/tests/localized-fonts-specs.js +33 -0
- package/internal/selection/selection.js +1 -6
- package/internal/selection/tests/selection-specs.js +6 -4
- package/internal/validators/tests/validators-specs.js +80 -0
- package/internal/validators/validators.js +14 -34
- package/package.json +9 -3
- package/resolution/ResolutionDecorator.js +4 -40
- package/resolution/index.js +0 -7
- package/resolution/resolution.js +42 -80
- package/resolution/tests/ResolutionDecorator-specs.js +4 -11
- package/resolution/tests/resolution-specs.js +2 -2
- package/useControlledState/tests/useControlledState-specs.js +15 -46
- package/useControlledState/useControlledState.js +11 -22
- package/useScroll/ScrollAnimator.js +49 -65
- package/useScroll/Scrollbar.js +22 -58
- package/useScroll/ScrollbarTrack.js +3 -19
- package/useScroll/useScroll.js +267 -454
- package/useScroll/utilDOM.js +8 -14
- package/useScroll/utilEvent.js +0 -4
package/Touchable/Touchable.js
CHANGED
|
@@ -17,79 +17,59 @@ Object.defineProperty(exports, "useTouch", {
|
|
|
17
17
|
return _useTouch["default"];
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
|
-
|
|
21
20
|
var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
|
|
22
|
-
|
|
23
21
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
24
|
-
|
|
25
22
|
var _react = require("react");
|
|
26
|
-
|
|
27
23
|
var _config = require("./config");
|
|
28
|
-
|
|
29
24
|
var _Drag = require("./Drag");
|
|
30
|
-
|
|
31
25
|
var _Flick = require("./Flick");
|
|
32
|
-
|
|
33
26
|
var _Hold = require("./Hold");
|
|
34
|
-
|
|
35
27
|
var _useTouch = _interopRequireDefault(require("./useTouch"));
|
|
36
|
-
|
|
37
28
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
38
|
-
|
|
39
29
|
var _excluded = ["dragConfig", "flickConfig", "holdConfig", "disabled", "noResume", "onBlur", "onClick", "onMouseDown", "onMouseEnter", "onMouseLeave", "onMouseMove", "onMouseUp", "onTouchEnd", "onTouchMove", "onTouchStart", "onDown", "onDrag", "onDragEnd", "onDragStart", "onFlick", "onHold", "onHoldEnd", "onHoldStart", "onMove", "onTap", "onUp"];
|
|
40
|
-
|
|
41
30
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
42
|
-
|
|
43
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; }
|
|
44
|
-
|
|
45
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; }
|
|
46
|
-
|
|
47
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; }
|
|
48
|
-
|
|
49
34
|
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; }
|
|
50
|
-
|
|
51
35
|
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; }
|
|
52
|
-
|
|
53
36
|
var selectProps = function selectProps(props) {
|
|
54
37
|
var dragConfig = props.dragConfig,
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
38
|
+
flickConfig = props.flickConfig,
|
|
39
|
+
holdConfig = props.holdConfig,
|
|
40
|
+
disabled = props.disabled,
|
|
41
|
+
noResume = props.noResume,
|
|
42
|
+
onBlur = props.onBlur,
|
|
43
|
+
onClick = props.onClick,
|
|
44
|
+
onMouseDown = props.onMouseDown,
|
|
45
|
+
onMouseEnter = props.onMouseEnter,
|
|
46
|
+
onMouseLeave = props.onMouseLeave,
|
|
47
|
+
onMouseMove = props.onMouseMove,
|
|
48
|
+
onMouseUp = props.onMouseUp,
|
|
49
|
+
onTouchEnd = props.onTouchEnd,
|
|
50
|
+
onTouchMove = props.onTouchMove,
|
|
51
|
+
onTouchStart = props.onTouchStart,
|
|
52
|
+
onDown = props.onDown,
|
|
53
|
+
onDrag = props.onDrag,
|
|
54
|
+
onDragEnd = props.onDragEnd,
|
|
55
|
+
onDragStart = props.onDragStart,
|
|
56
|
+
onFlick = props.onFlick,
|
|
57
|
+
onHold = props.onHold,
|
|
58
|
+
onHoldEnd = props.onHoldEnd,
|
|
59
|
+
onHoldStart = props.onHoldStart,
|
|
60
|
+
onMove = props.onMove,
|
|
61
|
+
onTap = props.onTap,
|
|
62
|
+
onUp = props.onUp,
|
|
63
|
+
rest = _objectWithoutProperties(props, _excluded);
|
|
82
64
|
return {
|
|
83
65
|
configForHook: {
|
|
84
66
|
/* configs */
|
|
85
67
|
dragConfig: dragConfig,
|
|
86
68
|
flickConfig: flickConfig,
|
|
87
69
|
holdConfig: holdConfig,
|
|
88
|
-
|
|
89
70
|
/* general props */
|
|
90
71
|
disabled: disabled,
|
|
91
72
|
noResume: noResume,
|
|
92
|
-
|
|
93
73
|
/* events to be captured and forwarded by useTouch hook */
|
|
94
74
|
onBlur: onBlur,
|
|
95
75
|
onClick: onClick,
|
|
@@ -101,7 +81,6 @@ var selectProps = function selectProps(props) {
|
|
|
101
81
|
onTouchEnd: onTouchEnd,
|
|
102
82
|
onTouchMove: onTouchMove,
|
|
103
83
|
onTouchStart: onTouchStart,
|
|
104
|
-
|
|
105
84
|
/* custom events to be forwarded by useTouch hook */
|
|
106
85
|
onDown: onDown,
|
|
107
86
|
onDrag: onDrag,
|
|
@@ -120,14 +99,13 @@ var selectProps = function selectProps(props) {
|
|
|
120
99
|
}, rest)
|
|
121
100
|
};
|
|
122
101
|
};
|
|
102
|
+
|
|
123
103
|
/**
|
|
124
104
|
* Default config for `Touchable`.
|
|
125
105
|
*
|
|
126
106
|
* @memberof ui/Touchable.Touchable
|
|
127
107
|
* @hocconfig
|
|
128
108
|
*/
|
|
129
|
-
|
|
130
|
-
|
|
131
109
|
var defaultConfig = {
|
|
132
110
|
/**
|
|
133
111
|
* Configures the prop name to pass the active state to the wrapped component
|
|
@@ -138,6 +116,7 @@ var defaultConfig = {
|
|
|
138
116
|
*/
|
|
139
117
|
activeProp: null
|
|
140
118
|
};
|
|
119
|
+
|
|
141
120
|
/**
|
|
142
121
|
* A higher-order component that provides a consistent set of pointer events -- `onDown`, `onUp`,
|
|
143
122
|
* and `onTap` -- across mouse and touch interfaces along with support for common gestures including
|
|
@@ -151,24 +130,21 @@ var defaultConfig = {
|
|
|
151
130
|
* @hoc
|
|
152
131
|
* @public
|
|
153
132
|
*/
|
|
154
|
-
|
|
155
133
|
var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
156
|
-
var activeProp = config.activeProp;
|
|
134
|
+
var activeProp = config.activeProp;
|
|
157
135
|
|
|
136
|
+
// eslint-disable-next-line no-shadow
|
|
158
137
|
var Touchable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
159
138
|
var _selectProps = selectProps(props),
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
139
|
+
configForHook = _selectProps.configForHook,
|
|
140
|
+
propsForWrapped = _selectProps.propsForWrapped;
|
|
163
141
|
var hook = (0, _useTouch["default"])(_objectSpread({
|
|
164
142
|
getActive: !!activeProp
|
|
165
143
|
}, configForHook));
|
|
166
144
|
Object.assign(propsForWrapped, hook.handlers);
|
|
167
|
-
|
|
168
145
|
if (activeProp) {
|
|
169
146
|
propsForWrapped[activeProp] = hook.active;
|
|
170
147
|
}
|
|
171
|
-
|
|
172
148
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread(_objectSpread({}, propsForWrapped), {}, {
|
|
173
149
|
ref: ref
|
|
174
150
|
}));
|
|
@@ -183,7 +159,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
183
159
|
* @public
|
|
184
160
|
*/
|
|
185
161
|
disabled: _propTypes["default"].bool,
|
|
186
|
-
|
|
187
162
|
/**
|
|
188
163
|
* Instance-specific overrides of the drag configuration.
|
|
189
164
|
*
|
|
@@ -193,7 +168,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
193
168
|
* @public
|
|
194
169
|
*/
|
|
195
170
|
dragConfig: _Drag.dragConfigPropType,
|
|
196
|
-
|
|
197
171
|
/**
|
|
198
172
|
* Instance-specific overrides of the flick configuration.
|
|
199
173
|
*
|
|
@@ -203,7 +177,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
203
177
|
* @public
|
|
204
178
|
*/
|
|
205
179
|
flickConfig: _Flick.flickConfigPropType,
|
|
206
|
-
|
|
207
180
|
/**
|
|
208
181
|
* Instance-specific overrides of the hold configuration.
|
|
209
182
|
*
|
|
@@ -213,7 +186,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
213
186
|
* @public
|
|
214
187
|
*/
|
|
215
188
|
holdConfig: _Hold.holdConfigPropType,
|
|
216
|
-
|
|
217
189
|
/**
|
|
218
190
|
* Prevents resuming the touch events and gestures when re-entering the component.
|
|
219
191
|
*
|
|
@@ -223,7 +195,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
223
195
|
* @public
|
|
224
196
|
*/
|
|
225
197
|
noResume: _propTypes["default"].bool,
|
|
226
|
-
|
|
227
198
|
/**
|
|
228
199
|
* Event handler for 'down' pointer events.
|
|
229
200
|
*
|
|
@@ -232,7 +203,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
232
203
|
* @public
|
|
233
204
|
*/
|
|
234
205
|
onDown: _propTypes["default"].func,
|
|
235
|
-
|
|
236
206
|
/**
|
|
237
207
|
* Event handler for a drag gesture.
|
|
238
208
|
*
|
|
@@ -247,7 +217,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
247
217
|
* @public
|
|
248
218
|
*/
|
|
249
219
|
onDrag: _propTypes["default"].func,
|
|
250
|
-
|
|
251
220
|
/**
|
|
252
221
|
* Event handler for the end of a drag gesture.
|
|
253
222
|
*
|
|
@@ -260,7 +229,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
260
229
|
* @public
|
|
261
230
|
*/
|
|
262
231
|
onDragEnd: _propTypes["default"].func,
|
|
263
|
-
|
|
264
232
|
/**
|
|
265
233
|
* Event handler for the start of a drag gesture.
|
|
266
234
|
*
|
|
@@ -275,7 +243,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
275
243
|
* @public
|
|
276
244
|
*/
|
|
277
245
|
onDragStart: _propTypes["default"].func,
|
|
278
|
-
|
|
279
246
|
/**
|
|
280
247
|
* Event handler for a flick gesture.
|
|
281
248
|
*
|
|
@@ -292,7 +259,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
292
259
|
* @public
|
|
293
260
|
*/
|
|
294
261
|
onFlick: _propTypes["default"].func,
|
|
295
|
-
|
|
296
262
|
/**
|
|
297
263
|
* Event handler for hold pulse events.
|
|
298
264
|
*
|
|
@@ -306,7 +272,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
306
272
|
* @public
|
|
307
273
|
*/
|
|
308
274
|
onHold: _propTypes["default"].func,
|
|
309
|
-
|
|
310
275
|
/**
|
|
311
276
|
* Event handler for the end of hold events.
|
|
312
277
|
*
|
|
@@ -320,7 +285,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
320
285
|
* @public
|
|
321
286
|
*/
|
|
322
287
|
onHoldEnd: _propTypes["default"].func,
|
|
323
|
-
|
|
324
288
|
/**
|
|
325
289
|
* Event handler for hold events.
|
|
326
290
|
*
|
|
@@ -336,7 +300,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
336
300
|
* @public
|
|
337
301
|
*/
|
|
338
302
|
onHoldStart: _propTypes["default"].func,
|
|
339
|
-
|
|
340
303
|
/**
|
|
341
304
|
* Event handler for 'move' pointer events.
|
|
342
305
|
*
|
|
@@ -345,7 +308,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
345
308
|
* @public
|
|
346
309
|
*/
|
|
347
310
|
onMove: _propTypes["default"].func,
|
|
348
|
-
|
|
349
311
|
/**
|
|
350
312
|
* Event handler for 'tap' pointer events.
|
|
351
313
|
*
|
|
@@ -354,7 +316,6 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
354
316
|
* @public
|
|
355
317
|
*/
|
|
356
318
|
onTap: _propTypes["default"].func,
|
|
357
|
-
|
|
358
319
|
/**
|
|
359
320
|
* Event handler for 'up' pointer events.
|
|
360
321
|
*
|
package/Touchable/config.js
CHANGED
|
@@ -4,48 +4,41 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.resetDefaultConfig = exports.mergeConfig = exports.getConfig = exports["default"] = exports.configure = void 0;
|
|
7
|
-
|
|
8
7
|
var _Drag = require("./Drag.js");
|
|
9
|
-
|
|
10
8
|
var _Flick = require("./Flick.js");
|
|
11
|
-
|
|
12
9
|
var _Hold = require("./Hold.js");
|
|
13
|
-
|
|
14
10
|
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
|
-
|
|
16
11
|
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
|
-
|
|
18
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; }
|
|
19
|
-
|
|
20
13
|
var allowedDragKeys = Object.keys(_Drag.defaultDragConfig);
|
|
21
14
|
var allowedFlickKeys = Object.keys(_Flick.defaultFlickConfig);
|
|
22
15
|
var allowedHoldKeys = Object.keys(_Hold.defaultHoldConfig);
|
|
16
|
+
|
|
23
17
|
/**
|
|
24
18
|
* The Global Gesture Configuration Object
|
|
25
19
|
*
|
|
26
20
|
* @private
|
|
27
21
|
* @memberof ui/Touchable
|
|
28
22
|
*/
|
|
23
|
+
var config = {};
|
|
29
24
|
|
|
30
|
-
|
|
31
|
-
|
|
25
|
+
// map-friendly clone method
|
|
32
26
|
var clone = function clone(o) {
|
|
33
27
|
return Object.assign({}, o);
|
|
34
|
-
};
|
|
35
|
-
|
|
28
|
+
};
|
|
36
29
|
|
|
30
|
+
// Merges two configuation objects while retaining only the allowed keys
|
|
37
31
|
var mergeGestureConfig = function mergeGestureConfig(current, update, allowed) {
|
|
38
32
|
var cfg = _objectSpread(_objectSpread({}, current), update);
|
|
39
|
-
|
|
40
33
|
Object.keys(cfg).forEach(function (key) {
|
|
41
34
|
if (allowed.indexOf(key) === -1) {
|
|
42
35
|
delete cfg[key];
|
|
43
36
|
}
|
|
44
37
|
});
|
|
45
38
|
return cfg;
|
|
46
|
-
};
|
|
47
|
-
|
|
39
|
+
};
|
|
48
40
|
|
|
41
|
+
// Merges the current global config with the provided `cfg` and returns the result
|
|
49
42
|
var mergeConfig = function mergeConfig(cfg) {
|
|
50
43
|
var merged = {
|
|
51
44
|
drag: mergeGestureConfig(config.drag, cfg.drag, allowedDragKeys),
|
|
@@ -55,6 +48,7 @@ var mergeConfig = function mergeConfig(cfg) {
|
|
|
55
48
|
merged.hold.events = merged.hold.events.map(clone);
|
|
56
49
|
return merged;
|
|
57
50
|
};
|
|
51
|
+
|
|
58
52
|
/**
|
|
59
53
|
* Configures the global gesture configuration for the application.
|
|
60
54
|
*
|
|
@@ -117,22 +111,15 @@ var mergeConfig = function mergeConfig(cfg) {
|
|
|
117
111
|
* @public
|
|
118
112
|
* @memberof ui/Touchable
|
|
119
113
|
*/
|
|
120
|
-
|
|
121
|
-
|
|
122
114
|
exports.mergeConfig = mergeConfig;
|
|
123
|
-
|
|
124
115
|
var configure = function configure(cfg) {
|
|
125
116
|
config = mergeConfig(cfg);
|
|
126
117
|
};
|
|
127
|
-
|
|
128
118
|
exports.configure = configure;
|
|
129
|
-
|
|
130
119
|
var getConfig = function getConfig() {
|
|
131
120
|
return config;
|
|
132
121
|
};
|
|
133
|
-
|
|
134
122
|
exports.getConfig = getConfig;
|
|
135
|
-
|
|
136
123
|
var resetDefaultConfig = function resetDefaultConfig() {
|
|
137
124
|
return configure({
|
|
138
125
|
drag: _Drag.defaultDragConfig,
|
|
@@ -140,7 +127,6 @@ var resetDefaultConfig = function resetDefaultConfig() {
|
|
|
140
127
|
flick: _Flick.defaultFlickConfig
|
|
141
128
|
});
|
|
142
129
|
};
|
|
143
|
-
|
|
144
130
|
exports.resetDefaultConfig = resetDefaultConfig;
|
|
145
131
|
resetDefaultConfig();
|
|
146
132
|
var _default = configure;
|