@enact/ui 4.5.2 → 4.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (185) hide show
  1. package/AnnounceDecorator/Announce.js +1 -40
  2. package/AnnounceDecorator/AnnounceDecorator.js +3 -21
  3. package/AnnounceDecorator/tests/Announce-specs.js +2 -7
  4. package/AnnounceDecorator/tests/AnnounceDecorator-specs.js +2 -6
  5. package/AnnounceDecorator/tests/useAnnounce-specs.js +8 -19
  6. package/AnnounceDecorator/useAnnounce.js +0 -6
  7. package/BodyText/BodyText.d.ts +1 -1
  8. package/BodyText/BodyText.js +8 -28
  9. package/BodyText/tests/BodyText-specs.js +0 -19
  10. package/Button/Button.d.ts +6 -6
  11. package/Button/Button.js +33 -63
  12. package/Button/tests/Button-specs.js +0 -26
  13. package/CHANGELOG.md +30 -0
  14. package/Cancelable/Cancelable.js +8 -47
  15. package/Cancelable/cancelHandler.js +5 -12
  16. package/Cancelable/modalHandler.js +3 -11
  17. package/Cancelable/tests/Cancelable-specs.js +3 -57
  18. package/Changeable/Changeable.js +2 -34
  19. package/Changeable/tests/Changeable-specs.js +20 -66
  20. package/ComponentOverride/ComponentOverride.js +1 -13
  21. package/FloatingLayer/FloatingLayer.js +17 -73
  22. package/FloatingLayer/FloatingLayerContainer.js +0 -15
  23. package/FloatingLayer/FloatingLayerDecorator.js +4 -17
  24. package/FloatingLayer/Scrim.js +9 -53
  25. package/FloatingLayer/index.js +0 -4
  26. package/FloatingLayer/tests/FloatingLayer-specs.js +8 -22
  27. package/FloatingLayer/tests/Scrim-specs.js +0 -9
  28. package/FloatingLayer/tests/useFloatingLayerDecorator-specs.js +0 -13
  29. package/FloatingLayer/useFloatingLayer.js +3 -14
  30. package/FloatingLayer/useFloatingLayerDecorator.js +3 -11
  31. package/ForwardRef/ForwardRef.js +1 -10
  32. package/GridListImageItem/GridListImageItem.d.ts +1 -1
  33. package/GridListImageItem/GridListImageItem.js +18 -51
  34. package/Group/Group.js +5 -36
  35. package/Group/GroupItem.js +16 -33
  36. package/Group/tests/Group-specs.js +0 -32
  37. package/Heading/Heading.js +8 -36
  38. package/Heading/tests/Heading-specs.js +81 -14
  39. package/Icon/Icon.d.ts +4 -4
  40. package/Icon/Icon.js +19 -53
  41. package/Icon/tests/Icon-specs.js +0 -22
  42. package/IconButton/IconButton.d.ts +4 -4
  43. package/IconButton/IconButton.js +17 -55
  44. package/IconButton/tests/IconButton-specs.js +0 -7
  45. package/Image/Image.js +17 -46
  46. package/Image/tests/Image-specs.js +0 -14
  47. package/ImageItem/ImageItem.js +18 -47
  48. package/ImageItem/tests/ImageItem-specs.js +0 -25
  49. package/Item/Item.js +9 -33
  50. package/Item/tests/Item-specs.js +0 -24
  51. package/LabeledIcon/LabeledIcon.d.ts +2 -2
  52. package/LabeledIcon/LabeledIcon.js +22 -53
  53. package/LabeledIcon/tests/LabeledIcon-specs.js +0 -14
  54. package/Layout/Cell.js +18 -44
  55. package/Layout/Layout.d.ts +16 -16
  56. package/Layout/Layout.js +23 -46
  57. package/Layout/tests/Layout-specs.js +10 -39
  58. package/Marquee/MarqueeBase.js +29 -63
  59. package/Marquee/MarqueeController.js +11 -72
  60. package/Marquee/MarqueeDecorator.js +70 -196
  61. package/Marquee/index.js +1 -5
  62. package/Marquee/tests/Marquee-specs.js +295 -87
  63. package/Measurable/Measurable.js +12 -34
  64. package/Measurable/tests/Measurable-specs.js +115 -0
  65. package/Media/Media.js +15 -65
  66. package/Media/tests/Media-specs.js +168 -0
  67. package/Placeholder/PlaceholderControllerDecorator.js +7 -43
  68. package/Placeholder/PlaceholderDecorator.js +7 -38
  69. package/Placeholder/index.js +1 -5
  70. package/Placeholder/tests/PlaceholderControllerDecorator-specs.js +25 -0
  71. package/Placeholder/tests/PlaceholderDecorator-specs.js +28 -0
  72. package/ProgressBar/ProgressBar.js +14 -45
  73. package/ProgressBar/tests/ProgressBar-specs.js +0 -17
  74. package/RadioDecorator/RadioControllerDecorator.js +1 -29
  75. package/RadioDecorator/RadioDecorator.js +4 -42
  76. package/RadioDecorator/tests/RadioDecorator-specs.js +12 -49
  77. package/Repeater/Repeater.js +9 -33
  78. package/Repeater/tests/Repeater-specs.js +0 -38
  79. package/Resizable/Resizable.js +9 -37
  80. package/Resizable/tests/Resizable-specs.js +34 -0
  81. package/Routable/Link.js +11 -47
  82. package/Routable/Routable.d.ts +2 -2
  83. package/Routable/Routable.js +12 -35
  84. package/Routable/Route.js +0 -6
  85. package/Routable/Router.js +15 -58
  86. package/Routable/tests/Routable-specs.js +7 -33
  87. package/Routable/tests/Router-specs.js +18 -44
  88. package/Routable/useLink.js +4 -8
  89. package/Routable/util.js +18 -24
  90. package/Scrollable/ScrollAnimator.js +49 -65
  91. package/Scrollable/ScrollThumb.js +2 -13
  92. package/Scrollable/Scrollable.js +180 -387
  93. package/Scrollable/ScrollableNative.js +189 -392
  94. package/Scrollable/Scrollbar.js +30 -102
  95. package/Scroller/Scroller.js +15 -39
  96. package/Scroller/ScrollerBasic.js +34 -89
  97. package/Scroller/UiScrollerBase.js +31 -84
  98. package/Scroller/tests/Scroller-specs.js +56 -0
  99. package/Skinnable/Skinnable.js +11 -38
  100. package/Skinnable/tests/Skinnable-specs.js +3 -74
  101. package/Skinnable/tests/useSkins-specs.js +1 -13
  102. package/Skinnable/tests/util-specs.js +0 -14
  103. package/Skinnable/useSkins.js +8 -15
  104. package/Skinnable/util.js +9 -20
  105. package/Slider/Knob.js +5 -24
  106. package/Slider/PositionDecorator.js +16 -54
  107. package/Slider/Slider.d.ts +2 -2
  108. package/Slider/Slider.js +29 -67
  109. package/Slider/tests/Slider-specs.js +94 -7
  110. package/Slider/utils.js +0 -2
  111. package/SlotItem/SlotItem.d.ts +1 -1
  112. package/SlotItem/SlotItem.js +17 -43
  113. package/SlotItem/tests/SlotItem-specs.js +0 -5
  114. package/Slottable/Slottable.js +4 -12
  115. package/Slottable/tests/Slottable-specs.js +19 -46
  116. package/Slottable/tests/useSlots-specs.js +27 -65
  117. package/Slottable/useSlots.js +8 -33
  118. package/Spinner/Spinner.d.ts +1 -1
  119. package/Spinner/Spinner.js +16 -43
  120. package/Spinner/tests/Spinner-specs.js +0 -15
  121. package/ToggleIcon/ToggleIcon.js +10 -36
  122. package/ToggleIcon/tests/ToggleIcon-specs.js +0 -16
  123. package/ToggleItem/ToggleItem.d.ts +3 -3
  124. package/ToggleItem/ToggleItem.js +18 -55
  125. package/ToggleItem/tests/ToggleItem-specs.js +0 -30
  126. package/Toggleable/Toggle.js +1 -15
  127. package/Toggleable/Toggleable.js +12 -45
  128. package/Toggleable/tests/Toggleable-specs.js +28 -96
  129. package/Toggleable/useToggle.js +3 -19
  130. package/Touchable/ClickAllow.js +5 -14
  131. package/Touchable/Drag.js +16 -54
  132. package/Touchable/Flick.js +11 -42
  133. package/Touchable/Hold.js +21 -68
  134. package/Touchable/Touch.js +37 -65
  135. package/Touchable/Touchable.js +32 -71
  136. package/Touchable/config.js +8 -22
  137. package/Touchable/tests/Touchable-specs.js +270 -119
  138. package/Touchable/tests/useTouch-specs.js +6 -80
  139. package/Touchable/useTouch.js +17 -34
  140. package/Transition/Transition.js +37 -118
  141. package/Transition/tests/Transition-specs.js +20 -60
  142. package/ViewManager/Arranger.js +10 -22
  143. package/ViewManager/TransitionGroup.js +32 -107
  144. package/ViewManager/View.js +35 -91
  145. package/ViewManager/ViewManager.d.ts +1 -1
  146. package/ViewManager/ViewManager.js +20 -84
  147. package/ViewManager/tests/View-specs.js +0 -17
  148. package/ViewManager/tests/ViewManager-specs.js +236 -305
  149. package/ViewManager/tests/test-utils.js +0 -8
  150. package/VirtualList/UiVirtualListBase.js +259 -409
  151. package/VirtualList/VirtualList.d.ts +4 -4
  152. package/VirtualList/VirtualList.js +29 -69
  153. package/VirtualList/VirtualListBase.js +0 -3
  154. package/VirtualList/VirtualListBasic.js +273 -431
  155. package/VirtualList/tests/VirtualGridList-native-specs.js +161 -0
  156. package/VirtualList/tests/VirtualGridList-specs.js +614 -0
  157. package/VirtualList/tests/VirtualList-native-specs.js +152 -0
  158. package/VirtualList/tests/VirtualList-specs.js +423 -95
  159. package/internal/IdProvider/IdProvider.js +7 -21
  160. package/internal/IdProvider/Provider.js +4 -17
  161. package/internal/IdProvider/tests/IdProvider-specs.js +44 -0
  162. package/internal/IdProvider/tests/useId-specs.js +6 -20
  163. package/internal/IdProvider/useId.js +0 -6
  164. package/internal/Pure/Pure.js +3 -30
  165. package/internal/Pure/tests/Pure-specs.js +88 -0
  166. package/internal/localized-fonts/localized-fonts.js +33 -62
  167. package/internal/localized-fonts/tests/localized-fonts-specs.js +33 -0
  168. package/internal/selection/selection.js +1 -6
  169. package/internal/selection/tests/selection-specs.js +6 -4
  170. package/internal/validators/tests/validators-specs.js +80 -0
  171. package/internal/validators/validators.js +14 -34
  172. package/package.json +9 -3
  173. package/resolution/ResolutionDecorator.js +4 -40
  174. package/resolution/index.js +0 -7
  175. package/resolution/resolution.js +42 -80
  176. package/resolution/tests/ResolutionDecorator-specs.js +4 -11
  177. package/resolution/tests/resolution-specs.js +2 -2
  178. package/useControlledState/tests/useControlledState-specs.js +15 -46
  179. package/useControlledState/useControlledState.js +11 -22
  180. package/useScroll/ScrollAnimator.js +49 -65
  181. package/useScroll/Scrollbar.js +22 -58
  182. package/useScroll/ScrollbarTrack.js +3 -19
  183. package/useScroll/useScroll.js +267 -454
  184. package/useScroll/utilDOM.js +8 -14
  185. package/useScroll/utilEvent.js +0 -4
