@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/Toggleable/Toggle.js
CHANGED
|
@@ -8,9 +8,11 @@ var _handle = require("@enact/core/handle");
|
|
|
8
8
|
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; }
|
|
9
9
|
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; }
|
|
10
10
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
11
|
-
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); } }
|
|
11
|
+
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); } }
|
|
12
12
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
13
|
-
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); }
|
|
14
16
|
var isEnabled = (0, _handle.not)((0, _handle.forProp)('disabled', true));
|
|
15
17
|
var makeEvent = function makeEvent(config, value) {
|
|
16
18
|
return _defineProperty({}, config.prop || 'selected', value);
|
package/Toggleable/Toggleable.js
CHANGED
|
@@ -25,7 +25,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
25
25
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
26
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; }
|
|
27
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; }
|
|
28
|
-
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; }
|
|
29
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
30
|
+
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); }
|
|
29
31
|
/**
|
|
30
32
|
* Default config for `Toggleable`.
|
|
31
33
|
*
|
package/Toggleable/useToggle.js
CHANGED
|
@@ -15,7 +15,7 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
|
|
|
15
15
|
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); }
|
|
16
16
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
17
17
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
18
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++)
|
|
18
|
+
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; }
|
|
19
19
|
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; }
|
|
20
20
|
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; }
|
|
21
21
|
/**
|
package/Touchable/ClickAllow.js
CHANGED
|
@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports["default"] = exports.ClickAllow = void 0;
|
|
7
7
|
var _platform = require("@enact/core/platform");
|
|
8
8
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
9
|
-
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); } }
|
|
9
|
+
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); } }
|
|
10
10
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
11
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
12
|
+
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); }
|
|
11
13
|
// It's possible that emitting `onTap` will cause a DOM change before the mousedown fires resulting
|
|
12
14
|
// in multiple tap/click events for the same user action. To avoid this, we store the last touchend
|
|
13
15
|
// target and timestamp to compare against the next mouse down. If the timestamp is different (e.g
|
package/Touchable/Drag.js
CHANGED
|
@@ -9,9 +9,11 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
9
9
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
10
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; }
|
|
11
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; }
|
|
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 _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); } }
|
|
12
|
+
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; }
|
|
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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
16
18
|
var Tracking = {
|
|
17
19
|
Untracked: 0,
|
package/Touchable/Flick.js
CHANGED
|
@@ -9,10 +9,12 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
9
9
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
10
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; }
|
|
11
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; }
|
|
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; }
|
|
12
|
+
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; }
|
|
13
13
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
14
|
-
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); } }
|
|
14
|
+
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); } }
|
|
15
15
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
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
|
var Flick = /*#__PURE__*/function () {
|
|
17
19
|
function Flick() {
|
|
18
20
|
var _this = this;
|
package/Touchable/Hold.js
CHANGED
|
@@ -8,10 +8,12 @@ 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
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
|
var Hold = /*#__PURE__*/function () {
|
|
16
18
|
function Hold() {
|
|
17
19
|
var _this = this;
|
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.pinchConfigPropType = exports.defaultPinchConfig = exports["default"] = exports.Pinch = void 0;
|
|
7
|
+
var _clamp = _interopRequireDefault(require("ramda/src/clamp"));
|
|
8
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
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; }
|
|
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; }
|
|
12
|
+
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; }
|
|
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
|
+
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); }
|
|
17
|
+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
18
|
+
var Pinch = /*#__PURE__*/_createClass(function Pinch() {
|
|
19
|
+
var _this = this;
|
|
20
|
+
_classCallCheck(this, Pinch);
|
|
21
|
+
this.pinchConfig = null;
|
|
22
|
+
this.startScale = 1.0;
|
|
23
|
+
this.scale = 1.0;
|
|
24
|
+
this.isPinching = function () {
|
|
25
|
+
return _this.pinchConfig != null;
|
|
26
|
+
};
|
|
27
|
+
this.setContainerBounds = function (node) {
|
|
28
|
+
var _this$pinchConfig = _this.pinchConfig,
|
|
29
|
+
isGlobal = _this$pinchConfig.global,
|
|
30
|
+
boxSizing = _this$pinchConfig.boxSizing;
|
|
31
|
+
var bounds = null;
|
|
32
|
+
if (typeof window === 'undefined' || !node) return;
|
|
33
|
+
if (isGlobal) {
|
|
34
|
+
bounds = {
|
|
35
|
+
minX: 0,
|
|
36
|
+
minY: 0,
|
|
37
|
+
maxX: window.innerWidth,
|
|
38
|
+
maxY: window.innerHeight
|
|
39
|
+
};
|
|
40
|
+
} else {
|
|
41
|
+
bounds = node.getBoundingClientRect();
|
|
42
|
+
|
|
43
|
+
// adjust for padding when using content-box
|
|
44
|
+
if (boxSizing === 'content-box') {
|
|
45
|
+
var computedStyle = window.getComputedStyle(node);
|
|
46
|
+
bounds = {
|
|
47
|
+
minX: bounds.left + parseInt(computedStyle.paddingLeft),
|
|
48
|
+
minY: bounds.top + parseInt(computedStyle.paddingTop),
|
|
49
|
+
maxX: bounds.right - parseInt(computedStyle.paddingRight),
|
|
50
|
+
maxY: bounds.bottom - parseInt(computedStyle.paddingBottom)
|
|
51
|
+
};
|
|
52
|
+
} else {
|
|
53
|
+
bounds = {
|
|
54
|
+
minX: bounds.left,
|
|
55
|
+
minY: bounds.top,
|
|
56
|
+
maxX: bounds.right,
|
|
57
|
+
maxY: bounds.bottom
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
_this.bounds = bounds;
|
|
62
|
+
};
|
|
63
|
+
this.getBoundsCoords = function (_ref) {
|
|
64
|
+
var x = _ref.x,
|
|
65
|
+
y = _ref.y;
|
|
66
|
+
var _this$bounds = _this.bounds,
|
|
67
|
+
maxX = _this$bounds.maxX,
|
|
68
|
+
maxY = _this$bounds.maxY,
|
|
69
|
+
minX = _this$bounds.minX,
|
|
70
|
+
minY = _this$bounds.minY;
|
|
71
|
+
return {
|
|
72
|
+
x: (0, _clamp["default"])(minX, maxX, x) - minX,
|
|
73
|
+
y: (0, _clamp["default"])(minY, maxY, y) - minY
|
|
74
|
+
};
|
|
75
|
+
};
|
|
76
|
+
this.getDistance = function (coords) {
|
|
77
|
+
if (Array.isArray(coords)) {
|
|
78
|
+
var _this$getBoundsCoords = _this.getBoundsCoords(coords[0]),
|
|
79
|
+
x1 = _this$getBoundsCoords.x,
|
|
80
|
+
y1 = _this$getBoundsCoords.y;
|
|
81
|
+
var _this$getBoundsCoords2 = _this.getBoundsCoords(coords[1]),
|
|
82
|
+
x2 = _this$getBoundsCoords2.x,
|
|
83
|
+
y2 = _this$getBoundsCoords2.y;
|
|
84
|
+
var dx = x1 - x2;
|
|
85
|
+
var dy = y1 - y2;
|
|
86
|
+
return Math.sqrt(dx * dx + dy * dy);
|
|
87
|
+
}
|
|
88
|
+
return 0;
|
|
89
|
+
};
|
|
90
|
+
this.updateScale = function (scale) {
|
|
91
|
+
var _this$pinchConfig2 = _this.pinchConfig,
|
|
92
|
+
maxScale = _this$pinchConfig2.maxScale,
|
|
93
|
+
minScale = _this$pinchConfig2.minScale;
|
|
94
|
+
var newScale = (0, _clamp["default"])(minScale, maxScale, scale);
|
|
95
|
+
if (newScale !== _this.scale) {
|
|
96
|
+
_this.scale = newScale;
|
|
97
|
+
return true;
|
|
98
|
+
}
|
|
99
|
+
return false;
|
|
100
|
+
};
|
|
101
|
+
this.begin = function (config, _ref2, coords, node) {
|
|
102
|
+
var noResume = _ref2.noResume,
|
|
103
|
+
onPinch = _ref2.onPinch,
|
|
104
|
+
onPinchEnd = _ref2.onPinchEnd,
|
|
105
|
+
onPinchStart = _ref2.onPinchStart;
|
|
106
|
+
if (!onPinch && !onPinchStart && !onPinchEnd) {
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
_this.pinchConfig = _objectSpread(_objectSpread({}, config), {}, {
|
|
110
|
+
node: node,
|
|
111
|
+
resume: !noResume
|
|
112
|
+
});
|
|
113
|
+
_this.setContainerBounds(node);
|
|
114
|
+
_this.startDist = _this.getDistance(coords);
|
|
115
|
+
_this.previousDist = _this.startDist;
|
|
116
|
+
_this.startScale = _this.scale;
|
|
117
|
+
_this.onPinch = onPinch;
|
|
118
|
+
_this.onPinchStart = onPinchStart;
|
|
119
|
+
_this.onPinchEnd = onPinchEnd;
|
|
120
|
+
if (_this.onPinchStart) {
|
|
121
|
+
_this.onPinchStart({
|
|
122
|
+
type: 'onPinchStart',
|
|
123
|
+
coords: coords
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
};
|
|
127
|
+
this.updateProps = function (_ref3) {
|
|
128
|
+
var onPinch = _ref3.onPinch,
|
|
129
|
+
onPinchEnd = _ref3.onPinchEnd,
|
|
130
|
+
onPinchStart = _ref3.onPinchStart;
|
|
131
|
+
// Check `isPinching` gesture is not in progress. Check if gesture exists before updating the references to the `pinchConfig`
|
|
132
|
+
if (!_this.isPinching()) return;
|
|
133
|
+
|
|
134
|
+
// This will update the `pinchConfig` with the new value
|
|
135
|
+
_this.onPinch = onPinch;
|
|
136
|
+
_this.onPinchStart = onPinchStart;
|
|
137
|
+
_this.onPinchEnd = onPinchEnd;
|
|
138
|
+
};
|
|
139
|
+
this.move = function (coords) {
|
|
140
|
+
if (!_this.isPinching()) return;
|
|
141
|
+
var moveTolerance = _this.pinchConfig.moveTolerance;
|
|
142
|
+
var currentDist = _this.getDistance(coords);
|
|
143
|
+
var scale = currentDist / _this.startDist * _this.startScale;
|
|
144
|
+
if (Math.abs(_this.previousDist - currentDist) > moveTolerance && _this.onPinch && _this.updateScale(scale)) {
|
|
145
|
+
_this.onPinch({
|
|
146
|
+
type: 'onPinch',
|
|
147
|
+
scale: _this.scale,
|
|
148
|
+
coords: coords
|
|
149
|
+
});
|
|
150
|
+
_this.previousDist = currentDist;
|
|
151
|
+
}
|
|
152
|
+
};
|
|
153
|
+
this.blur = function () {
|
|
154
|
+
if (!_this.isPinching()) return;
|
|
155
|
+
if (!_this.pinchConfig.global) {
|
|
156
|
+
_this.end();
|
|
157
|
+
}
|
|
158
|
+
};
|
|
159
|
+
this.end = function () {
|
|
160
|
+
if (!_this.isPinching()) return;
|
|
161
|
+
if (_this.onPinchEnd) {
|
|
162
|
+
_this.onPinchEnd({
|
|
163
|
+
type: 'onPinchEnd'
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
_this.pinchConfig = null;
|
|
167
|
+
};
|
|
168
|
+
});
|
|
169
|
+
exports.Pinch = Pinch;
|
|
170
|
+
var defaultPinchConfig = {
|
|
171
|
+
boxSizing: 'border-box',
|
|
172
|
+
global: false,
|
|
173
|
+
maxScale: 4,
|
|
174
|
+
minScale: 0.5,
|
|
175
|
+
moveTolerance: 16
|
|
176
|
+
};
|
|
177
|
+
exports.defaultPinchConfig = defaultPinchConfig;
|
|
178
|
+
var pinchConfigPropType = _propTypes["default"].shape({
|
|
179
|
+
boxSizing: _propTypes["default"].string,
|
|
180
|
+
global: _propTypes["default"].bool,
|
|
181
|
+
maxScale: _propTypes["default"].number,
|
|
182
|
+
minScale: _propTypes["default"].number,
|
|
183
|
+
moveTolerance: _propTypes["default"].number
|
|
184
|
+
});
|
|
185
|
+
exports.pinchConfigPropType = pinchConfigPropType;
|
|
186
|
+
var _default = Pinch;
|
|
187
|
+
exports["default"] = _default;
|
package/Touchable/Touch.js
CHANGED
|
@@ -14,17 +14,29 @@ var _ClickAllow = _interopRequireDefault(require("./ClickAllow"));
|
|
|
14
14
|
var _Drag = require("./Drag");
|
|
15
15
|
var _Flick = require("./Flick");
|
|
16
16
|
var _Hold = require("./Hold");
|
|
17
|
+
var _Pinch = require("./Pinch");
|
|
17
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
18
19
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
19
|
-
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); } }
|
|
20
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
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
23
|
+
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); }
|
|
21
24
|
var getEventCoordinates = function getEventCoordinates(ev) {
|
|
22
25
|
var x = ev.clientX,
|
|
23
26
|
y = ev.clientY,
|
|
24
27
|
type = ev.type;
|
|
25
28
|
if (type.indexOf('touch') === 0) {
|
|
26
|
-
|
|
27
|
-
|
|
29
|
+
if (ev.targetTouches.length >= 2) {
|
|
30
|
+
return Array.from(ev.targetTouches, function (targetTouch) {
|
|
31
|
+
return {
|
|
32
|
+
x: targetTouch.clientX,
|
|
33
|
+
y: targetTouch.clientY
|
|
34
|
+
};
|
|
35
|
+
});
|
|
36
|
+
} else {
|
|
37
|
+
x = ev.targetTouches[0].clientX;
|
|
38
|
+
y = ev.targetTouches[0].clientY;
|
|
39
|
+
}
|
|
28
40
|
}
|
|
29
41
|
return {
|
|
30
42
|
x: x,
|
|
@@ -107,6 +119,7 @@ var Touch = /*#__PURE__*/function () {
|
|
|
107
119
|
this.drag = new _Drag.Drag();
|
|
108
120
|
this.flick = new _Flick.Flick();
|
|
109
121
|
this.hold = new _Hold.Hold();
|
|
122
|
+
this.pinch = new _Pinch.Pinch();
|
|
110
123
|
this.clickAllow = new _ClickAllow["default"]();
|
|
111
124
|
this.handlers = {
|
|
112
125
|
onClick: handleClick.bindAs(this, 'handleClick'),
|
|
@@ -137,11 +150,12 @@ var Touch = /*#__PURE__*/function () {
|
|
|
137
150
|
}
|
|
138
151
|
}, {
|
|
139
152
|
key: "updateGestureConfig",
|
|
140
|
-
value: function updateGestureConfig(dragConfig, flickConfig, holdConfig) {
|
|
153
|
+
value: function updateGestureConfig(dragConfig, flickConfig, holdConfig, pinchConfig) {
|
|
141
154
|
this.config = (0, _config.mergeConfig)({
|
|
142
155
|
drag: dragConfig,
|
|
143
156
|
flick: flickConfig,
|
|
144
|
-
hold: holdConfig
|
|
157
|
+
hold: holdConfig,
|
|
158
|
+
pinch: pinchConfig
|
|
145
159
|
});
|
|
146
160
|
}
|
|
147
161
|
}, {
|
|
@@ -210,7 +224,8 @@ var Touch = /*#__PURE__*/function () {
|
|
|
210
224
|
}, {
|
|
211
225
|
key: "updateProps",
|
|
212
226
|
value: function updateProps(props) {
|
|
213
|
-
// Update the props onHoldStart, onHold, and onHoldEnd on any gesture (hold, flick, drag).
|
|
227
|
+
// Update the props onHoldStart, onHold, and onHoldEnd on any gesture (pinch, hold, flick, drag).
|
|
228
|
+
this.pinch.updateProps(props);
|
|
214
229
|
this.hold.updateProps(props);
|
|
215
230
|
this.flick.updateProps(props);
|
|
216
231
|
this.drag.updateProps(props);
|
|
@@ -240,12 +255,17 @@ var Touch = /*#__PURE__*/function () {
|
|
|
240
255
|
value: function startGesture(ev, props) {
|
|
241
256
|
var coords = getEventCoordinates(ev);
|
|
242
257
|
var _this$config = this.config,
|
|
258
|
+
pinch = _this$config.pinch,
|
|
243
259
|
hold = _this$config.hold,
|
|
244
260
|
flick = _this$config.flick,
|
|
245
261
|
drag = _this$config.drag;
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
262
|
+
if (Array.isArray(coords)) {
|
|
263
|
+
this.pinch.begin(pinch, props, coords, this.target);
|
|
264
|
+
} else {
|
|
265
|
+
this.hold.begin(hold, props, coords);
|
|
266
|
+
this.flick.begin(flick, props, coords);
|
|
267
|
+
this.drag.begin(drag, props, coords, this.target);
|
|
268
|
+
}
|
|
249
269
|
this.targetHadFocus = this.target === document.activeElement;
|
|
250
270
|
return true;
|
|
251
271
|
}
|
|
@@ -253,9 +273,13 @@ var Touch = /*#__PURE__*/function () {
|
|
|
253
273
|
key: "moveGesture",
|
|
254
274
|
value: function moveGesture(ev) {
|
|
255
275
|
var coords = getEventCoordinates(ev);
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
276
|
+
if (Array.isArray(coords)) {
|
|
277
|
+
this.pinch.move(coords);
|
|
278
|
+
} else {
|
|
279
|
+
this.hold.move(coords);
|
|
280
|
+
this.flick.move(coords);
|
|
281
|
+
this.drag.move(coords);
|
|
282
|
+
}
|
|
259
283
|
return true;
|
|
260
284
|
}
|
|
261
285
|
}, {
|
|
@@ -285,6 +309,7 @@ var Touch = /*#__PURE__*/function () {
|
|
|
285
309
|
key: "endGesture",
|
|
286
310
|
value: function endGesture() {
|
|
287
311
|
this.targetHadFocus = false;
|
|
312
|
+
this.pinch.end();
|
|
288
313
|
this.hold.end();
|
|
289
314
|
this.flick.end();
|
|
290
315
|
this.drag.end();
|
package/Touchable/Touchable.d.ts
CHANGED
|
@@ -100,6 +100,32 @@ from time since the hold began
|
|
|
100
100
|
* Event handler for 'move' pointer events.
|
|
101
101
|
*/
|
|
102
102
|
onMove?: Function;
|
|
103
|
+
/**
|
|
104
|
+
* Event handler for a pinch gesture.
|
|
105
|
+
*
|
|
106
|
+
* Event payload includes:
|
|
107
|
+
* * `type` - Type of event, `'onPinch'`
|
|
108
|
+
* * `scale` - The scale factor, calculated from the distance while pinching.
|
|
109
|
+
The default value is 1.0. The value would be a number between
|
|
110
|
+
pinchConfig.minScale and pinchConfig.maxScale.
|
|
111
|
+
* * `coords` - The coordinates array of the touch point, relative to the viewport
|
|
112
|
+
*/
|
|
113
|
+
onPinch?: Function;
|
|
114
|
+
/**
|
|
115
|
+
* Event handler for the end of a pinch gesture.
|
|
116
|
+
*
|
|
117
|
+
* Event payload includes:
|
|
118
|
+
* * `type` - Type of event, `'onPinchEnd'`
|
|
119
|
+
*/
|
|
120
|
+
onPinchEnd?: Function;
|
|
121
|
+
/**
|
|
122
|
+
* Event handler for the start of a pinch gesture.
|
|
123
|
+
*
|
|
124
|
+
* Event payload includes:
|
|
125
|
+
* * `type` - Type of event, `'onPinchStart'`
|
|
126
|
+
* * `coords` - The coordinates array of the touch point, relative to the viewport
|
|
127
|
+
*/
|
|
128
|
+
onPinchStart?: Function;
|
|
103
129
|
/**
|
|
104
130
|
* Event handler for 'tap' pointer events.
|
|
105
131
|
*/
|
|
@@ -108,6 +134,10 @@ from time since the hold began
|
|
|
108
134
|
* Event handler for 'up' pointer events.
|
|
109
135
|
*/
|
|
110
136
|
onUp?: Function;
|
|
137
|
+
/**
|
|
138
|
+
* Instance-specific overrides of the pinch configuration.
|
|
139
|
+
*/
|
|
140
|
+
pinchConfig?: object;
|
|
111
141
|
}
|
|
112
142
|
export function Touchable<P>(
|
|
113
143
|
config: TouchableConfig,
|
|
@@ -169,6 +199,18 @@ may move before cancelling the hold. Ignored when `cancelOnMove` is `false` .
|
|
|
169
199
|
* * `events` - An array of `onHoldStart` events which each contain a `name` and `time` . The `time`
|
|
170
200
|
controls the amount of time that must pass before this `onHoldStart` event is fired and should
|
|
171
201
|
be a multiple of `frequency` .
|
|
202
|
+
*
|
|
203
|
+
* `pinch`
|
|
204
|
+
* * `boxSizing` - The part of the component's box model is used as the bounds of the constraint.
|
|
205
|
+
Only applies when `global` is `false` .
|
|
206
|
+
* * `'border-box'` - the default, includes the padding and border but excludes the margin.
|
|
207
|
+
* * `'content-box'` - excludes the padding, border, and margin.
|
|
208
|
+
* * `global` - When `true` , pinch gestures will continue when leaving the bounds of the component
|
|
209
|
+
or blurring the component.
|
|
210
|
+
* * `maxScale` - The maximum scale value. Defaults to `4` .
|
|
211
|
+
* * `minScale` - The minimum scale value. Defaults to `0.5` .
|
|
212
|
+
* * `moveTolerance` - The distance difference from the previous distance that the pointer may move
|
|
213
|
+
before cancelling the scaling. Defaults to `16` .
|
|
172
214
|
*/
|
|
173
215
|
export function configure(cfg: object): void;
|
|
174
216
|
|
package/Touchable/Touchable.js
CHANGED
|
@@ -24,19 +24,23 @@ var _config = require("./config");
|
|
|
24
24
|
var _Drag = require("./Drag");
|
|
25
25
|
var _Flick = require("./Flick");
|
|
26
26
|
var _Hold = require("./Hold");
|
|
27
|
+
var _Pinch = require("./Pinch");
|
|
27
28
|
var _useTouch = _interopRequireDefault(require("./useTouch"));
|
|
28
29
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
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"];
|
|
30
|
+
var _excluded = ["dragConfig", "flickConfig", "holdConfig", "pinchConfig", "disabled", "noResume", "onBlur", "onClick", "onMouseDown", "onMouseEnter", "onMouseLeave", "onMouseMove", "onMouseUp", "onTouchEnd", "onTouchMove", "onTouchStart", "onDown", "onDrag", "onDragEnd", "onDragStart", "onFlick", "onHold", "onHoldEnd", "onHoldStart", "onMove", "onPinch", "onPinchEnd", "onPinchStart", "onTap", "onUp"];
|
|
30
31
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
31
32
|
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
33
|
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; }
|
|
34
|
+
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; }
|
|
35
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
36
|
+
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
37
|
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; }
|
|
35
38
|
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; }
|
|
36
39
|
var selectProps = function selectProps(props) {
|
|
37
40
|
var dragConfig = props.dragConfig,
|
|
38
41
|
flickConfig = props.flickConfig,
|
|
39
42
|
holdConfig = props.holdConfig,
|
|
43
|
+
pinchConfig = props.pinchConfig,
|
|
40
44
|
disabled = props.disabled,
|
|
41
45
|
noResume = props.noResume,
|
|
42
46
|
onBlur = props.onBlur,
|
|
@@ -58,6 +62,9 @@ var selectProps = function selectProps(props) {
|
|
|
58
62
|
onHoldEnd = props.onHoldEnd,
|
|
59
63
|
onHoldStart = props.onHoldStart,
|
|
60
64
|
onMove = props.onMove,
|
|
65
|
+
onPinch = props.onPinch,
|
|
66
|
+
onPinchEnd = props.onPinchEnd,
|
|
67
|
+
onPinchStart = props.onPinchStart,
|
|
61
68
|
onTap = props.onTap,
|
|
62
69
|
onUp = props.onUp,
|
|
63
70
|
rest = _objectWithoutProperties(props, _excluded);
|
|
@@ -67,6 +74,7 @@ var selectProps = function selectProps(props) {
|
|
|
67
74
|
dragConfig: dragConfig,
|
|
68
75
|
flickConfig: flickConfig,
|
|
69
76
|
holdConfig: holdConfig,
|
|
77
|
+
pinchConfig: pinchConfig,
|
|
70
78
|
/* general props */
|
|
71
79
|
disabled: disabled,
|
|
72
80
|
noResume: noResume,
|
|
@@ -91,6 +99,9 @@ var selectProps = function selectProps(props) {
|
|
|
91
99
|
onHoldEnd: onHoldEnd,
|
|
92
100
|
onHoldStart: onHoldStart,
|
|
93
101
|
onMove: onMove,
|
|
102
|
+
onPinch: onPinch,
|
|
103
|
+
onPinchEnd: onPinchEnd,
|
|
104
|
+
onPinchStart: onPinchStart,
|
|
94
105
|
onTap: onTap,
|
|
95
106
|
onUp: onUp
|
|
96
107
|
},
|
|
@@ -120,8 +131,8 @@ var defaultConfig = {
|
|
|
120
131
|
/**
|
|
121
132
|
* A higher-order component that provides a consistent set of pointer events -- `onDown`, `onUp`,
|
|
122
133
|
* and `onTap` -- across mouse and touch interfaces along with support for common gestures including
|
|
123
|
-
* `onFlick`, `onDrag`, `onHoldStart`, `onHold`,
|
|
124
|
-
*
|
|
134
|
+
* `onFlick`, `onDragStart`, `onDrag`, `onDragEnd`, `onHoldStart`, `onHold`, `onHoldEnd`,
|
|
135
|
+
* `onPinchStart`, `onPinch`, and `onPinchEnd`.
|
|
125
136
|
* Note: This HoC passes a number of props to the wrapped component that should be passed to the
|
|
126
137
|
* main DOM node or consumed by the wrapped component.
|
|
127
138
|
*
|
|
@@ -308,6 +319,47 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
308
319
|
* @public
|
|
309
320
|
*/
|
|
310
321
|
onMove: _propTypes["default"].func,
|
|
322
|
+
/**
|
|
323
|
+
* Event handler for a pinch gesture.
|
|
324
|
+
*
|
|
325
|
+
* Event payload includes:
|
|
326
|
+
*
|
|
327
|
+
* * `type` - Type of event, `'onPinch'`
|
|
328
|
+
* * `scale` - The scale factor, calculated from the distance while pinching.
|
|
329
|
+
* The default value is 1.0. The value would be a number between
|
|
330
|
+
* pinchConfig.minScale and pinchConfig.maxScale.
|
|
331
|
+
* * `coords` - The coordinates array of the touch point, relative to the viewport
|
|
332
|
+
*
|
|
333
|
+
* @memberof ui/Touchable.Touchable.prototype
|
|
334
|
+
* @type {Function}
|
|
335
|
+
* @public
|
|
336
|
+
*/
|
|
337
|
+
onPinch: _propTypes["default"].func,
|
|
338
|
+
/**
|
|
339
|
+
* Event handler for the end of a pinch gesture.
|
|
340
|
+
*
|
|
341
|
+
* Event payload includes:
|
|
342
|
+
*
|
|
343
|
+
* * `type` - Type of event, `'onPinchEnd'`
|
|
344
|
+
*
|
|
345
|
+
* @memberof ui/Touchable.Touchable.prototype
|
|
346
|
+
* @type {Function}
|
|
347
|
+
* @public
|
|
348
|
+
*/
|
|
349
|
+
onPinchEnd: _propTypes["default"].func,
|
|
350
|
+
/**
|
|
351
|
+
* Event handler for the start of a pinch gesture.
|
|
352
|
+
*
|
|
353
|
+
* Event payload includes:
|
|
354
|
+
*
|
|
355
|
+
* * `type` - Type of event, `'onPinchStart'`
|
|
356
|
+
* * `coords` - The coordinates array of the touch point, relative to the viewport
|
|
357
|
+
*
|
|
358
|
+
* @memberof ui/Touchable.Touchable.prototype
|
|
359
|
+
* @type {Function}
|
|
360
|
+
* @public
|
|
361
|
+
*/
|
|
362
|
+
onPinchStart: _propTypes["default"].func,
|
|
311
363
|
/**
|
|
312
364
|
* Event handler for 'tap' pointer events.
|
|
313
365
|
*
|
|
@@ -323,7 +375,16 @@ var Touchable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
|
323
375
|
* @type {Function}
|
|
324
376
|
* @public
|
|
325
377
|
*/
|
|
326
|
-
onUp: _propTypes["default"].func
|
|
378
|
+
onUp: _propTypes["default"].func,
|
|
379
|
+
/**
|
|
380
|
+
* Instance-specific overrides of the pinch configuration.
|
|
381
|
+
*
|
|
382
|
+
* @see {@link ui/Touchable.configure}
|
|
383
|
+
* @memberof ui/Touchable.Touchable.prototype
|
|
384
|
+
* @type {Object}
|
|
385
|
+
* @public
|
|
386
|
+
*/
|
|
387
|
+
pinchConfig: _Pinch.pinchConfigPropType
|
|
327
388
|
};
|
|
328
389
|
Touchable.defaultProps = {
|
|
329
390
|
disabled: false,
|