@enact/ui 4.5.2 → 4.5.4

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 +29 -63
  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 +325 -502
  166. package/useScroll/utilDOM.js +8 -14
  167. package/useScroll/utilEvent.js +0 -4
@@ -10,39 +10,22 @@ Object.defineProperty(exports, "useToggle", {
10
10
  return _useToggle.useToggle;
11
11
  }
12
12
  });
13
-
14
13
  var _handle = _interopRequireWildcard(require("@enact/core/handle"));
15
-
16
14
  var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
17
-
18
15
  var _useHandlers = _interopRequireDefault(require("@enact/core/useHandlers"));
19
-
20
16
  var _util = require("@enact/core/util");
21
-
22
17
  var _propTypes = _interopRequireDefault(require("prop-types"));
23
-
24
18
  var _pick = _interopRequireDefault(require("ramda/src/pick"));
25
-
26
19
  var _react = require("react");
27
-
28
20
  var _warning = _interopRequireDefault(require("warning"));
29
-
30
21
  var _useToggle = require("./useToggle");
31
-
32
22
  var _jsxRuntime = require("react/jsx-runtime");
33
-
34
23
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
35
-
36
24
  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); }
37
-
38
25
  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; }
39
-
40
26
  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; }
41
-
42
27
  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; }
43
-
44
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; }
45
-
46
29
  /**
47
30
  * Default config for `Toggleable`.
48
31
  *
@@ -71,7 +54,6 @@ var defaultConfig = {
71
54
  * @memberof ui/Toggleable.Toggleable.defaultConfig
72
55
  */
73
56
  activate: null,
74
-
75
57
  /**
76
58
  * Configures the event name that deactivates the component.
77
59
  *
@@ -93,7 +75,6 @@ var defaultConfig = {
93
75
  * @memberof ui/Toggleable.Toggleable.defaultConfig
94
76
  */
95
77
  deactivate: null,
96
-
97
78
  /**
98
79
  * Configures additional props to attach to the event that is sent when toggled.
99
80
  *
@@ -102,7 +83,6 @@ var defaultConfig = {
102
83
  * @memberof ui/Toggleable.Toggleable.defaultConfig
103
84
  */
104
85
  eventProps: [],
105
-
106
86
  /**
107
87
  * Configures the property that is passed to the wrapped component when toggled.
108
88
  *
@@ -111,7 +91,6 @@ var defaultConfig = {
111
91
  * @memberof ui/Toggleable.Toggleable.defaultConfig
112
92
  */
113
93
  prop: 'selected',
114
-
115
94
  /**
116
95
  * Configures the event name that toggles the component.
117
96
  *
@@ -125,7 +104,6 @@ var defaultConfig = {
125
104
  * @memberof ui/Toggleable.Toggleable.defaultConfig
126
105
  */
127
106
  toggle: 'onToggle',
128
-
129
107
  /**
130
108
  * Allows you to remap the incoming `toggle` callback to an event name of your choosing.
131
109
  *
@@ -138,6 +116,7 @@ var defaultConfig = {
138
116
  */
139
117
  toggleProp: null
140
118
  };
119
+
141
120
  /**
142
121
  * A higher-order component that applies a 'toggleable' behavior to its wrapped component.
143
122
  *
@@ -158,22 +137,18 @@ var defaultConfig = {
158
137
  * @hoc
159
138
  * @public
160
139
  */
161
-
162
140
  var ToggleableHOC = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
163
141
  var _Toggleable$propTypes;
164
-
165
142
  var activate = config.activate,
166
- deactivate = config.deactivate,
167
- eventProps = config.eventProps,
168
- prop = config.prop,
169
- toggle = config.toggle,
170
- toggleProp = config.toggleProp;
143
+ deactivate = config.deactivate,
144
+ eventProps = config.eventProps,
145
+ prop = config.prop,
146
+ toggle = config.toggle,
147
+ toggleProp = config.toggleProp;
171
148
  var defaultPropKey = 'default' + (0, _util.cap)(prop);
