@enact/ui 4.7.0 → 4.7.2
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.
- package/AnnounceDecorator/Announce.js +10 -11
- package/BodyText/BodyText.d.ts +1 -1
- package/Button/Button.d.ts +1 -1
- package/Button/tests/Button-specs.js +10 -6
- package/CHANGELOG.md +12 -0
- package/Group/Group.d.ts +1 -1
- package/Group/tests/Group-specs.js +14 -9
- package/Heading/Heading.d.ts +1 -1
- package/Icon/Icon.d.ts +1 -1
- package/IconButton/IconButton.d.ts +1 -1
- package/Image/Image.d.ts +1 -1
- package/ImageItem/ImageItem.d.ts +1 -1
- package/Item/Item.d.ts +1 -1
- package/Item/tests/Item-specs.js +10 -6
- package/LabeledIcon/LabeledIcon.d.ts +1 -1
- package/Layout/Layout.d.ts +1 -1
- package/Marquee/MarqueeController.js +43 -50
- package/Marquee/MarqueeDecorator.js +39 -46
- package/Placeholder/PlaceholderControllerDecorator.js +1 -2
- package/ProgressBar/ProgressBar.d.ts +1 -1
- package/RadioDecorator/RadioDecorator.js +5 -6
- package/RadioDecorator/tests/RadioDecorator-specs.js +28 -20
- package/Repeater/Repeater.d.ts +1 -1
- package/Resizable/Resizable.js +28 -102
- package/Resizable/ResizeContext.js +17 -0
- package/Resizable/tests/useResize-specs.js +43 -0
- package/Resizable/useResize.js +66 -0
- package/Routable/tests/Routable-specs.js +9 -6
- package/Scrollable/Scrollable.js +14 -20
- package/Scrollable/ScrollableNative.js +19 -26
- package/Slider/Slider.d.ts +1 -1
- package/SlotItem/SlotItem.d.ts +1 -1
- package/Spinner/Spinner.d.ts +1 -1
- package/ToggleIcon/tests/ToggleIcon-specs.js +6 -3
- package/ToggleItem/ToggleItem.d.ts +1 -1
- package/ToggleItem/tests/ToggleItem-specs.js +6 -3
- package/Touchable/Drag.js +2 -2
- package/Touchable/Flick.js +1 -2
- package/Touchable/Hold.js +1 -2
- package/Touchable/Pinch.js +2 -2
- package/ViewManager/View.js +9 -10
- package/ViewManager/ViewManager.d.ts +1 -1
- package/VirtualList/UiVirtualListBase.js +3 -8
- package/VirtualList/VirtualListBasic.js +10 -15
- package/package.json +3 -3
|
@@ -7,6 +7,8 @@ var _react2 = require("react");
|
|
|
7
7
|
var _RadioDecorator = require("../RadioDecorator");
|
|
8
8
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
9
9
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
10
|
+
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
11
|
+
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
10
12
|
describe('RadioDecorator', function () {
|
|
11
13
|
var Item = function Item(_ref) {
|
|
12
14
|
var onClick = _ref.onClick,
|
|
@@ -66,12 +68,13 @@ describe('RadioDecorator', function () {
|
|
|
66
68
|
var secondExpected = 'Active';
|
|
67
69
|
expect(component).toHaveTextContent(secondExpected);
|
|
68
70
|
});
|
|
69
|
-
test('should fire `activate` event with type when become activated', function () {
|
|
71
|
+
test('should fire `activate` event with type when become activated', /*#__PURE__*/_asyncToGenerator(function* () {
|
|
70
72
|
var Component = (0, _RadioDecorator.RadioDecorator)({
|
|
71
73
|
activate: 'onClick',
|
|
72
74
|
prop: 'active'
|
|
73
75
|
}, Item);
|
|
74
76
|
var handleActivate = jest.fn();
|
|
77
|
+
var user = _userEvent["default"].setup();
|
|
75
78
|
var Wrapper = function Wrapper() {
|
|
76
79
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
|
|
77
80
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
@@ -81,7 +84,7 @@ describe('RadioDecorator', function () {
|
|
|
81
84
|
};
|
|
82
85
|
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {}));
|
|
83
86
|
var component = _react.screen.getByTestId('span-element');
|
|
84
|
-
|
|
87
|
+
yield user.click(component);
|
|
85
88
|
var expected = 1;
|
|
86
89
|
var expectedType = {
|
|
87
90
|
type: 'onClick'
|
|
@@ -89,13 +92,14 @@ describe('RadioDecorator', function () {
|
|
|
89
92
|
var actual = handleActivate.mock.calls.length && handleActivate.mock.calls[0][0];
|
|
90
93
|
expect(handleActivate).toBeCalledTimes(expected);
|
|
91
94
|
expect(actual).toMatchObject(expectedType);
|
|
92
|
-
});
|
|
93
|
-
test('should fire `deactivate` event with type when become deactivated', function () {
|
|
95
|
+
}));
|
|
96
|
+
test('should fire `deactivate` event with type when become deactivated', /*#__PURE__*/_asyncToGenerator(function* () {
|
|
94
97
|
var Component = (0, _RadioDecorator.RadioDecorator)({
|
|
95
98
|
deactivate: 'onClick',
|
|
96
99
|
prop: 'active'
|
|
97
100
|
}, Item);
|
|
98
101
|
var handleDeactivate = jest.fn();
|
|
102
|
+
var user = _userEvent["default"].setup();
|
|
99
103
|
var Wrapper = function Wrapper() {
|
|
100
104
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
|
|
101
105
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
@@ -105,7 +109,7 @@ describe('RadioDecorator', function () {
|
|
|
105
109
|
};
|
|
106
110
|
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, {}));
|
|
107
111
|
var component = _react.screen.getByTestId('span-element');
|
|
108
|
-
|
|
112
|
+
yield user.click(component);
|
|
109
113
|
var expected = 1;
|
|
110
114
|
var expectedType = {
|
|
111
115
|
type: 'onClick'
|
|
@@ -113,7 +117,7 @@ describe('RadioDecorator', function () {
|
|
|
113
117
|
var actual = handleDeactivate.mock.calls.length && handleDeactivate.mock.calls[0][0];
|
|
114
118
|
expect(handleDeactivate).toBeCalledTimes(expected);
|
|
115
119
|
expect(actual).toMatchObject(expectedType);
|
|
116
|
-
});
|
|
120
|
+
}));
|
|
117
121
|
test('should not call deactivate callback on inactive items', function () {
|
|
118
122
|
var handleDeactivate = jest.fn();
|
|
119
123
|
var Component = (0, _RadioDecorator.RadioDecorator)({
|
|
@@ -122,8 +126,8 @@ describe('RadioDecorator', function () {
|
|
|
122
126
|
}, Item);
|
|
123
127
|
|
|
124
128
|
// deactivate() is only called when there was a previously active item
|
|
125
|
-
var Wrapper = function Wrapper(
|
|
126
|
-
var active =
|
|
129
|
+
var Wrapper = function Wrapper(_ref5) {
|
|
130
|
+
var active = _ref5.active;
|
|
127
131
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Controller, {
|
|
128
132
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
129
133
|
active: !active
|
|
@@ -149,13 +153,14 @@ describe('RadioDecorator', function () {
|
|
|
149
153
|
var actual = handleDeactivate.mock.calls.length;
|
|
150
154
|
expect(actual).toBe(expected);
|
|
151
155
|
});
|
|
152
|
-
test('should be activated when the activated event fires', function () {
|
|
156
|
+
test('should be activated when the activated event fires', /*#__PURE__*/_asyncToGenerator(function* () {
|
|
153
157
|
var controllerRef = /*#__PURE__*/(0, _react2.createRef)();
|
|
154
158
|
var decoratorRef = /*#__PURE__*/(0, _react2.createRef)();
|
|
155
159
|
var Component = (0, _RadioDecorator.RadioDecorator)({
|
|
156
160
|
activate: 'onClick',
|
|
157
161
|
prop: 'active'
|
|
158
162
|
}, Item);
|
|
163
|
+
var user = _userEvent["default"].setup();
|
|
159
164
|
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
|
|
160
165
|
ref: controllerRef,
|
|
161
166
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
@@ -163,16 +168,17 @@ describe('RadioDecorator', function () {
|
|
|
163
168
|
})
|
|
164
169
|
}));
|
|
165
170
|
var component = _react.screen.getByTestId('span-element');
|
|
166
|
-
|
|
171
|
+
yield user.click(component);
|
|
167
172
|
expectToBeActive(controllerRef.current, decoratorRef.current);
|
|
168
|
-
});
|
|
169
|
-
test('should be deactivated when the deactivated event fires', function () {
|
|
173
|
+
}));
|
|
174
|
+
test('should be deactivated when the deactivated event fires', /*#__PURE__*/_asyncToGenerator(function* () {
|
|
170
175
|
var controllerRef = /*#__PURE__*/(0, _react2.createRef)();
|
|
171
176
|
var decoratorRef = /*#__PURE__*/(0, _react2.createRef)();
|
|
172
177
|
var Component = (0, _RadioDecorator.RadioDecorator)({
|
|
173
178
|
deactivate: 'onClick',
|
|
174
179
|
prop: 'active'
|
|
175
180
|
}, Item);
|
|
181
|
+
var user = _userEvent["default"].setup();
|
|
176
182
|
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Controller, {
|
|
177
183
|
ref: controllerRef,
|
|
178
184
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
@@ -181,16 +187,17 @@ describe('RadioDecorator', function () {
|
|
|
181
187
|
})
|
|
182
188
|
}));
|
|
183
189
|
var component = _react.screen.getByTestId('span-element');
|
|
184
|
-
|
|
190
|
+
yield user.click(component);
|
|
185
191
|
expectToBeActive(controllerRef.current, null);
|
|
186
|
-
});
|
|
187
|
-
test('should be deactivated when the activated event fires on another instance', function () {
|
|
192
|
+
}));
|
|
193
|
+
test('should be deactivated when the activated event fires on another instance', /*#__PURE__*/_asyncToGenerator(function* () {
|
|
188
194
|
var controllerRef = /*#__PURE__*/(0, _react2.createRef)();
|
|
189
195
|
var decoratorRef = /*#__PURE__*/(0, _react2.createRef)();
|
|
190
196
|
var Component = (0, _RadioDecorator.RadioDecorator)({
|
|
191
197
|
activate: 'onClick',
|
|
192
198
|
prop: 'active'
|
|
193
199
|
}, Item);
|
|
200
|
+
var user = _userEvent["default"].setup();
|
|
194
201
|
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(Controller, {
|
|
195
202
|
ref: controllerRef,
|
|
196
203
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
@@ -200,10 +207,10 @@ describe('RadioDecorator', function () {
|
|
|
200
207
|
})]
|
|
201
208
|
}));
|
|
202
209
|
var inactiveComponent = _react.screen.getByText('Inactive');
|
|
203
|
-
|
|
210
|
+
yield user.click(inactiveComponent);
|
|
204
211
|
expectToBeActive(controllerRef.current, decoratorRef.current);
|
|
205
|
-
});
|
|
206
|
-
test('should not deactivate items in a ancestor controller', function () {
|
|
212
|
+
}));
|
|
213
|
+
test('should not deactivate items in a ancestor controller', /*#__PURE__*/_asyncToGenerator(function* () {
|
|
207
214
|
var parentControllerRef = /*#__PURE__*/(0, _react2.createRef)();
|
|
208
215
|
var parentDecoratorRef = /*#__PURE__*/(0, _react2.createRef)();
|
|
209
216
|
var childControllerRef = /*#__PURE__*/(0, _react2.createRef)();
|
|
@@ -212,6 +219,7 @@ describe('RadioDecorator', function () {
|
|
|
212
219
|
activate: 'onClick',
|
|
213
220
|
prop: 'active'
|
|
214
221
|
}, Item);
|
|
222
|
+
var user = _userEvent["default"].setup();
|
|
215
223
|
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(Controller, {
|
|
216
224
|
ref: parentControllerRef,
|
|
217
225
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
|
@@ -228,12 +236,12 @@ describe('RadioDecorator', function () {
|
|
|
228
236
|
})]
|
|
229
237
|
}));
|
|
230
238
|
var inactiveComponents = _react.screen.getAllByText('Inactive');
|
|
231
|
-
|
|
239
|
+
yield user.click(inactiveComponents[1]);
|
|
232
240
|
|
|
233
241
|
// Breaking the pattern of 1 expect per test in order to verify the expect change happened
|
|
234
242
|
// (activating second component in child controller) and no unexpected change happened in
|
|
235
243
|
// the parent controller (active component should remain the first component)
|
|
236
244
|
expectToBeActive(parentControllerRef, parentDecoratorRef);
|
|
237
245
|
expectToBeActive(childControllerRef, childDecoratorRef);
|
|
238
|
-
});
|
|
246
|
+
}));
|
|
239
247
|
});
|
package/Repeater/Repeater.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Type definitions for ui/Repeater
|
|
2
2
|
|
|
3
|
-
import * as React from "react";
|
|
4
3
|
import { ForwardRefProps as ui_ForwardRef_ForwardRefProps } from "@enact/ui/ForwardRef";
|
|
4
|
+
import * as React from "react";
|
|
5
5
|
|
|
6
6
|
type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
|
|
7
7
|
type Merge<M, N> = Omit<M, Extract<keyof M, keyof N>> & N;
|
package/Resizable/Resizable.js
CHANGED
|
@@ -3,48 +3,35 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports
|
|
7
|
-
|
|
6
|
+
exports.Resizable = void 0;
|
|
7
|
+
Object.defineProperty(exports, "ResizeContext", {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
get: function get() {
|
|
10
|
+
return _ResizeContext["default"];
|
|
11
|
+
}
|
|
12
|
+
});
|
|
13
|
+
exports["default"] = void 0;
|
|
8
14
|
var _hoc = _interopRequireDefault(require("@enact/core/hoc"));
|
|
9
15
|
var _invariant = _interopRequireDefault(require("invariant"));
|
|
10
|
-
var
|
|
16
|
+
var _ResizeContext = _interopRequireDefault(require("./ResizeContext"));
|
|
17
|
+
var _useResize = _interopRequireDefault(require("./useResize"));
|
|
11
18
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
12
19
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
13
20
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
14
21
|
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; }
|
|
15
22
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
16
|
-
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
17
|
-
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, _toPropertyKey(descriptor.key), descriptor); } }
|
|
18
|
-
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
19
23
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
20
|
-
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
* @exports Resizable
|
|
32
|
-
*/ /**
|
|
33
|
-
* Used internally for things to notify children that they need to resize because of a parent
|
|
34
|
-
* update.
|
|
35
|
-
*
|
|
36
|
-
* @type Object
|
|
37
|
-
* @private
|
|
38
|
-
*/
|
|
39
|
-
var ResizeContext = /*#__PURE__*/(0, _react.createContext)();
|
|
40
|
-
|
|
41
|
-
/**
|
|
42
|
-
* Default config for `Resizable`.
|
|
43
|
-
*
|
|
44
|
-
* @memberof ui/Resizable.Resizable
|
|
45
|
-
* @hocconfig
|
|
46
|
-
*/
|
|
47
|
-
exports.ResizeContext = ResizeContext;
|
|
24
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } /**
|
|
25
|
+
* A higher-order component that handles component resize event.
|
|
26
|
+
*
|
|
27
|
+
* @module ui/Resizable
|
|
28
|
+
* @exports Resizable
|
|
29
|
+
*/ /**
|
|
30
|
+
* Default config for `Resizable`.
|
|
31
|
+
*
|
|
32
|
+
* @memberof ui/Resizable.Resizable
|
|
33
|
+
* @hocconfig
|
|
34
|
+
*/
|
|
48
35
|
var defaultConfig = {
|
|
49
36
|
/**
|
|
50
37
|
* A handler to process the `resize` event.
|
|
@@ -88,76 +75,15 @@ var defaultConfig = {
|
|
|
88
75
|
* @public
|
|
89
76
|
*/
|
|
90
77
|
var Resizable = (0, _hoc["default"])(defaultConfig, function (config, Wrapped) {
|
|
91
|
-
var
|
|
92
|
-
var filter = config.filter,
|
|
93
|
-
resize = config.resize;
|
|
78
|
+
var resize = config.resize;
|
|
94
79
|
!resize ? process.env.NODE_ENV !== "production" ? (0, _invariant["default"])(false, "resize is required by Resizable but was omitted when applied to ".concat(Wrapped.displayName)) : (0, _invariant["default"])(false) : void 0;
|
|
95
|
-
return _class = /*#__PURE__*/function (_Component) {
|
|
96
|
-
_inherits(_class, _Component);
|
|
97
|
-
var _super = _createSuper(_class);
|
|
98
|
-
function _class() {
|
|
99
|
-
var _this;
|
|
100
|
-
_classCallCheck(this, _class);
|
|
101
|
-
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
102
|
-
args[_key] = arguments[_key];
|
|
103
|
-
}
|
|
104
|
-
_this = _super.call.apply(_super, [this].concat(args));
|
|
105
|
-
_this.handleResize = (0, _handle.handle)((0, _handle.forward)(resize),
|
|
106
|
-
// optionally filter the event before notifying the container
|
|
107
|
-
filter, (0, _handle.call)('invalidateBounds')).bind(_assertThisInitialized(_this));
|
|
108
|
-
return _this;
|
|
109
|
-
}
|
|
110
|
-
_createClass(_class, [{
|
|
111
|
-
key: "componentDidMount",
|
|
112
|
-
value: function componentDidMount() {
|
|
113
|
-
if (this.context && typeof this.context === 'function') {
|
|
114
|
-
// Registry requires a callback but (for now at least) Resizable doesn't respond to
|
|
115
|
-
// upstream events so we're initializing a no-op function to "handle" callbacks
|
|
116
|
-
this.resizeRegistry = this.context(function () {});
|
|
117
|
-
}
|
|
118
|
-
}
|
|
119
|
-
}, {
|
|
120
|
-
key: "componentWillUnmount",
|
|
121
|
-
value: function componentWillUnmount() {
|
|
122
|
-
if (this.resizeRegistry) {
|
|
123
|
-
this.resizeRegistry.unregister();
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
/*
|
|
128
|
-
* Notifies a container that a resize is necessary
|
|
129
|
-
*
|
|
130
|
-
* @returns {undefined}
|
|
131
|
-
* @private
|
|
132
|
-
*/
|
|
133
|
-
}, {
|
|
134
|
-
key: "invalidateBounds",
|
|
135
|
-
value: function invalidateBounds() {
|
|
136
|
-
if (this.resizeRegistry) {
|
|
137
|
-
this.resizeRegistry.notify({
|
|
138
|
-
action: 'invalidateBounds'
|
|
139
|
-
});
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
80
|
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
* @private
|
|
150
|
-
*/
|
|
151
|
-
}, {
|
|
152
|
-
key: "render",
|
|
153
|
-
value: function render() {
|
|
154
|
-
var props = Object.assign({}, this.props);
|
|
155
|
-
props[resize] = this.handleResize;
|
|
156
|
-
return /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread({}, props));
|
|
157
|
-
}
|
|
158
|
-
}]);
|
|
159
|
-
return _class;
|
|
160
|
-
}(_react.Component), _class.displayName = 'Resizable', _class.contextType = ResizeContext, _class;
|
|
81
|
+
// eslint-disable-next-line no-shadow
|
|
82
|
+
return function Resizable(props) {
|
|
83
|
+
var handlers = (0, _useResize["default"])(props, config);
|
|
84
|
+
var resizableProps = Object.assign({}, props, handlers);
|
|
85
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapped, _objectSpread({}, resizableProps));
|
|
86
|
+
};
|
|
161
87
|
});
|
|
162
88
|
exports.Resizable = Resizable;
|
|
163
89
|
var _default = Resizable;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports["default"] = void 0;
|
|
7
|
+
var _react = require("react");
|
|
8
|
+
/**
|
|
9
|
+
* Used internally for things to notify children that they need to resize because of a parent
|
|
10
|
+
* update.
|
|
11
|
+
*
|
|
12
|
+
* @type Object
|
|
13
|
+
* @private
|
|
14
|
+
*/
|
|
15
|
+
var ResizeContext = /*#__PURE__*/(0, _react.createContext)();
|
|
16
|
+
var _default = ResizeContext;
|
|
17
|
+
exports["default"] = _default;
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _Registry = _interopRequireDefault(require("@enact/core/internal/Registry"));
|
|
4
|
+
var _react = require("@testing-library/react");
|
|
5
|
+
var _Resizable = require("../Resizable");
|
|
6
|
+
var _useResize = _interopRequireDefault(require("../useResize"));
|
|
7
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
|
8
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
9
|
+
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; }
|
|
10
|
+
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; }
|
|
11
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
12
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
13
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
14
|
+
describe('useResize', function () {
|
|
15
|
+
var data;
|
|
16
|
+
var DivComponent = function DivComponent(props) {
|
|
17
|
+
data = props;
|
|
18
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
19
|
+
"data-testid": "component"
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
var ResizeButtonWithHook = function ResizeButtonWithHook(props) {
|
|
23
|
+
var handlers = (0, _useResize["default"])(props, {
|
|
24
|
+
resize: 'onClick'
|
|
25
|
+
});
|
|
26
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(DivComponent, _objectSpread(_objectSpread({}, handlers), {}, {
|
|
27
|
+
children: props.children
|
|
28
|
+
}));
|
|
29
|
+
};
|
|
30
|
+
describe('config', function () {
|
|
31
|
+
test('should pass \'onClick\' handler to the wrapped component', function () {
|
|
32
|
+
var resizeRegistry = _Registry["default"].create();
|
|
33
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Resizable.ResizeContext.Provider, {
|
|
34
|
+
value: resizeRegistry.register,
|
|
35
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ResizeButtonWithHook, {})
|
|
36
|
+
}));
|
|
37
|
+
expect(data).toHaveProperty('onClick');
|
|
38
|
+
var expected = 'function';
|
|
39
|
+
var actual = typeof data.onClick;
|
|
40
|
+
expect(actual).toBe(expected);
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
});
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports["default"] = void 0;
|
|
7
|
+
var _handle = require("@enact/core/handle");
|
|
8
|
+
var _react = require("react");
|
|
9
|
+
var _ResizeContext = _interopRequireDefault(require("./ResizeContext"));
|
|
10
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
11
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
12
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
13
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
14
|
+
/**
|
|
15
|
+
* Object returned by `useResize`
|
|
16
|
+
* Object has a property named with the value of the resize property of config.
|
|
17
|
+
* And this property has resizehandler.
|
|
18
|
+
*
|
|
19
|
+
* @typedef {Object} useResizeInterface
|
|
20
|
+
* @memberof ui/Resizable
|
|
21
|
+
* @private
|
|
22
|
+
*/
|
|
23
|
+
/**
|
|
24
|
+
* A custom hook which returns handler that indicates a resize is necessary
|
|
25
|
+
*
|
|
26
|
+
* @param {Object} props Resize component props
|
|
27
|
+
* @param {Object} config Configuration options with resize, filter property
|
|
28
|
+
* @returns {useResizeInterface}
|
|
29
|
+
* @private
|
|
30
|
+
*
|
|
31
|
+
*/
|
|
32
|
+
var useResize = function useResize(props, config) {
|
|
33
|
+
// `resize` is the name of the event on the component to listen for size changes.
|
|
34
|
+
var _config$filter = config.filter,
|
|
35
|
+
filter = _config$filter === void 0 ? null : _config$filter,
|
|
36
|
+
_config$resize = config.resize,
|
|
37
|
+
resize = _config$resize === void 0 ? null : _config$resize;
|
|
38
|
+
var resizeContextValue = (0, _react.useContext)(_ResizeContext["default"]);
|
|
39
|
+
var mutableRef = (0, _react.useRef)({
|
|
40
|
+
resizeRegistry: null
|
|
41
|
+
});
|
|
42
|
+
(0, _react.useEffect)(function () {
|
|
43
|
+
var resizeRegistry = mutableRef.current.resizeRegistry;
|
|
44
|
+
if (resizeContextValue && typeof resizeContextValue === 'function') {
|
|
45
|
+
mutableRef.current.resizeRegistry = resizeContextValue(function () {});
|
|
46
|
+
}
|
|
47
|
+
return function () {
|
|
48
|
+
if (resizeRegistry) {
|
|
49
|
+
resizeRegistry.unregister();
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
}, [resizeContextValue]);
|
|
53
|
+
var handleResize = (0, _react.useCallback)(function (ev) {
|
|
54
|
+
(0, _handle.forward)(resize, ev, props);
|
|
55
|
+
|
|
56
|
+
// Notifies a container that a resize is necessary
|
|
57
|
+
if ((filter === null || filter(ev, props)) && mutableRef.current.resizeRegistry) {
|
|
58
|
+
mutableRef.current.resizeRegistry.notify({
|
|
59
|
+
action: 'invalidateBounds'
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
}, [filter, props, resize]);
|
|
63
|
+
return _defineProperty({}, resize, handleResize);
|
|
64
|
+
};
|
|
65
|
+
var _default = useResize;
|
|
66
|
+
exports["default"] = _default;
|
|
@@ -20,8 +20,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
|
20
20
|
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; }
|
|
21
21
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
22
22
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
23
|
+
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
24
|
+
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
23
25
|
describe('Routable', function () {
|
|
24
|
-
test('should render nothing for a partially valid path', function () {
|
|
26
|
+
test('should render nothing for a partially valid path', /*#__PURE__*/_asyncToGenerator(function* () {
|
|
25
27
|
var App = function App() {
|
|
26
28
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
27
29
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Link["default"], {
|
|
@@ -37,8 +39,8 @@ describe('Routable', function () {
|
|
|
37
39
|
};
|
|
38
40
|
var Views = (0, _Routable["default"])({
|
|
39
41
|
navigate: 'onNavigate'
|
|
40
|
-
}, function (
|
|
41
|
-
var children =
|
|
42
|
+
}, function (_ref2) {
|
|
43
|
+
var children = _ref2.children;
|
|
42
44
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
43
45
|
children: children
|
|
44
46
|
});
|
|
@@ -64,17 +66,18 @@ describe('Routable', function () {
|
|
|
64
66
|
})
|
|
65
67
|
}));
|
|
66
68
|
}
|
|
69
|
+
var user = _userEvent["default"].setup();
|
|
67
70
|
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(Sample, {}));
|
|
68
71
|
var linkToSecondPage = _react.screen.getByText('Page 2');
|
|
69
72
|
|
|
70
73
|
// click once to navigate to new path
|
|
71
|
-
|
|
74
|
+
yield user.click(linkToSecondPage);
|
|
72
75
|
var secondPage = _react.screen.getByTestId('page2');
|
|
73
76
|
expect(secondPage).toBeInTheDocument();
|
|
74
77
|
|
|
75
78
|
// clicking again should use the same base path "/app" for the same result
|
|
76
|
-
|
|
79
|
+
yield user.click(linkToSecondPage);
|
|
77
80
|
secondPage = _react.screen.getByTestId('page2');
|
|
78
81
|
expect(secondPage).toBeInTheDocument();
|
|
79
|
-
});
|
|
82
|
+
}));
|
|
80
83
|
});
|
package/Scrollable/Scrollable.js
CHANGED
|
@@ -117,11 +117,15 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
117
117
|
_this.enqueueForceUpdate();
|
|
118
118
|
});
|
|
119
119
|
};
|
|
120
|
+
// constants
|
|
120
121
|
_this.pixelPerLine = 39;
|
|
121
122
|
_this.scrollWheelMultiplierForDeltaPixel = 1.5;
|
|
123
|
+
// The ratio of wheel 'delta' units to pixels scrolled.
|
|
124
|
+
// status
|
|
122
125
|
_this.deferScrollTo = true;
|
|
123
126
|
_this.isScrollAnimationTargetAccumulated = false;
|
|
124
127
|
_this.isUpdatedScrollThumb = false;
|
|
128
|
+
// overscroll
|
|
125
129
|
_this.lastInputType = null;
|
|
126
130
|
_this.overscrollEnabled = false;
|
|
127
131
|
_this.overscrollStatus = {
|
|
@@ -146,6 +150,7 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
146
150
|
}
|
|
147
151
|
}
|
|
148
152
|
};
|
|
153
|
+
// bounds info
|
|
149
154
|
_this.bounds = {
|
|
150
155
|
clientWidth: 0,
|
|
151
156
|
clientHeight: 0,
|
|
@@ -154,14 +159,19 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
154
159
|
maxTop: 0,
|
|
155
160
|
maxLeft: 0
|
|
156
161
|
};
|
|
162
|
+
// wheel/drag/flick info
|
|
157
163
|
_this.wheelDirection = 0;
|
|
158
164
|
_this.isDragging = false;
|
|
165
|
+
// scroll info
|
|
159
166
|
_this.scrolling = false;
|
|
160
167
|
_this.scrollLeft = 0;
|
|
161
168
|
_this.scrollTop = 0;
|
|
162
169
|
_this.scrollToInfo = null;
|
|
170
|
+
// component info
|
|
163
171
|
_this.childRefCurrent = null;
|
|
172
|
+
// scroll animator
|
|
164
173
|
_this.animator = new _ScrollAnimator["default"]();
|
|
174
|
+
// drag/flick event handlers
|
|
165
175
|
_this.getRtlX = function (x) {
|
|
166
176
|
return _this.props.rtl ? -x : x;
|
|
167
177
|
};
|
|
@@ -293,6 +303,7 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
293
303
|
overscrollEffect: overscrollEffect
|
|
294
304
|
});
|
|
295
305
|
};
|
|
306
|
+
// overscroll effect
|
|
296
307
|
_this.getEdgeFromPosition = function (position, maxPosition) {
|
|
297
308
|
if (position <= 0) {
|
|
298
309
|
return 'before';
|
|
@@ -415,6 +426,7 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
415
426
|
}
|
|
416
427
|
return reachedEdgeInfo;
|
|
417
428
|
};
|
|
429
|
+
// scroll start/stop
|
|
418
430
|
_this.doScrollStop = function () {
|
|
419
431
|
_this.scrolling = false;
|
|
420
432
|
_this.forwardScrollEvent('onScrollStop', _this.getReachedEdgeInfo());
|
|
@@ -472,6 +484,7 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
472
484
|
(_this$childRefCurrent = _this.childRefCurrent).setScrollPosition.apply(_this$childRefCurrent, [_this.scrollLeft, _this.scrollTop, _this.props.rtl].concat(rest));
|
|
473
485
|
_this.forwardScrollEvent('onScroll');
|
|
474
486
|
};
|
|
487
|
+
// scrollTo API
|
|
475
488
|
_this.getPositionForScrollTo = function (opt) {
|
|
476
489
|
var bounds = _this.getScrollBounds(),
|
|
477
490
|
canScrollHorizontally = _this.canScrollHorizontally(bounds),
|
|
@@ -617,6 +630,7 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
617
630
|
}
|
|
618
631
|
return false;
|
|
619
632
|
};
|
|
633
|
+
// render
|
|
620
634
|
_this.initChildRef = function (ref) {
|
|
621
635
|
if (ref) {
|
|
622
636
|
_this.childRefCurrent = ref;
|
|
@@ -745,18 +759,6 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
745
759
|
this.scrollLeft = bounds.maxLeft;
|
|
746
760
|
}
|
|
747
761
|
}
|
|
748
|
-
|
|
749
|
-
// constants
|
|
750
|
-
|
|
751
|
-
// The ratio of wheel 'delta' units to pixels scrolled.
|
|
752
|
-
// status
|
|
753
|
-
// overscroll
|
|
754
|
-
// bounds info
|
|
755
|
-
// wheel/drag/flick info
|
|
756
|
-
// scroll info
|
|
757
|
-
// component info
|
|
758
|
-
// scroll animator
|
|
759
|
-
// drag/flick event handlers
|
|
760
762
|
}, {
|
|
761
763
|
key: "calculateDistanceByWheel",
|
|
762
764
|
value: function calculateDistanceByWheel(deltaMode, delta, maxPixel) {
|
|
@@ -771,8 +773,6 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
771
773
|
}
|
|
772
774
|
return delta;
|
|
773
775
|
}
|
|
774
|
-
|
|
775
|
-
// overscroll effect
|
|
776
776
|
}, {
|
|
777
777
|
key: "forwardScrollEvent",
|
|
778
778
|
value:
|
|
@@ -813,8 +813,6 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
813
813
|
this.updateThumb(this.verticalScrollbarRef, bounds);
|
|
814
814
|
}
|
|
815
815
|
}
|
|
816
|
-
|
|
817
|
-
// scroll start/stop
|
|
818
816
|
}, {
|
|
819
817
|
key: "start",
|
|
820
818
|
value: function start(_ref) {
|
|
@@ -890,8 +888,6 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
890
888
|
this.scrollStopJob.start();
|
|
891
889
|
}
|
|
892
890
|
}
|
|
893
|
-
|
|
894
|
-
// scrollTo API
|
|
895
891
|
}, {
|
|
896
892
|
key: "showThumb",
|
|
897
893
|
value:
|
|
@@ -968,8 +964,6 @@ var ScrollableBase = /*#__PURE__*/function (_Component) {
|
|
|
968
964
|
window.removeEventListener('resize', this.handleResizeWindow);
|
|
969
965
|
}
|
|
970
966
|
}
|
|
971
|
-
|
|
972
|
-
// render
|
|
973
967
|
}, {
|
|
974
968
|
key: "render",
|
|
975
969
|
value: function render() {
|