@enact/ui 4.5.1 → 4.5.3

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 (167) 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.js +6 -26
  8. package/BodyText/tests/BodyText-specs.js +0 -19
  9. package/Button/Button.js +26 -56
  10. package/Button/tests/Button-specs.js +0 -26
  11. package/CHANGELOG.md +10 -0
  12. package/Cancelable/Cancelable.js +8 -47
  13. package/Cancelable/cancelHandler.js +5 -12
  14. package/Cancelable/modalHandler.js +3 -11
  15. package/Cancelable/tests/Cancelable-specs.js +3 -57
  16. package/Changeable/Changeable.js +2 -34
  17. package/Changeable/tests/Changeable-specs.js +20 -66
  18. package/ComponentOverride/ComponentOverride.js +1 -13
  19. package/FloatingLayer/FloatingLayer.js +17 -73
  20. package/FloatingLayer/FloatingLayerContainer.js +0 -15
  21. package/FloatingLayer/FloatingLayerDecorator.js +4 -17
  22. package/FloatingLayer/Scrim.js +9 -53
  23. package/FloatingLayer/index.js +0 -4
  24. package/FloatingLayer/tests/FloatingLayer-specs.js +8 -22
  25. package/FloatingLayer/tests/Scrim-specs.js +0 -9
  26. package/FloatingLayer/tests/useFloatingLayerDecorator-specs.js +0 -13
  27. package/FloatingLayer/useFloatingLayer.js +3 -14
  28. package/FloatingLayer/useFloatingLayerDecorator.js +3 -11
  29. package/ForwardRef/ForwardRef.js +1 -10
  30. package/GridListImageItem/GridListImageItem.js +17 -50
  31. package/Group/Group.js +4 -35
  32. package/Group/GroupItem.js +15 -32
  33. package/Group/tests/Group-specs.js +0 -32
  34. package/Heading/Heading.js +7 -35
  35. package/Heading/tests/Heading-specs.js +81 -14
  36. package/Icon/Icon.js +14 -48
  37. package/Icon/tests/Icon-specs.js +0 -22
  38. package/IconButton/IconButton.js +12 -50
  39. package/IconButton/tests/IconButton-specs.js +0 -7
  40. package/Image/Image.js +16 -45
  41. package/Image/tests/Image-specs.js +0 -14
  42. package/ImageItem/ImageItem.js +17 -46
  43. package/ImageItem/tests/ImageItem-specs.js +0 -25
  44. package/Item/Item.js +8 -32
  45. package/Item/tests/Item-specs.js +0 -24
  46. package/LabeledIcon/LabeledIcon.js +19 -50
  47. package/LabeledIcon/tests/LabeledIcon-specs.js +0 -14
  48. package/Layout/Cell.js +11 -37
  49. package/Layout/Layout.js +14 -37
  50. package/Layout/tests/Layout-specs.js +10 -39
  51. package/Marquee/MarqueeBase.js +31 -64
  52. package/Marquee/MarqueeController.js +11 -72
  53. package/Marquee/MarqueeDecorator.js +62 -196
  54. package/Marquee/index.js +1 -5
  55. package/Marquee/tests/Marquee-specs.js +258 -87
  56. package/Measurable/Measurable.js +12 -34
  57. package/Measurable/tests/Measurable-specs.js +115 -0
  58. package/Media/Media.js +15 -65
  59. package/Media/tests/Media-specs.js +168 -0
  60. package/Placeholder/PlaceholderControllerDecorator.js +7 -43
  61. package/Placeholder/PlaceholderDecorator.js +7 -38
  62. package/Placeholder/index.js +0 -4
  63. package/Placeholder/tests/PlaceholderControllerDecorator-specs.js +25 -0
  64. package/Placeholder/tests/PlaceholderDecorator-specs.js +28 -0
  65. package/ProgressBar/ProgressBar.js +13 -44
  66. package/ProgressBar/tests/ProgressBar-specs.js +0 -17
  67. package/RadioDecorator/RadioControllerDecorator.js +1 -29
  68. package/RadioDecorator/RadioDecorator.js +4 -42
  69. package/RadioDecorator/tests/RadioDecorator-specs.js +12 -49
  70. package/Repeater/Repeater.js +9 -33
  71. package/Repeater/tests/Repeater-specs.js +0 -38
  72. package/Resizable/Resizable.js +7 -35
  73. package/Resizable/tests/Resizable-specs.js +34 -0
  74. package/Routable/Link.js +8 -44
  75. package/Routable/Routable.js +10 -33
  76. package/Routable/Route.js +0 -6
  77. package/Routable/Router.js +13 -56
  78. package/Routable/tests/Routable-specs.js +7 -33
  79. package/Routable/tests/Router-specs.js +18 -44
  80. package/Routable/useLink.js +4 -8
  81. package/Routable/util.js +18 -24
  82. package/Scrollable/ScrollAnimator.js +49 -65
  83. package/Scrollable/ScrollThumb.js +2 -13
  84. package/Scrollable/Scrollable.js +179 -386
  85. package/Scrollable/ScrollableNative.js +188 -391
  86. package/Scrollable/Scrollbar.js +28 -100
  87. package/Scroller/Scroller.js +15 -39
  88. package/Scroller/ScrollerBasic.js +34 -89
  89. package/Scroller/UiScrollerBase.js +31 -84
  90. package/Skinnable/Skinnable.js +11 -38
  91. package/Skinnable/tests/Skinnable-specs.js +3 -74
  92. package/Skinnable/tests/useSkins-specs.js +1 -13
  93. package/Skinnable/tests/util-specs.js +0 -14
  94. package/Skinnable/useSkins.js +8 -15
  95. package/Skinnable/util.js +9 -20
  96. package/Slider/Knob.js +5 -24
  97. package/Slider/PositionDecorator.js +16 -54
  98. package/Slider/Slider.js +26 -64
  99. package/Slider/tests/Slider-specs.js +94 -7
  100. package/Slider/utils.js +0 -2
  101. package/SlotItem/SlotItem.js +15 -41
  102. package/SlotItem/tests/SlotItem-specs.js +0 -5
  103. package/Slottable/Slottable.js +4 -12
  104. package/Slottable/tests/Slottable-specs.js +19 -46
  105. package/Slottable/tests/useSlots-specs.js +27 -65
  106. package/Slottable/useSlots.js +8 -33
  107. package/Spinner/Spinner.js +15 -42
  108. package/Spinner/tests/Spinner-specs.js +0 -15
  109. package/ToggleIcon/ToggleIcon.js +10 -36
  110. package/ToggleIcon/tests/ToggleIcon-specs.js +0 -16
  111. package/ToggleItem/ToggleItem.js +15 -52
  112. package/ToggleItem/tests/ToggleItem-specs.js +0 -30
  113. package/Toggleable/Toggle.js +1 -15
  114. package/Toggleable/Toggleable.js +12 -45
  115. package/Toggleable/tests/Toggleable-specs.js +28 -96
  116. package/Toggleable/useToggle.js +3 -19
  117. package/Touchable/ClickAllow.js +5 -14
  118. package/Touchable/Drag.js +16 -54
  119. package/Touchable/Flick.js +11 -42
  120. package/Touchable/Hold.js +21 -68
  121. package/Touchable/Touch.js +37 -65
  122. package/Touchable/Touchable.js +32 -71
  123. package/Touchable/config.js +8 -22
  124. package/Touchable/tests/Touchable-specs.js +270 -119
  125. package/Touchable/tests/useTouch-specs.js +6 -80
  126. package/Touchable/useTouch.js +17 -34
  127. package/Transition/Transition.js +37 -118
  128. package/Transition/tests/Transition-specs.js +20 -60
  129. package/ViewManager/Arranger.js +10 -22
  130. package/ViewManager/TransitionGroup.js +31 -106
  131. package/ViewManager/View.js +35 -91
  132. package/ViewManager/ViewManager.js +19 -83
  133. package/ViewManager/tests/View-specs.js +0 -17
  134. package/ViewManager/tests/ViewManager-specs.js +236 -305
  135. package/ViewManager/tests/test-utils.js +0 -8
  136. package/VirtualList/UiVirtualListBase.js +256 -406
  137. package/VirtualList/VirtualList.js +29 -69
  138. package/VirtualList/VirtualListBase.js +0 -3
  139. package/VirtualList/VirtualListBasic.js +270 -428
  140. package/VirtualList/tests/VirtualList-specs.js +9 -37
  141. package/internal/IdProvider/IdProvider.js +7 -21
  142. package/internal/IdProvider/Provider.js +4 -17
  143. package/internal/IdProvider/tests/IdProvider-specs.js +44 -0
  144. package/internal/IdProvider/tests/useId-specs.js +7 -22
  145. package/internal/IdProvider/useId.js +0 -6
  146. package/internal/Pure/Pure.js +3 -30
  147. package/internal/Pure/tests/Pure-specs.js +88 -0
  148. package/internal/localized-fonts/localized-fonts.js +33 -62
  149. package/internal/localized-fonts/tests/localized-fonts-specs.js +33 -0
  150. package/internal/selection/selection.js +1 -6
  151. package/internal/selection/tests/selection-specs.js +6 -4
  152. package/internal/validators/tests/validators-specs.js +80 -0
  153. package/internal/validators/validators.js +14 -34
  154. package/package.json +8 -2
  155. package/resolution/ResolutionDecorator.js +4 -40
  156. package/resolution/index.js +0 -7
  157. package/resolution/resolution.js +42 -80
  158. package/resolution/tests/ResolutionDecorator-specs.js +4 -11
  159. package/resolution/tests/resolution-specs.js +2 -2
  160. package/useControlledState/tests/useControlledState-specs.js +15 -46
  161. package/useControlledState/useControlledState.js +11 -22
  162. package/useScroll/ScrollAnimator.js +49 -65
  163. package/useScroll/Scrollbar.js +22 -58
  164. package/useScroll/ScrollbarTrack.js +3 -19
  165. package/useScroll/useScroll.js +267 -454
  166. package/useScroll/utilDOM.js +8 -14
  167. package/useScroll/utilEvent.js +0 -4
