@hipay/hipay-material-ui 3.5.1 → 3.6.0-rc1

package/HiDatePicker/HiDateRangePicker.js

@@ -410,8 +410,9 @@ function (_React$Component) {
           errorText = _this$props2.errorText,
           hasSelector = _this$props2.hasSelector,
           helperIcon = _this$props2.helperIcon,
+          helperIconLeft = _this$props2.helperIconLeft,
           helperText = _this$props2.helperText,
-          props = (0, _objectWithoutProperties2.default)(_this$props2, ["classes", "disabled", "disabledDays", "disableFutureDays", "enableTime", "labelFrom", "labelTo", "locale", "format", "from", "fromError", "minimumDate", "onReset", "to", "toError", "translations", "id", "staticPosition", "errorText", "hasSelector", "helperIcon", "helperText"]);
+          props = (0, _objectWithoutProperties2.default)(_this$props2, ["classes", "disabled", "disabledDays", "disableFutureDays", "enableTime", "labelFrom", "labelTo", "locale", "format", "from", "fromError", "minimumDate", "onReset", "to", "toError", "translations", "id", "staticPosition", "errorText", "hasSelector", "helperIcon", "helperIconLeft", "helperText"]);
       var today = (0, _momentTimezone.default)();
       var now = new Date(today.year(), today.month(), today.date(), 23, 59, 59, 999);
       var modifiers = (0, _defineProperty2.default)({
@@ -608,6 +609,7 @@ function (_React$Component) {
         content = _react.default.createElement(_HiFormControl.default, {
           disabled: disabled,
           helperIcon: helperIcon,
+          helperIconLeft: helperIconLeft,
           helperText: helperText,
           errorText: errorText,
           error: fromError || toError,

package/HiDatePicker/HiDateRangeSelector.js

@@ -450,6 +450,7 @@ function (_React$Component) {
           fromError = _this$props2.fromError,
           toError = _this$props2.toError,
           helperIcon = _this$props2.helperIcon,
+          helperIconLeft = _this$props2.helperIconLeft,
           helperText = _this$props2.helperText,
           idRange = _this$props2.idRange,
           idSelect = _this$props2.idSelect,
@@ -463,7 +464,7 @@ function (_React$Component) {
           classes = _this$props2.classes,
           selectProps = _this$props2.selectProps,
           staticPosition = _this$props2.staticPosition,
-          props = (0, _objectWithoutProperties2.default)(_this$props2, ["availableOptionKeys", "disabled", "enableTime", "errorText", "fromError", "toError", "helperIcon", "helperText", "idRange", "idSelect", "minimumDate", "label", "from", "onChange", "required", "to", "translations", "classes", "selectProps", "staticPosition"]);
+          props = (0, _objectWithoutProperties2.default)(_this$props2, ["availableOptionKeys", "disabled", "enableTime", "errorText", "fromError", "toError", "helperIcon", "helperIconLeft", "helperText", "idRange", "idSelect", "minimumDate", "label", "from", "onChange", "required", "to", "translations", "classes", "selectProps", "staticPosition"]);
       var _this$state = this.state,
           selectedPreset = _this$state.selectedPreset,
           containerWidth = _this$state.containerWidth;
@@ -476,6 +477,7 @@ function (_React$Component) {
       return _react.default.createElement(_HiFormControl.default, {
         disabled: disabled,
         helperIcon: helperIcon,
+        helperIconLeft: helperIconLeft,
         helperText: helperText,
         errorText: errorText,
         error: !!(fromError || toError),

package/HiForm/HiFormControl.js

@@ -64,6 +64,8 @@ var styles = function styles(theme) {
       height: 20,
       width: 20,
       marginLeft: 3,
+      transform: 'translateY(2px)',
+      marginTop: -6,
       '&$iconButtonError': {
         color: theme.palette.negative.main
       },
@@ -73,17 +75,15 @@ var styles = function styles(theme) {
       '&$iconButtonInfoActive': {
         color: theme.palette.primary.main
       },
-      '&$iconFullWidth': {
-        position: 'absolute',
-        right: theme.spacing(1),
-        marginLeft: 0,
-        bottom: 0
-      }
+      '&$iconFullWidth': {}
     },
     iconButtonError: {},
     iconButtonInfo: {},
     iconButtonInfoActive: {},
     iconFullWidth: {},
+    iconRight: {
+      justifyContent: 'space-between'
+    },
     errorDiv: (0, _objectSpread2.default)({}, theme.typography.b3, {
       backgroundColor: theme.palette.negative.main,
       color: '#FFFFFF',
@@ -224,6 +224,7 @@ function (_React$PureComponent) {
           InputLabelProps = _this$props.InputLabelProps,
           helperText = _this$props.helperText,
           helperIcon = _this$props.helperIcon,
+          helperIconLeft = _this$props.helperIconLeft,
           FormHelperTextProps = _this$props.FormHelperTextProps,
           fullWidth = _this$props.fullWidth,
           required = _this$props.required,
@@ -231,7 +232,7 @@ function (_React$PureComponent) {
           rootRef = _this$props.rootRef,
           maxLength = _this$props.maxLength,
           nbChars = _this$props.nbChars,
-          others = (0, _objectWithoutProperties2.default)(_this$props, ["children", "classes", "className", "disabled", "error", "errorText", "id", "label", "InputLabelProps", "helperText", "helperIcon", "FormHelperTextProps", "fullWidth", "required", "multiline", "rootRef", "maxLength", "nbChars"]);
+          others = (0, _objectWithoutProperties2.default)(_this$props, ["children", "classes", "className", "disabled", "error", "errorText", "id", "label", "InputLabelProps", "helperText", "helperIcon", "helperIconLeft", "FormHelperTextProps", "fullWidth", "required", "multiline", "rootRef", "maxLength", "nbChars"]);
       var _this$state = this.state,
           helperOpen = _this$state.helperOpen,
           focused = _this$state.focused,
@@ -264,7 +265,8 @@ function (_React$PureComponent) {
         label: label,
         required: required,
         disabled: disabled,
-        focused: !disabled && (focused || hovered)
+        focused: !disabled && (focused || hovered),
+        className: !helperIconLeft && classes.iconRight
       }, InputLabelProps), error && errorText && _react.default.createElement(_HiIconButton.default, {
         className: (0, _classnames.default)(classes.iconButton, classes.iconButtonError, (0, _defineProperty2.default)({}, classes.iconFullWidth, fullWidth)),
         onClick: this.handleHelperClick
@@ -299,6 +301,7 @@ HiFormControl.defaultProps = {
   errorText: undefined,
   helperText: undefined,
   helperIcon: false,
+  helperIconLeft: false,
   multiline: false,
   nbChars: 0,
   maxLength: 280

package/HiForm/HiFormLabel.js

@@ -46,8 +46,7 @@ var styles = function styles(theme) {
       '&$error': {
         color: theme.palette.negative.main
       },
-      display: 'flex',
-      alignItems: 'baseline'
+      display: 'flex'
     }),
     optional: {
       fontSize: 11,

package/HiForm/HiTextField.js

@@ -101,6 +101,7 @@ function (_React$PureComponent) {
           label = _this$props.label,
           helperText = _this$props.helperText,
           helperIcon = _this$props.helperIcon,
+          helperIconLeft = _this$props.helperIconLeft,
           fullWidth = _this$props.fullWidth,
           required = _this$props.required,
           type = _this$props.type,
@@ -123,6 +124,7 @@ function (_React$PureComponent) {
         errorText: errorText,
         helperText: helperText,
         helperIcon: helperIcon,
+        helperIconLeft: helperIconLeft,
         multiline: multiline,
         maxLength: maxLength,
         nbChars: nbChars,
@@ -163,6 +165,7 @@ HiTextField.defaultProps = {
   errorText: '',
   helperText: '',
   helperIcon: false,
+  helperIconLeft: false,
   multiline: false,
   maxLength: 280
 };

package/HiForm/HiUploadField.js

@@ -47,7 +47,8 @@ function (_React$PureComponent) {
           helperText = _this$props.helperText,
           values = _this$props.values,
           fullWidth = _this$props.fullWidth,
-          others = (0, _objectWithoutProperties2.default)(_this$props, ["className", "label", "helperIcon", "helperText", "values", "fullWidth"]);
+          required = _this$props.required,
+          others = (0, _objectWithoutProperties2.default)(_this$props, ["className", "label", "helperIcon", "helperText", "values", "fullWidth", "required"]);
       var empty = true;
       var error = false;
       var errorText = '';
@@ -68,8 +69,10 @@ function (_React$PureComponent) {
         errorText: errorText,
         error: error,
         helperIcon: helperIcon,
+        helperIconLeft: true,
         helperText: helperText,
-        fullWidth: fullWidth
+        fullWidth: fullWidth,
+        required: required
       }, _react.default.createElement(_HiUpload.default, (0, _extends2.default)({
         values: values
       }, others)));
@@ -82,7 +85,8 @@ HiUploadField.defaultProps = {
   helperText: '',
   helperIcon: false,
   seeFile: true,
-  fullWidth: false
+  fullWidth: false,
+  required: true
 };
 var _default = HiUploadField;
 exports.default = _default;