@enact/ui 4.6.2 → 4.7.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.
Files changed (91) hide show
  1. package/AnnounceDecorator/Announce.js +25 -16
  2. package/AnnounceDecorator/AnnounceDecorator.js +14 -7
  3. package/AnnounceDecorator/useAnnounce.js +1 -2
  4. package/BodyText/BodyText.js +14 -8
  5. package/Button/Button.js +16 -10
  6. package/Button/tests/Button-specs.js +10 -6
  7. package/CHANGELOG.md +18 -0
  8. package/Cancelable/Cancelable.js +13 -7
  9. package/Changeable/Changeable.js +11 -7
  10. package/ComponentOverride/ComponentOverride.js +18 -7
  11. package/FloatingLayer/FloatingLayer.js +10 -11
  12. package/FloatingLayer/FloatingLayerDecorator.js +9 -6
  13. package/ForwardRef/ForwardRef.js +11 -7
  14. package/GridListImageItem/GridListImageItem.js +16 -9
  15. package/Group/Group.js +17 -8
  16. package/Group/GroupItem.js +14 -10
  17. package/Group/tests/Group-specs.js +14 -9
  18. package/Heading/Heading.js +20 -9
  19. package/Icon/Icon.js +15 -8
  20. package/IconButton/IconButton.js +22 -9
  21. package/Image/Image.js +16 -8
  22. package/ImageItem/ImageItem.js +9 -1
  23. package/Item/Item.js +17 -9
  24. package/Item/tests/Item-specs.js +10 -6
  25. package/LabeledIcon/LabeledIcon.js +16 -8
  26. package/Layout/Cell.js +27 -4
  27. package/Layout/Layout.d.ts +22 -5
  28. package/Layout/Layout.js +154 -32
  29. package/Layout/Layout.module.css +8 -0
  30. package/Layout/tests/Layout-specs.js +39 -0
  31. package/Marquee/MarqueeController.js +43 -0
  32. package/Marquee/MarqueeDecorator.js +40 -9
  33. package/Measurable/Measurable.js +11 -7
  34. package/Media/Media.js +30 -23
  35. package/Placeholder/PlaceholderControllerDecorator.js +8 -8
  36. package/Placeholder/PlaceholderDecorator.js +7 -8
  37. package/ProgressBar/ProgressBar.js +12 -1
  38. package/RadioDecorator/RadioDecorator.js +18 -13
  39. package/RadioDecorator/tests/RadioDecorator-specs.js +28 -20
  40. package/Repeater/Repeater.js +14 -10
  41. package/Resizable/Resizable.js +28 -98
  42. package/Resizable/ResizeContext.js +17 -0
  43. package/Resizable/tests/useResize-specs.js +43 -0
  44. package/Resizable/useResize.js +66 -0
  45. package/Routable/Link.js +8 -8
  46. package/Routable/Routable.js +15 -8
  47. package/Routable/Router.js +10 -10
  48. package/Routable/tests/Routable-specs.js +9 -6
  49. package/Scrollable/ScrollThumb.js +8 -9
  50. package/Scrollable/Scrollable.js +23 -7
  51. package/Scrollable/ScrollableNative.js +19 -14
  52. package/Scroller/Scroller.js +8 -1
  53. package/Scroller/ScrollerBasic.js +8 -9
  54. package/Scroller/UiScrollerBase.js +11 -12
  55. package/Skinnable/Skinnable.js +19 -7
  56. package/Skinnable/useSkins.js +1 -2
  57. package/Slider/Knob.js +8 -8
  58. package/Slider/Slider.js +16 -9
  59. package/SlotItem/SlotItem.js +20 -8
  60. package/Slottable/Slottable.js +14 -8
  61. package/Spinner/Spinner.js +24 -9
  62. package/ToggleIcon/ToggleIcon.js +21 -9
  63. package/ToggleIcon/tests/ToggleIcon-specs.js +6 -3
  64. package/ToggleItem/ToggleItem.js +14 -1
  65. package/ToggleItem/tests/ToggleItem-specs.js +6 -3
  66. package/Toggleable/Toggleable.js +11 -7
  67. package/Toggleable/useToggle.js +0 -1
  68. package/Touchable/Drag.js +1 -0
  69. package/Touchable/Flick.js +1 -0
  70. package/Touchable/Hold.js +1 -0
  71. package/Touchable/Pinch.js +1 -0
  72. package/Touchable/Touch.js +3 -3
  73. package/Touchable/Touchable.js +7 -0
  74. package/Touchable/useTouch.js +0 -1
  75. package/Transition/Transition.js +19 -3
  76. package/ViewManager/Arranger.js +4 -1
  77. package/ViewManager/TransitionGroup.js +5 -4
  78. package/ViewManager/View.js +12 -12
  79. package/ViewManager/ViewManager.js +25 -9
  80. package/ViewManager/tests/ViewManager-specs.js +44 -0
  81. package/VirtualList/UiVirtualListBase.js +3 -4
  82. package/VirtualList/VirtualList.js +11 -1
  83. package/VirtualList/VirtualListBasic.js +4 -4
  84. package/internal/IdProvider/IdProvider.js +6 -7
  85. package/internal/IdProvider/useId.js +0 -1
  86. package/internal/Pure/Pure.js +11 -7
  87. package/package.json +3 -3
  88. package/resolution/ResolutionDecorator.js +36 -7
  89. package/resolution/resolution.js +23 -7
  90. package/useScroll/ScrollbarTrack.js +8 -8
  91. package/useScroll/useScroll.js +17 -1
