@hipay/hipay-material-ui 3.3.0 → 3.4.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -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
  };
@@ -65,141 +65,147 @@ function (_React$PureComponent) {
65
65
  _this = (0, _possibleConstructorReturn2.default)(this, (_getPrototypeOf2 = (0, _getPrototypeOf3.default)(HiCellBuilder)).call.apply(_getPrototypeOf2, [this].concat(args)));
66
66
 
67
67
  _this.createCell = function (cell, rowdata, locale) {
68
- if (rowdata.datas[cell.colId]) {
69
- var datacell = rowdata.datas[cell.colId];
68
+ if (typeof rowdata[cell.colId] !== 'undefined' || typeof rowdata.datas[cell.colId] !== 'undefined') {
69
+ var datacell = typeof rowdata[cell.colId] !== 'undefined' ? rowdata[cell.colId] : rowdata.datas[cell.colId];
70
70
 
71
- if (cell.data !== undefined) {
72
- var refproperties = cell.data.find(function (el) {
73
- return el.id === datacell.value;
74
- });
75
-
76
- if (refproperties) {
77
- Object.keys(refproperties).forEach(function (key) {
78
- datacell[key] = refproperties[key];
71
+ if (datacell !== null) {
72
+ if (cell.data !== undefined) {
73
+ var refproperties = cell.data.find(function (el) {
74
+ return el.id === datacell.value;
79
75
  });
80
- } else {
81
- datacell = undefined;
82
- }
83
- }
84
-
85
- if (datacell) {
86
- switch (cell.type) {
87
- case cst.TYPE_NUMERIC:
88
- case cst.TYPE_AMOUNT:
89
- return _react.default.createElement(_CellNumeric.default, {
90
- value: datacell.value,
91
- view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type],
92
- precision: cell.precision,
93
- currency: datacell.currency,
94
- locale: datacell.locale || cell.locale || locale
95
- });
96
-
97
- case cst.TYPE_COUNTRY:
98
- return _react.default.createElement(_CellImage.default, {
99
- label: datacell.label,
100
- shortLabel: datacell.id,
101
- path: datacell.img,
102
- size: datacell.size,
103
- view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
104
- });
105
-
106
- case cst.TYPE_IMAGE:
107
- return _react.default.createElement(_CellImage.default, {
108
- label: datacell.label,
109
- shortLabel: datacell.id,
110
- path: datacell.img,
111
- size: datacell.size || cell.size,
112
- view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type],
113
- fallbackImage: datacell.fallbackImage,
114
- title: cell.title ? cell.title(datacell, cell) : datacell.title
115
- });
116
-
117
- case cst.TYPE_RATE:
118
- return _react.default.createElement(_CellRate.default, {
119
- indicator: datacell.indicator,
120
- isPositive: datacell.isPositive,
121
- locale: datacell.locale || cell.locale || locale,
122
- value: datacell.value,
123
- trendchip: datacell.trendchip,
124
- view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
125
- });
126
-
127
- case cst.TYPE_ADDRESS:
128
- return _react.default.createElement(_CellAddress.default, {
129
- city: datacell.city,
130
- country: datacell.country,
131
- isoCountry: datacell.isoCountry,
132
- name: datacell.name,
133
- postalCode: datacell.postalCode,
134
- streetAddress: datacell.streetAddress,
135
- view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
136
- });
137
76
 
138
- case cst.TYPE_DATE:
139
- return _react.default.createElement(_CellDate.default, {
140
- date: datacell.date,
141
- displayTime: datacell.displayTime,
142
- formatShort: datacell.formatShort,
143
- locale: datacell.locale || cell.precision || locale,
144
- view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
145
- });
146
-
147
- case cst.TYPE_ICON:
148
- return _react.default.createElement(_CellIcon.default, {
149
- align: cell.align,
150
- color: datacell.color,
151
- icon: datacell.icon,
152
- label: datacell.label,
153
- onClick: datacell.handleClick,
154
- view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type],
155
- size: cell.size
156
- });
157
-
158
- case cst.TYPE_THIRD_PARTY_SECURITY:
159
- return _react.default.createElement(_CellIcon.default, {
160
- color: datacell.color,
161
- icon: datacell.icon,
162
- label: datacell.label,
163
- view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type],
164
- size: cell.size
165
- });
166
-
167
- case cst.TYPE_SENTINEL:
168
- return _react.default.createElement(_CellSentinel.default, {
169
- color: datacell.color,
170
- label: datacell.label,
171
- letter: datacell.label2,
172
- active: datacell.active,
173
- reviewer: datacell.reviewer,
174
- outlined: datacell.outlined
175
- });
176
-
177
- case cst.TYPE_SCORE:
178
- return _react.default.createElement(_CellSentinelScore.default, {
179
- value: datacell.value,
180
- result: datacell.result,
181
- active: datacell.active
182
- });
183
-
184
- case cst.TYPE_PIN_TO_ACTION:
185
- return _react.default.createElement(_CellPinToAction.default, {
186
- number: datacell.number // eslint-disable-next-line react/jsx-handler-names
187
- ,
188
- onClick: datacell.onClick
77
+ if (refproperties) {
78
+ Object.keys(refproperties).forEach(function (key) {
79
+ datacell[key] = refproperties[key];
189
80
  });
81
+ } else {
82
+ datacell = undefined;
83
+ }
84
+ }
190
85
 
191
- case cst.TYPE_ACCOUNT_NUMBER:
192
- case cst.TYPE_CUSTOMER_ACCOUNT_NUMBER:
193
- default:
194
- return _react.default.createElement(_CellTextStyled.default, {
195
- active: datacell.active,
196
- color: datacell.color,
197
- label: datacell.label,
198
- isButton: datacell.isButton,
199
- onClick: datacell.handleClick,
200
- title: cell.title ? cell.title(datacell, cell) : datacell.title,
201
- value: datacell.value
202
- });
86
+ if (datacell) {
87
+ switch (cell.type) {
88
+ case cst.TYPE_NUMERIC:
89
+ case cst.TYPE_AMOUNT:
90
+ return _react.default.createElement(_CellNumeric.default, {
91
+ value: datacell.value,
92
+ view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type],
93
+ precision: cell.precision,
94
+ currency: datacell.currency,
95
+ locale: datacell.locale || cell.locale || locale,
96
+ isButton: datacell.isButton,
97
+ onClick: datacell.handleClick,
98
+ rowId: rowdata.rowId
99
+ });
100
+
101
+ case cst.TYPE_COUNTRY:
102
+ return _react.default.createElement(_CellImage.default, {
103
+ label: datacell.label,
104
+ shortLabel: datacell.id,
105
+ path: datacell.img,
106
+ size: datacell.size,
107
+ view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
108
+ });
109
+
110
+ case cst.TYPE_IMAGE:
111
+ return _react.default.createElement(_CellImage.default, {
112
+ label: datacell.label,
113
+ shortLabel: datacell.id,
114
+ path: datacell.img,
115
+ size: datacell.size || cell.size,
116
+ view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type],
117
+ fallbackImage: datacell.fallbackImage,
118
+ title: cell.title ? cell.title(datacell, cell) : datacell.title
119
+ });
120
+
121
+ case cst.TYPE_RATE:
122
+ return _react.default.createElement(_CellRate.default, {
123
+ indicator: datacell.indicator,
124
+ isPositive: datacell.isPositive,
125
+ locale: datacell.locale || cell.locale || locale,
126
+ value: datacell.value,
127
+ trendchip: datacell.trendchip,
128
+ view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
129
+ });
130
+
131
+ case cst.TYPE_ADDRESS:
132
+ return _react.default.createElement(_CellAddress.default, {
133
+ city: datacell.city,
134
+ country: datacell.country,
135
+ isoCountry: datacell.isoCountry,
136
+ name: datacell.name,
137
+ postalCode: datacell.postalCode,
138
+ streetAddress: datacell.streetAddress,
139
+ view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
140
+ });
141
+
142
+ case cst.TYPE_DATE:
143
+ return _react.default.createElement(_CellDate.default, {
144
+ date: datacell.date,
145
+ displayTime: datacell.displayTime,
146
+ formatShort: datacell.formatShort,
147
+ locale: datacell.locale || cell.precision || locale,
148
+ view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
149
+ });
150
+
151
+ case cst.TYPE_ICON:
152
+ return _react.default.createElement(_CellIcon.default, {
153
+ align: cell.align,
154
+ color: datacell.color,
155
+ icon: datacell.icon,
156
+ label: datacell.label,
157
+ onClick: datacell.handleClick,
158
+ view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type],
159
+ size: cell.size
160
+ });
161
+
162
+ case cst.TYPE_THIRD_PARTY_SECURITY:
163
+ return _react.default.createElement(_CellIcon.default, {
164
+ color: datacell.color,
165
+ icon: datacell.icon,
166
+ label: datacell.label,
167
+ view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type],
168
+ size: cell.size
169
+ });
170
+
171
+ case cst.TYPE_SENTINEL:
172
+ return _react.default.createElement(_CellSentinel.default, {
173
+ color: datacell.color,
174
+ label: datacell.label,
175
+ letter: datacell.label2,
176
+ active: datacell.active,
177
+ reviewer: datacell.reviewer,
178
+ outlined: datacell.outlined
179
+ });
180
+
181
+ case cst.TYPE_SCORE:
182
+ return _react.default.createElement(_CellSentinelScore.default, {
183
+ value: datacell.value,
184
+ result: datacell.result,
185
+ active: datacell.active
186
+ });
187
+
188
+ case cst.TYPE_PIN_TO_ACTION:
189
+ return _react.default.createElement(_CellPinToAction.default, {
190
+ number: datacell.number // eslint-disable-next-line react/jsx-handler-names
191
+ ,
192
+ onClick: datacell.onClick
193
+ });
194
+
195
+ case cst.TYPE_ACCOUNT_NUMBER:
196
+ case cst.TYPE_CUSTOMER_ACCOUNT_NUMBER:
197
+ default:
198
+ return _react.default.createElement(_CellTextStyled.default, {
199
+ active: datacell.active,
200
+ color: datacell.color,
201
+ label: datacell.label,
202
+ isButton: datacell.isButton,
203
+ onClick: datacell.handleClick,
204
+ title: cell.title ? cell.title(datacell, cell) : datacell.title,
205
+ value: datacell.value,
206
+ align: cell.align
207
+ });
208
+ }
203
209
  }
204
210
  }
205
211
  }
@@ -43,11 +43,11 @@ function (_React$PureComponent) {
43
43
  dense = _this$props.dense,
44
44
  locale = _this$props.locale,
45
45
  onClick = _this$props.onClick;
46
- return _react.default.createElement(_TableBody.default, null, data.map(function (n) {
46
+ return _react.default.createElement(_TableBody.default, null, data.map(function (n, index) {
47
47
  return _react.default.createElement(_HiTableRow.default, {
48
48
  columns: columns,
49
49
  rowdata: n,
50
- key: n.rowId,
50
+ key: n.rowId || index,
51
51
  onClick: onClick,
52
52
  dense: dense,
53
53
  locale: locale
@@ -19,6 +19,8 @@ var _getPrototypeOf3 = _interopRequireDefault(require("@babel/runtime/helpers/es
19
19
 
20
20
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
21
21
 
22
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
23
+
22
24
  var _react = _interopRequireDefault(require("react"));
23
25
 
24
26
  var _styles = require("@material-ui/core/styles");
@@ -40,14 +42,16 @@ var styles = function styles(theme) {
40
42
  cursor: 'inherit',
41
43
  borderBottom: "solid 1px ".concat(theme.palette.divider)
42
44
  },
43
- cell: {
45
+ cell: (0, _objectSpread2.default)({
44
46
  border: 'none',
45
47
  paddingRight: '13px',
46
48
  paddingLeft: '13px',
47
49
  overflow: 'hidden',
48
50
  textOverflow: 'ellipsis',
49
- whiteSpace: 'nowrap'
50
- },
51
+ whiteSpace: 'nowrap',
52
+ fontWeight: theme.typography.fontWeightLight,
53
+ color: '#000000'
54
+ }, theme.typography.b4),
51
55
  icon: {
52
56
  color: '#00ADE9'
53
57
  }
@@ -23,6 +23,8 @@ var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/hel
23
23
 
24
24
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
25
25
 
26
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
27
+
26
28
  var _react = _interopRequireDefault(require("react"));
27
29
 
28
30
  var _keycode = _interopRequireDefault(require("keycode"));
@@ -51,14 +53,14 @@ var styles = function styles(theme) {
51
53
  clickableRow: {
52
54
  cursor: 'pointer'
53
55
  },
54
- cell: {
56
+ cell: (0, _objectSpread2.default)({
55
57
  border: 'none',
56
58
  padding: '0px 13px',
57
59
  minHeight: '32px',
58
60
  maxHeight: '40px',
59
61
  fontWeight: theme.typography.fontWeightRegular,
60
62
  lineHeight: 'unset'
61
- }
63
+ }, theme.typography.b3)
62
64
  };
63
65
  };
64
66
 
@@ -35,8 +35,9 @@ var _ref = _react.default.createElement("ellipse", {
35
35
  */
36
36
  var HiLogoRounded = (0, _pure.default)(function (props) {
37
37
  var theme = (0, _styles.useTheme)();
38
- var style = props.style,
39
- other = (0, _objectWithoutProperties2.default)(props, ["style"]);
38
+ var color = props.color,
39
+ style = props.style,
40
+ other = (0, _objectWithoutProperties2.default)(props, ["color", "style"]);
40
41
  return _react.default.createElement(_Icon.default, (0, _extends2.default)({
41
42
  style: (0, _objectSpread2.default)({}, style, {
42
43
  fontSize: props.size || 24
@@ -35,8 +35,9 @@ var _ref = _react.default.createElement("ellipse", {
35
35
  */
36
36
  var HiLogoRounded = (0, _pure.default)(function (props) {
37
37
  var theme = (0, _styles.useTheme)();
38
- var style = props.style,
39
- other = (0, _objectWithoutProperties2.default)(props, ["style"]);
38
+ var color = props.color,
39
+ style = props.style,
40
+ other = (0, _objectWithoutProperties2.default)(props, ["color", "style"]);
40
41
  return _react.default.createElement(_Icon.default, (0, _extends2.default)({
41
42
  style: (0, _objectSpread2.default)({}, style, {
42
43
  fontSize: props.size || 24
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@hipay/hipay-material-ui",
3
3
  "private": false,
4
- "version": "3.3.0",
4
+ "version": "3.4.0",
5
5
  "description": "React components that implement Google's Material Design.",
6
6
  "repository": {
7
7
  "type": "git",
@@ -13,7 +13,7 @@
13
13
  },
14
14
  "homepage": "http://materialui.hipay.dev.local/",
15
15
  "peerDependencies": {
16
- "@material-ui/core": "4.4.3",
16
+ "@material-ui/core": "4.10.2",
17
17
  "mdi-material-ui": "6.14.0",
18
18
  "moment-timezone": "0.5.27",
19
19
  "react": "16.9.0",
@@ -27,6 +27,7 @@
27
27
  "classnames": "2.2.6",
28
28
  "cross-env": "6.0.3",
29
29
  "deepmerge": "4.2.2",
30
+ "is-plain-object": "^3.0.1",
30
31
  "jss": "10.0.3",
31
32
  "jss-camel-case": "6.1.0",
32
33
  "jss-default-unit": "8.0.2",