@micromag/element-button 0.3.69 → 0.3.74

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 (3) hide show
  1. package/es/index.js +19 -13
  2. package/lib/index.js +19 -13
  3. package/package.json +3 -3
package/es/index.js CHANGED
@@ -11,7 +11,8 @@ import { getStyleFromText, getStyleFromBox } from '@micromag/core/utils';
11
11
  var styles = {"container":"micromag-element-button-container","active":"micromag-element-button-active","focus":"micromag-element-button-focus","disabled":"micromag-element-button-disabled","border":"micromag-element-button-border"};
12
12
 
13
13
  var _excluded = ["textStyle", "buttonStyle", "type", "disabled", "focusable", "separateBorder", "onClick", "children", "className", "refButton"],
14
- _excluded2 = ["borderRadius", "borderWidth", "borderColor", "borderStyle"];
14
+ _excluded2 = ["body"],
15
+ _excluded3 = ["borderRadius", "borderWidth", "borderColor", "borderStyle"];
15
16
  var propTypes = {
16
17
  textStyle: PropTypes.textStyle,
17
18
  buttonStyle: PropTypes.boxStyle,
@@ -54,7 +55,11 @@ var Button = function Button(_ref) {
54
55
  buttonProps = _objectWithoutProperties(_ref, _excluded);
55
56
 
56
57
  var finalStyles = null;
57
- var borderStyles = null;
58
+ var borderStyles = null; // eslint-disable-next-line no-unused-vars
59
+
60
+ var _ref2 = buttonProps || {};
61
+ _ref2.body;
62
+ var otherProps = _objectWithoutProperties(_ref2, _excluded2);
58
63
 
59
64
  if (textStyle !== null) {
60
65
  finalStyles = _objectSpread(_objectSpread({}, finalStyles), getStyleFromText(textStyle));
@@ -65,16 +70,16 @@ var Button = function Button(_ref) {
65
70
  }
66
71
 
67
72
  if (separateBorder) {
68
- var _ref2 = finalStyles || {},
69
- _ref2$borderRadius = _ref2.borderRadius,
70
- borderRadius = _ref2$borderRadius === void 0 ? null : _ref2$borderRadius,
71
- _ref2$borderWidth = _ref2.borderWidth,
72
- borderWidth = _ref2$borderWidth === void 0 ? null : _ref2$borderWidth,
73
- _ref2$borderColor = _ref2.borderColor,
74
- borderColor = _ref2$borderColor === void 0 ? null : _ref2$borderColor,
75
- _ref2$borderStyle = _ref2.borderStyle,
76
- borderStyle = _ref2$borderStyle === void 0 ? null : _ref2$borderStyle,
77
- otherStyles = _objectWithoutProperties(_ref2, _excluded2);
73
+ var _ref3 = finalStyles || {},
74
+ _ref3$borderRadius = _ref3.borderRadius,
75
+ borderRadius = _ref3$borderRadius === void 0 ? null : _ref3$borderRadius,
76
+ _ref3$borderWidth = _ref3.borderWidth,
77
+ borderWidth = _ref3$borderWidth === void 0 ? null : _ref3$borderWidth,
78
+ _ref3$borderColor = _ref3.borderColor,
79
+ borderColor = _ref3$borderColor === void 0 ? null : _ref3$borderColor,
80
+ _ref3$borderStyle = _ref3.borderStyle,
81
+ borderStyle = _ref3$borderStyle === void 0 ? null : _ref3$borderStyle,
82
+ otherStyles = _objectWithoutProperties(_ref3, _excluded3);
78
83
 
79
84
  finalStyles = _objectSpread(_objectSpread({}, otherStyles), {}, {
80
85
  borderRadius: borderRadius
@@ -88,6 +93,7 @@ var Button = function Button(_ref) {
88
93
  };
89
94
  }
90
95
 
96
+ console.log(finalStyles);
91
97
  var button = /*#__PURE__*/React.createElement(Button$1, Object.assign({
92
98
  className: classNames([styles.container, _defineProperty({}, className, className !== null)]),
93
99
  disabled: disabled,
@@ -96,7 +102,7 @@ var Button = function Button(_ref) {
96
102
  refButton: refButton,
97
103
  type: type,
98
104
  focusable: focusable
99
- }, buttonProps), children);
105
+ }, otherProps), children);
100
106
  return borderStyles !== null ? /*#__PURE__*/React.createElement("div", {
101
107
  className: styles.border,
102
108
  style: borderStyles
package/lib/index.js CHANGED
@@ -22,7 +22,8 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
22
22
  var styles = {"container":"micromag-element-button-container","active":"micromag-element-button-active","focus":"micromag-element-button-focus","disabled":"micromag-element-button-disabled","border":"micromag-element-button-border"};
23
23
 
24
24
  var _excluded = ["textStyle", "buttonStyle", "type", "disabled", "focusable", "separateBorder", "onClick", "children", "className", "refButton"],
25
- _excluded2 = ["borderRadius", "borderWidth", "borderColor", "borderStyle"];
25
+ _excluded2 = ["body"],
26
+ _excluded3 = ["borderRadius", "borderWidth", "borderColor", "borderStyle"];
26
27
  var propTypes = {
27
28
  textStyle: core.PropTypes.textStyle,
28
29
  buttonStyle: core.PropTypes.boxStyle,
@@ -65,7 +66,11 @@ var Button = function Button(_ref) {
65
66
  buttonProps = _objectWithoutProperties__default["default"](_ref, _excluded);
66
67
 
67
68
  var finalStyles = null;
68
- var borderStyles = null;
69
+ var borderStyles = null; // eslint-disable-next-line no-unused-vars
70
+
71
+ var _ref2 = buttonProps || {};
72
+ _ref2.body;
73
+ var otherProps = _objectWithoutProperties__default["default"](_ref2, _excluded2);
69
74
 
70
75
  if (textStyle !== null) {
71
76
  finalStyles = _objectSpread__default["default"](_objectSpread__default["default"]({}, finalStyles), utils.getStyleFromText(textStyle));
@@ -76,16 +81,16 @@ var Button = function Button(_ref) {
76
81
  }
77
82
 
78
83
  if (separateBorder) {
79
- var _ref2 = finalStyles || {},
80
- _ref2$borderRadius = _ref2.borderRadius,
81
- borderRadius = _ref2$borderRadius === void 0 ? null : _ref2$borderRadius,
82
- _ref2$borderWidth = _ref2.borderWidth,
83
- borderWidth = _ref2$borderWidth === void 0 ? null : _ref2$borderWidth,
84
- _ref2$borderColor = _ref2.borderColor,
85
- borderColor = _ref2$borderColor === void 0 ? null : _ref2$borderColor,
86
- _ref2$borderStyle = _ref2.borderStyle,
87
- borderStyle = _ref2$borderStyle === void 0 ? null : _ref2$borderStyle,
88
- otherStyles = _objectWithoutProperties__default["default"](_ref2, _excluded2);
84
+ var _ref3 = finalStyles || {},
85
+ _ref3$borderRadius = _ref3.borderRadius,
86
+ borderRadius = _ref3$borderRadius === void 0 ? null : _ref3$borderRadius,
87
+ _ref3$borderWidth = _ref3.borderWidth,
88
+ borderWidth = _ref3$borderWidth === void 0 ? null : _ref3$borderWidth,
89
+ _ref3$borderColor = _ref3.borderColor,
90
+ borderColor = _ref3$borderColor === void 0 ? null : _ref3$borderColor,
91
+ _ref3$borderStyle = _ref3.borderStyle,
92
+ borderStyle = _ref3$borderStyle === void 0 ? null : _ref3$borderStyle,
93
+ otherStyles = _objectWithoutProperties__default["default"](_ref3, _excluded3);
89
94
 
90
95
  finalStyles = _objectSpread__default["default"](_objectSpread__default["default"]({}, otherStyles), {}, {
91
96
  borderRadius: borderRadius
@@ -99,6 +104,7 @@ var Button = function Button(_ref) {
99
104
  };
100
105
  }
101
106
 
107
+ console.log(finalStyles);
102
108
  var button = /*#__PURE__*/React__default["default"].createElement(components.Button, Object.assign({
103
109
  className: classNames__default["default"]([styles.container, _defineProperty__default["default"]({}, className, className !== null)]),
104
110
  disabled: disabled,
@@ -107,7 +113,7 @@ var Button = function Button(_ref) {
107
113
  refButton: refButton,
108
114
  type: type,
109
115
  focusable: focusable
110
- }, buttonProps), children);
116
+ }, otherProps), children);
111
117
  return borderStyles !== null ? /*#__PURE__*/React__default["default"].createElement("div", {
112
118
  className: styles.border,
113
119
  style: borderStyles
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@micromag/element-button",
3
- "version": "0.3.69",
3
+ "version": "0.3.74",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "javascript"
@@ -49,7 +49,7 @@
49
49
  },
50
50
  "dependencies": {
51
51
  "@babel/runtime": "^7.13.10",
52
- "@micromag/core": "^0.3.69",
52
+ "@micromag/core": "^0.3.74",
53
53
  "classnames": "^2.2.6",
54
54
  "prop-types": "^15.7.2",
55
55
  "react-intl": "^5.12.1",
@@ -58,5 +58,5 @@
58
58
  "publishConfig": {
59
59
  "access": "public"
60
60
  },
61
- "gitHead": "c69c85dbe321ddcd2d57f5d972b456ab76b5da3e"
61
+ "gitHead": "c85b6b4ca7ff2162222291ca6ccaae79789c8db6"
62
62
  }