@@ -1,28 +1,17 @@
1
1
  "use strict";
2
2
 
3
3
  require("@testing-library/jest-dom");
4
-
5
4
  var _react = require("@testing-library/react");
6
-
7
5
  var _VirtualList = _interopRequireDefault(require("../VirtualList"));
8
-
9
6
  var _jsxRuntime = require("react/jsx-runtime");
10
-
11
7
  var _excluded = ["index"],
12
- _excluded2 = ["index"];
13
-
8
+ _excluded2 = ["index"];
14
9
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
15
-
16
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; }
17
-
18
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; }
19
-
20
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; }
21
-
22
13
  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; }
23
-
24
14
  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; }
25
-
26
15
  describe('VirtualList', function () {
27
16
  var clientSize, dataSize, getScrollTo, handlerOnScroll, handlerOnScrollStart, handlerOnScrollStop, items, myScrollTo, onScrollCount, onScrollStartCount, onScrollStopCount, renderItem, resultScrollTop;
28
17
  beforeEach(function () {
@@ -36,19 +25,15 @@ describe('VirtualList', function () {
36
25
  onScrollStartCount = 0;
37
26
  onScrollStopCount = 0;
38
27
  resultScrollTop = 0;
39
-
40
28
  getScrollTo = function getScrollTo(scrollTo) {
41
29
  myScrollTo = scrollTo;
42
30
  };
43
-
44
31
  handlerOnScroll = function handlerOnScroll() {
45
32
  onScrollCount++;
46
33
  };
47
-
48
34
  handlerOnScrollStart = function handlerOnScrollStart() {
49
35
  onScrollStartCount++;
50
36
  };
51
-
52
37
  handlerOnScrollStop = function handlerOnScrollStop(done, testCase) {
53
38
  return function (e) {
54
39
  onScrollStopCount++;
@@ -57,18 +42,15 @@ describe('VirtualList', function () {
57
42
  done();
58
43
  };
59
44
  };
60
-
61
45
  renderItem = function renderItem(_ref) {
62
46
  var index = _ref.index,
63
- rest = _objectWithoutProperties(_ref, _excluded);
64
-
47
+ rest = _objectWithoutProperties(_ref, _excluded);
65
48
  // eslint-disable-line enact/display-name
66
49
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, rest), {}, {
67
50
  id: 'item' + index,
68
51
  children: items[index].name
69
52
  }));
70
53
  };
71
-
72
54
  for (var i = 0; i < dataSize; i++) {
73
55
  items.push({
74
56
  name: 'Account ' + i
@@ -98,9 +80,7 @@ describe('VirtualList', function () {
98
80
  itemSize: 30
99
81
  }));
100
82
  var expected = 'Account 0';
101
-
102
83
  var actual = _react.screen.getByRole('list').children.item(0).textContent;
103
-
104
84
  expect(actual).toBe(expected);
105
85
  });
106
86
  test('should render (clientHeight / itemHeight + overhang) items', function () {
@@ -111,9 +91,7 @@ describe('VirtualList', function () {
111
91
  itemSize: 30
112
92
  }));
113
93
  var expected = 27; // 720 / 30 + 3
114
-
115
94
  var actual = _react.screen.getByRole('list').children.length;
116
-
117
95
  expect(actual).toBe(expected);
118
96
  });
119
97
  describe('ScrollTo', function () {
@@ -262,25 +240,21 @@ describe('VirtualList', function () {
262
240
  }, {
263
241
  name: 'C'
264
242
  }];
265
-
266
243
  var renderItemArray = function renderItemArray(_ref2) {
267
244
  var index = _ref2.index,
268
- rest = _objectWithoutProperties(_ref2, _excluded2);
269
-
245
+ rest = _objectWithoutProperties(_ref2, _excluded2);
270
246
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, rest), {}, {
271
247
  id: 'item' + index,
272
248
  children: itemArray[index].name
273
249
  }));
274
250
  };
275
-
276
251
  var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_VirtualList["default"], {
277
- clientSize: clientSize,
278
- dataSize: itemArray.length,
279
- itemRenderer: renderItemArray,
280
- itemSize: 30
281
- })),
282
- rerender = _render.rerender;
283
-
252
+ clientSize: clientSize,
253
+ dataSize: itemArray.length,
254
+ itemRenderer: renderItemArray,
255
+ itemSize: 30
256
+ })),
257
+ rerender = _render.rerender;
284
258
  itemArray.unshift({
285
259
  name: 'Password 0'
286
260
  });
