@enact/ui 4.5.1 → 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 +36 -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 +31 -64
  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
package/Routable/Route.js CHANGED
@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports["default"] = exports.Route = void 0;
7
-
8
7
  var _propTypes = _interopRequireDefault(require("@enact/core/internal/prop-types"));
9
-
10
8
  var _propTypes2 = _interopRequireDefault(require("prop-types"));
11
-
12
9
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
13
-
14
10
  /**
15
11
  * Used with {@link ui/Routable.Routable} to define the `path` segment and the
16
12
  * `component` to render.
@@ -41,7 +37,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
41
37
  var Route = function Route() {
42
38
  return null;
43
39
  };
44
-
45
40
  exports.Route = Route;
46
41
  Route.propTypes = {
47
42
  /**
@@ -54,7 +49,6 @@ Route.propTypes = {
54
49
  * @memberof ui/Routable.Route.prototype
55
50
  */
56
51
  component: _propTypes["default"].renderable.isRequired,
57
-
58
52
  /**
59
53
  * The name of the path segment.
60
54
  *
@@ -4,60 +4,34 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports["default"] = exports.RouterBase = exports.Router = void 0;
7
-
8
7
  var _propTypes = _interopRequireDefault(require("@enact/core/internal/prop-types"));
9
-
10
8
  var _propTypes2 = _interopRequireDefault(require("prop-types"));
11
-
12
9
  var _react = require("react");
13
-
14
10
  var _warning = _interopRequireDefault(require("warning"));
15
-
16
11
  var _ForwardRef = _interopRequireDefault(require("../ForwardRef"));
17
-
18
12
  var _util = require("./util");
19
-
20
13
  var _jsxRuntime = require("react/jsx-runtime");
21
-
22
14
  var _excluded = ["path", "children", "component"],
23
- _excluded2 = ["component", "componentRef"];
24
-
15
+ _excluded2 = ["component", "componentRef"];
25
16
  var _class;
26
-
27
17
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
28
-
29
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; }
30
-
31
19
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
32
-
33
20
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
34
-
35
21
  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; }
36
-
37
22
  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; }
38
-
39
23
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
40
-
41
24
  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); } }
42
-
43
25
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
44
-
45
26
  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); }
46
-
47
27
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
48
-
49
28
  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); }; }
50
-
51
29
  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
52
-
53
30
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
54
-
55
31
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
56
-
57
32
  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
58
-
59
33
  /**
60
- * A Router component for use with [`ViewManager`]{@link ui/ViewManager.ViewManager}
34
+ * A Router component for use with {@link ui/ViewManager.ViewManager|ViewManager}
61
35
  *
62
36
  * @class Router
63
37
  * @memberof ui/Routable
@@ -67,14 +41,12 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
67
41
  */
