@enact/ui 4.1.2 → 4.5.0-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (169) hide show
  1. package/AnnounceDecorator/Announce.js +9 -9
  2. package/AnnounceDecorator/AnnounceDecorator.js +6 -4
  3. package/AnnounceDecorator/tests/Announce-specs.js +13 -5
  4. package/AnnounceDecorator/tests/AnnounceDecorator-specs.js +9 -7
  5. package/AnnounceDecorator/tests/useAnnounce-specs.js +25 -17
  6. package/AnnounceDecorator/useAnnounce.js +1 -1
  7. package/BodyText/BodyText.d.ts +1 -1
  8. package/BodyText/BodyText.js +6 -4
  9. package/BodyText/tests/BodyText-specs.js +51 -37
  10. package/Button/Button.d.ts +6 -6
  11. package/Button/Button.js +11 -7
  12. package/Button/tests/Button-specs.js +104 -3
  13. package/CHANGELOG.md +25 -0
  14. package/Cancelable/Cancelable.js +12 -11
  15. package/Cancelable/tests/Cancelable-specs.js +133 -70
  16. package/Changeable/Changeable.js +9 -9
  17. package/Changeable/tests/Changeable-specs.js +172 -110
  18. package/ComponentOverride/ComponentOverride.js +6 -4
  19. package/FloatingLayer/FloatingLayer.js +40 -49
  20. package/FloatingLayer/FloatingLayer.module.css +3 -0
  21. package/FloatingLayer/FloatingLayerContainer.js +2 -2
  22. package/FloatingLayer/FloatingLayerDecorator.js +6 -4
  23. package/FloatingLayer/Scrim.js +9 -7
  24. package/FloatingLayer/index.js +1 -1
  25. package/FloatingLayer/tests/FloatingLayer-specs.js +83 -8
  26. package/FloatingLayer/tests/Scrim-specs.js +20 -11
  27. package/FloatingLayer/tests/useFloatingLayerDecorator-specs.js +17 -11
  28. package/FloatingLayer/useFloatingLayer.js +2 -2
  29. package/FloatingLayer/useFloatingLayerDecorator.js +1 -1
  30. package/ForwardRef/ForwardRef.js +3 -3
  31. package/GridListImageItem/GridListImageItem.d.ts +1 -1
  32. package/GridListImageItem/GridListImageItem.js +6 -4
  33. package/Group/Group.d.ts +2 -2
  34. package/Group/Group.js +7 -4
  35. package/Group/GroupItem.js +6 -4
  36. package/Group/tests/Group-specs.js +73 -43
  37. package/Heading/Heading.d.ts +2 -1
  38. package/Heading/Heading.js +6 -4
  39. package/Heading/tests/Heading-specs.js +27 -20
  40. package/Icon/Icon.d.ts +4 -4
  41. package/Icon/Icon.js +6 -4
  42. package/Icon/tests/Icon-specs.js +54 -33
  43. package/IconButton/IconButton.d.ts +4 -4
  44. package/IconButton/IconButton.js +6 -4
  45. package/IconButton/tests/IconButton-specs.js +2 -2
  46. package/Image/Image.js +6 -4
  47. package/Image/tests/Image-specs.js +41 -31
  48. package/ImageItem/ImageItem.js +8 -5
  49. package/ImageItem/tests/ImageItem-specs.js +75 -72
  50. package/Item/Item.js +6 -4
  51. package/Item/tests/Item-specs.js +59 -35
  52. package/LabeledIcon/LabeledIcon.d.ts +4 -4
  53. package/LabeledIcon/LabeledIcon.js +6 -4
  54. package/LabeledIcon/tests/LabeledIcon-specs.js +30 -19
  55. package/Layout/Cell.js +6 -4
  56. package/Layout/Layout.d.ts +16 -16
  57. package/Layout/Layout.js +6 -4
  58. package/Layout/tests/Layout-specs.js +42 -30
  59. package/Marquee/MarqueeBase.js +7 -9
  60. package/Marquee/MarqueeController.js +9 -9
  61. package/Marquee/MarqueeDecorator.js +18 -13
  62. package/Marquee/index.d.ts +4 -1
  63. package/Marquee/index.js +2 -1
  64. package/Marquee/tests/Marquee-specs.js +254 -122
  65. package/Measurable/Measurable.js +4 -4
  66. package/Media/Media.js +10 -10
  67. package/Placeholder/PlaceholderControllerDecorator.js +9 -9
  68. package/Placeholder/PlaceholderDecorator.js +9 -9
  69. package/ProgressBar/ProgressBar.js +6 -4
  70. package/ProgressBar/tests/ProgressBar-specs.js +60 -42
  71. package/README.md +1 -1
  72. package/RadioDecorator/RadioControllerDecorator.js +9 -9
  73. package/RadioDecorator/RadioDecorator.js +12 -14
  74. package/RadioDecorator/tests/RadioDecorator-specs.js +179 -65
  75. package/Repeater/Repeater.d.ts +2 -1
  76. package/Repeater/Repeater.js +6 -4
  77. package/Repeater/tests/Repeater-specs.js +90 -49
  78. package/Resizable/Resizable.js +10 -10
  79. package/Routable/Link.js +9 -7
  80. package/Routable/Routable.d.ts +2 -2
  81. package/Routable/Routable.js +10 -6
  82. package/Routable/Route.js +1 -1
  83. package/Routable/Router.js +14 -11
  84. package/Routable/tests/Routable-specs.js +29 -20
  85. package/Routable/tests/Router-specs.js +65 -41
  86. package/Routable/useLink.js +1 -1
  87. package/Routable/util.js +1 -1
  88. package/Scrollable/ScrollAnimator.js +2 -2
  89. package/Scrollable/ScrollThumb.js +3 -3
  90. package/Scrollable/Scrollable.js +14 -10
  91. package/Scrollable/ScrollableNative.js +14 -10
  92. package/Scrollable/Scrollbar.js +14 -8
  93. package/Scroller/Scroller.d.ts +2 -14
  94. package/Scroller/Scroller.js +8 -7
  95. package/Scroller/ScrollerBasic.js +18 -35
  96. package/Scroller/UiScrollerBase.js +9 -7
  97. package/Skinnable/Skinnable.js +6 -4
  98. package/Skinnable/tests/Skinnable-specs.js +104 -56
  99. package/Skinnable/tests/useSkins-specs.js +39 -44
  100. package/Skinnable/useSkins.js +1 -1
  101. package/Slider/Knob.js +6 -4
  102. package/Slider/PositionDecorator.js +9 -9
  103. package/Slider/Slider.d.ts +3 -3
  104. package/Slider/Slider.js +6 -4
  105. package/Slider/tests/Slider-specs.js +4 -4
  106. package/SlotItem/SlotItem.d.ts +2 -2
  107. package/SlotItem/SlotItem.js +6 -4
  108. package/SlotItem/tests/SlotItem-specs.js +4 -4
  109. package/Slottable/Slottable.js +3 -3
  110. package/Slottable/tests/Slottable-specs.js +67 -36
  111. package/Slottable/tests/useSlots-specs.js +68 -35
  112. package/Slottable/useSlots.js +6 -4
  113. package/Spinner/Spinner.d.ts +1 -1
  114. package/Spinner/Spinner.js +6 -4
  115. package/Spinner/tests/Spinner-specs.js +46 -31
  116. package/ToggleIcon/ToggleIcon.js +6 -4
  117. package/ToggleIcon/tests/ToggleIcon-specs.js +32 -20
  118. package/ToggleItem/ToggleItem.d.ts +13 -11
  119. package/ToggleItem/ToggleItem.js +6 -4
  120. package/ToggleItem/tests/ToggleItem-specs.js +54 -37
  121. package/Toggleable/Toggle.js +10 -10
  122. package/Toggleable/Toggleable.js +11 -17
  123. package/Toggleable/tests/Toggleable-specs.js +464 -324
  124. package/Toggleable/useToggle.js +4 -2
  125. package/Touchable/ClickAllow.js +2 -2
  126. package/Touchable/Drag.js +22 -22
  127. package/Touchable/Flick.js +22 -18
  128. package/Touchable/Hold.js +18 -23
  129. package/Touchable/Touch.js +2 -2
  130. package/Touchable/Touchable.d.ts +3 -3
  131. package/Touchable/Touchable.js +7 -4
  132. package/Touchable/config.js +3 -3
  133. package/Touchable/tests/Touchable-specs.js +225 -109
  134. package/Touchable/tests/useTouch-specs.js +163 -86
  135. package/Touchable/useTouch.js +4 -4
  136. package/Transition/Transition.d.ts +29 -27
  137. package/Transition/Transition.js +22 -17
  138. package/Transition/tests/Transition-specs.js +116 -36
  139. package/ViewManager/Arranger.js +3 -3
  140. package/ViewManager/TransitionGroup.js +10 -9
  141. package/ViewManager/View.js +7 -7
  142. package/ViewManager/ViewManager.d.ts +4 -4
  143. package/ViewManager/ViewManager.js +24 -22
  144. package/ViewManager/tests/View-specs.js +141 -81
  145. package/ViewManager/tests/ViewManager-specs.js +486 -193
  146. package/VirtualList/UiVirtualListBase.js +26 -35
  147. package/VirtualList/VirtualList.d.ts +11 -29
  148. package/VirtualList/VirtualList.js +10 -9
  149. package/VirtualList/VirtualListBase.js +1 -1
  150. package/VirtualList/VirtualListBasic.js +44 -61
  151. package/VirtualList/tests/VirtualList-specs.js +81 -95
  152. package/internal/IdProvider/IdProvider.js +3 -3
  153. package/internal/IdProvider/Provider.js +2 -2
  154. package/internal/IdProvider/tests/useId-specs.js +37 -20
  155. package/internal/Pure/Pure.js +9 -9
  156. package/internal/localized-fonts/localized-fonts.js +1 -1
  157. package/internal/validators/validators.js +1 -1
  158. package/package.json +11 -11
  159. package/resolution/ResolutionDecorator.js +9 -9
  160. package/resolution/index.js +2 -2
  161. package/resolution/resolution.js +4 -2
  162. package/resolution/tests/ResolutionDecorator-specs.js +17 -8
  163. package/styles/mixins.less +14 -2
  164. package/useControlledState/tests/useControlledState-specs.js +68 -43
  165. package/useControlledState/useControlledState.js +2 -2
  166. package/useScroll/ScrollAnimator.js +2 -2
  167. package/useScroll/Scrollbar.js +7 -4
  168. package/useScroll/ScrollbarTrack.js +6 -4
  169. package/useScroll/useScroll.js +18 -29
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.Announce = exports["default"] = void 0;
6
+ exports["default"] = exports.Announce = void 0;
7
7
 