@@ -295,9 +269,7 @@ describe('VirtualList', function () {
295
269
  return jest.advanceTimersByTime(0);
296
270
  });
297
271
  var expected = itemArray[0].name;
298
-
299
272
  var actual = _react.screen.getByRole('list').children.item(0).textContent;
300
-
301
273
  expect(actual).toBe(expected);
302
274
  done();
303
275
  jest.useRealTimers();
@@ -10,21 +10,13 @@ Object.defineProperty(exports, "useId", {
10
10
  return _useId2["default"];
11
11
  }
12
12
  });
13
-
14
13
  var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
15
-
16
14
  var _useId2 = _interopRequireDefault(require("./useId"));
17
-
18
15
  var _jsxRuntime = require("react/jsx-runtime");
19
-
20
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
21
-
22
17
  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; }
23
-
24
18
  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; }
25
-
26
19
  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; }
27
-
28
20
  /**
29
21
  * Default config for {@link ui/IdProvider.IdProvider}
30
22
  *
@@ -40,7 +32,6 @@ var defaultConfig = {
40
32
  * @memberof ui/IdProvider.IdProvider.defaultConfig
41
33
  */
42
34
  generateProp: 'generateId',
43
-
44
35
  /**
45
36
  * Prop to pass the identifier
46
37
  *
@@ -49,7 +40,6 @@ var defaultConfig = {
49
40
  * @memberof ui/IdProvider.IdProvider.defaultConfig
50
41
  */
