@hipay/hipay-material-ui 3.2.3 → 3.3.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,29 +1,23 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
4
+
3
5
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
6
 
5
7
  Object.defineProperty(exports, "__esModule", {
6
8
  value: true
7
9
  });
8
- exports.default = exports.styles = void 0;
9
-
10
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
11
-
12
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
13
-
14
- var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
10
+ exports.default = void 0;
15
11
 
16
- var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
12
+ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
17
13
 
18
- var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/possibleConstructorReturn"));
19
-
20
- var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/getPrototypeOf"));
14
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
21
15
 
22
- var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/assertThisInitialized"));
16
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
23
17
 
24
- var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
18
+ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
25
19
 
26
- var _react = _interopRequireDefault(require("react"));
20
+ var _react = _interopRequireWildcard(require("react"));
27
21
 
28
22
  var _Dialog = _interopRequireDefault(require("@material-ui/core/Dialog"));
29
23
 
@@ -44,7 +38,7 @@ var _HiIcon = _interopRequireDefault(require("../HiIcon"));
44
38
  var _helpers = require("../utils/helpers");
45
39
 
46
40
  // @inheritedComponent Dialog
47
- var styles = function styles(theme) {
41
+ var useStyles = (0, _styles.makeStyles)(function (theme) {
48
42
  return {
49
43
  classContent: {
50
44
  fontSize: 14,
@@ -85,147 +79,137 @@ var styles = function styles(theme) {
85
79
  transform: 'translate(-50%, -50%)',
86
80
  color: theme.palette.background2,
87
81
  flex: '1'
82
+ },
83
+ backgroundIcon: function backgroundIcon(props) {
84
+ return {
85
+ fontSize: "".concat(props.iconSize, "px !important")
86
+ };
88
87
  }
89
88
  };
90
- };
89
+ });
91
90
  /**
92
91
  * Pop up d'alert
93
92
  */
94
93
 
94
+ var HiAlertModal = function HiAlertModal(props) {
95
+ var backgroundIcon = props.backgroundIcon,
96
+ iconSize = props.iconSize,
97
+ content = props.content,
98
+ labelCancelButton = props.labelCancelButton,
99
+ labelSubmitButton = props.labelSubmitButton,
100
+ onCancelClick = props.onCancelClick,
101
+ onSubmitClick = props.onSubmitClick,
102
+ open = props.open,
103
+ cancelColor = props.cancelColor,
104
+ submitColor = props.submitColor,
105
+ title = props.title,
106
+ theme = props.theme,
107
+ onClose = props.onClose,
108
+ submitActionsRef = props.submitActionsRef,
109
+ cancelActionsRef = props.cancelActionsRef,
110
+ others = (0, _objectWithoutProperties2.default)(props, ["backgroundIcon", "iconSize", "content", "labelCancelButton", "labelSubmitButton", "onCancelClick", "onSubmitClick", "open", "cancelColor", "submitColor", "title", "theme", "onClose", "submitActionsRef", "cancelActionsRef"]);
111
+ var classes = useStyles(props);
112
+ var submitButtonRef = (0, _react.useRef)(null);
113
+ var cancelButtonRef = (0, _react.useRef)(null);
114
+ var thisCancelActionsRef = (0, _objectSpread2.default)({}, cancelActionsRef);
115
+ var thisSubmitActionsRef = (0, _objectSpread2.default)({}, submitActionsRef); // Appelé si clic en dehors de la pop up
116
+
117
+ var handleOnClose = function handleOnClose() {
118
+ if (onClose) {
119
+ onClose();
120
+ }
121
+ };
95
122
 
96
- exports.styles = styles;
97
-
98
- var HiAlertModal =
99
- /*#__PURE__*/
100
- function (_React$PureComponent) {
101
- (0, _inherits2.default)(HiAlertModal, _React$PureComponent);
123
+ var handleOnEntered = function handleOnEntered() {
124
+ if (labelSubmitButton) {
125
+ submitButtonRef.current.focus();
126
+ thisSubmitActionsRef.focusVisible();
127
+ } else if (props.labelCancelButton) {
128
+ cancelButtonRef.current.focus();
129
+ thisCancelActionsRef.focusVisible();
130
+ }
131
+ }; // Render
102
132
 
103
- function HiAlertModal(props) {
104
- var _this;
105
133
 
106
- (0, _classCallCheck2.default)(this, HiAlertModal);
107
- _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(HiAlertModal).call(this, props));
134
+ var dialogContent = content;
108
135
 
109
- _this.handleOnClose = function () {
110
- if (_this.props.onClose) {
111
- _this.props.onClose();
136
+ if (typeof content === 'string') {
137
+ dialogContent = _react.default.createElement("span", {
138
+ // eslint-disable-next-line react/no-danger
139
+ dangerouslySetInnerHTML: {
140
+ __html: (0, _helpers.escapeHTML)(content)
112
141
  }
113
- };
142
+ });
143
+ }
114
144
 
115
- _this.submitButtonRef = _react.default.createRef();
116
- _this.cancelButtonRef = _react.default.createRef();
117
- _this.handleOnClose = _this.handleOnClose.bind((0, _assertThisInitialized2.default)(_this));
118
- _this.handleOnEntered = _this.handleOnEntered.bind((0, _assertThisInitialized2.default)(_this));
119
- return _this;
120
- } // Appelé si clic en dehors de la pop up
121
-
122
-
123
- (0, _createClass2.default)(HiAlertModal, [{
124
- key: "handleOnEntered",
125
- value: function handleOnEntered() {
126
- if (this.props.labelSubmitButton) {
127
- this.submitButtonRef.current.focus();
128
- this.submitActionsRef.focusVisible();
129
- } else if (this.props.labelCancelButton) {
130
- this.cancelButtonRef.current.focus();
131
- this.cancelActionsRef.focusVisible();
132
- }
133
- } // Render
134
-
135
- }, {
136
- key: "render",
137
- value: function render() {
138
- var _this2 = this;
139
-
140
- var _this$props = this.props,
141
- backgroundIcon = _this$props.backgroundIcon,
142
- iconSize = _this$props.iconSize,
143
- classes = _this$props.classes,
144
- content = _this$props.content,
145
- labelCancelButton = _this$props.labelCancelButton,
146
- labelSubmitButton = _this$props.labelSubmitButton,
147
- onCancelClick = _this$props.onCancelClick,
148
- onSubmitClick = _this$props.onSubmitClick,
149
- open = _this$props.open,
150
- cancelColor = _this$props.cancelColor,
151
- submitColor = _this$props.submitColor,
152
- title = _this$props.title,
153
- theme = _this$props.theme,
154
- props = (0, _objectWithoutProperties2.default)(_this$props, ["backgroundIcon", "iconSize", "classes", "content", "labelCancelButton", "labelSubmitButton", "onCancelClick", "onSubmitClick", "open", "cancelColor", "submitColor", "title", "theme"]);
155
- var dialogContent = content;
156
-
157
- if (typeof content === 'string') {
158
- dialogContent = _react.default.createElement("span", {
159
- // eslint-disable-next-line react/no-danger
160
- dangerouslySetInnerHTML: {
161
- __html: (0, _helpers.escapeHTML)(content)
162
- }
163
- });
164
- }
145
+ var bgIcon;
146
+
147
+ if (backgroundIcon) {
148
+ var iconProps = {
149
+ color: "inherit",
150
+ className: classes.backgroundIcon
151
+ };
165
152
 
166
- return _react.default.createElement(_Dialog.default, (0, _extends2.default)({
167
- open: open,
168
- onClose: this.handleOnClose,
169
- onEntered: this.handleOnEntered,
170
- classes: {
171
- root: classes.classDialogRoot,
172
- paper: classes.classDialogPaper
173
- }
174
- }, props), backgroundIcon && _react.default.createElement("div", {
175
- className: classes.classBackgroundIcon
176
- }, _react.default.createElement(_HiIcon.default, {
177
- color: "inherit",
178
- icon: backgroundIcon,
179
- size: iconSize
180
- })), title && _react.default.createElement(_DialogTitle.default, {
181
- disableTypography: true,
182
- classes: {
183
- root: classes.classTitle
184
- }
185
- }, title), _react.default.createElement(_DialogContent.default, null, _react.default.createElement(_DialogContentText.default, {
186
- classes: {
187
- root: classes.classContent
188
- }
189
- }, dialogContent)), _react.default.createElement(_DialogActions.default, {
190
- classes: {
191
- root: classes.classAction
192
- }
193
- }, labelCancelButton && _react.default.createElement(_HiButton.default, {
194
- classes: {
195
- root: classes.classCancelButton
196
- },
197
- onClick: onCancelClick,
198
- color: cancelColor,
199
- innerRef: this.cancelButtonRef,
200
- action: function action(actions) {
201
- _this2.cancelActionsRef = actions;
202
- }
203
- }, labelCancelButton), labelSubmitButton && _react.default.createElement(_HiButton.default, {
204
- classes: {
205
- root: classes.classSubmitButton
206
- },
207
- onClick: onSubmitClick,
208
- color: submitColor,
209
- innerRef: this.submitButtonRef,
210
- action: function action(actions) {
211
- _this2.submitActionsRef = actions;
212
- }
213
- }, labelSubmitButton)));
153
+ if (typeof backgroundIcon === 'string') {
154
+ bgIcon = _react.default.createElement(_HiIcon.default, (0, _extends2.default)({
155
+ icon: backgroundIcon
156
+ }, iconProps));
157
+ } else if ((0, _typeof2.default)(backgroundIcon) === 'object') {
158
+ bgIcon = (0, _objectSpread2.default)({}, backgroundIcon);
159
+ bgIcon.props = (0, _objectSpread2.default)({}, iconProps);
160
+ }
161
+ }
162
+
163
+ return _react.default.createElement(_Dialog.default, (0, _extends2.default)({
164
+ open: open,
165
+ onClose: handleOnClose,
166
+ onEntered: handleOnEntered,
167
+ classes: {
168
+ root: classes.classDialogRoot,
169
+ paper: classes.classDialogPaper
170
+ }
171
+ }, others), bgIcon && _react.default.createElement("div", {
172
+ className: classes.classBackgroundIcon
173
+ }, bgIcon), title && _react.default.createElement(_DialogTitle.default, {
174
+ disableTypography: true,
175
+ classes: {
176
+ root: classes.classTitle
177
+ }
178
+ }, title), _react.default.createElement(_DialogContent.default, null, _react.default.createElement(_DialogContentText.default, {
179
+ classes: {
180
+ root: classes.classContent
214
181
  }
215
- }]);
216
- return HiAlertModal;
217
- }(_react.default.PureComponent);
182
+ }, dialogContent)), _react.default.createElement(_DialogActions.default, {
183
+ classes: {
184
+ root: classes.classAction
185
+ }
186
+ }, labelCancelButton && _react.default.createElement(_HiButton.default, {
187
+ classes: {
188
+ root: classes.classCancelButton
189
+ },
190
+ onClick: onCancelClick,
191
+ color: cancelColor,
192
+ innerRef: cancelButtonRef,
193
+ action: function action(actions) {
194
+ thisCancelActionsRef = actions;
195
+ }
196
+ }, labelCancelButton), labelSubmitButton && _react.default.createElement(_HiButton.default, {
197
+ classes: {
198
+ root: classes.classSubmitButton
199
+ },
200
+ onClick: onSubmitClick,
201
+ color: submitColor,
202
+ innerRef: submitButtonRef,
203
+ action: function action(actions) {
204
+ thisSubmitActionsRef = actions;
205
+ }
206
+ }, labelSubmitButton)));
207
+ };
218
208
 
219
209
  HiAlertModal.defaultProps = {
220
210
  content: '',
221
211
  cancelColor: 'neutral',
222
212
  submitColor: 'primary'
223
213
  };
224
-
225
- var _default = (0, _styles.withStyles)(styles, {
226
- hiComponent: true,
227
- name: 'HmuiHiAlertModal',
228
- withTheme: true
229
- })(HiAlertModal);
230
-
214
+ var _default = HiAlertModal;
231
215
  exports.default = _default;
@@ -23,7 +23,11 @@ var _react = _interopRequireDefault(require("react"));
23
23
 
24
24
  var _classnames = _interopRequireDefault(require("classnames"));
25
25
 
26
- var _mdiMaterialUi = require("mdi-material-ui");
26
+ var _ArrowBottomRight = _interopRequireDefault(require("mdi-material-ui/ArrowBottomRight"));
27
+
28
+ var _ArrowTopRight = _interopRequireDefault(require("mdi-material-ui/ArrowTopRight"));
29
+
30
+ var _Equal = _interopRequireDefault(require("mdi-material-ui/Equal"));
27
31
 
28
32
  var _helpers = require("../utils/helpers");
29
33
 
@@ -102,19 +106,19 @@ function (_React$PureComponent) {
102
106
 
103
107
  switch (trendchip) {
104
108
  case 'equal':
105
- trendIcon = _react.default.createElement(_mdiMaterialUi.Equal, {
109
+ trendIcon = _react.default.createElement(_Equal.default, {
106
110
  className: (0, _classnames.default)(classes.trendChipIcon, classes.neutral)
107
111
  });
108
112
  break;
109
113
 
110
114
  case 'up':
111
- trendIcon = _react.default.createElement(_mdiMaterialUi.ArrowTopRight, {
115
+ trendIcon = _react.default.createElement(_ArrowTopRight.default, {
112
116
  className: (0, _classnames.default)(classes.trendChipIcon, (_classNames = {}, (0, _defineProperty2.default)(_classNames, classes.positive, isPositive), (0, _defineProperty2.default)(_classNames, classes.negative, !isPositive), _classNames))
113
117
  });
114
118
  break;
115
119
 
116
120
  case 'down':
117
- trendIcon = _react.default.createElement(_mdiMaterialUi.ArrowBottomRight, {
121
+ trendIcon = _react.default.createElement(_ArrowBottomRight.default, {
118
122
  className: (0, _classnames.default)(classes.trendChipIcon, (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, classes.positive, !isPositive), (0, _defineProperty2.default)(_classNames2, classes.negative, isPositive), _classNames2))
119
123
  });
120
124
  break;
@@ -7,10 +7,12 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = exports.styles = void 0;
9
9
 
10
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
11
-
12
10
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
13
11
 
12
+ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
13
+
14
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
15
+
14
16
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
15
17
 
16
18
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
@@ -43,7 +45,8 @@ var styles = function styles(theme) {
43
45
  root: {
44
46
  marginRight: 4,
45
47
  marginLeft: 4,
46
- padding: 0
48
+ padding: 0,
49
+ fontSize: 20
47
50
  },
48
51
  checked: {},
49
52
  checkedPrimary: {
@@ -125,6 +128,23 @@ function (_React$PureComponent) {
125
128
  height: size
126
129
  }, style);
127
130
  var hcolor = ['positive', 'negative', 'middle', 'neutral', 'inherit'].includes(color) ? 'default' : color;
131
+ var checkboxIcon;
132
+
133
+ if (icon) {
134
+ var iconProps = {
135
+ className: classes.root
136
+ };
137
+
138
+ if (typeof icon === 'string') {
139
+ checkboxIcon = _react.default.createElement(_HiIcon.default, (0, _extends2.default)({
140
+ icon: icon
141
+ }, iconProps));
142
+ } else if ((0, _typeof2.default)(icon) === 'object') {
143
+ checkboxIcon = (0, _objectSpread2.default)({}, icon);
144
+ checkboxIcon.props = (0, _objectSpread2.default)({}, checkboxIcon.props, {}, iconProps);
145
+ }
146
+ }
147
+
128
148
  return _react.default.createElement(_Checkbox.default, (0, _extends2.default)({
129
149
  classes: {
130
150
  root: classes.root,
@@ -133,13 +153,8 @@ function (_React$PureComponent) {
133
153
  },
134
154
  style: iconStyles,
135
155
  color: hcolor,
136
- onChange: this.handleChange
137
- }, icon && {
138
- icon: _react.default.createElement(_HiIcon.default, {
139
- className: classes.root,
140
- icon: icon,
141
- size: 20
142
- })
156
+ onChange: this.handleChange,
157
+ icon: checkboxIcon
143
158
  }, checkedIcon && {
144
159
  checkedIcon: _react.default.createElement(_HiIcon.default, {
145
160
  className: classes.root,
package/HiChip/HiChip.js CHANGED
@@ -5,7 +5,11 @@ 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 = void 0;
9
+
10
+ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
11
+
12
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
9
13
 
10
14
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
11
15
 
@@ -21,7 +25,7 @@ var _HiIcon = _interopRequireDefault(require("../HiIcon"));
21
25
 
22
26
  var _styles = require("@material-ui/core/styles");
23
27
 
24
- var styles = function styles(theme) {
28
+ var useStyles = (0, _styles.makeStyles)(function (theme) {
25
29
  return {
26
30
  root: (0, _objectSpread2.default)({}, theme.typography.b3, {
27
31
  display: 'inline-flex',
@@ -53,8 +57,12 @@ var styles = function styles(theme) {
53
57
  rightNavigation: {},
54
58
  deletable: {},
55
59
  leftIcon: {},
56
- icon: {
57
- marginRight: 4
60
+ icon: function icon(props) {
61
+ var fontSize = props.iconSize || 20;
62
+ return {
63
+ marginRight: 4,
64
+ fontSize: fontSize
65
+ };
58
66
  },
59
67
  iconClickable: {
60
68
  cursor: 'pointer',
@@ -105,9 +113,7 @@ var styles = function styles(theme) {
105
113
  paddingRight: '8px'
106
114
  }
107
115
  };
108
- };
109
-
110
- exports.styles = styles;
116
+ });
111
117
 
112
118
  var handleKeyDown = function handleKeyDown(e, fn) {
113
119
  if ((0, _keycode.default)(e) === 'space' || (0, _keycode.default)(e) === 'enter') {
@@ -116,11 +122,10 @@ var handleKeyDown = function handleKeyDown(e, fn) {
116
122
  }
117
123
  };
118
124
 
119
- function HiChip(props) {
120
- var _classNames;
125
+ var HiChip = function HiChip(props) {
126
+ var _classNames2;
121
127
 
122
128
  var className = props.className,
123
- classes = props.classes,
124
129
  fallbackImage = props.fallbackImage,
125
130
  icon = props.icon,
126
131
  _props$iconSize = props.iconSize,
@@ -143,27 +148,41 @@ function HiChip(props) {
143
148
  titleNext = props.titleNext,
144
149
  titlePrevious = props.titlePrevious,
145
150
  style = props.style;
151
+ var classes = useStyles(props);
152
+ var chipIcon;
153
+
154
+ if (icon) {
155
+ var iconProps = {
156
+ className: (0, _classnames.default)(classes.icon, (0, _defineProperty2.default)({}, classes.iconClickable, onIconClick)),
157
+ id: "".concat(id, "-icon"),
158
+ onClick: onIconClick,
159
+ onKeyDown: function onKeyDown(event) {
160
+ return handleKeyDown(event, onIconClick);
161
+ },
162
+ title: titleIcon,
163
+ tabIndex: onIconClick ? 0 : -1
164
+ };
165
+
166
+ if (typeof icon === 'string') {
167
+ chipIcon = _react.default.createElement(_HiIcon.default, (0, _extends2.default)({
168
+ icon: icon
169
+ }, iconProps));
170
+ } else if ((0, _typeof2.default)(icon) === 'object') {
171
+ chipIcon = (0, _objectSpread2.default)({}, icon);
172
+ chipIcon.props = (0, _objectSpread2.default)({}, iconProps);
173
+ }
174
+ }
175
+
146
176
  return _react.default.createElement("div", {
147
177
  id: id,
148
178
  role: 'button',
149
- className: (0, _classnames.default)(classes.root, className, (_classNames = {}, (0, _defineProperty2.default)(_classNames, classes.leftNavigation, onPrevious), (0, _defineProperty2.default)(_classNames, classes.rightNavigation, onNext), (0, _defineProperty2.default)(_classNames, classes.deletable, onDelete), (0, _defineProperty2.default)(_classNames, classes.leftIcon, icon), _classNames)),
179
+ className: (0, _classnames.default)(classes.root, className, (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, classes.leftNavigation, onPrevious), (0, _defineProperty2.default)(_classNames2, classes.rightNavigation, onNext), (0, _defineProperty2.default)(_classNames2, classes.deletable, onDelete), (0, _defineProperty2.default)(_classNames2, classes.leftIcon, icon), _classNames2)),
150
180
  title: title,
151
181
  onClick: onClick,
152
182
  onKeyDown: onKeyDown,
153
183
  tabIndex: onKeyDown ? '0' : '-1',
154
184
  style: style
155
- }, icon && _react.default.createElement(_HiIcon.default, {
156
- className: (0, _classnames.default)(classes.icon, (0, _defineProperty2.default)({}, classes.iconClickable, onIconClick)),
157
- id: "".concat(id, "-icon"),
158
- icon: icon,
159
- size: iconSize,
160
- onClick: onIconClick,
161
- onKeyDown: function onKeyDown(event) {
162
- return handleKeyDown(event, onIconClick);
163
- },
164
- title: titleIcon,
165
- tabIndex: onIconClick ? 0 : -1
166
- }), prefix && _react.default.createElement("span", {
185
+ }, chipIcon, prefix && _react.default.createElement("span", {
167
186
  id: "".concat(id, "-prefix"),
168
187
  className: classes.prefix
169
188
  }, prefix), img && _react.default.createElement("img", {
@@ -225,11 +244,7 @@ function HiChip(props) {
225
244
  title: titleDelete,
226
245
  tabIndex: 0
227
246
  }));
228
- }
229
-
230
- var _default = (0, _styles.withStyles)(styles, {
231
- hiComponent: true,
232
- name: 'HmuiHiChip'
233
- })(HiChip);
247
+ };
234
248
 
249
+ var _default = HiChip;
235
250
  exports.default = _default;
@@ -44,6 +44,10 @@ var _HiFormControl = _interopRequireDefault(require("../HiForm/HiFormControl"));
44
44
 
45
45
  var _reactDeviceDetect = require("react-device-detect");
46
46
 
47
+ var _Calendar = _interopRequireDefault(require("mdi-material-ui/Calendar"));
48
+
49
+ var _CalendarBlank = _interopRequireDefault(require("mdi-material-ui/CalendarBlank"));
50
+
47
51
  function findSeparator(format) {
48
52
  var str = '';
49
53
 
@@ -302,6 +306,10 @@ exports.styles = styles;
302
306
  var PRESET_PERIOD_LIST = ['cd', 'pd', 'cw', 'pw', 'cm', 'pm', 'cq', 'pq', 'cy', 'yy'];
303
307
  var CUSTOM_PERIOD_LIST = ['custom'];
304
308
 
309
+ var _ref2 = _react.default.createElement(_Calendar.default, null);
310
+
311
+ var _ref3 = _react.default.createElement(_CalendarBlank.default, null);
312
+
305
313
  var HiDateRangeSelector =
306
314
  /*#__PURE__*/
307
315
  function (_React$Component) {
@@ -402,7 +410,7 @@ function (_React$Component) {
402
410
  id: "preset_periods_subheader",
403
411
  type: PRESET_PERIOD_LIST.includes(selectedPreset) ? "primary-highlight" : "highlight",
404
412
  pinned: true,
405
- icon: "mdi_calendar",
413
+ icon: _ref2,
406
414
  label: translations.preset_periods
407
415
  });
408
416
  presetOptionsAvailable.forEach(function (option) {
@@ -417,7 +425,7 @@ function (_React$Component) {
417
425
  id: "custom_periods_subheader",
418
426
  type: CUSTOM_PERIOD_LIST.includes(selectedPreset) ? "primary-highlight" : "highlight",
419
427
  pinned: true,
420
- icon: "mdi_calendar_blank",
428
+ icon: _ref3,
421
429
  label: translations.custom_periods
422
430
  });
423
431
  customOptionsAvailable.forEach(function (option) {
@@ -27,12 +27,12 @@ var _ExpansionPanelSummary = _interopRequireDefault(require("@material-ui/core/E
27
27
 
28
28
  var _ExpansionPanelDetails = _interopRequireDefault(require("@material-ui/core/ExpansionPanelDetails"));
29
29
 
30
- var _HiIcon = _interopRequireDefault(require("./../HiIcon"));
31
-
32
30
  var _styles = require("@material-ui/core/styles");
33
31
 
34
32
  var _classnames = _interopRequireDefault(require("classnames"));
35
33
 
34
+ var _MenuUp = _interopRequireDefault(require("mdi-material-ui/MenuUp"));
35
+
36
36
  var useStyles = (0, _styles.makeStyles)(function (theme) {
37
37
  return {
38
38
  summaryContent: {
@@ -113,10 +113,7 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
113
113
  * HiExpansionPanel
114
114
  */
115
115
 
116
- var _ref = _react.default.createElement(_HiIcon.default, {
117
- icon: "mdi_menu_up",
118
- size: 24
119
- });
116
+ var _ref = _react.default.createElement(_MenuUp.default, null);
120
117
 
121
118
  function HiExpansionPanel(props) {
122
119
  var disabled = props.disabled,
package/HiForm/HiInput.js CHANGED
@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = exports.styles = void 0;
9
9
 
10
+ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
11
+
12
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
13
+
10
14
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
11
15
 
12
16
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
@@ -86,6 +90,7 @@ var styles = function styles(theme) {
86
90
  borderRadius: 2
87
91
  },
88
92
  startAdornment: {
93
+ fontSize: 20,
89
94
  zIndex: 1,
90
95
  marginLeft: 0,
91
96
  marginRight: 8
@@ -100,6 +105,7 @@ var styles = function styles(theme) {
100
105
  color: theme.palette.neutral.light
101
106
  },
102
107
  rightIcon: {
108
+ fontSize: 20,
103
109
  width: 39,
104
110
  color: theme.palette.neutral.main
105
111
  },
@@ -355,16 +361,26 @@ function (_React$PureComponent) {
355
361
  });
356
362
  var leftIcon;
357
363
 
358
- if (startAdornment) {
364
+ if (!!startAdornment) {
359
365
  var _classNames2;
360
366
 
361
- leftIcon = _react.default.createElement(_HiIcon.default, {
362
- icon: startAdornment,
363
- size: 20,
367
+ var leftIconProps = {
364
368
  color: startAdornmentColor,
365
369
  onClick: this.props.onLeftIconClick,
366
370
  className: (0, _classnames.default)(classes.startAdornment, (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, classes.startAdornmentDefaultColor, !startAdornmentColor), (0, _defineProperty2.default)(_classNames2, classes.startAdornmentFocus, focused && !startAdornmentColor), (0, _defineProperty2.default)(_classNames2, classes.startAdornmentDisabled, disabled && !startAdornmentColor), (0, _defineProperty2.default)(_classNames2, classes.iconPointer, this.props.onLeftIconClick), _classNames2))
367
- });
371
+ };
372
+
373
+ if (typeof startAdornment === 'string') {
374
+ leftIcon = _react.default.createElement(_HiIcon.default, (0, _extends2.default)({
375
+ icon: startAdornment
376
+ }, leftIconProps));
377
+ } else if ((0, _typeof2.default)(startAdornment) === 'object') {
378
+ // Icon component as prop
379
+ leftIcon = (0, _objectSpread2.default)({}, startAdornment);
380
+ leftIcon.props = (0, _objectSpread2.default)({}, leftIcon.props, {}, leftIconProps, {
381
+ className: "".concat(leftIconProps.className, " ").concat(leftIcon.props.className)
382
+ });
383
+ }
368
384
  } // Build endAdornment with eraseIcon + endAdornmentProps
369
385
 
370
386