8
8
  var _propTypes = _interopRequireDefault(require("prop-types"));
9
9
 
@@ -11,13 +11,13 @@ var _react = require("react");
11
11
 
12
12
  var _jsxRuntime = require("react/jsx-runtime");
13
13
 
14
- var _class, _temp;
14
+ var _class;
15
15
 
16
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
17
17
 
18
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
18
+ 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
19
 
20
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
20
+ 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; }
21
21
 
22
22
  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; }
23
23
 
@@ -25,15 +25,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
25
25
 
26
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, descriptor.key, descriptor); } }
27
27
 
28
- function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
28
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
29
29
 
30
- 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 } }); if (superClass) _setPrototypeOf(subClass, superClass); }
30
+ 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); }
31
31
 
32
32
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
33
33
 
34
34
  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); }; }
35
35
 
36
- function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
36
+ 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); }
37
37
 
38
38
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
39
39
 
@@ -76,7 +76,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
76
76
  * @memberof ui/AnnounceDecorator
77
77
  * @public
78
78
  */
79
- var Announce = (_temp = _class = /*#__PURE__*/function (_Component) {
79
+ var Announce = (_class = /*#__PURE__*/function (_Component) {
80
80
  _inherits(Announce, _Component);
81
81
 
82
82
  var _super = _createSuper(Announce);
@@ -174,7 +174,7 @@ var Announce = (_temp = _class = /*#__PURE__*/function (_Component) {
174
174
  // how frequently we should allow alerting. Should also consider if this timeout should be
175
175
  // "global" such that multiple instances of Announce respect each other.
176
176
  timeout: 500
177
- }, _temp);
177
+ }, _class);
178
178
  exports.Announce = Announce;
179
179
  var _default = Announce;
180
180
  exports["default"] = _default;
@@ -9,13 +9,13 @@ Object.defineProperty(exports, "Announce", {
9
9
  return _Announce["default"];
10
10
  }
11
11
  });
12
+ exports["default"] = exports.AnnounceDecorator = void 0;
12
13
  Object.defineProperty(exports, "useAnnounce", {
13
14
  enumerable: true,
14
15
  get: function get() {
15
16
  return _useAnnounce["default"];
16
17
  }
17
18
  });
18
- exports.AnnounceDecorator = exports["default"] = void 0;
19
19
 
20
20
  var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
21
21
 
@@ -27,11 +27,13 @@ var _useAnnounce = _interopRequireDefault(require("./useAnnounce"));
27
27
 
28
28
  var _jsxRuntime = require("react/jsx-runtime");
29
29
 
30
+ var _excluded = ["children"];
31
+
30
32
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
31
33
 
32
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
34
+ 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; }
33
35
 