68
42
  var RouterBase = (_class = /*#__PURE__*/function (_ReactComponent) {
69
43
  _inherits(RouterBase, _ReactComponent);
70
-
71
44
  var _super = _createSuper(RouterBase);
72
-
73
45
  function RouterBase(props) {
74
46
  _classCallCheck(this, RouterBase);
75
-
76
47
  return _super.call(this, props);
77
48
  }
49
+
78
50
  /**
79
51
  * Generates a set of routes from `children` and appends them to `routes`.
80
52
  *
@@ -83,61 +55,53 @@ var RouterBase = (_class = /*#__PURE__*/function (_ReactComponent) {
83
55
  *
84
56
  * @returns {Object} Route configuration object
85
57
  */
86
-
87
-
88
58
  _createClass(RouterBase, [{
89
59
  key: "createRoutes",
90
60
  value: function createRoutes(children, routes) {
91
61
  var _this = this;
92
-
93
62
  _react.Children.forEach(children, function (child) {
94
63
  var _child$props = child.props,
95
- path = _child$props.path,
96
- grandchildren = _child$props.children,
97
- component = _child$props.component,
98
- rest = _objectWithoutProperties(_child$props, _excluded);
99
-
64
+ path = _child$props.path,
65
+ grandchildren = _child$props.children,
66
+ component = _child$props.component,
67
+ rest = _objectWithoutProperties(_child$props, _excluded);
100
68
  if (path && component) {
101
69
  routes[path] = {
102
70
  $component: component,
103
71
  $props: rest
104
72
  };
105
-
106
73
  if (grandchildren) {
107
74
  _this.createRoutes(grandchildren, routes[path]);
108
75
  }
109
76
  }
110
77
  });
111
-
112
78
  return routes;
113
79
  }
80
+
114
81
  /**
115
82
  * Creates an array of React.elements for the current path.
116
83
  *
117
84
  * @returns {React.element[]} Children to render
118
85
  */
119
-
120
86
  }, {
121
87
  key: "createChildren",
122
88
  value: function createChildren() {
123
89
  var segments = (0, _util.toSegments)(this.props.path);
124
90
  var _this$props = this.props,
125
- routes = _this$props.routes,
126
- children = _this$props.children;
91
+ routes = _this$props.routes,
92
+ children = _this$props.children;
127
93
  var computedRoutes = routes || this.createRoutes(children, {});
128
94
  var valid = true;
129
95
  var route = computedRoutes;
130
96
  var childrenElements = segments.map(function (segment, index) {
131
97
  var subPath = segments.slice(0, index + 1).join('/');
132
98
  route = route && route[segment];
133
-
134
99
  if (route && route.$component) {
135
100
  return /*#__PURE__*/(0, _react.createElement)(route.$component, _objectSpread(_objectSpread({}, route.$props), {}, {
136
101
  key: 'view$/' + subPath,
137
102
  spotlightId: "panel-".concat(subPath.replace(/\//g, '-'))
138
103
  }));
139
104
  }
140
-
141
105
  valid = false;
142
106
  return null;
143
107
  });
@@ -148,10 +112,9 @@ var RouterBase = (_class = /*#__PURE__*/function (_ReactComponent) {
148
112
  key: "render",
149
113
  value: function render() {
150
114
  var _this$props2 = this.props,
151
- Component = _this$props2.component,
152
- componentRef = _this$props2.componentRef,
153
- rest = _objectWithoutProperties(_this$props2, _excluded2);
154
-
115
+ Component = _this$props2.component,
116
+ componentRef = _this$props2.componentRef,
117
+ rest = _objectWithoutProperties(_this$props2, _excluded2);
155
118
  var children = this.createChildren();
156
119
  delete rest.path;
157
120
  delete rest.routes;
@@ -162,11 +125,8 @@ var RouterBase = (_class = /*#__PURE__*/function (_ReactComponent) {
162
125
  }));
163
126
  }
164
127
  }]);
165
-
166
128
  return RouterBase;
167
- }(_react.Component), _class.displayName = 'Router', _class.propTypes =
168
- /** @lends ui/Routable.Router.prototype */
169
- {
129
+ }(_react.Component), _class.displayName = 'Router', _class.propTypes = /** @lends ui/Routable.Router.prototype */{
170
130
  /**
171
131
  * List of views to render.
172
132
  *
@@ -181,7 +141,6 @@ var RouterBase = (_class = /*#__PURE__*/function (_ReactComponent) {
181
141
  * @public
182
142
  */
183
143
  path: _util.propTypes.path.isRequired,
184
-
185
144
  /**
186
145
  * The component wrapping the rendered path.
187
146
  *
@@ -190,15 +149,13 @@ var RouterBase = (_class = /*#__PURE__*/function (_ReactComponent) {
190
149
  * @public
191
150
  */
192
151
  component: _propTypes["default"].renderable,
193
-
194
152
  /**
195
- * Called with a reference to [component]{@link ui/Routable.Router#component}.
153
+ * Called with a reference to {@link ui/Routable.Router#component|component}.
196
154
  *
197
155
  * @type {Object|Function}
198
156
  * @private
199
157
  */
200
158
  componentRef: _propTypes["default"].ref,
201
-
202
159
  /**
203
160
  * Routes defined as an object rather than via JSX.
204
161
  *
@@ -1,41 +1,23 @@
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 _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
8
-
9
6
  var _react2 = require("react");
10
-
11
7
  var _Link = _interopRequireDefault(require("../Link"));
12
-
13
8
  var _Routable = _interopRequireDefault(require("../Routable"));
14
-
15
9
  var _Route = _interopRequireDefault(require("../Route"));
16
-
17
10
  var _jsxRuntime = require("react/jsx-runtime");
18
-
19
11
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
20
-
21
12
  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; }
22
-
23
13
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
24
-
25
14
  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; }
26
-
27
15
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
28
-
29
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."); }
30
-
31
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); }
32
-
33
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; }
34
-
35
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; }
36
-
37
20
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
38
-
39
21
  describe('Routable', function () {
40
22
  test('should render nothing for a partially valid path', function () {
41
23
  var App = function App() {
@@ -46,13 +28,11 @@ describe('Routable', function () {
46
28
  })
47
29
  });
48
30
  };
49
-
50
31
  var Page2 = function Page2() {
51
32
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
52
33
  "data-testid": "page2"
53
34
  });
54
35
  };
55
-
56
36
  var Views = (0, _Routable["default"])({
57
37
  navigate: 'onNavigate'
58
38
  }, function (_ref) {
@@ -61,13 +41,11 @@ describe('Routable', function () {
61
41
  children: children
62
42
  });
63
43
  });
64
-
65
44
  function Sample(props) {
66
45
  var _useState = (0, _react2.useState)('/app'),
67
- _useState2 = _slicedToArray(_useState, 2),
68
- path = _useState2[0],
69
- nav = _useState2[1];
70
-
46
+ _useState2 = _slicedToArray(_useState, 2),
47
+ path = _useState2[0],
48
+ nav = _useState2[1];
71
49
  var handleNavigate = (0, _react2.useCallback)(function (ev) {
72
50
  return nav(ev.path);
73
51
  }, [nav]);
@@ -84,20 +62,16 @@ describe('Routable', function () {
84
62
  })
85
63
  }));
86
64
  }
87
-
88
65
  (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Sample, {}));
66
+ var linkToSecondPage = _react.screen.getByText('Page 2');
89
67
 
90
- var linkToSecondPage = _react.screen.getByText('Page 2'); // click once to navigate to new path
91
-
92
-
68
+ // click once to navigate to new path
93
69
  _userEvent["default"].click(linkToSecondPage);
94
-
95
70
  var secondPage = _react.screen.getByTestId('page2');
71
+ expect(secondPage).toBeInTheDocument();
96
72
 
97
- expect(secondPage).toBeInTheDocument(); // clicking again should use the same base path "/app" for the same result
98
-
73
+ // clicking again should use the same base path "/app" for the same result
99
74
  _userEvent["default"].click(linkToSecondPage);
100
-
101
75
  secondPage = _react.screen.getByTestId('page2');
102
76
  expect(secondPage).toBeInTheDocument();
103
77
  });
@@ -1,22 +1,19 @@
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 _Route = _interopRequireDefault(require("../Route"));
8
-
9
6
  var _Router = require("../Router");
10
-
11
7
  var _jsxRuntime = require("react/jsx-runtime");
12
-
13
8
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
14
-
15
9
  /* eslint no-console: ["error", { allow: ["warn", "error"] }], react/jsx-no-bind: off */
10
+
16
11
  describe('Router', function () {
17
12
  var View = function View() {
18
13
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {});
19
- }; // the internal representation of
14
+ };
15
+
16
+ // the internal representation of
20
17
  // <Router>
21
18
  // <Route path="app" component={View}>
22
19
  // <Route path="home" component={View} />
@@ -24,8 +21,6 @@ describe('Router', function () {
24
21
  // </Route>
25
22
  // <Route path="admin" component={View} />
26
23
  // </Router>
27
-
28
-
29
24
  var routes = {
30
25
  app: {
31
26
  $component: View,
@@ -49,9 +44,7 @@ describe('Router', function () {
49
44
  routes: routes,
50
45
  path: "/app"
51
46
  }));
52
-
53
47
  var view = _react.screen.getByRole('button');
54
-
55
48
  expect(view).toBeInTheDocument();
56
49
  });
57
50
  test('should render an array of components matching the {path}', function () {
@@ -59,9 +52,7 @@ describe('Router', function () {
59
52
  routes: routes,
60
53
  path: "/app/home"
61
54
  }));
62
-
63
55
  var view = _react.screen.getAllByRole('button');
64
-
65
56
  var expected = 2;
66
57
  expect(view.length).toBe(expected);
67
58
  });
@@ -70,9 +61,7 @@ describe('Router', function () {
70
61
  routes: routes,
71
62
  path: ['app', 'home']
72
63
  }));
73
-
74
64
  var view = _react.screen.getAllByRole('button');
75
-
76
65
  var expected = 2;
77
66
  expect(view.length).toBe(expected);
78
67
  });
@@ -84,9 +73,7 @@ describe('Router', function () {
84
73
  routes: routes,
85
74
  path: "/help"
86
75
  }));
87
-
88
76
  var view = _react.screen.queryByRole('button');
89
-
90
77
  expect(view).toBeNull();
91
78
  });
92
79
  test('should render children into {component}', function () {
@@ -99,15 +86,12 @@ describe('Router', function () {
99
86
  })
100
87
  });
101
88
  };
102
-
103
89
  (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Router.Router, {
104
90
  routes: routes,
105
91
  path: "/app/settings",
106
92
  component: component
107
93
  }));
108
-
109
94
  var secondDiv = _react.screen.getByTestId('div2');
110
-
111
95
  var expected = 2;
112
96
  var actual = secondDiv.childElementCount;
113
97
  expect(actual).toBe(expected);
@@ -130,39 +114,35 @@ describe('Router', function () {
130
114
  component: View
131
115
  })]
