@micromag/core 0.3.63 → 0.3.67
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 +6 -4
- package/es/contexts.js +5 -6
- package/es/utils.js +23 -2
- package/lib/components.js +6 -4
- package/lib/contexts.js +5 -6
- package/lib/utils.js +23 -2
- 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;
|
|
@@ -562,9 +566,7 @@ var Form = function Form(_ref) {
|
|
|
562
566
|
}
|
|
563
567
|
}, [fieldPaths, setFieldPaths]);
|
|
564
568
|
var closeFieldForm = useCallback(function () {
|
|
565
|
-
var newFields =
|
|
566
|
-
|
|
567
|
-
newFields.pop();
|
|
569
|
+
var newFields = fieldPaths !== null && fieldPaths.length > 0 ? fieldPaths.slice(-1)[0] : [];
|
|
568
570
|
setFieldPaths(_toConsumableArray(newFields));
|
|
569
571
|
|
|
570
572
|
if (onCloseFieldForm !== null) {
|
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
|
};
|
|
@@ -492,7 +491,7 @@ var propTypes$b = {
|
|
|
492
491
|
customFonts: PropTypes$1.fonts
|
|
493
492
|
};
|
|
494
493
|
var defaultProps$b = {
|
|
495
|
-
systemFonts: ['Arial', 'Courier', 'Georgia', 'Times New Roman', 'Verdana'],
|
|
494
|
+
systemFonts: ['Arial', 'Courier New', 'Georgia', 'Times New Roman', 'Verdana'],
|
|
496
495
|
customFonts: null
|
|
497
496
|
};
|
|
498
497
|
var FontsProvider = function FontsProvider(_ref4) {
|
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,
|
|
@@ -430,7 +431,8 @@ var getStyleFromBox = function getStyleFromBox(value) {
|
|
|
430
431
|
backgroundColor = _value$backgroundColo === void 0 ? null : _value$backgroundColo,
|
|
431
432
|
_value$borderRadius = value.borderRadius,
|
|
432
433
|
borderRadius = _value$borderRadius === void 0 ? null : _value$borderRadius,
|
|
433
|
-
padding = value.padding,
|
|
434
|
+
_value$padding = value.padding,
|
|
435
|
+
paddingValue = _value$padding === void 0 ? null : _value$padding,
|
|
434
436
|
_value$borderWidth = value.borderWidth,
|
|
435
437
|
borderWidth = _value$borderWidth === void 0 ? null : _value$borderWidth,
|
|
436
438
|
_value$borderStyle = value.borderStyle,
|
|
@@ -442,9 +444,28 @@ var getStyleFromBox = function getStyleFromBox(value) {
|
|
|
442
444
|
style: borderStyle,
|
|
443
445
|
color: borderColor
|
|
444
446
|
};
|
|
447
|
+
|
|
448
|
+
var _ref = isObject(paddingValue) ? paddingValue : {
|
|
449
|
+
padding: paddingValue
|
|
450
|
+
},
|
|
451
|
+
_ref$top = _ref.top,
|
|
452
|
+
paddingTop = _ref$top === void 0 ? null : _ref$top,
|
|
453
|
+
_ref$right = _ref.right,
|
|
454
|
+
paddingRight = _ref$right === void 0 ? null : _ref$right,
|
|
455
|
+
_ref$bottom = _ref.bottom,
|
|
456
|
+
paddingBottom = _ref$bottom === void 0 ? null : _ref$bottom,
|
|
457
|
+
_ref$left = _ref.left,
|
|
458
|
+
paddingLeft = _ref$left === void 0 ? null : _ref$left,
|
|
459
|
+
_ref$padding = _ref.padding,
|
|
460
|
+
padding = _ref$padding === void 0 ? null : _ref$padding;
|
|
461
|
+
|
|
445
462
|
return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, getStyleFromColor(backgroundColor, 'backgroundColor')), borderRadius !== null ? {
|
|
446
463
|
borderRadius: borderRadius
|
|
447
464
|
} : null), getStyleFromBorder(border)), {}, {
|
|
465
|
+
paddingTop: paddingTop,
|
|
466
|
+
paddingRight: paddingRight,
|
|
467
|
+
paddingBottom: paddingBottom,
|
|
468
|
+
paddingLeft: paddingLeft,
|
|
448
469
|
padding: padding
|
|
449
470
|
});
|
|
450
471
|
};
|
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;
|
|
@@ -585,9 +589,7 @@ var Form = function Form(_ref) {
|
|
|
585
589
|
}
|
|
586
590
|
}, [fieldPaths, setFieldPaths]);
|
|
587
591
|
var closeFieldForm = React.useCallback(function () {
|
|
588
|
-
var newFields =
|
|
589
|
-
|
|
590
|
-
newFields.pop();
|
|
592
|
+
var newFields = fieldPaths !== null && fieldPaths.length > 0 ? fieldPaths.slice(-1)[0] : [];
|
|
591
593
|
setFieldPaths(_toConsumableArray__default["default"](newFields));
|
|
592
594
|
|
|
593
595
|
if (onCloseFieldForm !== null) {
|
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
|
};
|
|
@@ -527,7 +526,7 @@ var propTypes$b = {
|
|
|
527
526
|
customFonts: core.PropTypes.fonts
|
|
528
527
|
};
|
|
529
528
|
var defaultProps$b = {
|
|
530
|
-
systemFonts: ['Arial', 'Courier', 'Georgia', 'Times New Roman', 'Verdana'],
|
|
529
|
+
systemFonts: ['Arial', 'Courier New', 'Georgia', 'Times New Roman', 'Verdana'],
|
|
531
530
|
customFonts: null
|
|
532
531
|
};
|
|
533
532
|
var FontsProvider = function FontsProvider(_ref4) {
|
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,
|
|
@@ -447,7 +448,8 @@ var getStyleFromBox = function getStyleFromBox(value) {
|
|
|
447
448
|
backgroundColor = _value$backgroundColo === void 0 ? null : _value$backgroundColo,
|
|
448
449
|
_value$borderRadius = value.borderRadius,
|
|
449
450
|
borderRadius = _value$borderRadius === void 0 ? null : _value$borderRadius,
|
|
450
|
-
padding = value.padding,
|
|
451
|
+
_value$padding = value.padding,
|
|
452
|
+
paddingValue = _value$padding === void 0 ? null : _value$padding,
|
|
451
453
|
_value$borderWidth = value.borderWidth,
|
|
452
454
|
borderWidth = _value$borderWidth === void 0 ? null : _value$borderWidth,
|
|
453
455
|
_value$borderStyle = value.borderStyle,
|
|
@@ -459,9 +461,28 @@ var getStyleFromBox = function getStyleFromBox(value) {
|
|
|
459
461
|
style: borderStyle,
|
|
460
462
|
color: borderColor
|
|
461
463
|
};
|
|
464
|
+
|
|
465
|
+
var _ref = isObject__default["default"](paddingValue) ? paddingValue : {
|
|
466
|
+
padding: paddingValue
|
|
467
|
+
},
|
|
468
|
+
_ref$top = _ref.top,
|
|
469
|
+
paddingTop = _ref$top === void 0 ? null : _ref$top,
|
|
470
|
+
_ref$right = _ref.right,
|
|
471
|
+
paddingRight = _ref$right === void 0 ? null : _ref$right,
|
|
472
|
+
_ref$bottom = _ref.bottom,
|
|
473
|
+
paddingBottom = _ref$bottom === void 0 ? null : _ref$bottom,
|
|
474
|
+
_ref$left = _ref.left,
|
|
475
|
+
paddingLeft = _ref$left === void 0 ? null : _ref$left,
|
|
476
|
+
_ref$padding = _ref.padding,
|
|
477
|
+
padding = _ref$padding === void 0 ? null : _ref$padding;
|
|
478
|
+
|
|
462
479
|
return _objectSpread__default["default"](_objectSpread__default["default"](_objectSpread__default["default"](_objectSpread__default["default"]({}, getStyleFromColor(backgroundColor, 'backgroundColor')), borderRadius !== null ? {
|
|
463
480
|
borderRadius: borderRadius
|
|
464
481
|
} : null), getStyleFromBorder(border)), {}, {
|
|
482
|
+
paddingTop: paddingTop,
|
|
483
|
+
paddingRight: paddingRight,
|
|
484
|
+
paddingBottom: paddingBottom,
|
|
485
|
+
paddingLeft: paddingLeft,
|
|
465
486
|
padding: padding
|
|
466
487
|
});
|
|
467
488
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@micromag/core",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.67",
|
|
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": "f78a94a94a05f1f60f97b48b9cb4477b6ceae14c"
|
|
136
136
|
}
|