34
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
36
+ 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; }
35
37
 
36
38
  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; }
37
39
 
@@ -100,7 +102,7 @@ var AnnounceDecorator = (0, _hoc["default"])(defaultConfig, function (_ref, Wrap
100
102
  // eslint-disable-next-line no-shadow
101
103
  function AnnounceDecorator(_ref2) {
102
104
  var children = _ref2.children,
103
- rest = _objectWithoutProperties(_ref2, ["children"]);
105
+ rest = _objectWithoutProperties(_ref2, _excluded);
104
106
 
105
107
  var announce = (0, _useAnnounce["default"])();
106
108
  if (prop) rest[prop] = announce.announce;
@@ -1,6 +1,8 @@
1
1
  "use strict";
2
2
 
3
- var _enzyme = require("enzyme");
3
+ var _react = require("@testing-library/react");
4
+
5
+ var _react2 = require("react");
4
6
 
5
7
  var _Announce = _interopRequireDefault(require("../Announce"));
6
8
 
@@ -10,16 +12,22 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
10
12
 
11
13
  describe('Announce', function () {
12
14
  test('should have an announce method on the component', function () {
13
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Announce["default"], {}));
14
- var node = subject.instance();
15
+ var ref = /*#__PURE__*/(0, _react2.createRef)();
16
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Announce["default"], {
17
+ ref: ref
18
+ }));
19
+ var node = ref.current;
15
20
  var expected = 'function';
16
21
  var actual = typeof node.announce;
17
22
  expect(actual).toBe(expected);
18
23
  });
19
24
  test('should update the aria-label with the provided message', function () {
25
+ var ref = /*#__PURE__*/(0, _react2.createRef)();
20
26
  var message = 'message';
21
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Announce["default"], {}));
22
- var node = subject.instance();
27
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Announce["default"], {
28
+ ref: ref
29
+ }));
30
+ var node = ref.current;
23
31
  node.announce(message);
