@hipay/hipay-material-ui 2.0.0-beta.53 → 2.0.0-beta.55

package/HiDatePicker/HiDateRangeSelector.js

@@ -38,11 +38,12 @@ var _Grid = _interopRequireDefault(require("@material-ui/core/Grid"));
 
 var _withStyles = _interopRequireDefault(require("../styles/withStyles"));
 
-var _HiSelectField = _interopRequireDefault(require("../HiSelect/HiSelectField"));
+var _HiSelectField = _interopRequireDefault(require("../HiSelectNew/HiSelectField"));
 
 var _HiDateRangePicker = _interopRequireDefault(require("./HiDateRangePicker"));
 
-// @inheritedComponent HiDateRangePicker
+var _HiFormControl = _interopRequireDefault(require("../HiForm/HiFormControl"));
+
 function buildDateRangeOptionByKey(key, t, format) {
   var from;
   var label;
@@ -59,6 +60,8 @@ function buildDateRangeOptionByKey(key, t, format) {
   switch (key) {
     case 'custom':
       label = t.custom_period;
+      from = (0, _moment.default)().subtract(15, 'day').startOf('day');
+      to = (0, _moment.default)().endOf('day');
       type = 'primary-highlight';
       break;
 
@@ -94,35 +97,35 @@ function buildDateRangeOptionByKey(key, t, format) {
       label = t.current_month;
       from = (0, _moment.default)().startOf('month');
       to = (0, _moment.default)();
-      info = "".concat(from.format(format), " ").concat(t.to_now, ", ").concat(to.diff(from, 'days'), " ").concat(t.days);
+      info = "".concat(from.format(format), " ").concat(t.to_now, ", ").concat(to.diff(from, 'days') + 1, " ").concat(t.days);
       break;
 
     case 'pm':
       label = t.previous_month;
       from = (0, _moment.default)().subtract(1, 'month').startOf('month');
       to = (0, _moment.default)().subtract(1, 'month').endOf('month');
-      info = "".concat(from.format('YYYY-MM'), ", ").concat(to.diff(from, 'days'), " ").concat(t.days);
+      info = "".concat(from.format(t.yearAndMonth), ", ").concat(from.daysInMonth(), " ").concat(t.days);
       break;
 
     case 'cq':
       label = t.current_quarter;
       from = (0, _moment.default)().startOf('quarter');
       to = (0, _moment.default)();
-      info = "".concat(from.format(format), " ").concat(t.to_now, ", ").concat(to.diff(from, 'days'), " ").concat(t.days);
+      info = "".concat(from.format(t.yearAndQuarter), ", ").concat(from.format(format), " ").concat(t.to_now, ", ").concat(to.diff(from, 'days') + 1, " ").concat(t.days);
       break;
 
     case 'pq':
       label = t.previous_quarter;
       from = (0, _moment.default)().subtract(1, 'quarter').startOf('quarter');
       to = (0, _moment.default)().subtract(1, 'quarter').endOf('quarter');
-      info = "".concat(from.format('YYYY'), "-").concat(t.short_quarter).concat(from.format('Q'), ", ").concat(to.diff(from, 'days'), " ").concat(t.days);
+      info = "".concat(from.format(t.yearAndQuarter), ", ").concat(to.diff(from, 'days') + 1, " ").concat(t.days);
       break;
 
     case 'cy':
       label = t.current_year;
       from = (0, _moment.default)().startOf('year');
       to = (0, _moment.default)();
-      info = "".concat(from.format(format), " ").concat(t.to_now, ", ").concat(to.diff(from, 'days'), " ").concat(t.days);
+      info = "".concat(from.format(format), " ").concat(t.to_now, ", ").concat(to.diff(from, 'days') + 1, " ").concat(t.days);
       break;
 
     default:
@@ -172,25 +175,30 @@ function (_React$Component) {
     _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(HiDateRangeSelector).call(this));
     _this.options = [];
 
+    _this.onBlur = function (event) {
+      if (event instanceof Object && _this.props.onblur) {
+        _this.props.onBlur(event);
+      }
+    };
+
     _this.handleSelectChange = function (name) {
       return function (event, value) {
-        _this.setState((0, _defineProperty2.default)({}, name, value));
-
-        if (value !== 'custom') {
-          var selectedOption = _this.options.find(function (option) {
-            return option.id === value;
-          });
-
-          if (selectedOption) {
-            _this.props.onChange('from', selectedOption.from.toDate());
-
-            _this.props.onChange('to', selectedOption.to.toDate());
-          }
-        } else {
-          _this.setState({
-            defaultFrom: undefined,
-            defaultTo: undefined
-          });
+        var _this$setState;
+
+        _this.setState((_this$setState = {}, (0, _defineProperty2.default)(_this$setState, name, value), (0, _defineProperty2.default)(_this$setState, "key", _this.state.key === 1 ? 2 : 1), _this$setState));
+
+        var selectedOption = _this.options.find(function (option) {
+          return option.id === value;
+        });
+
+        if (selectedOption) {
+          _this.props.onChange('from', selectedOption.from.toDate());
+
+          _this.props.onChange('to', selectedOption.to.toDate());
+
+          _this.props.onChange('fromError', false);
+
+          _this.props.onChange('toError', false);
         }
 
         if (_this.props.returnSelectValue === true) {
@@ -204,25 +212,9 @@ function (_React$Component) {
     _this.options = props.availableOptionKeys.map(function (key) {
       return buildDateRangeOptionByKey(key, props.translations, props.format);
     });
-    var from;
-    var to;
-
-    if (props.defaultPreset !== 'custom') {
-      var selectedOption = _this.options.find(function (option) {
-        return option.id === props.defaultPreset;
-      });
-
-      if (selectedOption) {
-        from = selectedOption.from.toDate();
-        to = selectedOption.to.toDate();
-      }
-    }
-
     _this.state = {
       selectedPreset: props.defaultPreset,
-      containerWidth: 0,
-      defaultFrom: from,
-      defaultTo: to
+      containerWidth: 0
     };
     return _this;
   }
@@ -232,7 +224,7 @@ function (_React$Component) {
     value: function componentDidMount() {
       if (this.container) {
         this.setState({
-          containerWidth: (0, _reactDom.findDOMNode)(this.container).clientWidth
+          containerWidth: (0, _reactDom.findDOMNode)(this.container).clientWidth - 5
         });
       }
     }
@@ -245,6 +237,7 @@ function (_React$Component) {
     key: "handleReset",
     value: function handleReset(name) {
       this.props.onChange(name, undefined);
+      this.props.onChange("".concat(name, "Error"), undefined);
     }
   }, {
     key: "render",
@@ -254,12 +247,14 @@ function (_React$Component) {
       var _this$props = this.props,
           disabled = _this$props.disabled,
           enableTime = _this$props.enableTime,
-          error = _this$props.error,
           errorText = _this$props.errorText,
+          fromError = _this$props.fromError,
+          toError = _this$props.toError,
           helperIcon = _this$props.helperIcon,
           helperText = _this$props.helperText,
           idRange = _this$props.idRange,
           idSelect = _this$props.idSelect,
+          minimumDate = _this$props.minimumDate,
           label = _this$props.label,
           from = _this$props.from,
           onChange = _this$props.onChange,
@@ -269,17 +264,24 @@ function (_React$Component) {
           classes = _this$props.classes,
           selectProps = _this$props.selectProps,
           staticPosition = _this$props.staticPosition,
-          props = (0, _objectWithoutProperties2.default)(_this$props, ["disabled", "enableTime", "error", "errorText", "helperIcon", "helperText", "idRange", "idSelect", "label", "from", "onChange", "required", "to", "translations", "classes", "selectProps", "staticPosition"]);
-      var _this$state = this.state,
-          defaultFrom = _this$state.defaultFrom,
-          defaultTo = _this$state.defaultTo,
-          selectedPreset = _this$state.selectedPreset;
-      return _react.default.createElement(_Grid.default, {
+          props = (0, _objectWithoutProperties2.default)(_this$props, ["disabled", "enableTime", "errorText", "fromError", "toError", "helperIcon", "helperText", "idRange", "idSelect", "minimumDate", "label", "from", "onChange", "required", "to", "translations", "classes", "selectProps", "staticPosition"]);
+      var selectedPreset = this.state.selectedPreset;
+      var hiSelectableListProps = {
+        hideCheckbox: true
+      };
+      return _react.default.createElement(_HiFormControl.default, {
+        disabled: disabled,
+        helperIcon: helperIcon,
+        helperText: helperText,
+        errorText: errorText,
+        error: !!(fromError || toError),
+        label: ' '
+      }, _react.default.createElement(_Grid.default, {
         container: true,
         spacing: 8,
         className: classes.root,
         ref: function ref(container) {
-          _this2.container = container;
+          return _this2.container = container;
         }
       }, _react.default.createElement(_Grid.default, {
         item: true,
@@ -290,12 +292,10 @@ function (_React$Component) {
         }
       }, _react.default.createElement(_HiSelectField.default, (0, _extends2.default)({
         disabled: disabled,
-        error: error,
-        errorText: errorText,
-        helperIcon: helperIcon,
-        helperText: helperText,
         id: idSelect,
         label: label,
+        hideCheckbox: true,
+        hiSelectableListProps: hiSelectableListProps,
         name: 'selectedPreset',
         options: this.options,
         onChange: this.handleSelectChange('selectedPreset'),
@@ -315,19 +315,26 @@ function (_React$Component) {
           'grid-sm-8': classes.smRangePicker
         }
       }, _react.default.createElement(_HiDateRangePicker.default, (0, _extends2.default)({
+        key: this.state.key,
         classes: {
           root: classes.dateRangePicker
         },
         id: idRange,
-        from: from || defaultFrom,
-        to: to || defaultTo,
+        from: selectedPreset ? from : undefined,
+        to: selectedPreset ? to : undefined,
         enableTime: enableTime,
         onChange: onChange,
+        toError: toError,
+        fromError: fromError,
+        minimumDate: minimumDate,
+        errorText: null,
         onReset: this.handleReset,
         disabled: disabled || selectedPreset !== 'custom',
         translations: translations,
-        staticPosition: staticPosition
-      }, props))));
+        staticPosition: staticPosition,
+        onBlur: this.onBlur,
+        hasSelector: true
+      }, props)))));
     }
   }], [{
     key: "getDerivedStateFromProps",
@@ -346,7 +353,6 @@ function (_React$Component) {
 
 HiDateRangeSelector.defaultProps = {
   availableOptionKeys: ['cd', 'pd', 'cw', 'pw', 'cm', 'pm', 'cq', 'pq', 'cy', 'custom'],
-  defaultPreset: 'cd',
   enableTime: false,
   returnSelectValue: false,
   staticPosition: false,
@@ -360,7 +366,8 @@ HiDateRangeSelector.defaultProps = {
     quarter: 'Quarter',
     week: 'Week',
     short_week: 'W',
-    short_quarter: 'Q',
+    yearAndMonth: 'YYYY[-]MM',
+    yearAndQuarter: 'YYYY[-Q]Q',
     year: 'Year',
     days: 'days',
     custom_period: 'Custom Period',
@@ -373,7 +380,13 @@ HiDateRangeSelector.defaultProps = {
     previous_month: 'Previous Month',
     current_quarter: 'Current Quarter',
     previous_quarter: 'Previous Quarter',
-    current_year: 'Current Year'
+    current_year: 'Current Year',
+    invalid_format: 'The date format is not valid',
+    to_superior_from: 'Date from cannot be greater than date to',
+    date_superior_max_date: 'Date from cannot be greater than %s',
+    date_inferior_min_date: 'Date from cannot be before than %s',
+    missing_date_from: 'Missing date from',
+    missing_date_to: 'Missing date to'
   }
 };
 HiDateRangeSelector.propTypes = process.env.NODE_ENV !== "production" ? {
@@ -410,7 +423,7 @@ HiDateRangeSelector.propTypes = process.env.NODE_ENV !== "production" ? {
   /**
    * Texte de l'erreur
    */
-  errorText: _propTypes.default.string,
+  errorText: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.bool]),
 
   /**
    * Format de date utilisé
@@ -452,6 +465,11 @@ HiDateRangeSelector.propTypes = process.env.NODE_ENV !== "production" ? {
    */
   locale: _propTypes.default.string,
 
+  /**
+   * Date minimale sélectionnable
+   */
+  minimumDate: _propTypes.default.instanceOf(Date).isRequired,
+
   /**
    * Callback à la sélection d'une date
    */

package/HiDatePicker/NavBar.js

@@ -35,7 +35,8 @@ var styles = function styles(theme) {
     button: {
       height: 32,
       width: 32,
-      margin: '4px 24px'
+      margin: '4px 24px',
+      padding: 0
     },
     left: {
       float: 'left'

package/HiDatePicker/Overlays/TimePickerOverlay.js

@@ -111,7 +111,7 @@ var styles = function styles(theme) {
       bottom: 0,
       height: 32,
       width: 32,
-      margin: '4px 24px'
+      margin: '0px 24px'
     },
     calendarButton: {
       fontWeight: theme.typography.fontWeightMedium

package/HiDatePicker/Overlays/YearPickerOverlay.js

@@ -95,8 +95,8 @@ function (_React$Component) {
 }(_react.default.Component);
 
 YearPickerOverlay.defaultProps = {
-  disableFutureDays: false,
-  disablePastDays: false,
+  // disableFutureDays: true,
+  // disablePastDays: false,
   minimumDate: new Date(2013, 4, 1),
   // by default 1 May 2013
   translations: {
@@ -132,7 +132,7 @@ YearPickerOverlay.propTypes = process.env.NODE_ENV !== "production" ? {
   /**
    * Date minimale sélectionnable
    */
-  minimumDate: _propTypes.default.instanceOf(Date),
+  minimumDate: _propTypes.default.instanceOf(Date).isRequired,
 
   /**
    * Fonction de callback

package/HiForm/HiFormControl.js

@@ -62,6 +62,7 @@ var styles = function styles(theme) {
       position: 'absolute',
       right: 5,
       cursor: 'pointer',
+      zIndex: 1,
       top: '-5px',
       '&$iconButtonError': {
         color: theme.palette.negative.main
@@ -247,7 +248,7 @@ function (_React$PureComponent) {
         required: required,
         disabled: disabled,
         focused: !disabled && (focused || hovered)
-      }, InputLabelProps), error && _react.default.createElement(_HiIconButton.default, {
+      }, InputLabelProps), error && errorText && _react.default.createElement(_HiIconButton.default, {
         className: (0, _classnames.default)(classes.iconButton, classes.iconButtonError),
         onClick: this.handleHelperClick,
         onKeyDown: this.handleKeyDown
@@ -279,8 +280,8 @@ HiFormControl.defaultProps = {
   required: true,
   disabled: false,
   error: false,
-  errorText: '',
-  helperText: '',
+  errorText: undefined,
+  helperText: undefined,
   helperIcon: false,
   multiline: false,
   nbChars: 0,
@@ -315,7 +316,7 @@ HiFormControl.propTypes = process.env.NODE_ENV !== "production" ? {
   /**
    * Texte de l'erreur
    */
-  errorText: _propTypes.default.string,
+  errorText: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.bool]),
 
   /**
    * Propriétés appliquées au composant FormHelperText

package/HiSelect/HiSuggestSelect.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.styles = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -33,6 +35,8 @@ var _Grow = _interopRequireDefault(require("@material-ui/core/Grow"));
 
 var _Paper = _interopRequireDefault(require("@material-ui/core/Paper"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _HiSelectableList = _interopRequireDefault(require("../HiSelectableList"));
 
 var _HiInput = _interopRequireDefault(require("../HiForm/HiInput"));
@@ -62,6 +66,9 @@ var styles = function styles(theme) {
       borderRadius: '0px 2px',
       maxHeight: 440,
       transition: 'none'
+    },
+    alignRight: {
+      right: 0
     }
   };
 };
@@ -195,7 +202,8 @@ function (_React$PureComponent) {
           showNoResults = _this$props.showNoResults,
           onSearch = _this$props.onSearch,
           translations = _this$props.translations,
-          otherProps = (0, _objectWithoutProperties2.default)(_this$props, ["classes", "id", "loading", "showMinLength", "showNoResults", "onSearch", "translations"]);
+          align = _this$props.align,
+          otherProps = (0, _objectWithoutProperties2.default)(_this$props, ["classes", "id", "loading", "showMinLength", "showNoResults", "onSearch", "translations", "align"]);
       var _this$state = this.state,
           focused = _this$state.focused,
           options = _this$state.options;
@@ -240,7 +248,7 @@ function (_React$PureComponent) {
         disablePortal: true,
         anchorEl: this.textInput,
         placement: "bottom-start",
-        className: classes.popper,
+        className: (0, _classnames.default)(classes.popper, (0, _defineProperty2.default)({}, classes.alignRight, align === 'right')),
         open: true
       }, _react.default.createElement(_Grow.default, {
         in: open,
@@ -264,6 +272,7 @@ function (_React$PureComponent) {
 }(_react.default.PureComponent);
 
 HiSuggestSelect.defaultProps = {
+  align: 'left',
   showMinLength: false,
   showNoResults: false,
   translations: {
@@ -273,6 +282,11 @@ HiSuggestSelect.defaultProps = {
   options: []
 };
 HiSuggestSelect.propTypes = process.env.NODE_ENV !== "production" ? {
+  /**
+   * Align popper on right or left of container
+   */
+  align: _propTypes.default.oneOf(['left', 'right']),
+
   /**
    * Useful to extend the style applied to components.
    */

package/HiSelectNew/HiSelect.js

@@ -501,7 +501,7 @@ function (_React$PureComponent) {
         }
       }
 
-      var popperClass = (0, _classnames.default)(classes.popper, (_classNames = {}, (0, _defineProperty2.default)(_classNames, classes.popperWidth, !this.props.containerWidth), (0, _defineProperty2.default)(_classNames, classes.popperRightAlign, this.props.containerWidth), _classNames));
+      var popperClass = (0, _classnames.default)(classes.popper, (_classNames = {}, (0, _defineProperty2.default)(_classNames, classes.popperWidth, !this.props.containerWidth), (0, _defineProperty2.default)(_classNames, classes.popperRightAlign, this.props.containerWidth && this.props.align === 'right'), _classNames));
 
       var content = _react.default.createElement(_ClickAwayListener.default, {
         onClickAway: this.handleClickAway
@@ -595,6 +595,7 @@ function (_React$PureComponent) {
 }(_react.default.PureComponent);
 
 HiSelect.defaultProps = {
+  align: 'left',
   disabled: false,
   displayAsChip: false,
   error: false,
@@ -617,6 +618,8 @@ HiSelect.defaultProps = {
   type: 'text'
 };
 HiSelect.propTypes = process.env.NODE_ENV !== "production" ? {
+  align: _propTypes.default.oneOf(['left', 'right']),
+
   /**
    * Useful to extend the style applied to components.
    */

package/HiSelectableList/HiSelectableListItem.js

@@ -146,7 +146,9 @@ var styles = function styles(theme) {
       textOverflow: 'ellipsis',
       textAlign: 'right',
       margin: '4px 12px 4px 8px',
-      alignSelf: 'center'
+      alignSelf: 'center',
+      minWidth: '40%',
+      maxWidth: '100%'
     }),
     checkbox: {
       marginTop: 3

package/HiSwitch/HiSwitch.js

@@ -33,7 +33,8 @@ var styles = function styles(theme) {
       display: 'inline-flex',
       width: 62,
       position: 'relative',
-      flexShrink: 0
+      flexShrink: 0,
+      zIndex: 0
     },
     bar: {
       borderRadius: 7,

package/HiTable/HiCellBuilder.js

@@ -25,23 +25,25 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell"));
 
-var _CellAddress = _interopRequireDefault(require("@hipay/hipay-material-ui/HiCell/CellAddress"));
+var _CellAddress = _interopRequireDefault(require("../HiCell/CellAddress"));
 
-var _CellDate = _interopRequireDefault(require("@hipay/hipay-material-ui/HiCell/CellDate"));
+var _CellDate = _interopRequireDefault(require("../HiCell/CellDate"));
 
-var _CellIcon = _interopRequireDefault(require("@hipay/hipay-material-ui/HiCell/CellIcon"));
+var _CellIcon = _interopRequireDefault(require("../HiCell/CellIcon"));
 
-var _CellImage = _interopRequireDefault(require("@hipay/hipay-material-ui/HiCell/CellImage"));
+var _CellImage = _interopRequireDefault(require("../HiCell/CellImage"));
 
-var _CellNumeric = _interopRequireDefault(require("@hipay/hipay-material-ui/HiCell/CellNumeric"));
+var _CellNumeric = _interopRequireDefault(require("../HiCell/CellNumeric"));
 
-var _CellSentinel = _interopRequireDefault(require("@hipay/hipay-material-ui/HiCell/CellSentinel"));
+var _CellSentinel = _interopRequireDefault(require("../HiCell/CellSentinel"));
 
-var _CellText = _interopRequireDefault(require("@hipay/hipay-material-ui/HiCell/CellText"));
+var _CellSentinelScore = _interopRequireDefault(require("../HiCell/CellSentinelScore"));
 
-var _CellRate = _interopRequireDefault(require("@hipay/hipay-material-ui/HiCell/CellRate"));
+var _CellTextStyled = _interopRequireDefault(require("../HiCell/CellTextStyled"));
 
-var _CellPinToAction = _interopRequireDefault(require("@hipay/hipay-material-ui/HiCell/CellPinToAction"));
+var _CellRate = _interopRequireDefault(require("../HiCell/CellRate"));
+
+var _CellPinToAction = _interopRequireDefault(require("../HiCell/CellPinToAction"));
 
 var cst = _interopRequireWildcard(require("./constants"));
 
@@ -102,7 +104,8 @@ function (_React$PureComponent) {
                 shortLabel: datacell.id,
                 path: datacell.img,
                 size: datacell.size,
-                view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
+                view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type],
+                fallbackImage: datacell.fallbackImage
               });
 
             case cst.TYPE_RATE:
@@ -155,13 +158,19 @@ function (_React$PureComponent) {
 
             case cst.TYPE_SENTINEL:
               return _react.default.createElement(_CellSentinel.default, {
-                automaticFraudReviewResult: datacell.automaticFraudReviewResult,
-                fraudResult: datacell.value,
-                hideFraudResult: datacell.hideFraudResult,
-                pendingManualAction: datacell.pendingManualAction,
-                score: datacell.score,
-                smartDecision: datacell.smartDecision,
-                view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
+                color: datacell.color,
+                label: datacell.label,
+                letter: datacell.label2,
+                active: datacell.active,
+                reviewer: datacell.reviewer,
+                outlined: datacell.outlined
+              });
+
+            case cst.TYPE_SENTINEL_SCORE:
+              return _react.default.createElement(_CellSentinelScore.default, {
+                value: datacell.value,
+                result: datacell.result,
+                active: datacell.active
               });
 
             case cst.TYPE_PIN_TO_ACTION:
@@ -171,18 +180,13 @@ function (_React$PureComponent) {
               });
 
             case cst.TYPE_ACCOUNT_NUMBER:
-              return _react.default.createElement(_CellText.default, {
-                label: datacell.value,
-                color: datacell.color,
-                ellipsis: datacell.ellipse
-              });
-
             default:
-              return _react.default.createElement(_CellText.default, {
-                label: datacell.value,
+              return _react.default.createElement(_CellTextStyled.default, {
+                active: datacell.active,
                 color: datacell.color,
-                ellipsis: datacell.ellipse,
-                view: cell.view ? cell.view : cst.DEFAULT_VIEWS[cell.type]
+                label: datacell.label,
+                title: datacell.title,
+                value: datacell.value
               });
           }
         }

package/HiTable/HiTableHeader.js

@@ -9,6 +9,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -76,6 +78,8 @@ function (_React$PureComponent) {
   (0, _createClass2.default)(HiTableHeader, [{
     key: "render",
     value: function render() {
+      var _this2 = this;
+
       var _this$props = this.props,
           classes = _this$props.classes,
           columns = _this$props.columns,
@@ -89,28 +93,32 @@ function (_React$PureComponent) {
           whiteSpace: 'nowrap'
         }
       }, Object.keys(columns).map(function (key) {
-        var column = columns[key];
+        var _columns$key = columns[key],
+            colId = _columns$key.colId,
+            type = _columns$key.type,
+            label = _columns$key.label,
+            smallLabel = _columns$key.smallLabel,
+            view = _columns$key.view;
         return _react.default.createElement(_TableCell.default, {
-          key: column.colId,
-          sortDirection: orderBy === column.colId ? order : false,
+          key: colId,
+          sortDirection: orderBy === colId ? order : false,
           style: {
             border: 'none',
-            borderBottom: orderBy === column.colId ? 'solid 1px #00ADE9' : 'none',
+            borderBottom: orderBy === colId ? 'solid 1px #00ADE9' : 'none',
             paddingRight: '13px',
             paddingLeft: '13px'
           },
-          numeric: !!cst.ALIGN_RIGHT_TYPES.includes(column.type)
-        }, sortable ? _react.default.createElement(_Tooltip.default, {
-          title: "Sort",
-          enterDelay: 300
-        }, _react.default.createElement(_TableSortLabel.default, {
-          active: orderBy === column.colId,
+          numeric: cst.ALIGN_RIGHT_TYPES.includes(type)
+        }, _react.default.createElement(_TableSortLabel.default, (0, _extends2.default)({}, sortable && {
+          active: orderBy === colId,
           direction: order,
-          onClick: this.createSortHandler(column.colId),
+          onClick: _this2.createSortHandler(colId)
+        }, {
           classes: {
             icon: classes.icon
-          }
-        }, column.label)) : column.label);
+          },
+          title: label
+        }), view === 's' ? smallLabel : label));
       }, this)));
     }
   }]);