172
-
173
149
  var adapter = function adapter(ev, props) {
174
150
  return _objectSpread(_objectSpread({}, (0, _pick["default"])(eventProps, props)), ev);
175
151
  };
176
-
177
152
  var toggleHandlers = {
178
153
  onToggle: (0, _handle["default"])(function (ev, props, context) {
179
154
  return context.toggle();
@@ -185,10 +160,8 @@ var ToggleableHOC = (0, _hoc["default"])(defaultConfig, function (config, Wrappe
185
160
  return context.deactivate();
186
161
  }, (0, _handle.forwardCustom)(deactivate, adapter))
187
162
  };
188
-
189
163
  function Toggleable(props) {
190
164
  var updated = _objectSpread({}, props);
191
-
192
165
  var propSelected = props[prop];
193
166
  var hook = (0, _useToggle.useToggle)({
194
167
  defaultSelected: props[defaultPropKey],
@@ -203,38 +176,32 @@ var ToggleableHOC = (0, _hoc["default"])(defaultConfig, function (config, Wrappe
203
176
  selected: propSelected == null ? undefined : propSelected
204
177
  });
205
178
  var handlers = (0, _useHandlers["default"])(toggleHandlers, props, hook);
206
- process.env.NODE_ENV !== "production" ? (0, _warning["default"])(!(prop in props && defaultPropKey in props), "Do not specify both '".concat(prop, "' and '").concat(defaultPropKey, "' for Toggleable instances.\n\t\t\t'").concat(defaultPropKey, "' will be ignored unless '").concat(prop, "' is 'null' or 'undefined'.")) : void 0; // FIXME: Current behavior is to use `false` when switching from a truthy value to
179
+ process.env.NODE_ENV !== "production" ? (0, _warning["default"])(!(prop in props && defaultPropKey in props), "Do not specify both '".concat(prop, "' and '").concat(defaultPropKey, "' for Toggleable instances.\n\t\t\t'").concat(defaultPropKey, "' will be ignored unless '").concat(prop, "' is 'null' or 'undefined'.")) : void 0;
180
+
181
+ // FIXME: Current behavior is to use `false` when switching from a truthy value to
207
182
  // either null or undefined. The ternary below enforces that but we don't want to
208
183
  // continue this exception in the future and should sunset it with this HOC.
209
-
210
184
  var _useRef = (0, _react.useRef)({
211
- selected: null
212
- }),
213
- instance = _useRef.current;
214
-
185
+ selected: null
186
+ }),
187
+ instance = _useRef.current;
215
188
  var selected = instance.selected && propSelected == null ? false : hook.selected;
216
189
  instance.selected = propSelected;
217
-
218
190
  if (prop) {
219
191
  updated[prop] = selected;
220
192
  }
221
-
222
193
  if (toggleProp || toggle) {
223
194
  updated[toggleProp || toggle] = handlers.onToggle;
224
195
  }
225
-
226
196
  if (activate) {
227
197
  updated[activate] = handlers.onActivate;
228
198
  }
229
-
230
199
  if (deactivate) {
231
200
  updated[deactivate] = handlers.onDeactivate;
232
201
  }
233
-
234
202
  delete updated[defaultPropKey];
235
203
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread({}, updated));
236
204
  }
237
-
238
205
  Toggleable.propTypes = (_Toggleable$propTypes = {}, _defineProperty(_Toggleable$propTypes, defaultPropKey, _propTypes["default"].bool), _defineProperty(_Toggleable$propTypes, "disabled", _propTypes["default"].bool), _defineProperty(_Toggleable$propTypes, prop, _propTypes["default"].bool), _defineProperty(_Toggleable$propTypes, toggle, _propTypes["default"].func), _Toggleable$propTypes);
239
206
  Toggleable.defaultProps = {
240
207
  disabled: false
@@ -1,35 +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 _Toggleable = _interopRequireDefault(require("../Toggleable"));
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
  describe('Toggleable', function () {
14
9
  var data;
15
-
16
10
  var DivComponent = function DivComponent(props) {
17
11
  var _props$selected;
18
-
19
12
  data = props;
20
13
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
21
14
  "data-testid": "selected-state",
22
15
  children: (_props$selected = props.selected) === null || _props$selected === void 0 ? void 0 : _props$selected.toString()
23
16
  });
24
17
  };
25
-
26
18
  describe('#config', function () {
27
19
  test('should pass "selected" to the wrapped component', function () {
28
20
  var Component = (0, _Toggleable["default"])(DivComponent);
29
21
  (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
30
-
31
22
  var toggleableDiv = _react.screen.getByTestId('selected-state');
32
-
33
23
  var expected = 'false';
34
24
  expect(toggleableDiv).toHaveTextContent(expected);
35
25
  });
@@ -67,9 +57,7 @@ describe('Toggleable', function () {
67
57
  (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
68
58
  defaultSelected: true
69
59
  }));
70
-
71
60
  var toggleableDiv = _react.screen.getByTestId('selected-state');
72
-
73
61
  var expected = 'true';
74
62
  expect(toggleableDiv).toHaveTextContent(expected);
75
63
  });
@@ -90,9 +78,7 @@ describe('Toggleable', function () {
90
78
  defaultSelected: true,
91
79
  selected: null
92
80
  }));
93
-
94
81
  var toggleableDiv = _react.screen.getByTestId('selected-state');
95
-
96
82
  var expected = 'true';
97
83
  expect(toggleableDiv).toHaveTextContent(expected);
98
84
  expect(spy).toHaveBeenCalled();
@@ -100,35 +86,29 @@ describe('Toggleable', function () {
100
86
  test('should use selected prop when selected changed from truthy to null', function () {
101
87
  var spy = jest.spyOn(console, 'error').mockImplementation(function () {});
102
88
  var Component = (0, _Toggleable["default"])(DivComponent);
103
-
104
89
  var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
105
- defaultSelected: true,
106
- selected: true
107
- })),
108
- rerender = _render.rerender;
109
-
90
+ defaultSelected: true,
91
+ selected: true
92
+ })),
93
+ rerender = _render.rerender;
110
94
  rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