@@ -0,0 +1,43 @@
1
+ "use strict";
2
+
3
+ var _Registry = _interopRequireDefault(require("@enact/core/internal/Registry"));
4
+ var _react = require("@testing-library/react");
5
+ var _Resizable = require("../Resizable");
6
+ var _useResize = _interopRequireDefault(require("../useResize"));
7
+ var _jsxRuntime = require("react/jsx-runtime");
8
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
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
+ 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
12
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
13
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
14
+ describe('useResize', function () {
15
+ var data;
16
+ var DivComponent = function DivComponent(props) {
17
+ data = props;
18
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
19
+ "data-testid": "component"
20
+ });
21
+ };
22
+ var ResizeButtonWithHook = function ResizeButtonWithHook(props) {
23
+ var handlers = (0, _useResize["default"])(props, {
24
+ resize: 'onClick'
25
+ });
26
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(DivComponent, _objectSpread(_objectSpread({}, handlers), {}, {
27
+ children: props.children
28
+ }));
29
+ };
30
+ describe('config', function () {
31
+ test('should pass \'onClick\' handler to the wrapped component', function () {
32
+ var resizeRegistry = _Registry["default"].create();
33
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Resizable.ResizeContext.Provider, {
34
+ value: resizeRegistry.register,
35
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ResizeButtonWithHook, {})
36
+ }));
37
+ expect(data).toHaveProperty('onClick');
38
+ var expected = 'function';
39
+ var actual = typeof data.onClick;
40
+ expect(actual).toBe(expected);
41
+ });
42
+ });
43
+ });
@@ -0,0 +1,66 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = void 0;
7
+ var _handle = require("@enact/core/handle");
8
+ var _react = require("react");
9
+ var _ResizeContext = _interopRequireDefault(require("./ResizeContext"));
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
11
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
12
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
13
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
14
+ /**
15
+ * Object returned by `useResize`
16
+ * Object has a property named with the value of the resize property of config.
17
+ * And this property has resizehandler.
18
+ *
19
+ * @typedef {Object} useResizeInterface
20
+ * @memberof ui/Resizable
21
+ * @private
22
+ */
23
+ /**
24
+ * A custom hook which returns handler that indicates a resize is necessary
25
+ *
26
+ * @param {Object} props Resize component props
27
+ * @param {Object} config Configuration options with resize, filter property
28
+ * @returns {useResizeInterface}
29
+ * @private
30
+ *
31
+ */
32
+ var useResize = function useResize(props, config) {
33
+ // `resize` is the name of the event on the component to listen for size changes.
34
+ var _config$filter = config.filter,
35
+ filter = _config$filter === void 0 ? null : _config$filter,
36
+ _config$resize = config.resize,
37
+ resize = _config$resize === void 0 ? null : _config$resize;
38
+ var resizeContextValue = (0, _react.useContext)(_ResizeContext["default"]);
39
+ var mutableRef = (0, _react.useRef)({
40
+ resizeRegistry: null
41
+ });
42
+ (0, _react.useEffect)(function () {
43
+ var resizeRegistry = mutableRef.current.resizeRegistry;
44
+ if (resizeContextValue && typeof resizeContextValue === 'function') {
45
+ mutableRef.current.resizeRegistry = resizeContextValue(function () {});
46
+ }
47
+ return function () {
48
+ if (resizeRegistry) {
49
+ resizeRegistry.unregister();
50
+ }
51
+ };
52
+ }, [resizeContextValue]);
53
+ var handleResize = (0, _react.useCallback)(function (ev) {
54
+ (0, _handle.forward)(resize, ev, props);
55
+
56
+ // Notifies a container that a resize is necessary
57
+ if ((filter === null || filter(ev, props)) && mutableRef.current.resizeRegistry) {
58
+ mutableRef.current.resizeRegistry.notify({
59
+ action: 'invalidateBounds'
60
+ });
61
+ }
62
+ }, [filter, props, resize]);
63
+ return _defineProperty({}, resize, handleResize);
64
+ };
65
+ var _default = useResize;
66
+ exports["default"] = _default;
package/Routable/Link.js CHANGED
@@ -13,6 +13,14 @@ var _react = require("react");
13
13
  var _useLink = _interopRequireDefault(require("./useLink"));