51
42
  idProp: 'id',
52
-
53
43
  /**
54
44
  * Optional prefix for the identifier
55
45
  *
@@ -59,6 +49,7 @@ var defaultConfig = {
59
49
  */
60
50
  prefix: 'c_'
61
51
  };
52
+
62
53
  /**
63
54
  * A higher-order component that generates globally-unique identifiers
64
55
  *
@@ -67,31 +58,26 @@ var defaultConfig = {
67
58
  * @private
68
59
  * @memberof ui/IdProvider
69
60
  */
70
-
71
61
  var IdProvider = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
72
62
  var generateProp = config.generateProp,
73
- idProp = config.idProp,
74
- prefix = config.prefix; // eslint-disable-next-line no-shadow
63
+ idProp = config.idProp,
64
+ prefix = config.prefix;
75
65
 
66
+ // eslint-disable-next-line no-shadow
76
67
  function IdProvider(props) {
77
68
  var updated = _objectSpread({}, props);
78
-
79
69
  var _useId = (0, _useId2["default"])({
80
- prefix: prefix
81
- }),
82
- generateId = _useId.generateId;
83
-
70
+ prefix: prefix
71
+ }),
72
+ generateId = _useId.generateId;
84
73
  if (generateProp) {
85
74
  updated[generateProp] = generateId;
86
75
  }