24
32
  var expected = message; // since we're manually updating the node in Announce, we have to manually check the node here
25
33
 
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- var _enzyme = require("enzyme");
3
+ var _react = require("@testing-library/react");
4
4
 
5
5
  var _AnnounceDecorator = _interopRequireDefault(require("../AnnounceDecorator"));
6
6
 
@@ -9,16 +9,18 @@ var _jsxRuntime = require("react/jsx-runtime");
9
9
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
10
10
 
11
11
  describe('AnnounceDecorator', function () {
12
- // no-op wrapper
13
- var Div = function Div() {
12
+ var announceProps; // no-op wrapper
13
+
14
+ var Div = function Div(props) {
15
+ announceProps = props;
14
16
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {});
15
17
  };
16
18
 
17
19
  test('should pass a function in the announce prop', function () {
18
20
  var Component = (0, _AnnounceDecorator["default"])(Div);
19
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
21
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
20
22
  var expected = 'function';
21
- var actual = typeof subject.prop('announce');
23
+ var actual = typeof announceProps.announce;
22
24
  expect(actual).toBe(expected);
23
25
  });
24
26
  test('should allow prop to be configured for announce function', function () {
@@ -26,9 +28,9 @@ describe('AnnounceDecorator', function () {
26
28
  var Component = (0, _AnnounceDecorator["default"])({
27
29
  prop: prop
28
30
  }, Div);
29
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
31
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
30
32
  var expected = 'function';
31
- var actual = typeof subject.prop(prop);
33
+ var actual = typeof announceProps[prop];
32
34
  expect(actual).toBe(expected);
33
35
  });
34
36
  });
@@ -1,8 +1,6 @@
1
1
  "use strict";
2
2
 
3
- var _react = require("react");
4
-
5
- var _enzyme = require("enzyme");
3
+ var _react = require("@testing-library/react");
6
4
 
7
5
  var _useAnnounce2 = _interopRequireDefault(require("../useAnnounce"));
8
6
 
@@ -11,9 +9,14 @@ var _jsxRuntime = require("react/jsx-runtime");
11
9
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
12
10
 
13
11
  describe('useAnnounce', function () {
12
+ var announceType;
13
+
14
14
  function Base(_ref) {
15
- var children = _ref.children;
15
+ var children = _ref.children,
16
+ announce = _ref.announce;
17
+ announceType = typeof announce;
16
18
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
19
+ "data-testid": "announce",
17
20
  children: children
18
21
  });
19
22
  }
@@ -30,28 +33,33 @@ describe('useAnnounce', function () {
30
33
  }
31
34
 
32
35
  test('should return an announce function', function () {
33
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
36
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
34
37
  var expected = 'function';
35
- var actual = typeof subject.prop('announce');
36
- expect(actual).toBe(expected);
38
+ expect(announceType).toBe(expected);
37
39
  });
38
40
  test('should return a single element in children', function () {
39
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
40
- var expected = true;
41
- var actual = /*#__PURE__*/(0, _react.isValidElement)(subject.prop('children'));
42
- expect(actual).toBe(expected);
43
- }); // this might be too specialized to the implmentation but we lack a better way to unit test this
41
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
42
+ var expected = 1;
43
+
44
+ var baseElementChildrenCount = _react.screen.getByTestId('announce').children.length;
45
+
46
+ expect(baseElementChildrenCount).toBe(expected);
47
+ }); // this might be too specialized to the implementation but we lack a better way to unit test this
44
48
  // capability right now
49
+ // TODO: find a relevant scenario that works on testing-library
45
50
 
46
- test('should set the value passed to announce into the ARIA role="alert" node', function () {
51
+ test.skip('should set the value passed to announce into the ARIA role="alert" node', function () {
47
52
  var text = '__NOTIFY__';
48
- var subject = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
49
- subject.find(Base).invoke('announce')(text);
50
- subject.update();
53
+
54
+ var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {})),
55
+ container = _render.container;
56
+
57
+ container.find(Base).invoke('announce')(text);
58
+ container.update();
51
59
  var expected = text; // Have to get the actual DOM node here since Announce updates the DOM directly so the
52
60
  // change isn't represented in either the React or Enzyme views
53
61
 
54
- var actual = subject.find({
62
+ var actual = container.find({
55
63
  role: 'alert'
56
64
  }).instance().getAttribute('aria-label');
57
65
  expect(actual).toBe(expected);
@@ -3,8 +3,8 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.useAnnounce = useAnnounce;
7
6
  exports["default"] = void 0;
7
+ exports.useAnnounce = useAnnounce;
8
8
 
9
9
  var _react = require("react");
10
10
 
@@ -11,7 +11,7 @@ export interface BodyTextBaseProps {
11
11
  * Centers the contents.
12
12
  *
13
13
  * Applies the `centered` CSS class which can be customized by
14
- theming .
14
+ [theming] .
15
15
  */
16
16
  centered?: boolean;
17
17
  /**
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.BodyTextDecorator = exports.BodyTextBase = exports.BodyText = exports["default"] = void 0;
6
+ exports["default"] = exports.BodyTextDecorator = exports.BodyTextBase = exports.BodyText = void 0;
7
7
 
8
8
  var _propTypes = _interopRequireDefault(require("@enact/core/internal/prop-types"));
9
9
 
@@ -17,11 +17,13 @@ var _BodyTextModule = _interopRequireDefault(require("./BodyText.module.css"));
17
17
 
18
18
  var _jsxRuntime = require("react/jsx-runtime");
19
19
 
20
+ var _excluded = ["component", "componentRef"];
21
+
20
22
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
21
23
 
22
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
24
+ 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
25
 
24
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
26
+ 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
27
 
26
28
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
27
29
 
@@ -111,7 +113,7 @@ var BodyTextBase = (0, _kind["default"])({
111
113
  render: function render(_ref2) {
112
114
  var Component = _ref2.component,
113
115
  componentRef = _ref2.componentRef,
114
- rest = _objectWithoutProperties(_ref2, ["component", "componentRef"]);
116
+ rest = _objectWithoutProperties(_ref2, _excluded);
115
117
 
116
118
  delete rest.centered;
117
119
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread({
@@ -1,71 +1,85 @@
1
1
  "use strict";
2
2
 
3
- var _enzyme = require("enzyme");
3
+ require("@testing-library/jest-dom");
4
4
 
5
- var _BodyText = _interopRequireWildcard(require("../BodyText"));
5
+ var _react = require("@testing-library/react");
6
6
 
7
7
  var _Layout = require("../../Layout");
8
8
 
9
- var _BodyTextModule = _interopRequireDefault(require("../BodyText.module.css"));
9
+ var _BodyText = _interopRequireWildcard(require("../BodyText"));
10
10
 
11
11
  var _jsxRuntime = require("react/jsx-runtime");
12
12
 
13
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
13
+ 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); }
14
14
 
15
- function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
16
-
17
- function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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; }
15
+ 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; }
18
16
 
19
17
  describe('BodyText Specs', function () {
20
18
  test('should render a single <p> tag', function () {
21
19
  var msg = 'Hello BodyText!';
22
- var bodyText = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText["default"], {
20
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText["default"], {
23
21
  children: msg
24
22
  }));
25
- var bodyTextTag = bodyText.find('p');
26
- var expected = 1;
27
- var actual = bodyTextTag.length;
23
+ var expected = 'P';
24
+
25
+ var actual = _react.screen.getByText(msg).nodeName;
26
+
28
27
  expect(actual).toBe(expected);
29
28
  });
30
29
  test('should render BodyText with content', function () {
31
30
  var content = 'Hello BodyText!';
32
- var bodyTextTag = (0, _enzyme.mount)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText["default"], {
31
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText["default"], {
33
32
  children: content
34
33
  }));
35
- var expected = content;
36
- var actual = bodyTextTag.text();
37
- expect(actual).toBe(expected);
34
+
35
+ var bodyText = _react.screen.getByText(content);
36
+
37
+ expect(bodyText).toBeInTheDocument();
38
38
  });
39
39
  test('should not include the centered class by default', function () {
40
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText.BodyTextBase, {}));
41
- var expected = false;
42
- var actual = subject.hasClass(_BodyTextModule["default"].centered);
43
- expect(actual).toBe(expected);
44
- });
45
- test('should include the centered class if `centered` is true', function () {
46
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText.BodyTextBase, {
47
- centered: true
40
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText.BodyTextBase, {
41
+ "data-testid": "bodyText"
48
42
  }));
49
- var expected = true;
50
- var actual = subject.hasClass(_BodyTextModule["default"].centered);
51
- expect(actual).toBe(expected);
43
+
44
+ var bodyText = _react.screen.getByTestId('bodyText');
45
+
46
+ var expected = 'centered';
47
+ expect(bodyText).not.toHaveClass(expected);
52
48
  });
53
- test('should support changing the component element to a different DOM node', function () {
54
- var componentTag = 'address';
55
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText.BodyTextBase, {
56
- component: componentTag
49
+ test('should include the centered class if `centered` is true', function () {
50
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText["default"], {
51
+ centered: true,
52
+ "data-testid": "bodyText"
57
53
  }));
58
- var expected = componentTag;
59
- var actual = subject.getElement().type;
60
- expect(actual).toBe(expected);
54
+
55
+ var bodyText = _react.screen.getByTestId('bodyText');
56
+
57
+ var expected = 'centered';
58
+ expect(bodyText).toHaveClass(expected);
61
59
  });
62
60
  test('should support changing the component element to a functional component', function () {
63
61
  var component = _Layout.Cell;
64
- var subject = (0, _enzyme.shallow)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText.BodyTextBase, {
65
- component: component
62
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText.BodyTextBase, {
63
+ component: component,
64
+ "data-testid": "bodyText"
65
+ }));
66
+
67
+ var bodyText = _react.screen.getByTestId('bodyText');
68
+
69
+ var expected = 'cell';
70
+ expect(bodyText).toHaveClass(expected);
71
+ });
72
+ test('should support changing the component element to a different DOM node', function () {
73
+ var componentTag = 'address';
74
+ (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_BodyText.BodyTextBase, {
75
+ component: componentTag,
76
+ "data-testid": "bodyText"
66
77
  }));
67
- var expected = component;
68
- var actual = subject.getElement().type;
78
+
79
+ var bodyText = _react.screen.getByTestId('bodyText');
80
+
81
+ var expected = 'ADDRESS';
82
+ var actual = bodyText.nodeName;
69
83
  expect(actual).toBe(expected);
70
84
  });
71
85
  });
@@ -55,10 +55,10 @@ externally.
55
55
  */
56
56
  icon?: React.ReactNode | boolean;
57
57
  /**
58
- * The component used to render the icon .
58
+ * The component used to render the [icon] .
59
59
  *
60
60
  * This component will receive the `icon` class to customize its styling.
61
- If icon is not assigned or is false, this component
61
+ If [icon] is not assigned or is false, this component
62
62
  will not be rendered.
63
63
  *
64
64
  * If this is a component rather than an HTML element string, this component will also
@@ -74,28 +74,28 @@ handle it.
74
74
  * Enforces a minimum width for the component.
75
75
  *
76
76
  * Applies the `minWidth` CSS class which can be customized by
77
- theming .
77
+ [theming] .
78
78
  */
79
79
  minWidth?: boolean;
80
80
  /**
81
81
  * Indicates the component is depressed.
82
82
  *
83
83
  * Applies the `pressed` CSS class which can be customized by
84
- theming .
84
+ [theming] .
85
85
  */
86
86
  pressed?: boolean;
87
87
  /**
88
88
  * Indicates the component is selected.
89
89
  *
90
90
  * Applies the `selected` CSS class which can be customized by
91
- theming .
91
+ [theming] .
92
92
  */
93
93
  selected?: boolean;
94
94
  /**
95
95
  * The size of the button.
96
96
  *
97
97
  * Applies the CSS class which can be customized by
98
- theming .
98
+ [theming] .
99
99
  */
100
100
  size?: string;
101
101
  }
package/Button/Button.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.ButtonDecorator = exports.ButtonBase = exports.Button = exports["default"] = void 0;
6
+ exports["default"] = exports.ButtonDecorator = exports.ButtonBase = exports.Button = void 0;
7
7
 
8
8
  var _propTypes = _interopRequireDefault(require("@enact/core/internal/prop-types"));
9
9
 
@@ -23,15 +23,17 @@ var _ButtonModule = _interopRequireDefault(require("./Button.module.css"));
23
23
 
24
24
  var _jsxRuntime = require("react/jsx-runtime");
25
25
 
26
+ var _excluded = ["children", "componentRef", "css", "decoration", "disabled", "icon"];
27
+
26
28
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
27
29
 
28
30
  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; }
29
31
 
30
32
  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; }
31
33
 
32
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
34
+ 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; }
33
35
 
34
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
36
+ 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; }
35
37
 
36
38
  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; }
37
39
 
@@ -241,9 +243,11 @@ var ButtonBase = (0, _kind["default"])({
241
243
  props.flip = iconFlip;
242
244
  }
243
245
 
244
- return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ComponentOverride["default"], _objectSpread(_objectSpread({}, props), {}, {
245
- children: _icon
246
- }));
246
+ if (_icon !== true) {
247
+ props.children = _icon;
248
+ }
249
+
250
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ComponentOverride["default"], _objectSpread({}, props));
247
251
  }
248
252
  },
249
253
  render: function render(_ref3) {
@@ -253,7 +257,7 @@ var ButtonBase = (0, _kind["default"])({
253
257
  decoration = _ref3.decoration,
254
258
  disabled = _ref3.disabled,
255
259
  icon = _ref3.icon,
256
- rest = _objectWithoutProperties(_ref3, ["children", "componentRef", "css", "decoration", "disabled", "icon"]);
260
+ rest = _objectWithoutProperties(_ref3, _excluded);
257
261
 
258
262
  delete rest.iconComponent;
259
263
  delete rest.iconFlip;