@hipay/hipay-material-ui 3.3.0 → 3.4.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -23,10 +23,15 @@ var _styles = require("@material-ui/core/styles");
23
23
 
24
24
  var _helpers = require("../utils/helpers");
25
25
 
26
+ var _HiButton = _interopRequireDefault(require("../HiButton"));
27
+
26
28
  var styles = function styles() {
27
29
  return {
28
30
  wrapper: {
29
31
  textAlign: 'right'
32
+ },
33
+ button: {
34
+ padding: '1px 5px'
30
35
  }
31
36
  };
32
37
  };
@@ -56,7 +61,10 @@ function (_React$PureComponent) {
56
61
  locale = _this$props.locale,
57
62
  currency = _this$props.currency,
58
63
  view = _this$props.view,
59
- precision = _this$props.precision;
64
+ precision = _this$props.precision,
65
+ isButton = _this$props.isButton,
66
+ onClick = _this$props.onClick,
67
+ rowId = _this$props.rowId;
60
68
  var displayedValue = '';
61
69
  var title = '';
62
70
 
@@ -68,10 +76,21 @@ function (_React$PureComponent) {
68
76
  title = (0, _helpers.formatNumber)(value, 'l', locale, precision);
69
77
  }
70
78
 
79
+ var content = displayedValue;
80
+
81
+ if (isButton) {
82
+ content = _react.default.createElement(_HiButton.default, {
83
+ onClick: onClick(rowId),
84
+ size: "small",
85
+ className: classes.button,
86
+ variant: "text"
87
+ }, displayedValue);
88
+ }
89
+
71
90
  return _react.default.createElement("div", {
72
91
  className: classes.wrapper,
73
92
  title: title
74
- }, displayedValue);
93
+ }, content);
75
94
  }
76
95
  }]);
77
96
  return CellNumeric;
