@hipay/hipay-material-ui 1.0.0-beta.3 → 1.0.0-beta.5

package/es/HiSelect/HiSelect.js

@@ -9,11 +9,9 @@ import Grow from 'material-ui/transitions/Grow';
 import { findDOMNode } from 'react-dom';
 import Paper from 'material-ui/Paper';
 import ClickAwayListener from 'material-ui/utils/ClickAwayListener';
-import Collapse from 'material-ui/transitions/Collapse';
 import { Manager, Target, Popper } from 'react-popper';
 import { CheckboxBlankOutline, CheckboxMarked } from 'mdi-material-ui';
 import HiSelectableList from '../HiSelectableList';
-import HiSelectableListItem from '../HiSelectableList/HiSelectableListItem';
 import { HiSearchField } from '../HiForm';
 import SelectInput from './SelectInput';
 import HiChip from '../HiChip/HiChip';
@@ -71,231 +69,7 @@ class HiSelect extends React.PureComponent {
     constructor(props) {
         super(props);
 
-        this.handleClick = () => {
-            document.body.style.overflow = 'hidden';
-            this.setState({ open: true });
-            const options = this.props.options.slice();
-            this.handleSuggestions(options);
-
-            if (this.props.onClick) {
-                this.props.onClick();
-            }
-
-            // Gestion du focus
-            if (this.searchField) {
-                // si searchable, focus sur le champs de recherche
-                const searchField = this.searchField;
-                setTimeout(() => {
-                    searchField.focus();
-                }, 1);
-            } else if (this.overlay) {
-                // sinon focus sur le dernier élément selectionné
-                this.focusOnSelectedItem();
-            }
-        };
-
-        this.focusOnSelectedItem = () => {
-            // On récupère la div parent "overlay"
-            const overlay = findDOMNode(this.overlay);
-            const multiple = this.props.multiple;
-            const value = this.props.value;
-            const selectedIdList = Array.isArray(value) ? value : [value];
-            setTimeout(() => {
-                let focused = false;
-                // Si un ou plusieurs items sont selectionnés, on focus sur le dernier
-                if (selectedIdList.length > 0) {
-                    const itemSelected = overlay.querySelector(`[data-id="${selectedIdList[selectedIdList.length - 1]}"]`);
-                    if (itemSelected && itemSelected.parentElement.tagName === 'LI') {
-                        itemSelected.parentElement.focus();
-                        focused = true;
-                    }
-                }
-                // Si pas d'item selectionné, ou pas visible (en cas de recherche), focus sur le premier
-                if (selectedIdList.length === 0 || !focused) {
-                    // On recupère tous les items
-                    const items = overlay.getElementsByTagName('li');
-                    let itemToFocus = items[0];
-                    // Si select multiple, et qu'au moins un selectionné, focus sur le 2e item
-                    if (multiple && selectedIdList.length > 0) {
-                        itemToFocus = items[1];
-                    }
-                    itemToFocus.focus();
-                }
-            }, 1);
-        };
-
-        this.handleKeyDown = event => {
-            let nextItem;
-            if (event.key === 'ArrowDown') {
-                nextItem = getNextItemSelectable(document.activeElement, 'down');
-            } else if (event.key === 'ArrowUp') {
-                nextItem = getNextItemSelectable(document.activeElement, 'up');
-            } else if (event.key === 'Tab') {
-                document.body.style.overflow = 'auto';
-                this.setState({ open: false });
-            }
-            if (nextItem) {
-                nextItem.focus();
-            }
-        };
-
-        this.handleKeyDownSearch = event => {
-            if (this.overlay && (event.key === 'ArrowDown' || event.key === 'ArrowUp')) {
-                this.focusOnSelectedItem();
-            }
-        };
-
-        this.handleFocus = () => {
-            this.setState({ focused: true });
-        };
-
-        this.handleBlur = () => {
-            this.setState({ focused: false });
-        };
-
-        this.handleClose = () => {
-            document.body.style.overflow = 'auto';
-            this.setState({
-                open: false
-            });
-
-            if (this.props.onClose) {
-                this.props.onClose();
-            }
-        };
-
-        this.handleSelect = (event, item) => {
-            const { multiple, value, name, onChange, options, hierarchic } = this.props;
-            const { hierarchySelected, hierarchy, nbOptions } = this.state;
-            const hiSelected = _extends({}, hierarchySelected);
-
-            if (multiple) {
-                let valueList = value;
-                if (item.id === '_all') {
-                    if (valueList.length === nbOptions) {
-                        valueList = [];
-                        if (hierarchic) {
-                            // if hierarchic select => empty associative array of selected children
-                            _Object$keys(hiSelected).forEach(key => {
-                                hiSelected[key] = [];
-                            });
-                        }
-                    } else {
-                        options.forEach(option => {
-                            if (option.hasChildren !== true && !valueList.includes(option.id) && option.id !== '_all') {
-                                valueList.push(option.id);
-                            } else if (option.hasChildren === true) {
-                                // if hierarchic select => fill associative array of selected children
-                                hiSelected[option.id] = hierarchy[option.id];
-                            }
-                        });
-                    }
-                } else if (valueList.includes(item.id) || item.hasChildren === true && hierarchySelected[item.id].length === hierarchy[item.id].length) {
-                    // item déjà sélectionné => on le déselectionne
-                    if (item.hasChildren !== true) {
-                        valueList = valueList.filter(val => {
-                            return val !== item.id;
-                        });
-                    }
-
-                    if (item.hasChildren === true) {
-                        // remove all children
-                        valueList = valueList.filter(val => {
-                            return !this.state.hierarchy[item.id].includes(val);
-                        });
-                        hiSelected[item.id] = [];
-                    } else if (item.hasOwnProperty('parentId')) {
-                        // Si item est un enfant on l'enlève du tableau associatif des
-                        // elmts sélectionnés
-                        hiSelected[item.parentId].splice(hiSelected[item.parentId].indexOf(item.id), 1);
-                    }
-                } else {
-                    // item non sélectionné => on le sélectionne
-                    if (item.hasChildren !== true) valueList.push(item.id);
-
-                    if (item.hasChildren === true) {
-                        // Si item parent => on ajoute tous les enfants
-                        // Ou on les supprime s'ils sont déjà tous sélectionnés (dans une liste filtrée)
-                        const idsInSuggestions = [];
-                        this.state.suggestions.forEach(suggestion => {
-                            if (this.state.hierarchy[item.id].includes(suggestion.id)) {
-                                idsInSuggestions.push(suggestion.id);
-                            }
-                        });
-                        // if(hierarchySelected[item.id].length > 0) {}
-                        let allChildrenSuggestionsSelected = true;
-                        idsInSuggestions.forEach(id => {
-                            if (!hierarchySelected[item.id].includes(id)) {
-                                allChildrenSuggestionsSelected = false;
-                            }
-                        });
-
-                        if (allChildrenSuggestionsSelected === true) {
-                            // On supprime les enfants car déjà tous sélectionnés
-                            idsInSuggestions.forEach(id => {
-                                valueList.splice(valueList.indexOf(id), 1);
-                                hiSelected[item.id].splice(hiSelected[item.id].indexOf(id), 1);
-                            });
-                        } else {
-                            // On ajoute tous les enfants filtrés au éléments sélectionnés
-                            valueList = arrayUnique(valueList.concat(idsInSuggestions));
-                            hiSelected[item.id] = arrayUnique(hiSelected[item.id].concat(idsInSuggestions));
-                        }
-
-                        this.setState({ hierarchySelected: hiSelected });
-                    } else if (item.hasOwnProperty('parentId')) {
-                        // Si item est un enfant on l'ajoute du tableau associatif des
-                        // elmts sélectionnés
-                        hiSelected[item.parentId].push(item.id);
-                    }
-                }
-                this.setState({ hierarchySelected: hiSelected });
-                onChange(event, valueList);
-            } else {
-                onChange(event, item.id);
-                this.handleClose();
-            }
-        };
-
-        this.handleSuggestions = suggestions => {
-            const { options, hasAll, iconAll, translations, multiple } = this.props;
-
-            if (suggestions.length === 0) {
-                // Handle No Result
-                // FIX to remove all item
-                suggestions = [];
-                suggestions.push({
-                    id: '_no_result',
-                    type: 'text',
-                    disabled: true,
-                    centered: true,
-                    checkbox: false,
-                    label: translations.no_result_match
-                });
-            } else if (hasAll && suggestions.length > 0 && suggestions.length === options.length && multiple === true) {
-                // Handle 'All'
-                if (suggestions.filter(suggestion => suggestion.id === '_all').length === 0) {
-                    const allItem = {
-                        id: '_all',
-                        icon: iconAll,
-                        label: translations.all
-                    };
-                    if (iconAll !== false) {
-                        allItem.type = 'icon';
-                    }
-                    suggestions.unshift(allItem);
-                }
-            }
-
-            this.setState({
-                suggestions
-            });
-        };
-
-        this.handleRequestDelete = evt => {
-            evt.stopPropagation();
-            this.props.onChange(this.props.name, []);
-        };
+        _initialiseProps.call(this);
 
         this.state = {
             open: false,
@@ -307,6 +81,26 @@ class HiSelect extends React.PureComponent {
             dynamic: false
         };
 
+        // Check if value is in options
+        let valueInOptions = false;
+        const val = this.props.value;
+        // No options provided.
+        if (!this.props.options.length && !val.length) {
+            valueInOptions = true;
+        }
+        // Check if an option match value prop.
+        this.props.options.forEach(item => {
+            if (!val.length) {
+                valueInOptions = true;
+            }
+            if (!valueInOptions && val.indexOf(item.id) !== -1) {
+                valueInOptions = true;
+            }
+        });
+        if (!valueInOptions) {
+            throw new Error('prop value provided does not match any option.');
+        }
+
         if (props.hierarchic === true && props.options.length > 1) {
             // Construct two associative arrays
             // hierarchy[parentId] => children
@@ -416,13 +210,13 @@ class HiSelect extends React.PureComponent {
         const { open, suggestions, focused } = this.state;
 
         let display = '';
-        const selectedIdList = Array.isArray(value) ? value : [value];
+        const selectedIdList = Array.isArray(value) ? value : value ? [value] : [];
 
         if (this.state.dynamic && selectedIdList.length === 1) {
             display = translations.one_item_selected.replace('%s', selectedIdList.length);
         } else if (this.state.nbOptions !== selectedIdList.length && selectedIdList.length > 1) {
             display = translations.n_items_selected.replace('%s', selectedIdList.length);
-        } else if (this.state.nbOptions === selectedIdList.length) {
+        } else if (this.state.nbOptions === selectedIdList.length && this.state.nbOptions >= 1) {
             display = translations.all;
         } else if (selectedIdList.length === 1) {
             if (type !== 'icon') {
@@ -486,7 +280,10 @@ class HiSelect extends React.PureComponent {
                         onFocus: this.handleFocus,
                         onBlur: this.handleBlur,
                         onMouseEnter: this.props.onMouseEnter,
-                        onMouseLeave: this.props.onMouseLeave
+                        onMouseLeave: this.props.onMouseLeave,
+                        refElement: el => {
+                            this.selectInputElement = el;
+                        }
                     })
                 ),
                 open && React.createElement(
@@ -572,6 +369,240 @@ HiSelect.defaultProps = {
         one_child: '%s item'
     }
 };
+
+var _initialiseProps = function () {
+    this.handleClick = () => {
+        document.body.style.overflow = 'hidden';
+        this.setState({ open: true });
+        const options = this.props.options.slice();
+        this.handleSuggestions(options);
+
+        if (this.props.onClick) {
+            this.props.onClick();
+        }
+
+        // Gestion du focus
+        if (this.searchField) {
+            // si searchable, focus sur le champs de recherche
+            const searchField = this.searchField;
+            setTimeout(() => {
+                searchField.focus();
+            }, 1);
+        } else if (this.overlay) {
+            // sinon focus sur le dernier élément selectionné
+            this.focusOnSelectedItem();
+        }
+    };
+
+    this.focusOnSelectedItem = () => {
+        // On récupère la div parent "overlay"
+        const overlay = findDOMNode(this.overlay);
+        const multiple = this.props.multiple;
+        const value = this.props.value;
+        const selectedIdList = Array.isArray(value) ? value : [value];
+        setTimeout(() => {
+            let focused = false;
+            // Si un ou plusieurs items sont selectionnés, on focus sur le dernier
+            if (selectedIdList.length > 0) {
+                const itemSelected = overlay.querySelector(`[data-id="${selectedIdList[selectedIdList.length - 1]}"]`);
+                if (itemSelected && itemSelected.parentElement.tagName === 'LI') {
+                    itemSelected.parentElement.focus();
+                    focused = true;
+                }
+            }
+            // Si pas d'item selectionné, ou pas visible (en cas de recherche), focus sur le premier
+            if (selectedIdList.length === 0 || !focused) {
+                // On recupère tous les items
+                const items = overlay.getElementsByTagName('li');
+                let itemToFocus = items[0];
+                // Si select multiple, et qu'au moins un selectionné, focus sur le 2e item
+                if (multiple && selectedIdList.length > 0) {
+                    itemToFocus = items[1];
+                }
+                if (itemToFocus) {
+                    itemToFocus.focus();
+                }
+            }
+        }, 1);
+    };
+
+    this.handleKeyDown = event => {
+        let nextItem;
+        if (event.key === 'ArrowDown') {
+            nextItem = getNextItemSelectable(document.activeElement, 'down');
+        } else if (event.key === 'ArrowUp') {
+            nextItem = getNextItemSelectable(document.activeElement, 'up');
+        } else if (event.key === 'Tab') {
+            document.body.style.overflow = 'auto';
+            this.setState({ open: false });
+        }
+        if (nextItem) {
+            nextItem.focus();
+        }
+    };
+
+    this.handleKeyDownSearch = event => {
+        if (this.overlay && (event.key === 'ArrowDown' || event.key === 'ArrowUp')) {
+            this.focusOnSelectedItem();
+        }
+    };
+
+    this.handleFocus = () => {
+        this.setState({ focused: true });
+    };
+
+    this.handleBlur = () => {
+        this.setState({ focused: false });
+    };
+
+    this.handleClose = () => {
+        document.body.style.overflow = 'auto';
+        this.setState({
+            open: false
+        });
+
+        if (this.props.onClose) {
+            this.props.onClose();
+        }
+        if (this.selectInputElement) {
+            this.selectInputElement.focus();
+        }
+    };
+
+    this.handleSelect = (event, item) => {
+        const { multiple, value, name, onChange, options, hierarchic } = this.props;
+        const { hierarchySelected, hierarchy, nbOptions } = this.state;
+        const hiSelected = _extends({}, hierarchySelected);
+
+        if (multiple) {
+            let valueList = value;
+            if (item.id === '_all') {
+                if (valueList.length === nbOptions) {
+                    valueList = [];
+                    if (hierarchic) {
+                        // if hierarchic select => empty associative array of selected children
+                        _Object$keys(hiSelected).forEach(key => {
+                            hiSelected[key] = [];
+                        });
+                    }
+                } else {
+                    options.forEach(option => {
+                        if (option.hasChildren !== true && !valueList.includes(option.id) && option.id !== '_all') {
+                            valueList.push(option.id);
+                        } else if (option.hasChildren === true) {
+                            // if hierarchic select => fill associative array of selected children
+                            hiSelected[option.id] = hierarchy[option.id];
+                        }
+                    });
+                }
+            } else if (valueList.includes(item.id) || item.hasChildren === true && hierarchySelected[item.id].length === hierarchy[item.id].length) {
+                // item déjà sélectionné => on le déselectionne
+                if (item.hasChildren !== true) {
+                    valueList = valueList.filter(val => {
+                        return val !== item.id;
+                    });
+                }
+
+                if (item.hasChildren === true) {
+                    // remove all children
+                    valueList = valueList.filter(val => {
+                        return !this.state.hierarchy[item.id].includes(val);
+                    });
+                    hiSelected[item.id] = [];
+                } else if (item.hasOwnProperty('parentId')) {
+                    // Si item est un enfant on l'enlève du tableau associatif des
+                    // elmts sélectionnés
+                    hiSelected[item.parentId].splice(hiSelected[item.parentId].indexOf(item.id), 1);
+                }
+            } else {
+                // item non sélectionné => on le sélectionne
+                if (item.hasChildren !== true) valueList.push(item.id);
+
+                if (item.hasChildren === true) {
+                    // Si item parent => on ajoute tous les enfants
+                    // Ou on les supprime s'ils sont déjà tous sélectionnés (dans une liste filtrée)
+                    const idsInSuggestions = [];
+                    this.state.suggestions.forEach(suggestion => {
+                        if (this.state.hierarchy[item.id].includes(suggestion.id)) {
+                            idsInSuggestions.push(suggestion.id);
+                        }
+                    });
+                    // if(hierarchySelected[item.id].length > 0) {}
+                    let allChildrenSuggestionsSelected = true;
+                    idsInSuggestions.forEach(id => {
+                        if (!hierarchySelected[item.id].includes(id)) {
+                            allChildrenSuggestionsSelected = false;
+                        }
+                    });
+
+                    if (allChildrenSuggestionsSelected === true) {
+                        // On supprime les enfants car déjà tous sélectionnés
+                        idsInSuggestions.forEach(id => {
+                            valueList.splice(valueList.indexOf(id), 1);
+                            hiSelected[item.id].splice(hiSelected[item.id].indexOf(id), 1);
+                        });
+                    } else {
+                        // On ajoute tous les enfants filtrés au éléments sélectionnés
+                        valueList = arrayUnique(valueList.concat(idsInSuggestions));
+                        hiSelected[item.id] = arrayUnique(hiSelected[item.id].concat(idsInSuggestions));
+                    }
+
+                    this.setState({ hierarchySelected: hiSelected });
+                } else if (item.hasOwnProperty('parentId')) {
+                    // Si item est un enfant on l'ajoute du tableau associatif des
+                    // elmts sélectionnés
+                    hiSelected[item.parentId].push(item.id);
+                }
+            }
+            this.setState({ hierarchySelected: hiSelected });
+            onChange(event, valueList);
+        } else {
+            onChange(event, item.id);
+            this.handleClose();
+        }
+    };
+
+    this.handleSuggestions = suggestions => {
+        const { options, hasAll, iconAll, translations, multiple } = this.props;
+
+        if (suggestions.length === 0) {
+            // Handle No Result
+            // FIX to remove all item
+            suggestions = [];
+            suggestions.push({
+                id: '_no_result',
+                type: 'text',
+                disabled: true,
+                centered: true,
+                checkbox: false,
+                label: translations.no_result_match
+            });
+        } else if (hasAll && suggestions.length > 0 && suggestions.length === options.length && multiple === true) {
+            // Handle 'All'
+            if (suggestions.filter(suggestion => suggestion.id === '_all').length === 0) {
+                const allItem = {
+                    id: '_all',
+                    icon: iconAll,
+                    label: translations.all
+                };
+                if (iconAll !== false) {
+                    allItem.type = 'icon';
+                }
+                suggestions.unshift(allItem);
+            }
+        }
+
+        this.setState({
+            suggestions
+        });
+    };
+
+    this.handleRequestDelete = evt => {
+        evt.stopPropagation();
+        this.props.onChange(this.props.name, []);
+    };
+};
+
 HiSelect.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
      * Affiche une checkbox pour chaque éléments, par défaut si options est nested
@@ -652,6 +683,7 @@ HiSelect.propTypes = process.env.NODE_ENV !== "production" ? {
      * Fonction de callback appelée lorsqu'on écrit dans la barre de recherche
      * A utiliser pour les selects avec des données dynamiques
      *
+     * @param {object} event
      * @param {string} value
      */
     onSearch: PropTypes.func,

package/es/HiSelect/HiSelectField.js

@@ -31,9 +31,10 @@ class HiSelectField extends React.PureComponent {
       iconAll,
       checkbox,
       searchable,
-      translations
+      translations,
+      className
     } = _props,
-          others = _objectWithoutProperties(_props, ['label', 'required', 'disabled', 'error', 'errorText', 'helperText', 'helperIcon', 'id', 'name', 'value', 'options', 'type', 'multiple', 'iconAll', 'checkbox', 'searchable', 'translations']);
+          others = _objectWithoutProperties(_props, ['label', 'required', 'disabled', 'error', 'errorText', 'helperText', 'helperIcon', 'id', 'name', 'value', 'options', 'type', 'multiple', 'iconAll', 'checkbox', 'searchable', 'translations', 'className']);
 
     return React.createElement(
       HiFormControl,
@@ -45,7 +46,8 @@ class HiSelectField extends React.PureComponent {
         error: error,
         errorText: errorText,
         helperText: helperText,
-        helperIcon: helperIcon
+        helperIcon: helperIcon,
+        className: className
       },
       React.createElement(HiSelect, _extends({
         id: id,
@@ -58,10 +60,6 @@ class HiSelectField extends React.PureComponent {
         checkbox: checkbox,
         searchable: searchable,
         translations: translations,
-        onClick: this.handleClick,
-        onMouseEnter: this.handleMouseEnter,
-        onMouseLeave: this.handleMouseLeave,
-        onClose: this.handleClose,
         disabled: disabled,
         error: error
       }, others))
@@ -70,6 +68,10 @@ class HiSelectField extends React.PureComponent {
 }
 
 HiSelectField.propTypes = process.env.NODE_ENV !== "production" ? {
+  /**
+   * Surcharge des styles
+   */
+  className: PropTypes.string,
   /**
    * Si `true`, l'input sera inactif.
    */