111
95
  defaultSelected: true,
112
96
  selected: null
113
97
  }));
114
-
115
98
  var toggleableDiv = _react.screen.getByTestId('selected-state');
116
-
117
99
  var expected = 'false';
118
100
  expect(toggleableDiv).toHaveTextContent(expected);
119
101
  expect(spy).toHaveBeenCalled();
120
102
  });
121
103
  test('should use defaultSelected prop when selected prop is undefined', function () {
122
104
  var spy = jest.spyOn(console, 'error').mockImplementation(function () {});
123
- var Component = (0, _Toggleable["default"])(DivComponent); // eslint-disable-next-line no-undefined
124
-
105
+ var Component = (0, _Toggleable["default"])(DivComponent);
106
+ // eslint-disable-next-line no-undefined
125
107
  (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
126
108
  defaultSelected: true,
127
109
  selected: undefined
128
110
  }));
129
-
130
111
  var toggleableDiv = _react.screen.getByTestId('selected-state');
131
-
132
112
  var expected = 'true';
133
113
  expect(toggleableDiv).toHaveTextContent(expected);
134
114
  expect(spy).toHaveBeenCalled();
@@ -136,21 +116,17 @@ describe('Toggleable', function () {
136
116
  test('should use selected prop when selected changed from truthy to undefined', function () {
137
117
  var spy = jest.spyOn(console, 'error').mockImplementation(function () {});
138
118
  var Component = (0, _Toggleable["default"])(DivComponent);
139
-
140
119
  var _render2 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
141
- defaultSelected: true,
142
- selected: true
143
- })),
144
- rerender = _render2.rerender; // eslint-disable-next-line no-undefined
145
-
146
-
120
+ defaultSelected: true,
121
+ selected: true
122
+ })),
123
+ rerender = _render2.rerender;
124
+ // eslint-disable-next-line no-undefined
147
125
  rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