@@ -141,7 +141,8 @@ function (_React$Component) {
141
141
  classes = _this$props.classes,
142
142
  label = _this$props.label,
143
143
  ellipsis = _this$props.ellipsis,
144
- color = _this$props.color;
144
+ color = _this$props.color,
145
+ title = _this$props.title;
145
146
  var start;
146
147
  var end;
147
148
  var valueElement = '';
@@ -162,7 +163,8 @@ function (_React$Component) {
162
163
  valueElement = _react.default.createElement("div", {
163
164
  ref: function ref(div) {
164
165
  _this2.cellText = div;
165
- }
166
+ },
167
+ title: title
166
168
  }, _react.default.createElement("span", {
167
169
  className: classes.rightEllipsisSpan
168
170
  }, "".concat(start, " ")), _react.default.createElement("span", {
@@ -177,7 +179,8 @@ function (_React$Component) {
177
179
  valueElement = _react.default.createElement("div", {
178
180
  ref: function ref(div) {
179
181
  _this2.cellText = div;
180
- }
182
+ },
183
+ title: title
181
184
  }, _react.default.createElement("span", {
182
185
  className: classes.noEllipsisSpan
183
186
  }, start), _react.default.createElement("span", {
@@ -194,7 +197,8 @@ function (_React$Component) {
194
197
  className: classes.leftEllipsisSpan,
195
198
  style: {
196
199
  width: '100%'
197
- }
200
+ },
201
+ title: title
198
202
  }, valueString);
199
203
  break;
200
204
 
@@ -208,7 +212,8 @@ function (_React$Component) {
208
212
  className: classes.rightEllipsisSpan,
209
213
  style: {
210
214
  width: '100%'
211
- }
215
+ },
216
+ title: title
212
217
  }, valueString);
213
218
  break;
214
219
  }
@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
11
+
10
12
  var _react = _interopRequireDefault(require("react"));
11
13
 
12
14
  var _HiColoredLabel = _interopRequireDefault(require("../HiColoredLabel"));
@@ -45,9 +47,11 @@ var styleButton = {
45
47
  * @param label
46
48
  * @param color
47
49
  * @param isButton
50
+ * @param onClick
48
51
  * @param value
49
52
  * @param active
50
53
  * @param title
54
+ * @param align
51
55
  * @returns {*}
52
56
  * @constructor
53
57
  */
@@ -62,7 +66,9 @@ var CellTextStyled = function CellTextStyled(_ref) {
62
66
  _ref$active = _ref.active,
63
67
  active = _ref$active === void 0 ? false : _ref$active,
64
68
  _ref$title = _ref.title,
65
- title = _ref$title === void 0 ? '' : _ref$title;
69
+ title = _ref$title === void 0 ? '' : _ref$title,
70
+ _ref$align = _ref.align,
71
+ align = _ref$align === void 0 ? 'left' : _ref$align;
66
72
  var valueString = label ? label.toString() : value.toString();
67
73
 
68
74
  if (isButton) {
@@ -75,6 +81,16 @@ var CellTextStyled = function CellTextStyled(_ref) {
75
81
  }, valueString);
76
82
  }
77
83
 
84
+ if (align === 'right') {
85
+ styleRoot = (0, _objectSpread2.default)({}, styleRoot, {
86
+ textAlign: 'right'
87
+ });
88
+ } else {
89
+ styleRoot = (0, _objectSpread2.default)({}, styleRoot, {
90
+ textAlign: 'left'
91
+ });
92
+ }
93
+
78
94
  return _react.default.createElement("div", {
79
95
  style: styleRoot,
80
96
  title: title || valueString
@@ -82,7 +98,8 @@ var CellTextStyled = function CellTextStyled(_ref) {
82
98
  style: styleColorLabel,
83
99
  label: valueString,
84
100
  color: color,
85
- active: active
101
+ active: active,
102
+ fontSize: 13
86
103
  }) : _react.default.createElement("div", {
87
104
  style: styleLabel
88
105
  }, valueString));
package/HiChip/HiChip.js CHANGED
@@ -173,6 +173,27 @@ var HiChip = function HiChip(props) {
173
173
  }
174
174
  }
175
175
 
176
+ var chipLabelIcon;
177
+
178
+ if (labelIcon) {
179
+ var _iconProps = {
180
+ className: classes.icon,
181
+ id: "".concat(id, "-labelIcon"),
182
+ size: iconSize,
183
+ title: titleIcon,
184
+ tabIndex: -1
185
+ };
186
+
187
+ if (typeof labelIcon === 'string') {
188
+ chipLabelIcon = _react.default.createElement(_HiIcon.default, (0, _extends2.default)({
189
+ icon: labelIcon
190
+ }, _iconProps));
191
+ } else if ((0, _typeof2.default)(labelIcon) === 'object') {
192
+ chipLabelIcon = (0, _objectSpread2.default)({}, labelIcon);
193
+ chipLabelIcon.props = (0, _objectSpread2.default)({}, _iconProps);
194
+ }
195
+ }
196
+
176
197
  return _react.default.createElement("div", {
177
198
  id: id,
178
199
  role: 'button',
@@ -198,14 +219,7 @@ var HiChip = function HiChip(props) {
198
219
  }
199
220
  },
200
221
  title: titleImg
201
- }), labelIcon && _react.default.createElement(_HiIcon.default, {
202
- className: (0, _classnames.default)(classes.icon),
203
- id: "".concat(id, "-labelIcon"),
204
- icon: labelIcon,
205
- size: iconSize,
206
- title: titleIcon,
207
- tabIndex: -1
208
- }), onPrevious && _react.default.createElement(_HiIcon.default, {
222
+ }), labelIcon && chipLabelIcon, onPrevious && _react.default.createElement(_HiIcon.default, {
209
223
  className: (0, _classnames.default)(classes.navigate),
210
224
  id: "".concat(id, "-previous"),
211
225
  icon: "arrow_left",
@@ -378,8 +378,8 @@ function (_React$Component) {
378
378
  });
379
379
 
380
380
  if (selectedOption) {
381
- this.props.onChange('from', new Date(selectedOption.from.format('YYYY-MM-DD HH:mm:ss')));
382
- this.props.onChange('to', new Date(selectedOption.to.format('YYYY-MM-DD HH:mm:ss')));
381
+ this.props.onChange('from', selectedOption.from.toDate());
382
+ this.props.onChange('to', selectedOption.to.toDate());
383
383
  this.props.onChange('fromError', false);
384
384
  this.props.onChange('toError', false);
385
385
  }
@@ -49,7 +49,7 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
49
49
  borderBottom: '1px solid #E3E6E7',
50
50
  height: 48,
51
51
  minHeight: 48,
52
- padding: '0 0 0 8px',
52
+ padding: 0,
53
53
  '&$expanded': {
54
54
  minHeight: 48
55
55
  }
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.default = exports.styles = void 0;
8
+ exports.default = exports.useStyles = void 0;
9
9
 
10
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
11
11
 
@@ -24,81 +24,56 @@ var _colorManipulator = require("@material-ui/core/styles/colorManipulator");
24
24
  var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
25
25
 
26
26
  // @inheritedComponent IconButton
27
- var styles = function styles(theme) {
27
+ var useStyles = (0, _styles.makeStyles)(function (theme) {
28
28
  return {
29
29
  label: {},
30
- positive: {
31
- color: theme.palette.positive.main,
32
- '&:hover': {
33
- backgroundColor: (0, _colorManipulator.fade)(theme.palette.positive.main, theme.palette.action.hoverOpacity),
34
- // Reset on touch devices, it doesn't add specificity
35
- '@media (hover: none)': {
36
- backgroundColor: 'transparent'
37
- }
38
- }
39
- },
40
- negative: {
41
- color: theme.palette.negative.main,
42
- '&:hover': {
43
- backgroundColor: (0, _colorManipulator.fade)(theme.palette.negative.main, theme.palette.action.hoverOpacity),
44
- // Reset on touch devices, it doesn't add specificity
45
- '@media (hover: none)': {
46
- backgroundColor: 'transparent'
47
- }
48
- }
49
- },
50
- middle: {
51
- color: theme.palette.middle.main,
52
- '&:hover': {
53
- backgroundColor: (0, _colorManipulator.fade)(theme.palette.middle.main, theme.palette.action.hoverOpacity),
54
- // Reset on touch devices, it doesn't add specificity
55
- '@media (hover: none)': {
56
- backgroundColor: 'transparent'
57
- }
30
+ rootCustomColor: function rootCustomColor(props) {
31
+ var color;
32
+
33
+ if (theme.palette[props.color]) {
34
+ color = theme.palette[props.color].main;
35
+ } else if (props.color.charAt(0) === "#") {
36
+ color = props.color;
58
37
  }
59
- },
60
- neutral: {
61
- color: theme.palette.neutral.main,
62
- '&:hover': {
63
- backgroundColor: (0, _colorManipulator.fade)(theme.palette.neutral.main, theme.palette.action.hoverOpacity),
64
- // Reset on touch devices, it doesn't add specificity
65
- '@media (hover: none)': {
66
- backgroundColor: 'transparent'
38
+
39
+ if (!color) return {};
40
+ return {
41
+ color: color,
42
+ '&:hover': {
43
+ backgroundColor: (0, _colorManipulator.fade)(color, theme.palette.action.hoverOpacity),
44
+ // Reset on touch devices, it doesn't add specificity
45
+ '@media (hover: none)': {
46
+ backgroundColor: 'transparent'
47
+ }
67
48
  }
68
- }
49
+ };
69
50
  }
70
51
  };
71
- };
72
-
73
- exports.styles = styles;
52
+ });
53
+ exports.useStyles = useStyles;
74
54
 
75
55
  function HiIconButton(props) {
76
- var _classNames;
77
-
78
56
  var children = props.children,
79
- classes = props.classes,
80
57
  className = props.className,
81
58
  color = props.color,
82
- other = (0, _objectWithoutProperties2.default)(props, ["children", "classes", "className", "color"]);
83
- var hcolor = ['positive', 'negative', 'middle', 'neutral'].includes(color) ? 'inherit' : color;
84
- var buttonClassNames = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, classes.positive, color === 'positive'), (0, _defineProperty2.default)(_classNames, classes.negative, color === 'negative'), (0, _defineProperty2.default)(_classNames, classes.middle, color === 'middle'), (0, _defineProperty2.default)(_classNames, classes.neutral, color === 'neutral'), _classNames));
59
+ other = (0, _objectWithoutProperties2.default)(props, ["children", "className", "color"]);
60
+ var classes = useStyles(props);
61
+ var isHexColor = color.charAt(0) === "#";
62
+ var isExtendedColor = ['positive', 'negative', 'middle', 'neutral'].includes(color);
63
+ var isCustomColor = isHexColor || isExtendedColor;
64
+ var rootClassNames = (0, _classnames.default)((0, _defineProperty2.default)({}, classes.rootCustomColor, isCustomColor));
85
65
  return _react.default.createElement(_IconButton.default, (0, _extends2.default)({
86
66
  className: className,
87
67
  classes: {
88
- root: buttonClassNames,
68
+ root: rootClassNames,
89
69
  label: classes.label
90
70
  },
91
- color: hcolor
71
+ color: isCustomColor ? 'inherit' : color
92
72
  }, other), children);
93
73
  }
94
74
 
95
75
  HiIconButton.defaultProps = {
96
76
  color: 'default'
97
77
  };
98
-
99
- var _default = (0, _styles.withStyles)(styles, {
100
- hiComponent: true,
101
- name: 'HmuiHiIconButton'
102
- })(HiIconButton);
103
-
78
+ var _default = HiIconButton;
104
79
  exports.default = _default;
@@ -19,14 +19,6 @@ var _ListItem = _interopRequireDefault(require("@material-ui/core/ListItem"));
19
19
 
20
20
  var _ArrowRight = _interopRequireDefault(require("@material-ui/icons/ArrowRight"));
21
21
 
22
- var _Cancel = _interopRequireDefault(require("@material-ui/icons/Cancel"));
23
-
24
- var _CheckCircle = _interopRequireDefault(require("@material-ui/icons/CheckCircle"));
25
-
26
- var _Error = _interopRequireDefault(require("@material-ui/icons/Error"));
27
-
28
- var _RemoveCircle = _interopRequireDefault(require("@material-ui/icons/RemoveCircle"));
29
-
30
22
  var useStyles = (0, _styles.makeStyles)(function (theme) {
31
23
  return {
32
24
  root: function root(props) {
@@ -78,55 +70,15 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
78
70
  };
79
71
  });
80
72
 
81
- var StatusIcon = function StatusIcon(_ref) {
82
- var disabled = _ref.disabled,
83
- status = _ref.status;
84
- var theme = (0, _styles.useTheme)();
85
- var Icon, color;
86
-
87
- switch (status) {
88
- case "done":
89
- Icon = _CheckCircle.default;
90
- color = theme.palette.positive.main;
91
- break;
92
-
93
- case "error":
94
- Icon = _Cancel.default;
95
- color = theme.palette.negative.main;
96
- break;
97
-
98
- case "warning":
99
- Icon = _Error.default;
100
- color = theme.palette.middle.main;
101
- break;
102
-
103
- case "in_progress":
104
- Icon = _RemoveCircle.default;
105
- color = theme.palette.primary.main;
106
- break;
107
-
108
- default:
109
- return null;
110
- }
111
-
112
- if (disabled) {
113
- color = theme.palette.neutral.light;
114
- }
115
-
116
- return _react.default.createElement(Icon, {
117
- htmlColor: color
118
- });
119
- };
120
-
121
- var _ref2 = _react.default.createElement(_ArrowRight.default, null);
73
+ var _ref = _react.default.createElement(_ArrowRight.default, null);
122
74
 
123
75
  var HiListItemLink = _react.default.forwardRef(function (props, ref) {
124
76
  var disabled = props.disabled,
125
77
  info = props.info,
126
78
  primary = props.primary,
127
79
  secondary = props.secondary,
128
- status = props.status,
129
- others = (0, _objectWithoutProperties2.default)(props, ["disabled", "info", "primary", "secondary", "status"]);
80
+ icon = props.icon,
81
+ others = (0, _objectWithoutProperties2.default)(props, ["disabled", "info", "primary", "secondary", "icon"]);
130
82
  var classes = useStyles(props);
131
83
  return _react.default.createElement(_ListItem.default, (0, _extends2.default)({
132
84
  ref: ref,
@@ -140,12 +92,15 @@ var HiListItemLink = _react.default.forwardRef(function (props, ref) {
140
92
  className: classes.secondary
141
93
  }, secondary), info && _react.default.createElement("div", {
142
94
  className: classes.info
143
- }, info), status && _react.default.createElement(StatusIcon, {
144
- disabled: disabled,
145
- status: status
146
- }), _ref2);
95
+ }, info), icon, _ref);
147
96
  });
148
97
 
149
- HiListItemLink.defaultProps = {};
98
+ HiListItemLink.defaultProps = {
99
+ disabled: false,
100
+ info: null,
101
+ onClick: null,
102
+ secondary: null,
103
+ icon: null
104
+ };
150
105
  var _default = HiListItemLink;
151
106
  exports.default = _default;
@@ -11,15 +11,33 @@ var _react = _interopRequireDefault(require("react"));
11
11
 
12
12
  var _SvgIcon = _interopRequireDefault(require("@material-ui/core/SvgIcon"));
13
13
 
14
- var _ref = _react.default.createElement(_SvgIcon.default, null, _react.default.createElement("circle", {
14
+ var _styles = require("@material-ui/core/styles");
15
+
16
+ /**
17
+ * Custom style for SvgIcon
18
+ */
19
+ var useStyles = (0, _styles.makeStyles)(function (theme) {
20
+ return {
21
+ root: {
22
+ width: 20,
23
+ height: 20
24
+ }
25
+ };
26
+ });
27
+
28
+ var _ref = _react.default.createElement("circle", {
15
29
  cx: "10",
16
30
  cy: "10",
17
- r: "3",
31
+ r: "2",
18
32
  fill: "white"
19
- }));
33
+ });
20
34
 
21
35
  var DefaultIndicator = function DefaultIndicator() {
22
- return _ref;
36
+ var classes = useStyles();
37
+ return _react.default.createElement(_SvgIcon.default, {
38
+ className: classes.root,
39
+ viewBox: "0 0 20 20"
40
+ }, _ref);
23
41
  };
24
42
 
25
43
  var _default = DefaultIndicator;
@@ -50,10 +50,9 @@ var HiStepIcon = function HiStepIcon(_ref) {
50
50
  borderRadius: "50%",
51
51
  width: 20,
52
52
  height: 20,
53
- padding: 2,
54
53
  lineHeight: "20px",
55
54
  fontWeight: 600,
56
- fontSize: 14
55
+ fontSize: 13
57
56
  };
58
57
  }, [color]); // get component from status