14
14
  var _jsxRuntime = require("react/jsx-runtime");
15
15
  var _excluded = ["path"];
16
+ /**
17
+ * A base component that is used to make a link.
18
+ *
19
+ * @class LinkBase
20
+ * @ui
21
+ * @memberof ui/Routable
22
+ * @public
23
+ */
16
24
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
17
25
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
18
26
  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); } }
@@ -31,14 +39,6 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
31
39
  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); }
32
40
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
33
41
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
34
- /**
35
- * A base component that is used to make a link.
36
- *
37
- * @class LinkBase
38
- * @ui
39
- * @memberof ui/Routable
40
- * @public
41
- */
42
42
  var LinkBase = (0, _kind["default"])({
43
43
  name: 'Link',
44
44
  propTypes: /** @lends ui/Routable.Link.prototype */{
@@ -48,18 +48,25 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
48
48
  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; }
49
49
  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; }
50
50
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
51
- 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); }
52
- /**
53
- * Default config for {@link ui/Routable.Routable|Routable}.
54
- *
55
- * @memberof ui/Routable.Routable
56
- * @hocconfig
57
- */
51
+ 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); } /**
52
+ * Utilities for working with routes.
53
+ *
54
+ * @module ui/Routable
55
+ * @exports Routable
56
+ * @exports Route
57
+ * @exports Link
58
+ * @exports Linkable
59
+ */ /**
60
+ * Default config for {@link ui/Routable.Routable|Routable}.
61
+ *
62
+ * @memberof ui/Routable.Routable
63
+ * @hocconfig
64
+ */
58
65
  var defaultConfig = {
59
66
  /**
60
67
  * The event to listen to for path changes.
61
68
  *
62
- * This defines the actual name of the {@link ui/Routable.Routable#navigate|navigate}
69
+ * This defines the actual name of the {@link ui/Routable.Routable.navigate|navigate}
63
70
  * property.
64
71
  *
65
72
  * @type {String}
@@ -14,6 +14,15 @@ var _jsxRuntime = require("react/jsx-runtime");
14
14
  var _excluded = ["path", "children", "component"],
15
15
  _excluded2 = ["component", "componentRef"];
16
16
  var _class;
17
+ /**
18
+ * A Router component for use with {@link ui/ViewManager.ViewManager|ViewManager}
19
+ *
20
+ * @class Router
21
+ * @memberof ui/Routable
22
+ * @mixes ui/ForwardRef.ForwardRef
23
+ * @ui
24
+ * @private
25
+ */
17
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
18
27
  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; }
19
28
  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; }