132
116
  }));
133
-
134
117
  var view = _react.screen.getAllByRole('button');
135
-
136
118
  var expected = 2;
137
119
  var actual = view.length;
138
120
  expect(actual).toBe(expected);
139
121
  });
140
122
  test('should render a different component when the routes change for the same {path}', function () {
141
123
  var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Router.Router, {
142
- path: "/app",
143
- children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Route["default"], {
144
- path: "app",
145
- component: View,
146
- children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Route["default"], {
147
- path: "home",
148
- component: View
124
+ path: "/app",
125
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Route["default"], {
126
+ path: "app",
127
+ component: View,
128
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Route["default"], {
129
+ path: "home",
130
+ component: View
131
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Route["default"], {
132
+ path: "settings",
133
+ component: View
134
+ })]
149
135
  }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Route["default"], {
150
- path: "settings",
136
+ path: "admin",
151
137
  component: View
152
138
  })]
153
- }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Route["default"], {
154
- path: "admin",
155
- component: View
156
- })]
157
- })),
158
- rerender = _render.rerender;
159
-
139
+ })),
140
+ rerender = _render.rerender;
160
141
  var NewView = function NewView() {
161
142
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
162
143
  "data-testid": "span"
163
144
  });
164
145
  };
165
-
166
146
  rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Router.Router, {
167
147
  path: "/app",
168
148
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Route["default"], {
@@ -174,9 +154,7 @@ describe('Router', function () {
174
154
  })
175
155
  })
