@enact/core 4.5.2 → 4.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +30 -0
- package/dispatcher/dispatcher.js +15 -27
- package/dispatcher/listeners.js +0 -8
- package/dispatcher/tests/dispatcher-specs.js +0 -3
- package/handle/handle.js +40 -98
- package/handle/tests/handle-specs.js +21 -42
- package/hoc/hoc.js +2 -13
- package/hoc/tests/hoc-specs.js +0 -23
- package/internal/ApiDecorator/ApiDecorator.js +4 -34
- package/internal/ApiDecorator/tests/ApiDecorator-specs.js +69 -40
- package/internal/Registry/Registry.js +0 -7
- package/internal/Registry/tests/Registry-specs.js +26 -78
- package/internal/deprecate/deprecate.js +9 -22
- package/internal/deprecate/tests/deprecate-specs.js +38 -0
- package/internal/prop-types/prop-types.js +3 -20
- package/internal/prop-types/tests/prop-types-specs.js +265 -0
- package/keymap/index.js +2 -3
- package/keymap/keymap.js +10 -18
- package/keymap/tests/keymap-specs.js +0 -3
- package/kind/computed.js +2 -9
- package/kind/kind.js +14 -53
- package/kind/styles.js +6 -19
- package/kind/tests/computed-specs.js +4 -6
- package/kind/tests/kind-specs.js +9 -44
- package/kind/tests/styles-specs.js +12 -7
- package/kind/util.js +0 -2
- package/package.json +8 -2
- package/platform/platform.js +51 -57
- package/platform/tests/platform-specs.js +31 -3
- package/snapshot/snapshot.js +4 -9
- package/snapshot/tests/snapshot-specs.js +56 -0
- package/useChainRefs/tests/useChainRefs-specs.js +0 -14
- package/useChainRefs/useChainRefs.js +3 -11
- package/useClass/tests/useClass-specs.js +6 -21
- package/useClass/useClass.js +0 -8
- package/useHandlers/Handlers.js +0 -11
- package/useHandlers/tests/useHandlers-specs.js +11 -23
- package/useHandlers/useHandlers.js +0 -5
- package/usePublicClassNames/tests/usePublicClassNames-specs.js +21 -28
- package/usePublicClassNames/usePublicClassNames.js +4 -10
- package/util/Job.js +1 -43
- package/util/tests/Job-specs.js +48 -14
- package/util/tests/util-specs.js +125 -10
- package/util/util.js +15 -54
- package/dispatcher/dispatcher.d.ts +0 -21
- package/handle/handle.d.ts +0 -618
- package/hoc/hoc.d.ts +0 -44
- package/index.d.ts +0 -0
- package/internal/ApiDecorator/ApiDecorator.d.ts +0 -0
- package/internal/Registry/Registry.d.ts +0 -0
- package/internal/deprecate/deprecate.d.ts +0 -0
- package/internal/prop-types/prop-types.d.ts +0 -0
- package/keymap/index.d.ts +0 -37
- package/kind/kind.d.ts +0 -90
- package/platform/platform.d.ts +0 -45
- package/snapshot/snapshot.d.ts +0 -32
- package/useChainRefs/useChainRefs.d.ts +0 -0
- package/useClass/useClass.d.ts +0 -0
- package/useHandlers/useHandlers.d.ts +0 -0
- package/usePublicClassNames/usePublicClassNames.d.ts +0 -0
- package/util/util.d.ts +0 -162
|
@@ -4,63 +4,47 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports["default"] = void 0;
|
|
7
|
-
|
|
8
7
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
-
|
|
10
8
|
var _util = require("../../util");
|
|
11
|
-
|
|
12
9
|
var _deprecate = _interopRequireDefault(require("../deprecate"));
|
|
13
|
-
|
|
14
10
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
15
|
-
|
|
16
11
|
var isRequired = function isRequired(fn) {
|
|
17
12
|
fn.isRequired = function (props, key, componentName, location, propFullName) {
|
|
18
13
|
var propValue = props[key];
|
|
19
|
-
|
|
20
14
|
if (typeof propValue === 'undefined') {
|
|
21
15
|
return new Error("'".concat(propFullName, "' is required for '").concat(componentName, "' but was undefined."));
|
|
22
16
|
}
|
|
23
|
-
|
|
24
17
|
for (var _len = arguments.length, rest = new Array(_len > 5 ? _len - 5 : 0), _key = 5; _key < _len; _key++) {
|
|
25
18
|
rest[_key - 5] = arguments[_key];
|
|
26
19
|
}
|
|
27
|
-
|
|
28
20
|
return fn.apply(void 0, [propValue, key, componentName, location, propFullName].concat(rest));
|
|
29
21
|
};
|
|
30
|
-
|
|
31
22
|
return fn;
|
|
32
23
|
};
|
|
33
|
-
|
|
34
24
|
var renderable = isRequired(function (props, key, componentName) {
|
|
35
25
|
var propValue = props[key];
|
|
36
|
-
|
|
37
26
|
if (propValue && !(0, _util.isRenderable)(propValue)) {
|
|
38
27
|
return new Error("Invalid prop '".concat(key, "' supplied to '").concat(componentName, "'. ") + "Expected a renderable value but received '".concat(typeof propValue, "' instead."));
|
|
39
28
|
}
|
|
40
29
|
});
|
|
41
30
|
var component = isRequired(function (props, key, componentName) {
|
|
42
31
|
var propValue = props[key];
|
|
43
|
-
|
|
44
32
|
if (propValue && (typeof propValue === 'string' || !(0, _util.isRenderable)(propValue))) {
|
|
45
33
|
return new Error("Invalid prop '".concat(key, "' supplied to '").concat(componentName, "'. ") + "Expected a function but received '".concat(typeof propValue, "' instead."));
|
|
46
34
|
}
|
|
47
35
|
});
|
|
48
|
-
|
|
49
36
|
var renderableOverride = _propTypes["default"].oneOfType([_propTypes["default"].element, renderable]);
|
|
50
|
-
|
|
51
37
|
var componentOverride = _propTypes["default"].oneOfType([_propTypes["default"].element, component]);
|
|
52
|
-
|
|
53
38
|
var ref = _propTypes["default"].oneOfType([_propTypes["default"].shape({
|
|
54
39
|
current: _propTypes["default"].any
|
|
55
40
|
}), _propTypes["default"].func]);
|
|
41
|
+
|
|
56
42
|
/*
|
|
57
43
|
* Wrap a prop type validator with a deprecation warning when the prop has a non-null value
|
|
58
44
|
*
|
|
59
45
|
* @param {Function} base Prop type validator
|
|
60
46
|
* @param {Object} config deprecatioon configuration
|
|
61
47
|
*/
|
|
62
|
-
|
|
63
|
-
|
|
64
48
|
var deprecated = function deprecated(base, config) {
|
|
65
49
|
// Wrap in a no-op so deprecate only warns once
|
|
66
50
|
var warn = (0, _deprecate["default"])(function () {
|
|
@@ -68,16 +52,15 @@ var deprecated = function deprecated(base, config) {
|
|
|
68
52
|
}, config);
|
|
69
53
|
return function (props, key) {
|
|
70
54
|
// Warn on a non-null value for the prop
|
|
71
|
-
if (props[key] != null) warn();
|
|
55
|
+
if (props[key] != null) warn();
|
|
72
56
|
|
|
57
|
+
// Pass on to the prop type validator
|
|
73
58
|
for (var _len2 = arguments.length, rest = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
|
|
74
59
|
rest[_key2 - 2] = arguments[_key2];
|
|
75
60
|
}
|
|
76
|
-
|
|
77
61
|
return base.apply(void 0, [props, key].concat(rest));
|
|
78
62
|
};
|
|
79
63
|
};
|
|
80
|
-
|
|
81
64
|
var EnactPropTypes = {
|
|
82
65
|
component: component,
|
|
83
66
|
componentOverride: componentOverride,
|
|
@@ -0,0 +1,265 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _react = require("@testing-library/react");
|
|
4
|
+
var _react2 = require("react");
|
|
5
|
+
var _propTypes = _interopRequireDefault(require("../prop-types"));
|
|
6
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
|
7
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
8
|
+
function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
|
|
9
|
+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
10
|
+
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
|
|
11
|
+
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
12
|
+
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); }
|
|
13
|
+
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
|
|
14
|
+
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); }; }
|
|
15
|
+
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); }
|
|
16
|
+
function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
|
|
17
|
+
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; } }
|
|
18
|
+
function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
|
|
19
|
+
describe('prop-types', function () {
|
|
20
|
+
var DummyElement = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {});
|
|
21
|
+
var DummyRenderable = function DummyRenderable() {
|
|
22
|
+
return DummyElement;
|
|
23
|
+
};
|
|
24
|
+
var dummyString = 'Some String';
|
|
25
|
+
var TestComponent = /*#__PURE__*/function (_Component) {
|
|
26
|
+
_inherits(TestComponent, _Component);
|
|
27
|
+
var _super = _createSuper(TestComponent);
|
|
28
|
+
function TestComponent() {
|
|
29
|
+
_classCallCheck(this, TestComponent);
|
|
30
|
+
return _super.apply(this, arguments);
|
|
31
|
+
}
|
|
32
|
+
_createClass(TestComponent, [{
|
|
33
|
+
key: "render",
|
|
34
|
+
value: function render() {
|
|
35
|
+
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
36
|
+
rest = Object.assign({}, (_objectDestructuringEmpty(_ref), _ref));
|
|
37
|
+
delete rest.typeComponent;
|
|
38
|
+
delete rest.typeComponentOverride;
|
|
39
|
+
delete rest.typeRef;
|
|
40
|
+
delete rest.typeRenderable;
|
|
41
|
+
delete rest.typeRenderableOverride;
|
|
42
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
43
|
+
children: "Test"
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
}]);
|
|
47
|
+
return TestComponent;
|
|
48
|
+
}(_react2.Component);
|
|
49
|
+
TestComponent.displayName = 'TestComponent';
|
|
50
|
+
TestComponent.propTypes = {
|
|
51
|
+
typeComponent: _propTypes["default"].component,
|
|
52
|
+
typeComponentOverride: _propTypes["default"].componentOverride,
|
|
53
|
+
typeRef: _propTypes["default"].ref,
|
|
54
|
+
typeRenderable: _propTypes["default"].renderable,
|
|
55
|
+
typeRenderableOverride: _propTypes["default"].renderableOverride
|
|
56
|
+
};
|
|
57
|
+
var consoleWarnMock = null;
|
|
58
|
+
var consoleErrorMock = null;
|
|
59
|
+
beforeEach(function () {
|
|
60
|
+
consoleWarnMock = jest.spyOn(console, 'warn').mockImplementation();
|
|
61
|
+
consoleErrorMock = jest.spyOn(console, 'error').mockImplementation();
|
|
62
|
+
});
|
|
63
|
+
afterEach(function () {
|
|
64
|
+
consoleWarnMock.mockRestore();
|
|
65
|
+
consoleErrorMock.mockRestore();
|
|
66
|
+
});
|
|
67
|
+
describe('no prop', function () {
|
|
68
|
+
test('should not call console.error when no prop is given', function () {
|
|
69
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {}));
|
|
70
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
describe('component', function () {
|
|
74
|
+
test('should not call console.error for EnactPropTypes.component if renderable value is given', function () {
|
|
75
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
76
|
+
typeComponent: DummyRenderable
|
|
77
|
+
}));
|
|
78
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
79
|
+
});
|
|
80
|
+
test('should call console.error for EnactPropTypes.component if string value is given', function () {
|
|
81
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
82
|
+
typeComponent: dummyString
|
|
83
|
+
}));
|
|
84
|
+
expect(consoleErrorMock).toHaveBeenCalled();
|
|
85
|
+
});
|
|
86
|
+
test('should call console.error for EnactPropTypes.component if element value is given', function () {
|
|
87
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
88
|
+
typeComponent: DummyElement
|
|
89
|
+
}));
|
|
90
|
+
expect(consoleErrorMock).toHaveBeenCalled();
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
describe('componentOverride', function () {
|
|
94
|
+
test('should not call console.error for EnactPropTypes.componentOverride if renderable value is given', function () {
|
|
95
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
96
|
+
typeComponentOverride: DummyRenderable
|
|
97
|
+
}));
|
|
98
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
99
|
+
});
|
|
100
|
+
test('should call console.error for EnactPropTypes.componentOverride if string value is given', function () {
|
|
101
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
102
|
+
typeComponentOverride: dummyString
|
|
103
|
+
}));
|
|
104
|
+
expect(consoleErrorMock).toHaveBeenCalled();
|
|
105
|
+
});
|
|
106
|
+
test('should not call console.error for EnactPropTypes.componentOverride if element value is given', function () {
|
|
107
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
108
|
+
typeComponentOverride: DummyElement
|
|
109
|
+
}));
|
|
110
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
describe('ref', function () {
|
|
114
|
+
test('should not call console.error for EnactPropTypes.ref if ref value is given', function () {
|
|
115
|
+
var ref = /*#__PURE__*/(0, _react2.createRef)();
|
|
116
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
117
|
+
typeRef: ref
|
|
118
|
+
}));
|
|
119
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
120
|
+
});
|
|
121
|
+
test('should call console.error for EnactPropTypes.ref if non-ref value is given', function () {
|
|
122
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
123
|
+
typeRef: dummyString
|
|
124
|
+
}));
|
|
125
|
+
expect(consoleErrorMock).toHaveBeenCalled();
|
|
126
|
+
});
|
|
127
|
+
});
|
|
128
|
+
describe('renderable', function () {
|
|
129
|
+
test('should not call console.error for EnactPropTypes.renderable if renderable value is given', function () {
|
|
130
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
131
|
+
typeRenderable: DummyRenderable
|
|
132
|
+
}));
|
|
133
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
134
|
+
});
|
|
135
|
+
test('should not call console.error for EnactPropTypes.renderable if string value is given', function () {
|
|
136
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
137
|
+
typeRenderable: dummyString
|
|
138
|
+
}));
|
|
139
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
140
|
+
});
|
|
141
|
+
test('should call console.error for EnactPropTypes.renderable if element value is given', function () {
|
|
142
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
143
|
+
typeRenderable: DummyElement
|
|
144
|
+
}));
|
|
145
|
+
expect(consoleErrorMock).toHaveBeenCalled();
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
describe('renderableOverride', function () {
|
|
149
|
+
test('should not call console.error for EnactPropTypes.renderableOverride if renderable value is given', function () {
|
|
150
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
151
|
+
typeRenderableOverride: DummyRenderable
|
|
152
|
+
}));
|
|
153
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
154
|
+
});
|
|
155
|
+
test('should not call console.error for EnactPropTypes.renderableOverride if string value is given', function () {
|
|
156
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
157
|
+
typeRenderableOverride: dummyString
|
|
158
|
+
}));
|
|
159
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
160
|
+
});
|
|
161
|
+
test('should not call console.error for EnactPropTypes.renderableOverride if element value is given', function () {
|
|
162
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(TestComponent, {
|
|
163
|
+
typeRenderableOverride: DummyElement
|
|
164
|
+
}));
|
|
165
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
166
|
+
});
|
|
167
|
+
});
|
|
168
|
+
describe('isRequired', function () {
|
|
169
|
+
var RequiredComponent = /*#__PURE__*/function (_Component2) {
|
|
170
|
+
_inherits(RequiredComponent, _Component2);
|
|
171
|
+
var _super2 = _createSuper(RequiredComponent);
|
|
172
|
+
function RequiredComponent() {
|
|
173
|
+
_classCallCheck(this, RequiredComponent);
|
|
174
|
+
return _super2.apply(this, arguments);
|
|
175
|
+
}
|
|
176
|
+
_createClass(RequiredComponent, [{
|
|
177
|
+
key: "render",
|
|
178
|
+
value: function render() {
|
|
179
|
+
var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
180
|
+
rest = Object.assign({}, (_objectDestructuringEmpty(_ref2), _ref2));
|
|
181
|
+
delete rest.typeRequired;
|
|
182
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
183
|
+
children: "Test"
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
}]);
|
|
187
|
+
return RequiredComponent;
|
|
188
|
+
}(_react2.Component);
|
|
189
|
+
RequiredComponent.displayName = 'RequiredComponent';
|
|
190
|
+
RequiredComponent.propTypes = {
|
|
191
|
+
typeRequired: _propTypes["default"].renderable.isRequired
|
|
192
|
+
};
|
|
193
|
+
test('should not call console.error when required prop value is given', function () {
|
|
194
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(RequiredComponent, {
|
|
195
|
+
typeRequired: DummyRenderable
|
|
196
|
+
}));
|
|
197
|
+
expect(consoleErrorMock).not.toHaveBeenCalled();
|
|
198
|
+
});
|
|
199
|
+
test('should call console.error when prop value is missing for isRequired', function () {
|
|
200
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(RequiredComponent, {}));
|
|
201
|
+
expect(consoleErrorMock).toHaveBeenCalled();
|
|
202
|
+
});
|
|
203
|
+
});
|
|
204
|
+
describe('deprecated', function () {
|
|
205
|
+
test('should call console.warn when prop value is given for EnactPropTypes.deprecated', function () {
|
|
206
|
+
var ref = /*#__PURE__*/(0, _react2.createRef)();
|
|
207
|
+
var DeprecatedComponent = /*#__PURE__*/function (_Component3) {
|
|
208
|
+
_inherits(DeprecatedComponent, _Component3);
|
|
209
|
+
var _super3 = _createSuper(DeprecatedComponent);
|
|
210
|
+
function DeprecatedComponent() {
|
|
211
|
+
_classCallCheck(this, DeprecatedComponent);
|
|
212
|
+
return _super3.apply(this, arguments);
|
|
213
|
+
}
|
|
214
|
+
_createClass(DeprecatedComponent, [{
|
|
215
|
+
key: "render",
|
|
216
|
+
value: function render() {
|
|
217
|
+
var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
218
|
+
rest = Object.assign({}, (_objectDestructuringEmpty(_ref3), _ref3));
|
|
219
|
+
delete rest.typeDeprecated;
|
|
220
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
221
|
+
children: "Test"
|
|
222
|
+
});
|
|
223
|
+
}
|
|
224
|
+
}]);
|
|
225
|
+
return DeprecatedComponent;
|
|
226
|
+
}(_react2.Component);
|
|
227
|
+
DeprecatedComponent.displayName = 'DeprecatedComponent';
|
|
228
|
+
DeprecatedComponent.propTypes = {
|
|
229
|
+
typeDeprecated: _propTypes["default"].deprecated(_propTypes["default"].ref)
|
|
230
|
+
};
|
|
231
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(DeprecatedComponent, {
|
|
232
|
+
typeDeprecated: ref
|
|
233
|
+
}));
|
|
234
|
+
expect(consoleWarnMock).toHaveBeenCalled();
|
|
235
|
+
});
|
|
236
|
+
test('should call console.warn even when prop value is not given for EnactPropTypes.deprecated', function () {
|
|
237
|
+
var DeprecatedComponent = /*#__PURE__*/function (_Component4) {
|
|
238
|
+
_inherits(DeprecatedComponent, _Component4);
|
|
239
|
+
var _super4 = _createSuper(DeprecatedComponent);
|
|
240
|
+
function DeprecatedComponent() {
|
|
241
|
+
_classCallCheck(this, DeprecatedComponent);
|
|
242
|
+
return _super4.apply(this, arguments);
|
|
243
|
+
}
|
|
244
|
+
_createClass(DeprecatedComponent, [{
|
|
245
|
+
key: "render",
|
|
246
|
+
value: function render() {
|
|
247
|
+
var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
248
|
+
rest = Object.assign({}, (_objectDestructuringEmpty(_ref4), _ref4));
|
|
249
|
+
delete rest.typeDeprecated;
|
|
250
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
251
|
+
children: "Test"
|
|
252
|
+
});
|
|
253
|
+
}
|
|
254
|
+
}]);
|
|
255
|
+
return DeprecatedComponent;
|
|
256
|
+
}(_react2.Component);
|
|
257
|
+
DeprecatedComponent.displayName = 'DeprecatedComponent';
|
|
258
|
+
DeprecatedComponent.propTypes = {
|
|
259
|
+
typeDeprecated: _propTypes["default"].deprecated(_propTypes["default"].ref)
|
|
260
|
+
};
|
|
261
|
+
(0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(DeprecatedComponent, {}));
|
|
262
|
+
expect(consoleWarnMock).toHaveBeenCalled();
|
|
263
|
+
});
|
|
264
|
+
});
|
|
265
|
+
});
|
package/keymap/index.js
CHANGED
|
@@ -3,9 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
|
|
7
6
|
var _keymap = require("./keymap");
|
|
8
|
-
|
|
9
7
|
Object.keys(_keymap).forEach(function (key) {
|
|
10
8
|
if (key === "default" || key === "__esModule") return;
|
|
11
9
|
if (key in exports && exports[key] === _keymap[key]) return;
|
|
@@ -16,7 +14,6 @@ Object.keys(_keymap).forEach(function (key) {
|
|
|
16
14
|
}
|
|
17
15
|
});
|
|
18
16
|
});
|
|
19
|
-
|
|
20
17
|
/**
|
|
21
18
|
* Manages a map of names to key codes to simplify event handlers
|
|
22
19
|
*
|
|
@@ -40,9 +37,11 @@ Object.keys(_keymap).forEach(function (key) {
|
|
|
40
37
|
* @exports remove
|
|
41
38
|
* @exports removeAll
|
|
42
39
|
*/
|
|
40
|
+
|
|
43
41
|
// keymap uses a singleton object, map, to manage the keymap. since webpack may make multiple copies
|
|
44
42
|
// of the module available if the import path is different, we ensure a consistent import path for
|
|
45
43
|
// the singleton instance by facading it with this module.
|
|
44
|
+
|
|
46
45
|
// Add the default 5-way navigation key codes
|
|
47
46
|
(0, _keymap.addAll)({
|
|
48
47
|
enter: [13, 16777221],
|
package/keymap/keymap.js
CHANGED
|
@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.removeAll = exports.remove = exports.is = exports.addAll = exports.add = void 0;
|
|
7
|
-
|
|
8
7
|
var _curry = _interopRequireDefault(require("ramda/src/curry"));
|
|
9
|
-
|
|
10
8
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
11
|
-
|
|
12
9
|
/*
|
|
13
10
|
* The singleton map of names to keyCodes. If a name doesn't have any keyCodes mapped to it, it will
|
|
14
11
|
* not exist in this map. If it does, its value will be an array of its keyCodes.
|
|
@@ -17,6 +14,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
|
|
|
17
14
|
* @private
|
|
18
15
|
*/
|
|
19
16
|
var map = {};
|
|
17
|
+
|
|
20
18
|
/*
|
|
21
19
|
* Safely converts keymap name to lowercase.
|
|
22
20
|
*
|
|
@@ -27,10 +25,10 @@ var map = {};
|
|
|
27
25
|
* @memberof core/keymap
|
|
28
26
|
* @private
|
|
29
27
|
*/
|
|
30
|
-
|
|
31
28
|
var toLowerCase = function toLowerCase(name) {
|
|
32
29
|
return name ? name.toLowerCase() : '';
|
|
33
30
|
};
|
|
31
|
+
|
|
34
32
|
/*
|
|
35
33
|
* Iterates over `set` and invokes `fn` with the key and value of each item.
|
|
36
34
|
*
|
|
@@ -42,13 +40,12 @@ var toLowerCase = function toLowerCase(name) {
|
|
|
42
40
|
* @memberof core/keymap
|
|
43
41
|
* @private
|
|
44
42
|
*/
|
|
45
|
-
|
|
46
|
-
|
|
47
43
|
var forEachObj = (0, _curry["default"])(function (fn, set) {
|
|
48
44
|
Object.keys(set).forEach(function (name) {
|
|
49
45
|
return fn(name, set[name]);
|
|
50
46
|
});
|
|
51
47
|
});
|
|
48
|
+
|
|
52
49
|
/*
|
|
53
50
|
* Invokes `fn` with `name` and `keyCode` for each key code provided.
|
|
54
51
|
*
|
|
@@ -62,7 +59,6 @@ var forEachObj = (0, _curry["default"])(function (fn, set) {
|
|
|
62
59
|
* @memberof core/keymap
|
|
63
60
|
* @private
|
|
64
61
|
*/
|
|
65
|
-
|
|
66
62
|
var oneOrArray = (0, _curry["default"])(function (fn, name, keyCode) {
|
|
67
63
|
if (Array.isArray(keyCode)) {
|
|
68
64
|
keyCode.forEach(fn(name));
|
|
@@ -70,6 +66,7 @@ var oneOrArray = (0, _curry["default"])(function (fn, name, keyCode) {
|
|
|
70
66
|
fn(name, keyCode);
|
|
71
67
|
}
|
|
72
68
|
});
|
|
69
|
+
|
|
73
70
|
/*
|
|
74
71
|
* Adds `keyCode` to `name`.
|
|
75
72
|
*
|
|
@@ -82,13 +79,10 @@ var oneOrArray = (0, _curry["default"])(function (fn, name, keyCode) {
|
|
|
82
79
|
* @memberof core/keymap
|
|
83
80
|
* @private
|
|
84
81
|
*/
|
|
85
|
-
|
|
86
82
|
var addOne = (0, _curry["default"])(function (name, keyCode) {
|
|
87
83
|
name = toLowerCase(name);
|
|
88
|
-
|
|
89
84
|
if (name in map) {
|
|
90
85
|
var index = map[name].indexOf(keyCode);
|
|
91
|
-
|
|
92
86
|
if (index === -1) {
|
|
93
87
|
map[name].push(keyCode);
|
|
94
88
|
}
|
|
@@ -96,6 +90,7 @@ var addOne = (0, _curry["default"])(function (name, keyCode) {
|
|
|
96
90
|
map[name] = [keyCode];
|
|
97
91
|
}
|
|
98
92
|
});
|
|
93
|
+
|
|
99
94
|
/*
|
|
100
95
|
* Removes `keyCode` from `name`.
|
|
101
96
|
*
|
|
@@ -108,14 +103,11 @@ var addOne = (0, _curry["default"])(function (name, keyCode) {
|
|
|
108
103
|
* @memberof core/keymap
|
|
109
104
|
* @private
|
|
110
105
|
*/
|
|
111
|
-
|
|
112
106
|
var removeOne = (0, _curry["default"])(function (name, keyCode) {
|
|
113
107
|
name = toLowerCase(name);
|
|
114
|
-
|
|
115
108
|
if (name in map) {
|
|
116
109
|
var keys = map[name];
|
|
117
110
|
var index = keys.indexOf(keyCode);
|
|
118
|
-
|
|
119
111
|
if (index === -1) {
|
|
120
112
|
delete map[name];
|
|
121
113
|
} else {
|
|
@@ -123,6 +115,7 @@ var removeOne = (0, _curry["default"])(function (name, keyCode) {
|
|
|
123
115
|
}
|
|
124
116
|
}
|
|
125
117
|
});
|
|
118
|
+
|
|
126
119
|
/**
|
|
127
120
|
* Registers `keyCode` for `name`.
|
|
128
121
|
*
|
|
@@ -135,8 +128,8 @@ var removeOne = (0, _curry["default"])(function (name, keyCode) {
|
|
|
135
128
|
* @memberof core/keymap
|
|
136
129
|
* @public
|
|
137
130
|
*/
|
|
138
|
-
|
|
139
131
|
var add = oneOrArray(addOne);
|
|
132
|
+
|
|
140
133
|
/**
|
|
141
134
|
* Registers a set of key codes.
|
|
142
135
|
*
|
|
@@ -148,9 +141,9 @@ var add = oneOrArray(addOne);
|
|
|
148
141
|
* @memberof core/keymap
|
|
149
142
|
* @public
|
|
150
143
|
*/
|
|
151
|
-
|
|
152
144
|
exports.add = add;
|
|
153
145
|
var addAll = forEachObj(add);
|
|
146
|
+
|
|
154
147
|
/**
|
|
155
148
|
* Unregisters `keyCode` from `name`.
|
|
156
149
|
*
|
|
@@ -163,9 +156,9 @@ var addAll = forEachObj(add);
|
|
|
163
156
|
* @memberof core/keymap
|
|
164
157
|
* @public
|
|
165
158
|
*/
|
|
166
|
-
|
|
167
159
|
exports.addAll = addAll;
|
|
168
160
|
var remove = oneOrArray(removeOne);
|
|
161
|
+
|
|
169
162
|
/**
|
|
170
163
|
* Unregisters a set of key codes.
|
|
171
164
|
*
|
|
@@ -177,9 +170,9 @@ var remove = oneOrArray(removeOne);
|
|
|
177
170
|
* @memberof core/keymap
|
|
178
171
|
* @public
|
|
179
172
|
*/
|
|
180
|
-
|
|
181
173
|
exports.remove = remove;
|
|
182
174
|
var removeAll = forEachObj(remove);
|
|
175
|
+
|
|
183
176
|
/**
|
|
184
177
|
* Determines if `keyCode` is mapped to `name`.
|
|
185
178
|
*
|
|
@@ -192,7 +185,6 @@ var removeAll = forEachObj(remove);
|
|
|
192
185
|
* @memberof core/keymap
|
|
193
186
|
* @public
|
|
194
187
|
*/
|
|
195
|
-
|
|
196
188
|
exports.removeAll = removeAll;
|
|
197
189
|
var is = (0, _curry["default"])(function (name, keyCode) {
|
|
198
190
|
name = toLowerCase(name);
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var keymap = _interopRequireWildcard(require("../"));
|
|
4
|
-
|
|
5
4
|
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); }
|
|
6
|
-
|
|
7
5
|
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; }
|
|
8
|
-
|
|
9
6
|
describe('keymap', function () {
|
|
10
7
|
test('should support adding single keyCodes for a name', function () {
|
|
11
8
|
keymap.add('testEnter', 13);
|
package/kind/computed.js
CHANGED
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports["default"] = exports.computed = void 0;
|
|
7
|
-
|
|
8
7
|
/**
|
|
9
8
|
* Accepts an object of computed property configurations and a property object, passes the property
|
|
10
9
|
* object through each computed property handler, and merges the resulting computed properties with
|
|
@@ -32,29 +31,23 @@ exports["default"] = exports.computed = void 0;
|
|
|
32
31
|
*/
|
|
33
32
|
var computed = function computed(cfg, optProps) {
|
|
34
33
|
var keys = Object.keys(cfg);
|
|
35
|
-
|
|
36
34
|
var renderComputed = function renderComputed(props) {
|
|
37
35
|
var updated = {};
|
|
38
|
-
|
|
39
36
|
for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
|
|
40
37
|
args[_key - 1] = arguments[_key];
|
|
41
38
|
}
|
|
42
|
-
|
|
43
39
|
for (var i = keys.length - 1; i >= 0; i--) {
|
|
44
40
|
updated[keys[i]] = cfg[keys[i]].apply(cfg, [props].concat(args));
|
|
45
41
|
}
|
|
46
|
-
|
|
47
42
|
return Object.assign(props, updated);
|
|
48
|
-
};
|
|
49
|
-
|
|
43
|
+
};
|
|
50
44
|
|
|
45
|
+
// maintain compatibility with 1.x
|
|
51
46
|
if (optProps) {
|
|
52
47
|
return renderComputed(optProps);
|
|
53
48
|
}
|
|
54
|
-
|
|
55
49
|
return renderComputed;
|
|
56
50
|
};
|
|
57
|
-
|
|
58
51
|
exports.computed = computed;
|
|
59
52
|
var _default = computed;
|
|
60
53
|
exports["default"] = _default;
|