@@ -32,15 +41,6 @@ function _possibleConstructorReturn(self, call) { if (call && (typeof call === "
32
41
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
33
42
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
34
43
  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
35
- /**
36
- * A Router component for use with {@link ui/ViewManager.ViewManager|ViewManager}
37
- *
38
- * @class Router
39
- * @memberof ui/Routable
40
- * @mixes ui/ForwardRef.ForwardRef
41
- * @ui
42
- * @private
43
- */
44
44
  var RouterBase = (_class = /*#__PURE__*/function (_ReactComponent) {
45
45
  _inherits(RouterBase, _ReactComponent);
46
46
  var _super = _createSuper(RouterBase);
@@ -152,7 +152,7 @@ var RouterBase = (_class = /*#__PURE__*/function (_ReactComponent) {
152
152
  */
153
153
  component: _propTypes["default"].renderable,
154
154
  /**
155
- * Called with a reference to {@link ui/Routable.Router#component|component}.
155
+ * Called with a reference to {@link ui/Routable.RouterBase.component|component}.
156
156
  *
157
157
  * @type {Object|Function}
158
158
  * @private
@@ -20,8 +20,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
20
20
  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; }
21
21
  function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
22
22
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
23
+ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
24
+ function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
23
25
  describe('Routable', function () {
24
- test('should render nothing for a partially valid path', function () {
26
+ test('should render nothing for a partially valid path', /*#__PURE__*/_asyncToGenerator(function* () {
25
27
  var App = function App() {
26
28
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
27
29
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Link["default"], {
@@ -37,8 +39,8 @@ describe('Routable', function () {
37
39
  };
38
40
  var Views = (0, _Routable["default"])({
39
41
  navigate: 'onNavigate'
40
- }, function (_ref) {
41
- var children = _ref.children;
42
+ }, function (_ref2) {
43
+ var children = _ref2.children;
42
44
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
43
45
  children: children
44
46
  });
@@ -64,17 +66,18 @@ describe('Routable', function () {
64
66
  })
65
67
  }));
66
68
  }
69
+ var user = _userEvent["default"].setup();
67
70
  (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Sample, {}));
68
71
  var linkToSecondPage = _react.screen.getByText('Page 2');
69
72
 
70
73
  // click once to navigate to new path
71
- _userEvent["default"].click(linkToSecondPage);
74
+ yield user.click(linkToSecondPage);
72
75
  var secondPage = _react.screen.getByTestId('page2');
73
76
  expect(secondPage).toBeInTheDocument();
74
77
 
75
78
  // clicking again should use the same base path "/app" for the same result
76
- _userEvent["default"].click(linkToSecondPage);
79
+ yield user.click(linkToSecondPage);
77
80
  secondPage = _react.screen.getByTestId('page2');
78
81
  expect(secondPage).toBeInTheDocument();
79
- });
82
+ }));
80
83
  });
@@ -13,15 +13,14 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
13
13
  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; }
14
14
  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; }
15
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
- /**
18
- * An unstyled scroll thumb without any behavior.
19
- *
20
- * @class ScrollThumb
21
- * @memberof ui/Scrollable
22
- * @ui
23
- * @private
24
- */
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
+ * An unstyled scroll thumb without any behavior.
18
+ *
19
+ * @class ScrollThumb
20
+ * @memberof ui/Scrollable
21
+ * @ui
22
+ * @private
23
+ */
25
24
  var ScrollThumb = (0, _kind["default"])({
26
25
  name: 'ui:ScrollThumb',
27
26
  propTypes: /** @lends ui/Scrollable.ScrollThumb.prototype */{
@@ -41,7 +41,15 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
41
41
  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
42
42
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
43
43
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
44
- function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
44
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } /**
45
+ * Unstyled scrollable components and behaviors to be customized by a theme or application.
46
+ *
47
+ * @module ui/Scrollable
48
+ * @exports constants
49
+ * @exports Scrollable
50
+ * @exports ScrollableBase
51
+ * @private
52
+ */
45
53
  var constants = {
46
54
  animationDuration: 1000,
47
55
  epsilon: 1,
@@ -109,11 +117,15 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
109
117
  _this.enqueueForceUpdate();
110
118
  });
111
119
  };
120
+ // constants
112
121
  _this.pixelPerLine = 39;
113
122
  _this.scrollWheelMultiplierForDeltaPixel = 1.5;
123
+ // The ratio of wheel 'delta' units to pixels scrolled.
124
+ // status
114
125
  _this.deferScrollTo = true;
115
126
  _this.isScrollAnimationTargetAccumulated = false;
116
127
  _this.isUpdatedScrollThumb = false;
128
+ // overscroll
117
129
  _this.lastInputType = null;
118
130
  _this.overscrollEnabled = false;
119
131
  _this.overscrollStatus = {
@@ -138,6 +150,7 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
138
150
  }
139
151
  }
140
152
  };
153
+ // bounds info
141
154
  _this.bounds = {
142
155
  clientWidth: 0,
143
156
  clientHeight: 0,
@@ -146,14 +159,19 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
146
159
  maxTop: 0,
147
160
  maxLeft: 0
148
161
  };
162
+ // wheel/drag/flick info
149
163
  _this.wheelDirection = 0;
150
164
  _this.isDragging = false;
165
+ // scroll info
151
166
  _this.scrolling = false;
152
167
  _this.scrollLeft = 0;
153
168
  _this.scrollTop = 0;
154
169
  _this.scrollToInfo = null;
170
+ // component info
155
171
  _this.childRefCurrent = null;
172
+ // scroll animator
156
173
  _this.animator = new _ScrollAnimator["default"]();