176
156
  }));
177
-
178
157
  var view = _react.screen.getByTestId('span');
179
-
180
158
  expect(view).toBeInTheDocument();
181
159
  });
182
160
  test('should render nothing for an invalid path', function () {
@@ -200,9 +178,7 @@ describe('Router', function () {
200
178
  component: View
201
179
  })]
202
180
  }));
203
-
204
181
  var view = _react.screen.queryByRole('button');
205
-
206
182
  expect(view).toBeNull();
207
183
  });
208
184
  test('should render nothing for a partially valid path', function () {
@@ -226,9 +202,7 @@ describe('Router', function () {
226
202
  component: View
227
203
  })]
228
204
  }));
229
-
230
205
  var view = _react.screen.queryByRole('button');
231
-
232
206
  expect(view).toBeNull();
233
207
  });
234
208
  });
@@ -5,23 +5,20 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports["default"] = void 0;
7
7
  exports.useLink = useLink;
8
-
9
8
  var _react = require("react");
10
-
11
9
  var _util = require("./util");
12
-
13
10
  function useLink() {
14
11
  var _ref = (0, _react.useContext)(_util.RouteContext) || {},
15
- currentPath = _ref.path,
16
- navigate = _ref.navigate;
17
-
12
+ currentPath = _ref.path,
13
+ navigate = _ref.navigate;
18
14
  var handleNavigate = (0, _react.useCallback)(function (_ref2) {
19
15
  var path = _ref2.path;
20
16
  if (!navigate) return;
21
17
  navigate({
22
18
  path: (0, _util.resolve)(currentPath, path)
23
19
  });
24
- }, // omitting currentPath in order to cache the value used a mount time to avoid evaluating
20
+ },
21
+ // omitting currentPath in order to cache the value used a mount time to avoid evaluating
25
22
  // relative paths against updated currentPath values
26
23
  // eslint-disable-next-line react-hooks/exhaustive-deps
27
24
  [navigate]);
@@ -29,6 +26,5 @@ function useLink() {
29
26
  navigate: handleNavigate
30
27
  };