@@ -4,35 +4,20 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.useMeasurable = exports["default"] = exports.Measurable = void 0;
7
-
8
7
  var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
9
-
10
8
  var _react = require("react");
11
-
12
9
  var _jsxRuntime = require("react/jsx-runtime");
13
-
14
10
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
15
-
16
11
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
17
-
18
12
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
19
-
20
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; }
21
-
22
14
  function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
23
-
24
15
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
25
-
26
16
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
27
-
28
17
  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); }
29
-
30
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; }
31
-
32
19
  function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
33
-
34
20
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
35
-
36
21
  /**
37
22
  * Default config for {@link ui/Measurable.Measurable}.
38
23
  *
@@ -48,7 +33,6 @@ var defaultConfig = {
48
33
  * @memberof ui/Measurable.Measurable.defaultConfig
49
34
  */
50
35
  measurementProp: 'measurement',
51
-
52
36
  /**
53
37
  * Configures the prop name to pass a function to capture a reference to the element to measure.
54
38
  *
@@ -58,22 +42,19 @@ var defaultConfig = {
58
42
  */
59
43
  refProp: 'forwardRef'
60
44
  };
61
-
62
45
  var useMeasurable = function useMeasurable() {
63
46
  var _useState = (0, _react.useState)(),
64
- _useState2 = _slicedToArray(_useState, 2),
65
- measurement = _useState2[0],
66
- setMeasurement = _useState2[1];
67
-
47
+ _useState2 = _slicedToArray(_useState, 2),
48
+ measurement = _useState2[0],
49
+ setMeasurement = _useState2[1];
68
50
  var ref = (0, _react.useRef)(null);
69
51
  (0, _react.useLayoutEffect)(function () {
70
52
  var refToMeasure = ref.current;
71
-
72
53
  if (!refToMeasure) {
73
54
  return;
74
- } // Support for ResizeObserver
75
-
55
+ }
76
56
 
57
+ // Support for ResizeObserver
77
58
  if (typeof ResizeObserver === 'function') {
78
59
  var resizeObserver = new ResizeObserver(function (entries) {
79
60
  entries.forEach(function (entry) {
@@ -87,16 +68,15 @@ var useMeasurable = function useMeasurable() {
87
68
  return function () {
88
69
  resizeObserver.disconnect(refToMeasure);
89
70
  resizeObserver = null;
90
- }; // Fallback support for MutationObserver
71
+ };
72
+ // Fallback support for MutationObserver
91
73
  } else if (typeof MutationObserver === 'function') {
92
74
  var mutationObserver = new MutationObserver(function (mutationsList) {
93
75
  var _iterator = _createForOfIteratorHelper(mutationsList),
94
- _step;
95
-
76
+ _step;
96
77
  try {
97
78
  for (_iterator.s(); !(_step = _iterator.n()).done;) {
98
79
  var mutation = _step.value;
99
-
100
80
  if (mutation.type === 'childList') {
101
81
  setMeasurement(mutation.target.getBoundingClientRect());
102
82
  } else if (mutation.type === 'attributes' && (mutation.attributeName === 'style' || mutation.attributeName === 'class')) {
@@ -121,11 +101,13 @@ var useMeasurable = function useMeasurable() {
121
101
  }
122
102
  }, [] // disconnect on unmount
123
103
  );
104
+
124
105
  return {
125
106
  ref: ref,
126
107
  measurement: measurement
127
108
  };
128
109
  };
110
+
129
111
  /**
130
112
  * A higher-order component that adds the ability to measure a referenced node and get that value
131
113
  * back as a prop.
@@ -144,18 +126,14 @@ var useMeasurable = function useMeasurable() {
144
126
  * @hoc
145
127
  * @public
146
128
  */
147
-
148
-
149
129
  exports.useMeasurable = useMeasurable;
150
130
  var Measurable = (0, _hoc["default"])(defaultConfig, function (configHoc, Wrapped) {
151
131
  return function MeasurableHoc(props) {
152
132
  var _measurementProps;
153
-
154
133
  // Take the config from Measurable and insert it into a fresh instance of defineMeasurable
155
134
  var _useMeasurable = useMeasurable(),
156
- ref = _useMeasurable.ref,
157
- measurement = _useMeasurable.measurement;
158
-
135
+ ref = _useMeasurable.ref,
136
+ measurement = _useMeasurable.measurement;
159
137
  var measurementProps = (_measurementProps = {}, _defineProperty(_measurementProps, configHoc.refProp, ref), _defineProperty(_measurementProps, configHoc.measurementProp, measurement), _measurementProps);
160
138
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread(_objectSpread({}, props), measurementProps));
161
139
  };
@@ -0,0 +1,115 @@
1
+ "use strict";
2
+
3
+ var _react = require("@testing-library/react");
4
+ var _Measurable = _interopRequireWildcard(require("../Measurable"));
5
+ var _jsxRuntime = require("react/jsx-runtime");
6
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
7
+ 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; }
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); } }
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 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; }
12
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
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; }
14
+ var data;
15
+ var DivComponent = function DivComponent(props) {
16
+ data = props;
17
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
18
+ ref: props.controlsRef
19
+ });
20
+ };
21
+ var MeasurableComponent = (0, _Measurable["default"])({
22
+ refProp: 'controlsRef',
23
+ measurementProp: 'controlsMeasurements'
24
+ }, DivComponent);
25
+ var UseMeasurableDecorator = function UseMeasurableDecorator(Wrapped) {
26
+ return function UseMeasurableDecorator(props) {
27
+ // eslint-disable-line no-shadow
28
+ var _useMeasurable = (0, _Measurable.useMeasurable)(),
29
+ controlsRef = _useMeasurable.ref,
30
+ _useMeasurable$measur = _useMeasurable.measurement;
31
+ _useMeasurable$measur = _useMeasurable$measur === void 0 ? {} : _useMeasurable$measur;
32
+ var _useMeasurable$measur2 = _useMeasurable$measur.width,
33
+ contentWidth = _useMeasurable$measur2 === void 0 ? 0 : _useMeasurable$measur2;
34
+ var measurableProps = {
35
+ controlsRef: controlsRef,
36
+ contentSize: contentWidth
37
+ };
38
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread(_objectSpread({}, props), measurableProps));
39
+ };
40
+ };
41
+ var UseMeasurableComponent = UseMeasurableDecorator(DivComponent);
42
+ describe('Measurable', function () {
43
+ test('should pass \'controlsMeasurements\' prop to the wrapped component', function () {
44
+ var listener = function listener() {};
45
+ global.ResizeObserver = /*#__PURE__*/function () {
46
+ function _class(ls) {
47
+ _classCallCheck(this, _class);
48
+ listener = ls;
49
+ }
50
+ _createClass(_class, [{
51
+ key: "observe",
52
+ value: function observe() {}
53
+ }, {
54
+ key: "unobserve",
55
+ value: function unobserve() {}
56
+ }, {
57
+ key: "disconnect",
58
+ value: function disconnect() {}
59
+ }]);
60
+ return _class;
61
+ }();
62
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(MeasurableComponent, {}));
63
+ (0, _react.act)(function () {
64
+ listener([{
65
+ target: {
66
+ clientWidth: 100,
67
+ scrollWidth: 200,
68
+ clientHeight: 100,
69
+ scrollHeight: 200
70
+ }
71
+ }]);
72
+ });
73
+ expect(data).toHaveProperty('controlsMeasurements');
74
+ global.ResizeObserver = null;
75
+ });
76
+ test('should pass \'controlsRef\' prop to the wrapped component', function () {
77
+ var listener = function listener() {};
78
+ global.MutationObserver = /*#__PURE__*/function () {
79
+ function _class2(ls) {
80
+ _classCallCheck(this, _class2);
81
+ listener = ls;
82
+ }
83
+ _createClass(_class2, [{
84
+ key: "disconnect",
85
+ value: function disconnect() {}
86
+ }, {
87
+ key: "observe",
88
+ value: function observe() {}
89
+ }]);
90
+ return _class2;
91
+ }();
92
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(MeasurableComponent, {}));
93
+ (0, _react.act)(function () {
94
+ listener([{
95
+ addedNodes: [],
96
+ attributeName: "class",
97
+ attributeNamespace: null,
98
+ nextSibling: null,
99
+ oldValue: null,
100
+ previousSibling: null,
101
+ removedNodes: [],
102
+ target: 'div',
103
+ type: "attributes"
104
+ }]);
105
+ });
106
+ expect(data).toHaveProperty('controlsRef');
107
+ global.MutationObserver = null;
108
+ });
109
+ });
110
+ describe('useMeasurable', function () {
111
+ test('should pass \'controlsRef\' prop to the wrapped component', function () {
112
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(UseMeasurableComponent, {}));
113
+ expect(data).toHaveProperty('controlsRef');
114
+ });
115
+ });
package/Media/Media.js CHANGED
@@ -4,53 +4,29 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.handledMediaEventsMap = exports.getKeyFromSource = exports["default"] = exports.Media = void 0;
7
-
8
7
  var _dispatcher = require("@enact/core/dispatcher");