174
+ // drag/flick event handlers
157
175
  _this.getRtlX = function (x) {
158
176
  return _this.props.rtl ? -x : x;
159
177
  };
@@ -285,6 +303,7 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
285
303
  overscrollEffect: overscrollEffect
286
304
  });
287
305
  };
306
+ // overscroll effect
288
307
  _this.getEdgeFromPosition = function (position, maxPosition) {
289
308
  if (position <= 0) {
290
309
  return 'before';
@@ -407,6 +426,7 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
407
426
  }
408
427
  return reachedEdgeInfo;
409
428
  };
429
+ // scroll start/stop
410
430
  _this.doScrollStop = function () {
411
431
  _this.scrolling = false;
412
432
  _this.forwardScrollEvent('onScrollStop', _this.getReachedEdgeInfo());
@@ -464,6 +484,7 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
464
484
  (_this$childRefCurrent = _this.childRefCurrent).setScrollPosition.apply(_this$childRefCurrent, [_this.scrollLeft, _this.scrollTop, _this.props.rtl].concat(rest));
465
485
  _this.forwardScrollEvent('onScroll');
466
486
  };
487
+ // scrollTo API
467
488
  _this.getPositionForScrollTo = function (opt) {
468
489
  var bounds = _this.getScrollBounds(),
469
490
  canScrollHorizontally = _this.canScrollHorizontally(bounds),
@@ -609,6 +630,7 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
609
630
  }
610
631
  return false;
611
632
  };
633
+ // render
612
634
  _this.initChildRef = function (ref) {
613
635
  if (ref) {
614
636
  _this.childRefCurrent = ref;
@@ -737,8 +759,6 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
737
759
  this.scrollLeft = bounds.maxLeft;
738
760
  }
739
761
  }
740
-
741
- // constants
742
762
  }, {
743
763
  key: "calculateDistanceByWheel",
744
764
  value: function calculateDistanceByWheel(deltaMode, delta, maxPixel) {
@@ -868,8 +888,6 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
868
888
  this.scrollStopJob.start();
869
889
  }
870
890
  }
871
-
872
- // scrollTo API
873
891
  }, {
874
892
  key: "showThumb",
875
893
  value:
@@ -946,8 +964,6 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
946
964
  window.removeEventListener('resize', this.handleResizeWindow);
947
965
  }
948
966
  }
949
-
950
- // render
951
967
  }, {
952
968
  key: "render",
953
969
  value: function render() {
@@ -99,11 +99,15 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
99
99
  _this.enqueueForceUpdate();
100
100
  });
101
101
  };
102
+ // constants
102
103
  _this.pixelPerLine = 39;
103
104
  _this.scrollWheelMultiplierForDeltaPixel = 1.5;
105
+ // The ratio of wheel 'delta' units to pixels scrolled.
106
+ // status
104
107
  _this.deferScrollTo = true;
105
108
  _this.isScrollAnimationTargetAccumulated = false;
106
109
  _this.isUpdatedScrollThumb = false;
110
+ // overscroll
107
111
  _this.lastInputType = null;
108
112
  _this.overscrollEnabled = false;
109
113
  _this.overscrollStatus = {
@@ -128,6 +132,7 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
128
132
  }
129
133
  }
130
134
  };
135
+ // bounds info
131
136
  _this.bounds = {
132
137
  clientWidth: 0,
133
138
  clientHeight: 0,
@@ -136,15 +141,20 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
136
141
  maxTop: 0,
137
142
  maxLeft: 0
138
143
  };
144
+ // wheel/drag/flick info
139
145
  _this.wheelDirection = 0;
140
146
  _this.isDragging = false;
141
147
  _this.isTouching = false;
148
+ // scroll info
142
149
  _this.scrolling = false;
143
150
  _this.scrollLeft = 0;
144
151
  _this.scrollTop = 0;
145
152
  _this.scrollToInfo = null;
153
+ // component info
146
154
  _this.childRefCurrent = null;
155
+ // scroll animator
147
156
  _this.animator = new _ScrollAnimator["default"]();
157
+ // event handler for browser native scroll
148
158
  _this.getRtlX = function (x) {
149
159
  return _this.props.rtl ? -x : x;
150
160
  };
@@ -225,6 +235,11 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
225
235
  (0, _handle.forward)('onFlick', ev, _this.props);
226
236
  }
227
237
  };