87
-
88
76
  if (idProp && !updated[idProp]) {
89
77
  updated[idProp] = generateId();
90
78
  }
91
-
92
79
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread({}, updated));
93
80
  }
94
-
95
81
  return IdProvider;
96
82
  });
97
83
  exports.IdProvider = IdProvider;
@@ -4,33 +4,25 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports["default"] = exports.Provider = void 0;
7
-
8
7
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
9
-
10
8
  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
-
12
9
  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
-
14
10
  var GlobalId = 0;
15
11
  var ID_KEY = '$$ID$$';
16
-
17
12
  var Provider = /*#__PURE__*/function () {
18
13
  function Provider(prefix) {
19
14
  var _this = this;
20
-
21
15
  _classCallCheck(this, Provider);
22
-
23
16
  this.generate = function () {
24
17
  var key = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ID_KEY;
25
18
  var idPrefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _this.prefix;
26
19
  var onUnmount = arguments.length > 2 ? arguments[2] : undefined;
27
-
28
20
  // if an id has been generated for the key, return it
29
21
  if (key in _this.ids) {
30
22
  return _this.ids[key].id;
31
- } // otherwise generate a new id (with an optional prefix), cache it, and return it
32
-
23
+ }
33
24
 
25
+ // otherwise generate a new id (with an optional prefix), cache it, and return it
34
26
  var id = "".concat(idPrefix).concat(++GlobalId);
35
27
  _this.ids[typeof key === 'undefined' ? "generated-".concat(id) : key] = {
36
28
  id: id,
@@ -38,30 +30,25 @@ var Provider = /*#__PURE__*/function () {
38
30
  };
39
31
  return id;
40
32
  };
41
-
42
33
  this.prefix = prefix;
43
34
  this.ids = {};
44
35
  }
45
-
46
36
  _createClass(Provider, [{
47
37
  key: "unload",
48
38
  value: function unload() {
49
39
  // Call the onUnmount handler for each generated id (note: not the key)
50
40
  for (var key in this.ids) {
51
41
  var _this$ids$key = this.ids[key],
52
- id = _this$ids$key.id,
53
- onUnmount = _this$ids$key.onUnmount;
54
-
42
+ id = _this$ids$key.id,
43
+ onUnmount = _this$ids$key.onUnmount;
55
44
  if (typeof onUnmount === 'function') {
56
45
  onUnmount(id);
57
46
  }
58
47
  }
59
48
  }
60
49
  }]);
61
-
62
50
  return Provider;
63
51
  }();
64
-
65
52
  exports.Provider = Provider;
66
53
  var _default = Provider;
67
54
  exports["default"] = _default;
@@ -0,0 +1,44 @@
1
+ "use strict";
2
+
3
+ require("@testing-library/jest-dom");
4
+ var _react = require("@testing-library/react");
5
+ var _IdProvider = _interopRequireDefault(require("../IdProvider"));
6
+ var _jsxRuntime = require("react/jsx-runtime");
7
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
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
+ 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
+ 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
+ describe('IdProvider', function () {
12
+ test('should pass id to wrapped component', function () {
13
+ var Base = function Base(props) {
14
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread({
15
+ role: "button"
16
+ }, props));
17
+ };
18
+ var Component = (0, _IdProvider["default"])({
19
+ generateProp: null,
20
+ prefix: 'custom_'
21
+ }, Base);
22
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
23
+ var wrappedDiv = _react.screen.getByRole('button');
24
+ var expected = 'custom_1';
25
+ expect(wrappedDiv).toHaveAttribute('id', expected);
26
+ });
27
+ test('should create a generation function with a name indicated by \'generateProp\'', function () {
28
+ var expected = 'customProp';
29
+ var actual;
30
+ var Base = function Base(props) {
31
+ actual = props;
32
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {});
33
+ };
34
+ var Component = (0, _IdProvider["default"])({
35
+ generateProp: expected,
36
+ prefix: 'custom_'
37
+ }, Base);
38
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
39
+
40
+ // eslint-disable-next-line no-undefined
41
+ expect(actual[expected]).not.toBe(undefined);
42
+ expect(typeof actual[expected]).toBe('function');
43
+ });
44
+ });
@@ -1,36 +1,25 @@
1
1
  "use strict";