148
126
  defaultSelected: true,
149
127
  selected: undefined
150
128
  }));
151
-
152
129
  var toggleableDiv = _react.screen.getByTestId('selected-state');
153
-
154
130
  var expected = 'false';
155
131
  expect(toggleableDiv).toHaveTextContent(expected);
156
132
  expect(spy).toHaveBeenCalled();
@@ -162,9 +138,7 @@ describe('Toggleable', function () {
162
138
  defaultSelected: true,
163
139
  selected: false
164
140
  }));
165
-
166
141
  var toggleableDiv = _react.screen.getByTestId('selected-state');
167
-
168
142
  var expected = 'false';
169
143
  expect(toggleableDiv).toHaveTextContent(expected);
170
144
  expect(spy).toHaveBeenCalled();
@@ -174,7 +148,6 @@ describe('Toggleable', function () {
174
148
  test('should invoke passed "onToggle" handler with type', function () {
175
149
  // eslint-disable-next-line
176
150
  console.error = function () {};
177
-
178
151
  var handleToggle = jest.fn();
179
152
  var Component = (0, _Toggleable["default"])(DivComponent);
180
153
  (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
@@ -194,7 +167,6 @@ describe('Toggleable', function () {
194
167
  test('should invoke passed custom "onJiggle" handler with type', function () {
195
168
  // eslint-disable-next-line
196
169
  console.error = function () {};
197
-
198
170
  var handleJiggle = jest.fn();
199
171
  var Component = (0, _Toggleable["default"])({
200
172
  toggleProp: 'onJiggle'
@@ -214,7 +186,6 @@ describe('Toggleable', function () {
214
186
  test('should invoke passed "onActivate" handler with type', function () {
215
187
  // eslint-disable-next-line
216
188
  console.error = function () {};
217
-
218
189
  var handleActivate = jest.fn();
219
190
  var Component = (0, _Toggleable["default"])({
220
191
  activate: 'onActivate'
@@ -236,7 +207,6 @@ describe('Toggleable', function () {
236
207
  test('should invoke passed "onDeactivate" handler with type', function () {
237
208
  // eslint-disable-next-line
238
209
  console.error = function () {};
239
-
240
210
  var handleDeactivate = jest.fn();
241
211
  var Component = (0, _Toggleable["default"])({
242
212
  deactivate: 'onDeactivate'
@@ -270,16 +240,13 @@ describe('Toggleable', function () {
270
240
  test('should invoke passed "onToggle" handler when disabled at creation and becoming enabled', function () {
271
241
  // eslint-disable-next-line
272
242
  console.error = function () {};
273
-
274
243
  var handleToggle = jest.fn();
275
244
  var Component = (0, _Toggleable["default"])(DivComponent);
276
-
277
245
  var _render3 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
278
- onToggle: handleToggle,
279
- disabled: true
280
- })),
281
- rerender = _render3.rerender;
282
-
246
+ onToggle: handleToggle,
247
+ disabled: true
248
+ })),
249
+ rerender = _render3.rerender;
283
250
  rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
284
251
  onToggle: handleToggle,
285
252
  disabled: false
@@ -293,13 +260,10 @@ describe('Toggleable', function () {
293
260
  test('should invoke changed "onToggle" handler', function () {
294
261
  // eslint-disable-next-line
295
262
  console.error = function () {};
296
-
297
263
  var handleToggle = jest.fn();
298
264
  var Component = (0, _Toggleable["default"])(DivComponent);
299
-
300
265
  var _render4 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {})),
301
- rerender = _render4.rerender;
302
-
266
+ rerender = _render4.rerender;
303
267
  rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
304
268
  onToggle: handleToggle
305
269
  }));
@@ -342,7 +306,6 @@ describe('Toggleable', function () {
342
306
  test('should update "selected" when "onToggle" invoked and is not controlled', function () {
343
307
  // eslint-disable-next-line
344
308
  console.error = function () {};
345
-
346
309
  var Component = (0, _Toggleable["default"])(DivComponent);
347
310
  (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
348
311
  defaultSelected: true
@@ -350,16 +313,13 @@ describe('Toggleable', function () {
350
313
  (0, _react.act)(function () {
351
314
  return data.onToggle();
352
315
  });
353
-
354
316
  var toggleableDiv = _react.screen.getByTestId('selected-state');
355
-
356
317
  var expected = 'false';
357
318
  expect(toggleableDiv).toHaveTextContent(expected);
358
319
  });
359
320
  test('should update "selected" when "onJiggle" invoked and is not controlled', function () {
360
321
  // eslint-disable-next-line
361
322
  console.error = function () {};
362
-
363
323
  var Component = (0, _Toggleable["default"])({
364
324
  toggleProp: 'onJiggle'
365
325
  }, DivComponent);
@@ -369,9 +329,7 @@ describe('Toggleable', function () {
369
329
  (0, _react.act)(function () {
370
330
  return data.onJiggle();
371
331
  });
372
-
373
332
  var toggleableDiv = _react.screen.getByTestId('selected-state');
374
-
375
333
  var expected = 'false';
376
334
  expect(toggleableDiv).toHaveTextContent(expected);
377
335
  });
@@ -384,9 +342,7 @@ describe('Toggleable', function () {
384
342
  (0, _react.act)(function () {
385
343
  return data.onToggle();
386
344
  });
387
-
388
345
  var toggleableDiv = _react.screen.getByTestId('selected-state');
389
-
390
346
  var expected = 'true';
391
347
  expect(toggleableDiv).toHaveTextContent(expected);
392
348
  });
@@ -401,9 +357,7 @@ describe('Toggleable', function () {
401
357
  (0, _react.act)(function () {
402
358
  return data.onActivate();
403
359
  });
404
-
405
360
  var toggleableDiv = _react.screen.getByTestId('selected-state');
406
-
407
361
  var expected = 'false';
408
362
  expect(toggleableDiv).toHaveTextContent(expected);
409
363
  });
@@ -418,9 +372,7 @@ describe('Toggleable', function () {
418
372
  (0, _react.act)(function () {
419
373
  return data.onDeactivate();
420
374
  });
421
-
422
375
  var toggleableDiv = _react.screen.getByTestId('selected-state');
423
-
424
376
  var expected = 'true';
425
377
  expect(toggleableDiv).toHaveTextContent(expected);
426
378
  });
@@ -432,9 +384,7 @@ describe('Toggleable', function () {
432
384
  (0, _react.act)(function () {
433
385
  return data.onToggle();
434
386
  });
435
-
436
387
  var toggleableDiv = _react.screen.getByTestId('selected-state');
437
-
438
388
  var expected = 'true';
439
389
  expect(toggleableDiv).toHaveTextContent(expected);
440
390
  });
@@ -448,9 +398,7 @@ describe('Toggleable', function () {
448
398
  (0, _react.act)(function () {
449
399
  return data.onJiggle();
450
400
  });
451
-
452
401
  var toggleableDiv = _react.screen.getByTestId('selected-state');
453
-
454
402
  var expected = 'true';
455
403
  expect(toggleableDiv).toHaveTextContent(expected);
456
404
  });
@@ -464,9 +412,7 @@ describe('Toggleable', function () {
464
412
  (0, _react.act)(function () {
465
413
  return data.onActivate();
466
414
  });
467
-
468
415
  var toggleableDiv = _react.screen.getByTestId('selected-state');
469
-
470
416
  var expected = 'false';
471
417
  expect(toggleableDiv).toHaveTextContent(expected);
472
418
  });
@@ -480,9 +426,7 @@ describe('Toggleable', function () {
480
426
  (0, _react.act)(function () {
481
427
  return data.onDeactivate();
482
428
  });
483
-
484
429
  var toggleableDiv = _react.screen.getByTestId('selected-state');
485
-
486
430
  var expected = 'true';
487
431
  expect(toggleableDiv).toHaveTextContent(expected);
488
432
  });
@@ -490,31 +434,24 @@ describe('Toggleable', function () {
490
434
  describe('#new props', function () {
491
435
  test('should update "selected" with new props when controlled', function () {
492
436
  var Component = (0, _Toggleable["default"])(DivComponent);
493
-
494
437
  var _render5 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
495
- selected: true
496
- })),
497
- rerender = _render5.rerender;
498
-
438
+ selected: true
439
+ })),
440
+ rerender = _render5.rerender;
499
441
  rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
500
442
  selected: false
501
443
  }));
502
-
503
444
  var toggleableDiv = _react.screen.getByTestId('selected-state');
504
-
505
445
  var expected = 'false';
506
446
  expect(toggleableDiv).toHaveTextContent(expected);
507
447
  });
508
448
  test('should not update "selected" with new props when not controlled', function () {
509
449
  var Component = (0, _Toggleable["default"])(DivComponent);
510
-
511
450
  var _render6 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
512
- defaultSelected: true
513
- })),
514
- rerender = _render6.rerender;
515
-
451
+ defaultSelected: true
452
+ })),
453
+ rerender = _render6.rerender;
516
454
  var toggleableDiv = _react.screen.getByTestId('selected-state');
517
-
518
455
  var expected = 'true';
519
456
  expect(toggleableDiv).toHaveTextContent(expected);
520
457
  rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
@@ -527,12 +464,10 @@ describe('Toggleable', function () {
527
464
  var Component = (0, _Toggleable["default"])({
528
465
  prop: 'active'
529
466
  }, DivComponent);
530
-
531
467
  var _render7 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
532
- defaultSelected: true
533
- })),
534
- rerender = _render7.rerender;
535
-
468
+ defaultSelected: true
469
+ })),
470
+ rerender = _render7.rerender;
536
471
  var expectedProp = 'active';
537
472
  var expectedValue = false;
538
473
  expect(data).toHaveProperty(expectedProp, expectedValue);
@@ -541,21 +476,18 @@ describe('Toggleable', function () {
541
476
  }));
542
477
  expect(data).toHaveProperty(expectedProp, expectedValue);
543
478
  });
544
- }); // testing regression from #2679 causing #2735
479
+ });
545
480
 
481
+ // testing regression from #2679 causing #2735
546
482
  test('should not update instance value when prop did not change', function () {
547
483
  var Component = (0, _Toggleable["default"])(DivComponent);
548
-
549
484
  var _render8 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {})),
550
- rerender = _render8.rerender;
551
-
485
+ rerender = _render8.rerender;
552
486
  (0, _react.act)(function () {
553
487
  return data.onToggle();
554
488
  });
555
489
  rerender( /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {}));
556
-
557
490
  var toggleableDiv = _react.screen.getByTestId('selected-state');
558
-
559
491
  var expected = 'true';
560
492
  expect(toggleableDiv).toHaveTextContent(expected);
561
493
  });
@@ -5,33 +5,19 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports["default"] = void 0;
7
7
  exports.useToggle = useToggle;
8
-
9
8
  var _useClass = _interopRequireDefault(require("@enact/core/useClass"));
10
-
11
9
  var _useControlledState = _interopRequireDefault(require("../useControlledState"));
12
-
13
10
  var _Toggle = _interopRequireDefault(require("./Toggle"));
14
-
15
11
  var _excluded = ["defaultSelected", "selected"];
16
-
17
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
18
-
19
13
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
20
-
21
14
  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
22
-
23
15
  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); }
24
-
25
16
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
26
-
27
17
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
28
-
29
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; }
30
-
31
19
  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; }
