@enact/ui 4.1.2 → 4.5.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AnnounceDecorator/Announce.js +9 -9
- package/AnnounceDecorator/AnnounceDecorator.js +6 -4
- package/AnnounceDecorator/tests/Announce-specs.js +13 -5
- package/AnnounceDecorator/tests/AnnounceDecorator-specs.js +9 -7
- package/AnnounceDecorator/tests/useAnnounce-specs.js +25 -17
- package/AnnounceDecorator/useAnnounce.js +1 -1
- package/BodyText/BodyText.d.ts +1 -1
- package/BodyText/BodyText.js +6 -4
- package/BodyText/tests/BodyText-specs.js +51 -37
- package/Button/Button.d.ts +6 -6
- package/Button/Button.js +11 -7
- package/Button/tests/Button-specs.js +104 -3
- package/CHANGELOG.md +25 -0
- package/Cancelable/Cancelable.js +12 -11
- package/Cancelable/tests/Cancelable-specs.js +133 -70
- package/Changeable/Changeable.js +9 -9
- package/Changeable/tests/Changeable-specs.js +172 -110
- package/ComponentOverride/ComponentOverride.js +6 -4
- package/FloatingLayer/FloatingLayer.js +40 -49
- package/FloatingLayer/FloatingLayer.module.css +3 -0
- package/FloatingLayer/FloatingLayerContainer.js +2 -2
- package/FloatingLayer/FloatingLayerDecorator.js +6 -4
- package/FloatingLayer/Scrim.js +9 -7
- package/FloatingLayer/index.js +1 -1
- package/FloatingLayer/tests/FloatingLayer-specs.js +83 -8
- package/FloatingLayer/tests/Scrim-specs.js +20 -11
- package/FloatingLayer/tests/useFloatingLayerDecorator-specs.js +17 -11
- package/FloatingLayer/useFloatingLayer.js +2 -2
- package/FloatingLayer/useFloatingLayerDecorator.js +1 -1
- package/ForwardRef/ForwardRef.js +3 -3
- package/GridListImageItem/GridListImageItem.d.ts +1 -1
- package/GridListImageItem/GridListImageItem.js +6 -4
- package/Group/Group.d.ts +2 -2
- package/Group/Group.js +7 -4
- package/Group/GroupItem.js +6 -4
- package/Group/tests/Group-specs.js +73 -43
- package/Heading/Heading.d.ts +2 -1
- package/Heading/Heading.js +6 -4
- package/Heading/tests/Heading-specs.js +27 -20
- package/Icon/Icon.d.ts +4 -4
- package/Icon/Icon.js +6 -4
- package/Icon/tests/Icon-specs.js +54 -33
- package/IconButton/IconButton.d.ts +4 -4
- package/IconButton/IconButton.js +6 -4
- package/IconButton/tests/IconButton-specs.js +2 -2
- package/Image/Image.js +6 -4
- package/Image/tests/Image-specs.js +41 -31
- package/ImageItem/ImageItem.js +8 -5
- package/ImageItem/tests/ImageItem-specs.js +75 -72
- package/Item/Item.js +6 -4
- package/Item/tests/Item-specs.js +59 -35
- package/LabeledIcon/LabeledIcon.d.ts +4 -4
- package/LabeledIcon/LabeledIcon.js +6 -4
- package/LabeledIcon/tests/LabeledIcon-specs.js +30 -19
- package/Layout/Cell.js +6 -4
- package/Layout/Layout.d.ts +16 -16
- package/Layout/Layout.js +6 -4
- package/Layout/tests/Layout-specs.js +42 -30
- package/Marquee/MarqueeBase.js +7 -9
- package/Marquee/MarqueeController.js +9 -9
- package/Marquee/MarqueeDecorator.js +18 -13
- package/Marquee/index.d.ts +4 -1
- package/Marquee/index.js +2 -1
- package/Marquee/tests/Marquee-specs.js +254 -122
- package/Measurable/Measurable.js +4 -4
- package/Media/Media.js +10 -10
- package/Placeholder/PlaceholderControllerDecorator.js +9 -9
- package/Placeholder/PlaceholderDecorator.js +9 -9
- package/ProgressBar/ProgressBar.js +6 -4
- package/ProgressBar/tests/ProgressBar-specs.js +60 -42
- package/README.md +1 -1
- package/RadioDecorator/RadioControllerDecorator.js +9 -9
- package/RadioDecorator/RadioDecorator.js +12 -14
- package/RadioDecorator/tests/RadioDecorator-specs.js +179 -65
- package/Repeater/Repeater.d.ts +2 -1
- package/Repeater/Repeater.js +6 -4
- package/Repeater/tests/Repeater-specs.js +90 -49
- package/Resizable/Resizable.js +10 -10
- package/Routable/Link.js +9 -7
- package/Routable/Routable.d.ts +2 -2
- package/Routable/Routable.js +10 -6
- package/Routable/Route.js +1 -1
- package/Routable/Router.js +14 -11
- package/Routable/tests/Routable-specs.js +29 -20
- package/Routable/tests/Router-specs.js +65 -41
- package/Routable/useLink.js +1 -1
- package/Routable/util.js +1 -1
- package/Scrollable/ScrollAnimator.js +2 -2
- package/Scrollable/ScrollThumb.js +3 -3
- package/Scrollable/Scrollable.js +14 -10
- package/Scrollable/ScrollableNative.js +14 -10
- package/Scrollable/Scrollbar.js +14 -8
- package/Scroller/Scroller.d.ts +2 -14
- package/Scroller/Scroller.js +8 -7
- package/Scroller/ScrollerBasic.js +18 -35
- package/Scroller/UiScrollerBase.js +9 -7
- package/Skinnable/Skinnable.js +6 -4
- package/Skinnable/tests/Skinnable-specs.js +104 -56
- package/Skinnable/tests/useSkins-specs.js +39 -44
- package/Skinnable/useSkins.js +1 -1
- package/Slider/Knob.js +6 -4
- package/Slider/PositionDecorator.js +9 -9
- package/Slider/Slider.d.ts +3 -3
- package/Slider/Slider.js +6 -4
- package/Slider/tests/Slider-specs.js +4 -4
- package/SlotItem/SlotItem.d.ts +2 -2
- package/SlotItem/SlotItem.js +6 -4
- package/SlotItem/tests/SlotItem-specs.js +4 -4
- package/Slottable/Slottable.js +3 -3
- package/Slottable/tests/Slottable-specs.js +67 -36
- package/Slottable/tests/useSlots-specs.js +68 -35
- package/Slottable/useSlots.js +6 -4
- package/Spinner/Spinner.d.ts +1 -1
- package/Spinner/Spinner.js +6 -4
- package/Spinner/tests/Spinner-specs.js +46 -31
- package/ToggleIcon/ToggleIcon.js +6 -4
- package/ToggleIcon/tests/ToggleIcon-specs.js +32 -20
- package/ToggleItem/ToggleItem.d.ts +13 -11
- package/ToggleItem/ToggleItem.js +6 -4
- package/ToggleItem/tests/ToggleItem-specs.js +54 -37
- package/Toggleable/Toggle.js +10 -10
- package/Toggleable/Toggleable.js +11 -17
- package/Toggleable/tests/Toggleable-specs.js +464 -324
- package/Toggleable/useToggle.js +4 -2
- package/Touchable/ClickAllow.js +2 -2
- package/Touchable/Drag.js +22 -22
- package/Touchable/Flick.js +22 -18
- package/Touchable/Hold.js +18 -23
- package/Touchable/Touch.js +2 -2
- package/Touchable/Touchable.d.ts +3 -3
- package/Touchable/Touchable.js +7 -4
- package/Touchable/config.js +3 -3
- package/Touchable/tests/Touchable-specs.js +225 -109
- package/Touchable/tests/useTouch-specs.js +163 -86
- package/Touchable/useTouch.js +4 -4
- package/Transition/Transition.d.ts +29 -27
- package/Transition/Transition.js +22 -17
- package/Transition/tests/Transition-specs.js +116 -36
- package/ViewManager/Arranger.js +3 -3
- package/ViewManager/TransitionGroup.js +10 -9
- package/ViewManager/View.js +7 -7
- package/ViewManager/ViewManager.d.ts +4 -4
- package/ViewManager/ViewManager.js +24 -22
- package/ViewManager/tests/View-specs.js +141 -81
- package/ViewManager/tests/ViewManager-specs.js +486 -193
- package/VirtualList/UiVirtualListBase.js +26 -35
- package/VirtualList/VirtualList.d.ts +11 -29
- package/VirtualList/VirtualList.js +10 -9
- package/VirtualList/VirtualListBase.js +1 -1
- package/VirtualList/VirtualListBasic.js +44 -61
- package/VirtualList/tests/VirtualList-specs.js +81 -95
- package/internal/IdProvider/IdProvider.js +3 -3
- package/internal/IdProvider/Provider.js +2 -2
- package/internal/IdProvider/tests/useId-specs.js +37 -20
- package/internal/Pure/Pure.js +9 -9
- package/internal/localized-fonts/localized-fonts.js +1 -1
- package/internal/validators/validators.js +1 -1
- package/package.json +11 -11
- package/resolution/ResolutionDecorator.js +9 -9
- package/resolution/index.js +2 -2
- package/resolution/resolution.js +4 -2
- package/resolution/tests/ResolutionDecorator-specs.js +17 -8
- package/styles/mixins.less +14 -2
- package/useControlledState/tests/useControlledState-specs.js +68 -43
- package/useControlledState/useControlledState.js +2 -2
- package/useScroll/ScrollAnimator.js +2 -2
- package/useScroll/Scrollbar.js +7 -4
- package/useScroll/ScrollbarTrack.js +6 -4
- package/useScroll/useScroll.js +18 -29
package/Toggleable/useToggle.js
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.useToggle = useToggle;
|
|
7
6
|
exports["default"] = void 0;
|
|
7
|
+
exports.useToggle = useToggle;
|
|
8
8
|
|
|
9
9
|
var _useClass = _interopRequireDefault(require("@enact/core/useClass"));
|
|
10
10
|
|
|
@@ -12,6 +12,8 @@ var _useControlledState = _interopRequireDefault(require("../useControlledState"
|
|
|
12
12
|
|
|
13
13
|
var _Toggle = _interopRequireDefault(require("./Toggle"));
|
|
14
14
|
|
|
15
|
+
var _excluded = ["defaultSelected", "selected"];
|
|
16
|
+
|
|
15
17
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
16
18
|
|
|
17
19
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
@@ -70,7 +72,7 @@ function useToggle() {
|
|
|
70
72
|
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
71
73
|
defaultSelected = _ref.defaultSelected,
|
|
72
74
|
selected = _ref.selected,
|
|
73
|
-
config = _objectWithoutProperties(_ref,
|
|
75
|
+
config = _objectWithoutProperties(_ref, _excluded);
|
|
74
76
|
|
|
75
77
|
var toggle = (0, _useClass["default"])(_Toggle["default"], config);
|
|
76
78
|
var state = (0, _useControlledState["default"])(defaultSelected, selected, typeof selected !== 'undefined');
|
package/Touchable/ClickAllow.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports
|
|
6
|
+
exports["default"] = exports.ClickAllow = void 0;
|
|
7
7
|
|
|
8
8
|
var _platform = require("@enact/core/platform");
|
|
9
9
|
|
|
@@ -11,7 +11,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
11
11
|
|
|
12
12
|
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
13
|
|
|
14
|
-
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
|
|
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
15
|
|
|
16
16
|
// It's possible that emitting `onTap` will cause a DOM change before the mousedown fires resulting
|
|
17
17
|
// in multiple tap/click events for the same user action. To avoid this, we store the last touchend
|
package/Touchable/Drag.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.dragConfigPropType = exports.
|
|
6
|
+
exports.dragConfigPropType = exports.defaultDragConfig = exports["default"] = exports.Drag = void 0;
|
|
7
7
|
|
|
8
8
|
var _clamp = _interopRequireDefault(require("ramda/src/clamp"));
|
|
9
9
|
|
|
@@ -11,12 +11,16 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
11
11
|
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
13
13
|
|
|
14
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
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
|
|
|
16
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
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
17
|
|
|
18
18
|
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
19
|
|
|
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); } }
|
|
21
|
+
|
|
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
|
+
|
|
20
24
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
21
25
|
|
|
22
26
|
var Tracking = {
|
|
@@ -25,7 +29,7 @@ var Tracking = {
|
|
|
25
29
|
Paused: 2
|
|
26
30
|
};
|
|
27
31
|
|
|
28
|
-
var Drag = function Drag() {
|
|
32
|
+
var Drag = /*#__PURE__*/_createClass(function Drag() {
|
|
29
33
|
var _this = this;
|
|
30
34
|
|
|
31
35
|
_classCallCheck(this, Drag);
|
|
@@ -98,11 +102,11 @@ var Drag = function Drag() {
|
|
|
98
102
|
_this.startY = y;
|
|
99
103
|
_this.dragConfig = _objectSpread(_objectSpread({}, config), {}, {
|
|
100
104
|
node: node,
|
|
101
|
-
onDragStart: onDragStart,
|
|
102
|
-
onDragEnd: onDragEnd,
|
|
103
|
-
onDrag: onDrag,
|
|
104
105
|
resume: !noResume
|
|
105
106
|
});
|
|
107
|
+
_this.onDrag = onDrag;
|
|
108
|
+
_this.onDragStart = onDragStart;
|
|
109
|
+
_this.onDragEnd = onDragEnd;
|
|
106
110
|
|
|
107
111
|
_this.setContainerBounds(node);
|
|
108
112
|
|
|
@@ -116,17 +120,14 @@ var Drag = function Drag() {
|
|
|
116
120
|
// Check `isDragging` gesture is not in progress. Check if gesture exists before updating the references to the `dragConfig`
|
|
117
121
|
if (!_this.isDragging()) return; // This will update the `dragConfig` with the new value
|
|
118
122
|
|
|
119
|
-
_this.
|
|
120
|
-
_this.
|
|
121
|
-
_this.
|
|
123
|
+
_this.onDrag = onDrag;
|
|
124
|
+
_this.onDragStart = onDragStart;
|
|
125
|
+
_this.onDragEnd = onDragEnd;
|
|
122
126
|
};
|
|
123
127
|
|
|
124
128
|
this.move = function (coords) {
|
|
125
129
|
if (!_this.isDragging()) return;
|
|
126
|
-
var
|
|
127
|
-
moveTolerance = _this$dragConfig2.moveTolerance,
|
|
128
|
-
onDrag = _this$dragConfig2.onDrag,
|
|
129
|
-
onDragStart = _this$dragConfig2.onDragStart;
|
|
130
|
+
var moveTolerance = _this.dragConfig.moveTolerance;
|
|
130
131
|
|
|
131
132
|
if (_this.tracking === Tracking.Untracked) {
|
|
132
133
|
var dx = coords.x - _this.startX;
|
|
@@ -135,14 +136,14 @@ var Drag = function Drag() {
|
|
|
135
136
|
if (Math.sqrt(dx * dx + dy * dy) >= moveTolerance) {
|
|
136
137
|
_this.tracking = Tracking.Active;
|
|
137
138
|
|
|
138
|
-
if (onDragStart) {
|
|
139
|
-
onDragStart(_objectSpread({
|
|
139
|
+
if (_this.onDragStart) {
|
|
140
|
+
_this.onDragStart(_objectSpread({
|
|
140
141
|
type: 'onDragStart'
|
|
141
142
|
}, coords));
|
|
142
143
|
}
|
|
143
144
|
}
|
|
144
|
-
} else if (onDrag && _this.tracking === Tracking.Active && _this.updatePosition(coords)) {
|
|
145
|
-
onDrag(_objectSpread({
|
|
145
|
+
} else if (_this.onDrag && _this.tracking === Tracking.Active && _this.updatePosition(coords)) {
|
|
146
|
+
_this.onDrag(_objectSpread({
|
|
146
147
|
type: 'onDrag'
|
|
147
148
|
}, coords));
|
|
148
149
|
}
|
|
@@ -158,10 +159,9 @@ var Drag = function Drag() {
|
|
|
158
159
|
|
|
159
160
|
this.end = function () {
|
|
160
161
|
if (!_this.isDragging()) return;
|
|
161
|
-
var onDragEnd = _this.dragConfig.onDragEnd;
|
|
162
162
|
|
|
163
|
-
if (onDragEnd && _this.tracking !== Tracking.Untracked) {
|
|
164
|
-
onDragEnd({
|
|
163
|
+
if (_this.onDragEnd && _this.tracking !== Tracking.Untracked) {
|
|
164
|
+
_this.onDragEnd({
|
|
165
165
|
type: 'onDragEnd'
|
|
166
166
|
});
|
|
167
167
|
}
|
|
@@ -185,7 +185,7 @@ var Drag = function Drag() {
|
|
|
185
185
|
_this.tracking = Tracking.Paused;
|
|
186
186
|
}
|
|
187
187
|
};
|
|
188
|
-
};
|
|
188
|
+
});
|
|
189
189
|
|
|
190
190
|
exports.Drag = Drag;
|
|
191
191
|
var defaultDragConfig = {
|
package/Touchable/Flick.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.flickConfigPropType = exports.
|
|
6
|
+
exports.flickConfigPropType = exports.defaultFlickConfig = exports["default"] = exports.Flick = void 0;
|
|
7
7
|
|
|
8
8
|
var _util = require("@enact/core/util");
|
|
9
9
|
|
|
@@ -11,11 +11,17 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
11
11
|
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
13
13
|
|
|
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
|
+
|
|
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
|
+
|
|
18
|
+
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
|
+
|
|
14
20
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
15
21
|
|
|
16
22
|
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
|
|
17
23
|
|
|
18
|
-
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
|
|
24
|
+
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
19
25
|
|
|
20
26
|
var Flick = /*#__PURE__*/function () {
|
|
21
27
|
function Flick() {
|
|
@@ -23,16 +29,12 @@ var Flick = /*#__PURE__*/function () {
|
|
|
23
29
|
|
|
24
30
|
_classCallCheck(this, Flick);
|
|
25
31
|
|
|
26
|
-
this.begin = function (
|
|
27
|
-
var
|
|
28
|
-
|
|
29
|
-
minVelocity = _ref.minVelocity;
|
|
30
|
-
var onFlick = _ref2.onFlick;
|
|
31
|
-
_this.minVelocity = minVelocity;
|
|
32
|
-
_this.maxMoves = maxMoves;
|
|
32
|
+
this.begin = function (config, _ref, coords) {
|
|
33
|
+
var onFlick = _ref.onFlick;
|
|
34
|
+
_this.flickConfig = _objectSpread({}, config);
|
|
33
35
|
|
|
34
|
-
if (maxDuration !== null) {
|
|
35
|
-
_this.cancelJob.startAfter(maxDuration);
|
|
36
|
+
if (_this.flickConfig.maxDuration !== null) {
|
|
37
|
+
_this.cancelJob.startAfter(_this.flickConfig.maxDuration);
|
|
36
38
|
}
|
|
37
39
|
|
|
38
40
|
_this.tracking = !!onFlick;
|
|
@@ -42,18 +44,19 @@ var Flick = /*#__PURE__*/function () {
|
|
|
42
44
|
_this.move(coords);
|
|
43
45
|
};
|
|
44
46
|
|
|
45
|
-
this.updateProps = function (
|
|
46
|
-
var onFlick =
|
|
47
|
+
this.updateProps = function (_ref2) {
|
|
48
|
+
var onFlick = _ref2.onFlick;
|
|
47
49
|
// Check `tracking` gesture is not in progress. Check if gesture exists before updating the references to the `onFlick`
|
|
48
50
|
if (!_this.tracking) return; // This will update the `onFlick` with the new value
|
|
49
51
|
|
|
50
52
|
_this.onFlick = onFlick;
|
|
51
53
|
};
|
|
52
54
|
|
|
53
|
-
this.move = function (
|
|
54
|
-
var x =
|
|
55
|
-
y =
|
|
55
|
+
this.move = function (_ref3) {
|
|
56
|
+
var x = _ref3.x,
|
|
57
|
+
y = _ref3.y;
|
|
56
58
|
if (!_this.tracking) return;
|
|
59
|
+
var maxMoves = _this.flickConfig.maxMoves;
|
|
57
60
|
|
|
58
61
|
_this.moves.push({
|
|
59
62
|
x: x,
|
|
@@ -62,7 +65,7 @@ var Flick = /*#__PURE__*/function () {
|
|
|
62
65
|
}); // track specified # of points
|
|
63
66
|
|
|
64
67
|
|
|
65
|
-
if (_this.moves.length >
|
|
68
|
+
if (_this.moves.length > maxMoves) {
|
|
66
69
|
_this.moves.shift();
|
|
67
70
|
}
|
|
68
71
|
};
|
|
@@ -79,6 +82,7 @@ var Flick = /*#__PURE__*/function () {
|
|
|
79
82
|
|
|
80
83
|
this.end = function () {
|
|
81
84
|
if (!_this.tracking) return;
|
|
85
|
+
var minVelocity = _this.flickConfig.minVelocity;
|
|
82
86
|
|
|
83
87
|
_this.cancelJob.stop();
|
|
84
88
|
|
|
@@ -106,7 +110,7 @@ var Flick = /*#__PURE__*/function () {
|
|
|
106
110
|
|
|
107
111
|
var v = Math.sqrt(x * x + y * y);
|
|
108
112
|
|
|
109
|
-
if (v >
|
|
113
|
+
if (v > minVelocity) {
|
|
110
114
|
var vertical = Math.abs(y) > Math.abs(x); // generate the flick using the start event so it has those coordinates
|
|
111
115
|
// this.sendFlick(ti.startEvent, x, y, v);
|
|
112
116
|
|
package/Touchable/Hold.js
CHANGED
|
@@ -3,15 +3,15 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.holdConfigPropType = exports.
|
|
6
|
+
exports.holdConfigPropType = exports.defaultHoldConfig = exports["default"] = exports.Hold = void 0;
|
|
7
7
|
|
|
8
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
9
|
|
|
10
10
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
11
11
|
|
|
12
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
12
|
+
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; }
|
|
13
13
|
|
|
14
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
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
15
|
|
|
16
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; }
|
|
17
17
|
|
|
@@ -19,7 +19,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
19
19
|
|
|
20
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); } }
|
|
21
21
|
|
|
22
|
-
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
|
|
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
23
|
|
|
24
24
|
var Hold = /*#__PURE__*/function () {
|
|
25
25
|
function Hold() {
|
|
@@ -52,11 +52,11 @@ var Hold = /*#__PURE__*/function () {
|
|
|
52
52
|
_this.startX = x;
|
|
53
53
|
_this.startY = y;
|
|
54
54
|
_this.holdConfig = _objectSpread(_objectSpread(_objectSpread({}, defaultConfig), holdConfig), {}, {
|
|
55
|
-
onHoldStart: onHoldStart,
|
|
56
|
-
onHoldEnd: onHoldEnd,
|
|
57
|
-
onHold: onHold,
|
|
58
55
|
resume: !noResume
|
|
59
|
-
});
|
|
56
|
+
});
|
|
57
|
+
_this.onHold = onHold;
|
|
58
|
+
_this.onHoldStart = onHoldStart;
|
|
59
|
+
_this.onHoldEnd = onHoldEnd; // copy the events array since it is mutated for each hold
|
|
60
60
|
|
|
61
61
|
_this.holdConfig.events = _this.holdConfig.events.slice();
|
|
62
62
|
|
|
@@ -83,9 +83,9 @@ var Hold = /*#__PURE__*/function () {
|
|
|
83
83
|
// check `isHolding` gesture is not in progress. Check if gesture exists before updating the references to the `holdConfig`
|
|
84
84
|
if (!_this.isHolding()) return; // Update the original values with new values of the gestures
|
|
85
85
|
|
|
86
|
-
_this.
|
|
87
|
-
_this.
|
|
88
|
-
_this.
|
|
86
|
+
_this.onHold = onHold;
|
|
87
|
+
_this.onHoldStart = onHoldStart;
|
|
88
|
+
_this.onHoldEnd = onHoldEnd;
|
|
89
89
|
};
|
|
90
90
|
|
|
91
91
|
this.move = function (coords) {
|
|
@@ -119,12 +119,11 @@ var Hold = /*#__PURE__*/function () {
|
|
|
119
119
|
|
|
120
120
|
this.end = function () {
|
|
121
121
|
if (!_this.isHolding()) return;
|
|
122
|
-
var onHoldEnd = _this.holdConfig.onHoldEnd;
|
|
123
122
|
|
|
124
|
-
if (_this.pulsing && onHoldEnd) {
|
|
123
|
+
if (_this.pulsing && _this.onHoldEnd) {
|
|
125
124
|
var time = window.performance.now() - _this.holdStart;
|
|
126
125
|
|
|
127
|
-
onHoldEnd({
|
|
126
|
+
_this.onHoldEnd({
|
|
128
127
|
type: 'onHoldEnd',
|
|
129
128
|
time: time
|
|
130
129
|
});
|
|
@@ -180,13 +179,11 @@ var Hold = /*#__PURE__*/function () {
|
|
|
180
179
|
var n = _this.next;
|
|
181
180
|
|
|
182
181
|
while (n && n.time <= holdTime) {
|
|
183
|
-
var
|
|
184
|
-
events = _this$holdConfig4.events,
|
|
185
|
-
onHoldStart = _this$holdConfig4.onHoldStart;
|
|
182
|
+
var events = _this.holdConfig.events;
|
|
186
183
|
_this.pulsing = true;
|
|
187
184
|
|
|
188
|
-
if (onHoldStart) {
|
|
189
|
-
onHoldStart(_objectSpread({
|
|
185
|
+
if (_this.onHoldStart) {
|
|
186
|
+
_this.onHoldStart(_objectSpread({
|
|
190
187
|
type: 'onHoldStart'
|
|
191
188
|
}, n));
|
|
192
189
|
} // if the hold is canceled from the onHoldStart handler, we should bail early and prevent
|
|
@@ -202,10 +199,8 @@ var Hold = /*#__PURE__*/function () {
|
|
|
202
199
|
}
|
|
203
200
|
|
|
204
201
|
if (_this.pulsing) {
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
if (onHold) {
|
|
208
|
-
onHold({
|
|
202
|
+
if (_this.onHold) {
|
|
203
|
+
_this.onHold({
|
|
209
204
|
type: 'onHold',
|
|
210
205
|
time: holdTime
|
|
211
206
|
});
|
package/Touchable/Touch.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports
|
|
6
|
+
exports["default"] = exports.Touch = void 0;
|
|
7
7
|
|
|
8
8
|
var _handle = require("@enact/core/handle");
|
|
9
9
|
|
|
@@ -31,7 +31,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
31
31
|
|
|
32
32
|
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); } }
|
|
33
33
|
|
|
34
|
-
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
|
|
34
|
+
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
35
35
|
|
|
36
36
|
var getEventCoordinates = function getEventCoordinates(ev) {
|
|
37
37
|
var x = ev.clientX,
|
package/Touchable/Touchable.d.ts
CHANGED
|
@@ -93,7 +93,7 @@ export interface TouchableProps {
|
|
|
93
93
|
* * `type` - Type of event, `'onHoldStart'`
|
|
94
94
|
* * `name` - The name of the hold as configured in the events list
|
|
95
95
|
* * `time` - Time, in milliseconds, configured for this hold which may vary slightly
|
|
96
|
-
|
|
96
|
+
from time since the hold began
|
|
97
97
|
*/
|
|
98
98
|
onHoldStart?: Function;
|
|
99
99
|
/**
|
|
@@ -146,7 +146,7 @@ Only applies when `global` is `false` .
|
|
|
146
146
|
* * `'border-box'` - the default, includes the padding and border but excludes the margin.
|
|
147
147
|
* * `'content-box'` - excludes the padding, border, and margin.
|
|
148
148
|
* * `global` - When `true` , drag gestures will continue when leaving the bounds of the component
|
|
149
|
-
|
|
149
|
+
or blurring the component.
|
|
150
150
|
* * `moveTolerance` - The number of pixels from the start position of the drag that the pointer
|
|
151
151
|
may move before cancelling the drag. Defaults to `16` .
|
|
152
152
|
*
|
|
@@ -161,7 +161,7 @@ time per move, that must be exceeded to generate a `onFlick` event.
|
|
|
161
161
|
* * `cancelOnMove` - When `true` , the hold is cancelled when moving beyond the `moveTolerance` .
|
|
162
162
|
Defaults to `false`
|
|
163
163
|
* * `global` - When `true` , hold gestures will continue when leaving the bounds of the component
|
|
164
|
-
|
|
164
|
+
or blurring the component.
|
|
165
165
|
* * `moveTolerance` - The number of pixels from the start position of the hold that the pointer
|
|
166
166
|
may move before cancelling the hold. Ignored when `cancelOnMove` is `false` . Defaults to
|
|
167
167
|
`16` .
|
package/Touchable/Touchable.js
CHANGED
|
@@ -3,19 +3,20 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
+
exports.Touchable = void 0;
|
|
6
7
|
Object.defineProperty(exports, "configure", {
|
|
7
8
|
enumerable: true,
|
|
8
9
|
get: function get() {
|
|
9
10
|
return _config.configure;
|
|
10
11
|
}
|
|
11
12
|
});
|
|
13
|
+
exports["default"] = void 0;
|
|
12
14
|
Object.defineProperty(exports, "useTouch", {
|
|
13
15
|
enumerable: true,
|
|
14
16
|
get: function get() {
|
|
15
17
|
return _useTouch["default"];
|
|
16
18
|
}
|
|
17
19
|
});
|
|
18
|
-
exports.Touchable = exports["default"] = void 0;
|
|
19
20
|
|
|
20
21
|
var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
|
|
21
22
|
|
|
@@ -35,11 +36,13 @@ var _useTouch = _interopRequireDefault(require("./useTouch"));
|
|
|
35
36
|
|
|
36
37
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
37
38
|
|
|
39
|
+
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
|
+
|
|
38
41
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
39
42
|
|
|
40
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
43
|
+
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; }
|
|
41
44
|
|
|
42
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
45
|
+
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; }
|
|
43
46
|
|
|
44
47
|
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; }
|
|
45
48
|
|
|
@@ -74,7 +77,7 @@ var selectProps = function selectProps(props) {
|
|
|
74
77
|
onMove = props.onMove,
|
|
75
78
|
onTap = props.onTap,
|
|
76
79
|
onUp = props.onUp,
|
|
77
|
-
rest = _objectWithoutProperties(props,
|
|
80
|
+
rest = _objectWithoutProperties(props, _excluded);
|
|
78
81
|
|
|
79
82
|
return {
|
|
80
83
|
configForHook: {
|
package/Touchable/config.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.resetDefaultConfig = exports.mergeConfig = exports.getConfig = exports
|
|
6
|
+
exports.resetDefaultConfig = exports.mergeConfig = exports.getConfig = exports["default"] = exports.configure = void 0;
|
|
7
7
|
|
|
8
8
|
var _Drag = require("./Drag.js");
|
|
9
9
|
|
|
@@ -11,9 +11,9 @@ var _Flick = require("./Flick.js");
|
|
|
11
11
|
|
|
12
12
|
var _Hold = require("./Hold.js");
|
|
13
13
|
|
|
14
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
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
|
|
|
16
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
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
17
|
|
|
18
18
|
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
19
|
|