2
2
 
3
3
  require("@testing-library/jest-dom");
4
-
5
4
  var _react = require("@testing-library/react");
6
-
7
5
  var _useId = _interopRequireDefault(require("../useId"));
8
-
9
6
  var _jsxRuntime = require("react/jsx-runtime");
10
-
11
7
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
12
-
13
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; }
14
-
15
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; }
16
-
17
10
  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; }
18
-
19
11
  describe('useId', function () {
20
12
  var data = [];
21
-
22
13
  function Base(props) {
23
14
  data.push(props);
24
15
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
25
- id: data.id,
26
- generateid: data.generateId
16
+ id: data.id
27
17
  });
28
18
  }
29
-
30
19
  function Component(_ref) {
31
20
  var key = _ref.key,
32
- prefix = _ref.prefix,
33
- onUnmount = _ref.onUnmount;
21
+ prefix = _ref.prefix,
22
+ onUnmount = _ref.onUnmount;
34
23
  var provider = (0, _useId["default"])({
35
24
  prefix: prefix
36
25
  });
@@ -38,7 +27,6 @@ describe('useId', function () {
38
27
  id: provider.generateId(key, prefix, onUnmount)
39
28
  }));
40
29
  }
41
-
42
30
  afterEach(function () {
43
31
  return data.splice(0, data.length);
44
32
  });
@@ -58,8 +46,7 @@ describe('useId', function () {
58
46
  });
59
47
  test('should maintain the same id across renders', function () {
60
48
  var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {})),
61
- rerender = _render.rerender;
62
-
49
+ rerender = _render.rerender;
63
50
  var expected = data[0].id;
64
51
  rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
65
52
  var actual = data[1].id;
@@ -76,12 +63,10 @@ describe('useId', function () {
76
63
  });
77
64
  test('should call onUnmount callback', function () {
78
65
  var spy = jest.fn();
79
-
80
66
  var _render2 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
81
- onUnmount: spy
82
- })),
83
- unmount = _render2.unmount;
84
-
67
+ onUnmount: spy
68
+ })),
69
+ unmount = _render2.unmount;
85
70
  unmount();
86
71
  expect(spy).toHaveBeenCalledTimes(1);
87
72
  });
@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.useIdProvider = exports["default"] = void 0;
7
-
8
7
  var _useClass = _interopRequireDefault(require("@enact/core/useClass"));
9
-
10
8
  var _react = require("react");
11
-
12
9
  var _Provider = _interopRequireDefault(require("./Provider"));
13
-
14
10
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
15
-
16
11
  /**
17
12
  * Configuration for `useIdProvider`
18
13
  *
@@ -50,7 +45,6 @@ var useIdProvider = function useIdProvider(_ref) {
50
45
  generateId: provider.generate
51
46
  };
52
47
  };
53
-
54
48
  exports.useIdProvider = useIdProvider;
55
49
  var _default = useIdProvider;
56
50
  exports["default"] = _default;
@@ -4,41 +4,23 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports["default"] = exports.Pure = 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
23
-
24
15
  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); } }
25
-
26
16
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
27
-
28
17
  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); }
29
-
30
18
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
31
-
32
19
  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); }; }
33
-
34
20
  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); }
35
-
36
21
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
37
-
38
22
  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; } }
39
-
40
23
  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
41
-
42
24
  /**
43
25
  * Default config for {@link ui/internal/Pure.Pure}.
44
26
  *
@@ -58,6 +40,7 @@ var defaultConfig = {
58
40
  }
59
41
  }
60
42
  };
43
+
61
44
  /**
62
45
  * Implements `shouldComponentUpdate` based on property change determination. By default, props are
63
46
  * shallowly compared for strict equality
@@ -82,22 +65,16 @@ var defaultConfig = {
82
65
  * @hoc
83
66
  * @private
84
67
  */
85
-
86
68
  var Pure = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
87
69
  var _class;
88
-
89
70
  var propComparators = config.propComparators;