238
+ /*
239
+ * wheel event handler;
240
+ * - for horizontal scroll, supports wheel action on any children nodes since web engine cannot support this
241
+ * - for vertical scroll, supports wheel action on scrollbars only
242
+ */
228
243
  _this.onWheel = function (ev) {
229
244
  if (_this.isDragging) {
230
245
  ev.preventDefault();
@@ -348,6 +363,7 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
348
363
  overscrollEffect: overscrollEffect
349
364
  });
350
365
  };
366
+ // overscroll effect
351
367
  _this.getEdgeFromPosition = function (position, maxPosition) {
352
368
  if (position <= 0) {
353
369
  return 'before';
@@ -454,6 +470,7 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
454
470
  _this.checkAndApplyOverscrollEffect(orientation, edge, overscrollTypeOnce);
455
471
  }
456
472
  };
473
+ // call scroll callbacks and update scrollbars for native scroll
457
474
  _this.scrollStartOnScroll = function () {
458
475
  _this.scrolling = true;
459
476
  _this.showThumb(_this.getScrollBounds());
@@ -504,6 +521,7 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
504
521
  }
505
522
  return reachedEdgeInfo;
506
523
  };
524
+ // scrollTo API
507
525
  _this.getPositionForScrollTo = function (opt) {
508
526
  var bounds = _this.getScrollBounds(),
509
527
  canScrollHorizontally = _this.canScrollHorizontally(bounds),
@@ -649,6 +667,7 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
649
667
  }
650
668
  return false;
651
669
  };
670
+ // render
652
671
  _this.initChildRef = function (ref) {
653
672
  if (ref) {
654
673
  _this.childRefCurrent = ref.current || ref;
@@ -750,8 +769,6 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
750
769
  this.childRefCurrent.calculateMetrics(this.childRefCurrent.props);
751
770
  this.forceUpdate();
752
771
  }
753
-
754
- // constants
755
772
  }, {
756
773
  key: "calculateDistanceByWheel",
757
774
  value: function calculateDistanceByWheel(deltaMode, delta, maxPixel) {
@@ -766,12 +783,6 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
766
783
  }
767
784
  return delta;
768
785
  }
769
-
770
- /*
771
- * wheel event handler;
772
- * - for horizontal scroll, supports wheel action on any children nodes since web engine cannot support this
773
- * - for vertical scroll, supports wheel action on scrollbars only
774
- */
775
786
  }, {
776
787
  key: "forwardScrollEvent",
777
788
  value:
@@ -786,8 +797,6 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
786
797
  reachedEdgeInfo: reachedEdgeInfo
787
798
  }, this.props);
788
799
  }
789
-
790
- // call scroll callbacks and update scrollbars for native scroll
791
800
  }, {
792
801
  key: "setScrollLeft",
793
802
  value:
@@ -879,8 +888,6 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
879
888
  childRefCurrent.scrollToPosition(this.scrollLeft + 0.1, this.scrollTop + 0.1);
880
889
  childContainerRef.current.style.scrollBehavior = 'smooth';
881
890
  }
882
-
883
- // scrollTo API
884
891
  }, {
885
892
  key: "showThumb",
886
893
  value:
@@ -972,8 +979,6 @@ var ScrollableBaseNative = /*#__PURE__*/function (_Component) {
972
979
  window.removeEventListener('resize', this.handleResizeWindow);
973
980
  }
974
981
  }
975
-
976
- // render
977
982
  }, {
978
983
  key: "render",
979
984
  value: function render() {
@@ -29,7 +29,14 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
29
29
  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; }
30
30
  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; }
31
31
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
32
- 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); }
32
+ 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); } /**
33
+ * Unstyled scroller components and behaviors to be customized by a theme or application.
34
+ *
35
+ * @module ui/Scroller
36
+ * @exports Scroller
37
+ * @exports ScrollerBase
38
+ * @exports ScrollerBasic
39
+ */
33
40
  var nop = function nop() {};
34
41
 
35
42
  /**
@@ -29,15 +29,14 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
29
29
  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
30
30
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
31
31
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
32
- function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
33
- /**
34
- * An unstyled base scroller component.
35
- *
36
- * @class ScrollerBasic
37
- * @memberof ui/Scroller
38
- * @ui
39
- * @public
40
- */
32
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } /**
33
+ * An unstyled base scroller component.
34
+ *
35
+ * @class ScrollerBasic
36
+ * @memberof ui/Scroller
37
+ * @ui
38
+ * @public
39
+ */
41
40
  var ScrollerBasic = /*#__PURE__*/function (_Component) {
42
41
  _inherits(ScrollerBasic, _Component);
43
42
  var _super = _createSuper(ScrollerBasic);