9
-
10
8
  var _handle = require("@enact/core/handle");
11
-
12
9
  var _propTypes = _interopRequireDefault(require("@enact/core/internal/prop-types"));
13
-
14
10
  var _propTypes2 = _interopRequireDefault(require("prop-types"));
15
-
16
11
  var _react = require("react");
17
-
18
12
  var _jsxRuntime = require("react/jsx-runtime");
19
-
20
13
  var _excluded = ["customMediaEventsMap", "mediaComponent", "source"];
21
-
22
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
23
-
24
15
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
25
-
26
16
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
27
-
28
17
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
29
-
30
18
  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; }
31
-
32
19
  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; }
33
-
34
20
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
35
-
36
21
  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
37
-
38
22
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
39
-
40
23
  function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
41
-
42
24
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
43
-
44
25
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
45
-
46
26
  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); }
47
-
48
27
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
49
-
50
28
  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; } }
51
-
52
29
  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
53
-
54
30
  /**
55
31
  * Generates a key representing the source node or nodes provided
56
32
  *
@@ -75,7 +51,6 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
75
51
  */
76
52
  var getKeyFromSource = function getKeyFromSource() {
77
53
  var source = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
78
-
79
54
  if ( /*#__PURE__*/(0, _react.isValidElement)(source)) {
80
55
  return _react.Children.toArray(source).filter(function (s) {
81
56
  return !!s;
@@ -83,9 +58,9 @@ var getKeyFromSource = function getKeyFromSource() {
83
58
  return s.props.src;
84
59
  }).join('+');
85
60
  }
86
-
87
61
  return String(source);
88
62
  };
63
+
89
64
  /**
90
65
  * Maps standard media event `type` values to React-style callback prop names
91
66
  *
@@ -123,8 +98,6 @@ var getKeyFromSource = function getKeyFromSource() {
123
98
  * @memberof ui/Media
124
99
  * @public
125
100
  */
126
-
127
-
128
101
  exports.getKeyFromSource = getKeyFromSource;
129
102
  var handledMediaEventsMap = {
130
103
  abort: 'onAbort',
@@ -151,6 +124,7 @@ var handledMediaEventsMap = {
151
124
  volumechange: 'onVolumeChange',
152
125
  waiting: 'onWaiting'
153
126
  };
127
+
154
128
  /**
155
129
  * A component representation of HTMLMediaElement.
156
130
  *
@@ -159,75 +133,61 @@ var handledMediaEventsMap = {
159
133
  * @ui
160
134
  * @public
161
135
  */
162
-
163
136
  exports.handledMediaEventsMap = handledMediaEventsMap;
164
-
165
137
  var Media = /*#__PURE__*/function (_ReactComponent) {
166
138
  _inherits(Media, _ReactComponent);
167
-
168
139
  var _super = _createSuper(Media);
169
-
170
140
  function Media(props) {
171
141
  var _this;
172
-
173
142
  _classCallCheck(this, Media);
174
-
175
143
  _this = _super.call(this, props);
176
-
177
144
  _this.attachCustomMediaEvents = function () {
178
145
  for (var eventName in _this.handledCustomMediaForwards) {
179
146
  (0, _dispatcher.on)(eventName, _this.handledCustomMediaForwards[eventName], _this.media);
180
147
  }
181
148
  };
182
-
183
149
  _this.detachCustomMediaEvents = function () {
184
150
  for (var eventName in _this.handledCustomMediaForwards) {
185
151
  (0, _dispatcher.off)(eventName, _this.handledCustomMediaForwards[eventName], _this.media);
186
152
  }
187
153
  };
188
-
189
154
  _this.handleEvent = function (ev) {
190
- (0, _handle.forwardCustom)('onUpdate')(null, _this.props); // fetch the forward() we generated earlier, using the event type as a key to find the real event name.
155
+ (0, _handle.forwardCustom)('onUpdate')(null, _this.props);
191
156
 
157
+ // fetch the forward() we generated earlier, using the event type as a key to find the real event name.
192
158
  var fwd = _this.handledMediaForwards[handledMediaEventsMap[ev.type]];
193
-
194
159
  if (fwd) {
195
160
  fwd(ev, _this.props);
196
161
  }
197
162
  };
198
-
199
163
  _this.mediaRef = function (node) {
200
164
  _this.media = node;
201
165
  };
202
-
203
166
  _this.media = null;
204
167
  _this.handledMediaForwards = {};
205
168
  _this.handledMediaEvents = {};
206
- _this.handledCustomMediaForwards = {}; // Generate event handling forwarders and a smooth block to pass to <Video>
169
+ _this.handledCustomMediaForwards = {};
207
170
 
171
+ // Generate event handling forwarders and a smooth block to pass to <Video>
208
172
  for (var key in props.mediaEventsMap) {
209
173
  var eventName = props.mediaEventsMap[key];
210
174
  _this.handledMediaForwards[eventName] = (0, _handle.forward)(eventName);
211
175
  _this.handledMediaEvents[eventName] = _this.handleEvent;
212
- } // Generate event handling forwarders for the custom events too
213
-
176
+ }
214
177
 
178
+ // Generate event handling forwarders for the custom events too
215
179
  var _loop = function _loop(_eventName) {
216
180
  var propName = props.customMediaEventsMap[_eventName];
217
181
  var forwardEvent = (0, _handle.forward)(propName);
218
-
219
182
  _this.handledCustomMediaForwards[_eventName] = function (ev) {
220
183
  return forwardEvent(ev, _this.props);
221
184
  };
222
185
  };
223
-
224
186
  for (var _eventName in props.customMediaEventsMap) {
225
187
  _loop(_eventName);
226
188
  }
227
-
228
189
  return _this;
229
190
  }
230
-
231
191
  _createClass(Media, [{
232
192
  key: "componentDidMount",
233
193
  value: function componentDidMount() {
@@ -238,7 +198,6 @@ var Media = /*#__PURE__*/function (_ReactComponent) {
238
198
  value: function componentDidUpdate(_ref) {
239
199
  var prevSource = _ref.source;
240
200
  var source = this.props.source;
241
-
242
201
  if (getKeyFromSource(source) !== getKeyFromSource(prevSource)) {
243
202
  this.load();
244
203
  }
@@ -313,32 +272,27 @@ var Media = /*#__PURE__*/function (_ReactComponent) {
313
272
  key: "render",
314
273
  value: function render() {
315
274
  var _this$props = this.props,
316
- customMediaEventsMap = _this$props.customMediaEventsMap,
317
- Component = _this$props.mediaComponent,
318
- source = _this$props.source,
319
- rest = _objectWithoutProperties(_this$props, _excluded);
320
-
275
+ customMediaEventsMap = _this$props.customMediaEventsMap,
276
+ Component = _this$props.mediaComponent,
277
+ source = _this$props.source,
278
+ rest = _objectWithoutProperties(_this$props, _excluded);
321
279
  delete rest.mediaEventsMap;
322
- delete rest.onUpdate; // Remove the events we manually added so they aren't added twice or fail.
280
+ delete rest.onUpdate;
323
281
 
282
+ // Remove the events we manually added so they aren't added twice or fail.
324
283
  for (var eventName in customMediaEventsMap) {
325
284
  delete rest[customMediaEventsMap[eventName]];
326
285
  }
327
-
328
286
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread(_objectSpread(_objectSpread({}, rest), this.handledMediaEvents), {}, {
329
287
  ref: this.mediaRef,
330
288
  children: source
331
289
  }));
332
290
  }
333
291
  }]);
334
-
335
292
  return Media;
336
293
  }(_react.Component);
337
-
338
294
  exports.Media = Media;
339
- Media.propTypes =
340
- /** @lends ui/Media.Media.prototype */
341
- {
295
+ Media.propTypes = /** @lends ui/Media.Media.prototype */{
342
296
  /**
343
297
  * A type of media component.
344
298
  *
@@ -347,7 +301,6 @@ Media.propTypes =
347
301
  * @public
348
302
  */
349
303
  mediaComponent: _propTypes["default"].renderable.isRequired,
350
-
351
304
  /**
352
305
  * An event map object for custom media events.
353
306
  *
@@ -363,7 +316,6 @@ Media.propTypes =
363
316
  * @public
364
317
  */
365
318
  customMediaEventsMap: _propTypes2["default"].object,
366
-
367
319
  /**
368
320
  * A event map object for media events.
369
321
  *
@@ -372,7 +324,6 @@ Media.propTypes =
372
324
  * @public
373
325
  */
374
326
  mediaEventsMap: _propTypes2["default"].object,
375
-
376
327
  /**
377
328
  * A function to be run when media updates.
378
329
  *
@@ -380,7 +331,6 @@ Media.propTypes =
380
331
  * @public
381
332
  */
382
333
  onUpdate: _propTypes2["default"].func,
383
-
384
334
  /**
385
335
  * Media sources passed as children to `mediaComponent`
386
336
  *
@@ -0,0 +1,168 @@
1
+ "use strict";
2
+
3
+ require("@testing-library/jest-dom");
4
+ var _react = require("@testing-library/react");
5
+ var _react2 = require("react");
6
+ var _Media = require("../Media");
7
+ var _jsxRuntime = require("react/jsx-runtime");
8
+ /* global HTMLMediaElement */
9
+
10
+ var mediaLoadStub;
11
+ var mediaPlayStub;
12
+ var mediaPauseStub;
13
+ var customMediaEventsMap = {
14
+ custom: 'onCustom'
15
+ };
16
+ describe('Media', function () {
17
+ beforeEach(function () {
18
+ mediaLoadStub = jest.spyOn(HTMLMediaElement.prototype, 'load').mockImplementation(function () {
19
+ return true;
20
+ });
21
+ mediaPlayStub = jest.spyOn(HTMLMediaElement.prototype, 'play').mockImplementation(function () {
22
+ return true;
23
+ });
24
+ mediaPauseStub = jest.spyOn(HTMLMediaElement.prototype, 'pause').mockImplementation(function () {
25
+ return true;
26
+ });
27
+ });
28
+ afterEach(function () {
29
+ mediaLoadStub.mockRestore();
30
+ mediaPlayStub.mockRestore();
31
+ mediaPauseStub.mockRestore();
32
+ });
33
+ test('should use the same node when changing the `source`', function () {
34
+ var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
35
+ mediaComponent: "video",
36
+ "data-testid": "media-id",
37
+ source: "abc.mp4"
38
+ })),
39
+ rerender = _render.rerender;
40
+ var expected = _react.screen.getByTestId('media-id');
41
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
42
+ mediaComponent: "video",
43
+ "data-testid": "media-id",
44
+ source: "def.mp4"
45
+ }));
46
+ var actual = _react.screen.getByTestId('media-id');
47
+ expect(actual).toBe(expected);
48
+ });
49
+ test('should return the key when a node provided', function () {
50
+ var expected = 'path/file.mp4';
51
+ var actual = (0, _Media.getKeyFromSource)( /*#__PURE__*/(0, _jsxRuntime.jsx)("source", {
52
+ src: "path/file.mp4",
53
+ type: "video/mp4"
54
+ }));
55
+ expect(actual).toEqual(expected);
56
+ });
57
+ test('should fire `onCanPlay` when canplay event is fired', function () {
58
+ var handleCanPlay = jest.fn();
59
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
60
+ mediaComponent: "video",
61
+ "data-testid": "media-id",
62
+ onCanPlay: handleCanPlay
63
+ }));
64
+ var video = _react.screen.getByTestId('media-id');
65
+ var canPlayEvent = (0, _react.createEvent)('canplay', video);
66
+ (0, _react.fireEvent)(video, canPlayEvent);
67
+ expect(handleCanPlay).toBeCalled();
68
+ });
69
+ test('should fire `onCustom` when custom event is fired', function () {
70
+ var handleCustom = jest.fn();
71
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
72
+ mediaComponent: "video",
73
+ "data-testid": "media-id",
74
+ onCustom: handleCustom,
75
+ customMediaEventsMap: customMediaEventsMap
76
+ }));
77
+ var video = _react.screen.getByTestId('media-id');
78
+ var customEvent = (0, _react.createEvent)('custom', video);
79
+ (0, _react.fireEvent)(video, customEvent);
80
+ expect(handleCustom).toBeCalled();
81
+ });
82
+ test('should call load', function () {
83
+ var ref = /*#__PURE__*/(0, _react2.createRef)();
84
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
85
+ ref: ref,
86
+ mediaComponent: "video"
87
+ }));
88
+ ref.current.load();
89
+ expect(mediaLoadStub).toHaveBeenCalled();
90
+ });
91
+ test('should call play', function () {
92
+ var ref = /*#__PURE__*/(0, _react2.createRef)();
93
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
94
+ ref: ref,
95
+ mediaComponent: "video"
96
+ }));
97
+ ref.current.play();
98
+ expect(mediaPlayStub).toHaveBeenCalled();
99
+ });
100
+ test('should call pause', function () {
101
+ var ref = /*#__PURE__*/(0, _react2.createRef)();
102
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
103
+ ref: ref,
104
+ mediaComponent: "video"
105
+ }));
106
+ ref.current.pause();
107
+ expect(mediaPauseStub).toHaveBeenCalled();
108
+ });
109
+ test('should return duration', function () {
110
+ var ref = /*#__PURE__*/(0, _react2.createRef)();
111
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
112
+ ref: ref,
113
+ mediaComponent: "video",
114
+ "data-testid": "media-id"
115
+ }));
116
+ var video = _react.screen.getByTestId('media-id');
117
+ var expected = 10;
118
+
119
+ // fake duration
120
+ Object.defineProperty(video, 'duration', {
121
+ writable: true,
122
+ value: expected
123
+ });
124
+ var actual = ref.current.duration;
125
+ expect(actual).toEqual(expected);
126
+ });
127
+ test('should return proportionPlayed', function () {
128
+ var ref = /*#__PURE__*/(0, _react2.createRef)();
129
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
130
+ ref: ref,
131
+ mediaComponent: "video",
132
+ "data-testid": "media-id"
133
+ }));
134
+ var video = _react.screen.getByTestId('media-id');
135
+
136
+ // fake duration
137
+ Object.defineProperty(video, 'duration', {
138
+ writable: true,
139
+ value: 10
140
+ });
141
+ ref.current.currentTime = 3;
142
+ var expected = 0.3;
143
+ var actual = ref.current.proportionPlayed;
144
+ expect(actual).toEqual(expected);
145
+ });
146
+ test('should be able to get and set the current time', function () {
147
+ var ref = /*#__PURE__*/(0, _react2.createRef)();
148
+ var expected = 3;
149
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
150
+ ref: ref,
151
+ mediaComponent: "video"
152
+ }));
153
+ ref.current.currentTime = expected;
154
+ var actual = ref.current.currentTime;
155
+ expect(actual).toEqual(expected);
156
+ });
157
+ test('should be able to get and set the playback rate', function () {
158
+ var ref = /*#__PURE__*/(0, _react2.createRef)();
159
+ var expected = 2;
160
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Media.Media, {
161
+ ref: ref,
162
+ mediaComponent: "video"
163
+ }));
164
+ ref.current.playbackRate = expected;
165
+ var actual = ref.current.playbackRate;
166
+ expect(actual).toEqual(expected);
167
+ });
168
+ });