90
71
  return _class = /*#__PURE__*/function (_Component) {
91
72
  _inherits(_class, _Component);
92
-
93
73
  var _super = _createSuper(_class);
94
-
95
74
  function _class() {
96
75
  _classCallCheck(this, _class);
97
-
98
76
  return _super.apply(this, arguments);
99
77
  }
100
-
101
78
  _createClass(_class, [{
102
79
  key: "shouldComponentUpdate",
103
80
  value: function shouldComponentUpdate(nextProps) {
@@ -107,23 +84,20 @@ var Pure = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
107
84
  key: "hasChanged",
108
85
  value: function hasChanged(current, next, comparators) {
109
86
  var propKeys = Object.keys(current);
110
- var nextKeys = Object.keys(next); // early bail out if the objects have a different number of keys
87
+ var nextKeys = Object.keys(next);
111
88
 
89
+ // early bail out if the objects have a different number of keys
112
90
  if (propKeys.length !== nextKeys.length) {
113
91
  return true;
114
92
  }
115
-
116
93
  var hasOwn = Object.prototype.hasOwnProperty.bind(current);
117
-
118
94
  for (var i = 0; i < nextKeys.length; i++) {
119
95
  var prop = nextKeys[i];
120
96
  var comp = comparators[prop] || comparators['*'];
121
-
122
97
  if (!hasOwn(prop) || !comp(current[prop], next[prop])) {
123
98
  return true;
124
99
  }
125
100
  }
126
-
127
101
  return false;
128
102
  }
129
103
  }, {
@@ -132,7 +106,6 @@ var Pure = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
132
106
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread({}, this.props));
133
107
  }
134
108
  }]);
135
-
136
109
  return _class;
137
110
  }(_react.Component), _class.displayName = 'Pure', _class.propTypes = {}, _class.defaultProps = {}, _class;
138
111
  });
@@ -0,0 +1,88 @@
1
+ "use strict";
2
+
3
+ require("@testing-library/jest-dom");
4
+ var _react = require("@testing-library/react");
5
+ var _react2 = require("react");
6
+ var _propTypes = _interopRequireDefault(require("prop-types"));
7
+ var _Pure = _interopRequireDefault(require("../Pure"));
8
+ var _jsxRuntime = require("react/jsx-runtime");
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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
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); } }
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 _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); }
17
+ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
18
+ 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); }; }
19
+ 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); }
20
+ function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
21
+ 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; } }
22
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
23
+ var defaultConfig = {
24
+ propComparators: {
25
+ '*': function _(a, b) {
26
+ return a === b;
27
+ }
28
+ }
29
+ };
30
+ var data = [];
31
+ var Base = /*#__PURE__*/function (_Component) {
32
+ _inherits(Base, _Component);
33
+ var _super = _createSuper(Base);
34
+ function Base(props) {
35
+ var _this;
36
+ _classCallCheck(this, Base);
37
+ _this = _super.call(this, props);
38
+ _this.countRenders = 0;
39
+ return _this;
40
+ }
41
+ _createClass(Base, [{
42
+ key: "render",
43
+ value: function render() {
44
+ data = this.props;
45
+ var value = this.props.value;
46
+ this.countRenders++;
47
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", _objectSpread(_objectSpread({}, this.props), {}, {
48
+ "data-testid": "baseComponent",
49
+ children: ["Value: ", value, ", CountRenders: ", this.countRenders]
50
+ }));
51
+ }
52
+ }]);
53
+ return Base;
54
+ }(_react2.Component);
55
+ Base.propTypes = {
56
+ value: _propTypes["default"].number
57
+ };
58
+ var PureComponent = (0, _Pure["default"])(Base);
59
+ describe('Pure', function () {
60
+ test('should have a \'comparator\' function', function () {
61
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(PureComponent, {
62
+ comparators: defaultConfig.propComparators
63
+ }));
64
+ expect(typeof data.comparators['*']).toBe('function');
65
+ });
66
+ test('should not update wrapped component when passing the same props', function () {
67
+ var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(PureComponent, {
68
+ value: 1
69
+ })),
70
+ rerender = _render.rerender;
71
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(PureComponent, {
72
+ value: 1
73
+ }));
74
+ var actual = _react.screen.getByTestId('baseComponent');
75
+ expect(actual).toHaveTextContent('CountRenders: 1');
76
+ });
77
+ test('should update wrapped component when passing different props', function () {
78
+ var _render2 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(PureComponent, {
79
+ value: 1
80
+ })),
81
+ rerender = _render2.rerender;
82
+ rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(PureComponent, {
83
+ value: 2
84
+ }));
85
+ var actual = _react.screen.getByTestId('baseComponent');
86
+ expect(actual).toHaveTextContent('CountRenders: 2');
87
+ });
88
+ });