31
28
  }
32
-
33
29
  var _default = useLink;
34
30
  exports["default"] = _default;
package/Routable/util.js CHANGED
@@ -4,22 +4,15 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.toSegments = exports.stringifyRoutes = exports.resolve = exports.propTypes = exports.RouteContext = void 0;
7
-
8
7
  var _propTypes = _interopRequireDefault(require("prop-types"));
9
-
10
8
  var _react = require("react");
11
-
12
9
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
13
-
14
10
  var RouteContext = /*#__PURE__*/(0, _react.createContext)(null);
15
11
  exports.RouteContext = RouteContext;
16
-
17
12
  var toSegments = function toSegments(path) {
18
13
  return Array.isArray(path) ? path : (path || '').split('/').filter(Boolean);
19
14
  };
20
-
21
15
  exports.toSegments = toSegments;
22
-
23
16
  var getPaths = function getPaths(routes, base) {
24
17
  var result = [];
25
18
  Object.keys(routes).filter(function (s) {
@@ -31,58 +24,59 @@ var getPaths = function getPaths(routes, base) {
31
24
  });
32
25
  return result;
33
26
  };
34
-
35
27
  var stringifyRoutes = function stringifyRoutes(routes) {
36
28
  var pad = '\n\t';
37
29
  var paths = getPaths(routes, '');
38
30
  return pad + paths.join(pad);
39
- }; // resolves path relative to base
40
-
31
+ };
41
32
 
33
+ // resolves path relative to base
42
34
  exports.stringifyRoutes = stringifyRoutes;
43
-
44
35
  var resolve = function resolve() {
45
36
  var base = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';
46
37
  var path = arguments.length > 1 ? arguments[1] : undefined;
47
38
  // We could resolve to base but we want to consider this an error condition
48
- if (!path) return; // convert a base array to a string for simpler normalization
39
+ if (!path) return;
49
40
 
50
- if (base instanceof Array) base = base.join('/'); // normalize base to have a leading slash
41
+ // convert a base array to a string for simpler normalization
42
+ if (base instanceof Array) base = base.join('/');
51
43
 
52
- if (!base.startsWith('/')) base = '/' + base; // if path has a leading slash, it's an absolute path so return it
44
+ // normalize base to have a leading slash
45
+ if (!base.startsWith('/')) base = '/' + base;
53
46
 
54
- if (path.startsWith('/')) return path; // if path isn't absolute and doesn't begin with ., it's relative to the base
47
+ // if path has a leading slash, it's an absolute path so return it
48
+ if (path.startsWith('/')) return path;
55
49
 
56
- if (!path.startsWith('.')) return base + '/' + path; // convert to arrays remove empty paths from base
50
+ // if path isn't absolute and doesn't begin with ., it's relative to the base
51
+ if (!path.startsWith('.')) return base + '/' + path;
57
52
 
53
+ // convert to arrays remove empty paths from base
58
54
  base = base.split('/').filter(Boolean);
59
55
  path = path.split('/');
60
-
61
56
  while (path.length > 0) {
62
57
  var p = path.shift();
63
-
64
58
  if (!p || p === '.') {
65
59
  // if we have an empty path or a current directory path, continue
66
60
  continue;
67
61
  } else if (p === '..') {
68
62
  // if we're down the root and we encounter a parent path, return
69
- if (base.length === 0) return; // otherwise, remove a level from base
70
-
63
+ if (base.length === 0) return;
64
+ // otherwise, remove a level from base
71
65
  base.pop();
72
66
  } else {
73
67
  // put back the current element so it can be included in the output path
74
68
  path.unshift(p);
75
69
  break;
76
70
  }
77
- } // finally rebuild the path including the segment we just shifted
78
-
71
+ }
79
72
 
73
+ // finally rebuild the path including the segment we just shifted
80
74
  return "/".concat(base.concat(path).join('/'));
81
75
  };
82
-
83
76
  exports.resolve = resolve;
84
77
  var propTypes = {
85
- path: _propTypes["default"].oneOfType([_propTypes["default"].arrayOf(_propTypes["default"].string), // array of path segments
78
+ path: _propTypes["default"].oneOfType([_propTypes["default"].arrayOf(_propTypes["default"].string),
79
+ // array of path segments
86
80
  _propTypes["default"].string // URI-style path
87
81
  ])
88
82
  };