59
58
 
@@ -101,7 +100,7 @@ var useStepButtonStyle = (0, _styles.makeStyles)(function (theme) {
101
100
  var useStepContentStyle = (0, _styles.makeStyles)(function (theme) {
102
101
  return {
103
102
  root: {
104
- marginLeft: 11,
103
+ marginLeft: 9,
105
104
  marginTop: 0,
106
105
  textAlign: "left",
107
106
  borderLeft: "2px solid ".concat(theme.palette.neutral.light)
@@ -119,7 +118,8 @@ var useStepLabelStyle = (0, _styles.makeStyles)(function (theme) {
119
118
  return {
120
119
  label: (0, _objectSpread2.default)({}, theme.typography.button, {
121
120
  fontWeight: '600 !important',
122
- color: "inherit !important"
121
+ color: "inherit !important",
122
+ fontSize: '13px'
123
123
  }),
124
124
  active: {},
125
125
  completed: {}
@@ -26,7 +26,7 @@ var HiStepConnector = (0, _styles.withStyles)(function (theme) {
26
26
  backgroundColor: theme.palette.neutral.light,
27
27
  borderRadius: 2,
28
28
  width: 2,
29
- marginLeft: -1,
29
+ marginLeft: -3,
30
30
  marginTop: -1
31
31
  }
32
32
  };