@hipay/hipay-material-ui 1.0.0-beta.27 → 1.0.0-beta.28

package/HiCheckbox/HiCheckbox.js

@@ -70,10 +70,13 @@ var styles = exports.styles = function styles(theme) {
             marginLeft: 12
         },
         checked: {
-            color: theme.palette.business.primary.normal
+            color: theme.palette.business.primary.normal,
+            '&$disabled': {
+                color: '#999999'
+            }
         },
         disabled: {
-            color: theme.palette.action.disabled
+            color: theme.palette.placeholder
         }
     };
 }; //
@@ -85,7 +88,7 @@ var HiCheckbox = function (_React$Component) {
     function HiCheckbox(props) {
         (0, _classCallCheck3.default)(this, HiCheckbox);
 
-        var _this = (0, _possibleConstructorReturn3.default)(this, (HiCheckbox.__proto__ || (0, _getPrototypeOf2.default)(HiCheckbox)).call(this));
+        var _this = (0, _possibleConstructorReturn3.default)(this, (HiCheckbox.__proto__ || (0, _getPrototypeOf2.default)(HiCheckbox)).call(this, props));
 
         _this.handleChange = _this.handleChange.bind(_this);
         return _this;

package/HiColoredLabel/HiColoredLabel.js

@@ -32,10 +32,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var styles = exports.styles = function styles(theme) {
     return {
         root: {
-            display: 'inline-flex',
+            display: 'inline-block',
             alignItems: 'baseline',
             maxWidth: '100%',
-            padding: '2px 4px',
+            padding: '2px 8px',
             borderRadius: 2,
             textOverflow: 'ellipsis',
             overflow: 'hidden',

package/HiDatePicker/HiDateRangeSelector.js

@@ -130,7 +130,7 @@ function buildDateRangeOptionByKey(key, t, format) {
             label = t.previous_quarter;
             from = (0, _moment2.default)().subtract(1, 'quarter').startOf('quarter');
             to = (0, _moment2.default)().subtract(1, 'quarter').endOf('quarter');
-            info = from.format('YYYY') + '-Q' + from.format('Q') + ', ' + to.diff(from, 'days') + ' ' + t.days;
+            info = from.format('YYYY') + '-' + t.short_quarter + from.format('Q') + ', ' + to.diff(from, 'days') + ' ' + t.days;
             break;
         case 'cy':
             label = t.current_year;
@@ -193,6 +193,11 @@ var HiDateRangeSelector = function (_React$Component) {
                         _this.props.onChange('from', selectedOption.from.toDate());
                         _this.props.onChange('to', selectedOption.to.toDate());
                     }
+                } else {
+                    _this.setState({
+                        defaultFrom: undefined,
+                        defaultTo: undefined
+                    });
                 }
                 if (_this.props.returnSelectValue === true) {
                     _this.props.onChange('period', value);
@@ -200,17 +205,31 @@ var HiDateRangeSelector = function (_React$Component) {
             };
         };
 
-        _this.state = {
-            selectedPreset: props.defaultPreset,
-            containerWidth: 0
-        };
-
         _this.handleReset = _this.handleReset.bind(_this);
         _this.handleSelectChange = _this.handleSelectChange.bind(_this);
 
         _this.options = props.availableOptionKeys.map(function (key) {
             return buildDateRangeOptionByKey(key, props.translations, props.format);
         });
+
+        var from = void 0;
+        var to = void 0;
+        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
+        };
         return _this;
     }
 
@@ -255,7 +274,10 @@ var HiDateRangeSelector = function (_React$Component) {
                 selectProps = _props.selectProps,
                 staticPosition = _props.staticPosition,
                 props = (0, _objectWithoutProperties3.default)(_props, ['disabled', 'enableTime', 'error', 'errorText', 'helperIcon', 'helperText', 'idRange', 'idSelect', 'label', 'from', 'onChange', 'required', 'to', 'translations', 'classes', 'selectProps', 'staticPosition']);
-            var selectedPreset = this.state.selectedPreset;
+            var _state = this.state,
+                defaultFrom = _state.defaultFrom,
+                defaultTo = _state.defaultTo,
+                selectedPreset = _state.selectedPreset;
 
 
             return _react2.default.createElement(
@@ -296,8 +318,8 @@ var HiDateRangeSelector = function (_React$Component) {
                     _react2.default.createElement(_HiDateRangePicker2.default, (0, _extends3.default)({
                         classes: { root: classes.dateRangePicker },
                         id: idRange,
-                        from: from,
-                        to: to,
+                        from: from || defaultFrom,
+                        to: to || defaultTo,
                         enableTime: enableTime,
                         onChange: onChange,
                         onReset: this.handleReset,
@@ -338,6 +360,7 @@ HiDateRangeSelector.defaultProps = {
         quarter: 'Quarter',
         week: 'Week',
         short_week: 'W',
+        short_quarter: 'Q',
         year: 'Year',
         days: 'days',
         custom_period: 'Custom Period',

package/HiForm/HiSearchField.js

@@ -40,6 +40,10 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
+var _reactProptypeConditionalRequire = require('react-proptype-conditional-require');
+
+var _reactProptypeConditionalRequire2 = _interopRequireDefault(_reactProptypeConditionalRequire);
+
 var _HiInput = require('../HiForm/HiInput');
 
 var _HiInput2 = _interopRequireDefault(_HiInput);
@@ -169,7 +173,9 @@ HiSearchField.propTypes = process.env.NODE_ENV !== "production" ? {
      *
      * @param {array} suggestions
      */
-    callbackFilteredList: _propTypes2.default.func.isRequired,
+    callbackFilteredList: (0, _reactProptypeConditionalRequire2.default)(_propTypes2.default.func, function (props) {
+        return !props.hasOwnProperty('onSearch');
+    }, 'callbackFilteredList required'),
     /**
      * Liste des propriété de l'élément sur lesquelles filtrer (par défaut l'item lui même)
      */