@micromag/core 0.3.64 → 0.3.68
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/es/components.js +5 -1
- package/es/contexts.js +4 -5
- package/es/utils.js +2 -1
- package/lib/components.js +5 -1
- package/lib/contexts.js +4 -5
- package/lib/utils.js +2 -1
- package/package.json +2 -2
package/es/components.js
CHANGED
|
@@ -347,7 +347,11 @@ var FieldForm = function FieldForm(_ref) {
|
|
|
347
347
|
type = _ref2$type === void 0 ? null : _ref2$type,
|
|
348
348
|
fieldProps = _objectWithoutProperties(_ref2, _excluded$7);
|
|
349
349
|
|
|
350
|
-
var
|
|
350
|
+
var fieldDefinition = fieldsManager.getDefinition(type) || null;
|
|
351
|
+
|
|
352
|
+
var fieldData = fieldDefinition || _objectSpread({}, field);
|
|
353
|
+
|
|
354
|
+
var _ref3 = fieldData || {},
|
|
351
355
|
_ref3$component = _ref3.component,
|
|
352
356
|
fieldComponent = _ref3$component === void 0 ? null : _ref3$component;
|
|
353
357
|
_ref3.id;
|
package/es/contexts.js
CHANGED
|
@@ -46,13 +46,12 @@ var useComponents = function useComponents() {
|
|
|
46
46
|
var useComponent = function useComponent(name) {
|
|
47
47
|
var defaultComponent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
|
|
48
48
|
var namespace = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
|
|
49
|
-
|
|
50
|
-
if (!isString(name)) {
|
|
51
|
-
return name || defaultComponent;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
49
|
var manager = useComponentsManager(namespace);
|
|
55
50
|
return useMemo(function () {
|
|
51
|
+
if (!isString(name)) {
|
|
52
|
+
return name || defaultComponent;
|
|
53
|
+
}
|
|
54
|
+
|
|
56
55
|
return manager.getComponent(name) || defaultComponent;
|
|
57
56
|
}, [manager, name, defaultComponent]);
|
|
58
57
|
};
|
package/es/utils.js
CHANGED
|
@@ -152,8 +152,9 @@ var getFieldFromPath = function getFieldFromPath(path, fields, fieldManager) {
|
|
|
152
152
|
_foundField$itemsFiel = foundField.itemsField,
|
|
153
153
|
itemsField = _foundField$itemsFiel === void 0 ? null : _foundField$itemsFiel;
|
|
154
154
|
var finalType = field !== null ? field.type || type : type;
|
|
155
|
+
var definition = fieldManager.getDefinition(finalType);
|
|
155
156
|
|
|
156
|
-
var _ref = finalType !== null ?
|
|
157
|
+
var _ref = finalType !== null ? definition : foundField,
|
|
157
158
|
_ref$fields = _ref.fields,
|
|
158
159
|
subFields = _ref$fields === void 0 ? null : _ref$fields,
|
|
159
160
|
_ref$settings = _ref.settings,
|
package/lib/components.js
CHANGED
|
@@ -370,7 +370,11 @@ var FieldForm = function FieldForm(_ref) {
|
|
|
370
370
|
type = _ref2$type === void 0 ? null : _ref2$type,
|
|
371
371
|
fieldProps = _objectWithoutProperties__default["default"](_ref2, _excluded$7);
|
|
372
372
|
|
|
373
|
-
var
|
|
373
|
+
var fieldDefinition = fieldsManager.getDefinition(type) || null;
|
|
374
|
+
|
|
375
|
+
var fieldData = fieldDefinition || _objectSpread__default["default"]({}, field);
|
|
376
|
+
|
|
377
|
+
var _ref3 = fieldData || {},
|
|
374
378
|
_ref3$component = _ref3.component,
|
|
375
379
|
fieldComponent = _ref3$component === void 0 ? null : _ref3$component;
|
|
376
380
|
_ref3.id;
|
package/lib/contexts.js
CHANGED
|
@@ -81,13 +81,12 @@ var useComponents = function useComponents() {
|
|
|
81
81
|
var useComponent = function useComponent(name) {
|
|
82
82
|
var defaultComponent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
|
|
83
83
|
var namespace = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
|
|
84
|
-
|
|
85
|
-
if (!isString__default["default"](name)) {
|
|
86
|
-
return name || defaultComponent;
|
|
87
|
-
}
|
|
88
|
-
|
|
89
84
|
var manager = useComponentsManager(namespace);
|
|
90
85
|
return React.useMemo(function () {
|
|
86
|
+
if (!isString__default["default"](name)) {
|
|
87
|
+
return name || defaultComponent;
|
|
88
|
+
}
|
|
89
|
+
|
|
91
90
|
return manager.getComponent(name) || defaultComponent;
|
|
92
91
|
}, [manager, name, defaultComponent]);
|
|
93
92
|
};
|
package/lib/utils.js
CHANGED
|
@@ -169,8 +169,9 @@ var getFieldFromPath = function getFieldFromPath(path, fields, fieldManager) {
|
|
|
169
169
|
_foundField$itemsFiel = foundField.itemsField,
|
|
170
170
|
itemsField = _foundField$itemsFiel === void 0 ? null : _foundField$itemsFiel;
|
|
171
171
|
var finalType = field !== null ? field.type || type : type;
|
|
172
|
+
var definition = fieldManager.getDefinition(finalType);
|
|
172
173
|
|
|
173
|
-
var _ref = finalType !== null ?
|
|
174
|
+
var _ref = finalType !== null ? definition : foundField,
|
|
174
175
|
_ref$fields = _ref.fields,
|
|
175
176
|
subFields = _ref$fields === void 0 ? null : _ref$fields,
|
|
176
177
|
_ref$settings = _ref.settings,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@micromag/core",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.68",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"javascript"
|
|
@@ -132,5 +132,5 @@
|
|
|
132
132
|
"publishConfig": {
|
|
133
133
|
"access": "public"
|
|
134
134
|
},
|
|
135
|
-
"gitHead": "
|
|
135
|
+
"gitHead": "3f6e61d8a3340735f345a20d1f0f86e91c820d9a"
|
|
136
136
|
}
|