32
-
33
20
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
34
-
35
21
  /**
36
22
  * Configuration for `useToggle`
37
23
  *
@@ -70,10 +56,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
70
56
  */
71
57
  function useToggle() {
72
58
  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
73
- defaultSelected = _ref.defaultSelected,
74
- selected = _ref.selected,
75
- config = _objectWithoutProperties(_ref, _excluded);
76
-
59
+ defaultSelected = _ref.defaultSelected,
60
+ selected = _ref.selected,
61
+ config = _objectWithoutProperties(_ref, _excluded);
77
62
  var toggle = (0, _useClass["default"])(_Toggle["default"], config);
78
63
  var state = (0, _useControlledState["default"])(defaultSelected, selected, typeof selected !== 'undefined');
79
64
  var props = {
@@ -88,6 +73,5 @@ function useToggle() {
88
73
  selected: toggle.value
89
74
  };
90
75
  }
91
-
92
76
  var _default = useToggle;
93
77
  exports["default"] = _default;
@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports["default"] = exports.ClickAllow = void 0;
7
-
8
7
  var _platform = require("@enact/core/platform");
9
-
10
8
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
11
-
12
9
  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
13
-
14
10
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
15
-
16
11
  // It's possible that emitting `onTap` will cause a DOM change before the mousedown fires resulting
17
12
  // in multiple tap/click events for the same user action. To avoid this, we store the last touchend
18
13
  // target and timestamp to compare against the next mouse down. If the timestamp is different (e.g
@@ -23,19 +18,15 @@ var _lastTouchEnd = {
23
18
  target: null,
24
19
  timeStamp: 0
25
20
  };
26
-
27
21
  var shouldAllowMouseDown = function shouldAllowMouseDown(ev) {
28
22
  return ev.timeStamp !== _lastTouchEnd.timeStamp || ev.target === _lastTouchEnd.target || _lastTouchEnd.target === null;
29
23
  };
30
-
31
24
  var ClickAllow = /*#__PURE__*/function () {
32
25
  function ClickAllow() {
33
26
  _classCallCheck(this, ClickAllow);
34
-
35
27
  this.lastTouchEndTime = 0;
36
28
  this.lastMouseUpTime = 0;
37
29
  }
38
-
39
30
  _createClass(ClickAllow, [{
40
31
  key: "setLastTouchEnd",
41
32
  value: function setLastTouchEnd(ev) {
@@ -55,24 +46,24 @@ var ClickAllow = /*#__PURE__*/function () {
55
46
  }, {
56
47
  key: "shouldAllowMouseEvent",
57
48
  value: function shouldAllowMouseEvent(ev) {
58
- var timeStamp = ev.timeStamp; // iOS Safari sends both touch and mouse events (with differing timestamps)
49
+ var timeStamp = ev.timeStamp;
59
50
 
51
+ // iOS Safari sends both touch and mouse events (with differing timestamps)
60
52
  return !_platform.platform.ios && this.lastTouchEndTime !== timeStamp && shouldAllowMouseDown(ev);
61
53
  }
62
54
  }, {
63
55
  key: "shouldAllowTap",
64
56
  value: function shouldAllowTap(ev) {
65
57
  var type = ev.type,
66
- timeStamp = ev.timeStamp; // Allow the custom tap event for a “click” when it’s actually a click and it’s not from the
67
- // last mouseup event which would have fired the click for us
58
+ timeStamp = ev.timeStamp;
68
59
 
60
+ // Allow the custom tap event for a “click” when it’s actually a click and it’s not from the
61
+ // last mouseup event which would have fired the click for us
69
62
  return type === 'click' && this.lastMouseUpTime !== timeStamp;
70
63
  }
71
64
  }]);
72
-
73
65
  return ClickAllow;
74
66
  }();
75
-
76
67
  exports.ClickAllow = ClickAllow;
77
68
  var _default = ClickAllow;
78
69
  exports["default"] = _default;