@hipay/hipay-material-ui 1.0.0-beta.1 → 1.0.0-beta.10

package/es/HiSelectableList/HiSelectableListItem.js

@@ -9,11 +9,13 @@ import HiCheckbox from '../HiCheckbox';
 import withStyles from '../styles/withStyles';
 import { escapeHTML } from '../utils/hiHelpers';
 import HiIconBuilder from '../utils/HiIconBuilder';
+import HiColoredLabel from '../HiColoredLabel';
 
 export const styles = theme => ({
     listItem: {
         padding: `${9}px 0px`,
-        fontWeight: theme.typography.fontWeightRegular
+        fontWeight: theme.typography.fontWeightRegular,
+        maxHeight: 40
     },
     listItemTitle: {
         padding: `${9}px 0px`,
@@ -50,11 +52,15 @@ export const styles = theme => ({
         fontWeight: 'inherit',
         width: '100%'
     }),
-    listItemSecondaryText: _extends({}, theme.typography.body4, {
+    listItemSecondaryText: _extends({}, theme.typography.body5, {
         fontWeight: theme.typography.fontWeightLight,
-        marginLeft: theme.spacing.unit
+        marginLeft: theme.spacing.unit,
+        color: theme.palette.neutral.normal
     }),
     listItemInfoText: _extends({
+        whiteSpace: 'nowrap',
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
         color: theme.palette.neutral.normal
     }, theme.typography.body4, {
         fontWeight: theme.typography.fontWeightRegular,
@@ -100,6 +106,11 @@ export const styles = theme => ({
             color: '#000000'
         }
     },
+    labelHighlightColored: {
+        '&>strong': {
+            fontWeight: theme.typography.fontWeightMedium
+        }
+    },
     primaryHighlight: {
         fontWeight: theme.typography.fontWeightMedium,
         color: theme.palette.business.primary.normal,
@@ -136,22 +147,30 @@ class HiSelectableListItem extends React.Component {
                         'div',
                         { className: classes.listItemContent, 'data-id': item.id },
                         !effectiveCheckbox && React.createElement(HiIconBuilder, { icon: item.icon, className: classes.icon }),
-                        item.label,
-                        React.createElement('span', { className: classes.listItemSecondaryText }),
+                        this.getItemLabel(item),
+                        React.createElement(
+                            'span',
+                            { className: classes.listItemSecondaryText },
+                            item.secondaryLabel
+                        ),
                         childrenIndicator
                     );
                 case 'image':
                     let img = '';
                     if (typeof item.img !== 'undefined') {
-                        img = React.createElement('img', { src: item.img, className: classes.imgListItem });
+                        img = React.createElement('img', { src: item.img, alt: item.img, className: classes.imgListItem });
                     }
 
                     return React.createElement(
                         'div',
                         { className: classes.listItemContent, 'data-id': item.id },
                         img,
-                        item.label,
-                        React.createElement('span', { className: classes.listItemSecondaryText }),
+                        this.getItemLabel(item),
+                        React.createElement(
+                            'span',
+                            { className: classes.listItemSecondaryText },
+                            item.secondaryLabel
+                        ),
                         childrenIndicator
                     );
                 case 'primary-highlight':
@@ -161,7 +180,7 @@ class HiSelectableListItem extends React.Component {
                     return React.createElement(
                         'div',
                         { className: itemPrimaryHighlightClass, 'data-id': item.id },
-                        item.label
+                        this.getItemLabel(item)
                     );
                 case 'text':
                 default:
@@ -172,14 +191,12 @@ class HiSelectableListItem extends React.Component {
                     return React.createElement(
                         'div',
                         { className: itemTextClass, 'data-id': item.id },
-                        item.labelHighlight && React.createElement('span', {
-                            className: classes.labelHighlight,
-                            dangerouslySetInnerHTML: {
-                                __html: escapeHTML(item.labelHighlight)
-                            }
-                        }),
-                        !item.labelHighlight && item.label,
-                        React.createElement('span', { className: classes.listItemSecondaryText }),
+                        this.getItemLabel(item),
+                        React.createElement(
+                            'span',
+                            { className: classes.listItemSecondaryText },
+                            item.secondaryLabel
+                        ),
                         childrenIndicator
                     );
             }
@@ -197,6 +214,25 @@ class HiSelectableListItem extends React.Component {
         this.setState({ hover: !this.state.hover });
     }
 
+    getItemLabel(item) {
+        const { classes } = this.props;
+        if (!item.labelHighlight && item.color && this.props.selected) {
+            return React.createElement(HiColoredLabel, { color: item.color, label: item.label });
+        } else if (item.labelHighlight) {
+            const mLabel = React.createElement('span', {
+                className: item.color ? classes.labelHighlightColored : classes.labelHighlight,
+                dangerouslySetInnerHTML: {
+                    __html: escapeHTML(item.labelHighlight)
+                }
+            });
+            if (item.color && this.props.selected) {
+                return React.createElement(HiColoredLabel, { color: item.color, label: mLabel });
+            }
+            return mLabel;
+        }
+        return item.label;
+    }
+
     /**
      * Build list item from type
      */
@@ -358,18 +394,38 @@ HiSelectableListItem.defaultProps = {
     }
 };
 HiSelectableListItem.propTypes = process.env.NODE_ENV !== "production" ? {
+    /**
+     * Affiche une checkbox
+     */
+    checkbox: PropTypes.bool,
+    /**
+     * Icon affiché lorsque l'item est sélectionné
+     */
+    checkedIcon: PropTypes.node,
     /**
      * Useful to extend the style applied to components.
      */
     classes: PropTypes.object,
     /**
-     * État de l'élément
+     * Applique le style et désactive le click
      */
-    selected: PropTypes.bool,
+    disabled: PropTypes.bool,
     /**
-     * Type de l'élément
+     * Si "true", liste avec hierarchie
      */
-    type: PropTypes.string,
+    hierarchic: PropTypes.bool,
+    /**
+     * Icon affiché lorsque l'item n'est pas sélectionné et qu'on le survole
+     */
+    hoverIcon: PropTypes.node,
+    /**
+     * Icon affiché lorsque l'item n'est pas sélectionné
+     */
+    icon: PropTypes.node,
+    /**
+     * Items sélectionné partiellement
+     */
+    indeterminate: PropTypes.bool,
     /**
      * Élément dont la structure attendue dépend du type
      * paramètres requis:
@@ -377,65 +433,45 @@ HiSelectableListItem.propTypes = process.env.NODE_ENV !== "production" ? {
      * - label: string
      */
     item: PropTypes.object.isRequired,
+    /**
+     * Padding par défaut des éléments
+     */
+    leftPadding: PropTypes.number,
     /**
      * Niveau de l'item
      */
     level: PropTypes.number,
     /**
-     * Affiche l'item en tant qu'item parent d'un groupe
+     * Nombre d'items enfants
      */
-    parentItem: PropTypes.bool,
+    nbChildren: PropTypes.number,
     /**
      * Fonction de callback à la sélection de l'élément
      */
     onSelect: PropTypes.func,
     /**
-     * Applique le style et désactive le click
+     * Icon affiché lorsqu'un item parent n'est pas sélectionné
      */
-    disabled: PropTypes.bool,
+    parentIcon: PropTypes.node,
     /**
-     * Items sélectionné partiellement
+     * Affiche l'item en tant qu'item parent d'un groupe
      */
-    indeterminate: PropTypes.bool,
+    parentItem: PropTypes.bool,
     /**
      * Les items parents sont sélectionnables
      */
     parentItemSelectable: PropTypes.bool,
     /**
-     * Nombre d'items enfants
+     * État de l'élément
      */
-    nbChildren: PropTypes.number,
+    selected: PropTypes.bool,
     /**
      * Traductions (par défaut en anglais)
      */
     translations: PropTypes.object,
     /**
-     * Icon affiché lorsque l'item n'est pas sélectionné
-     */
-    icon: PropTypes.node,
-    /**
-     * Icon affiché lorsqu'un item parent n'est pas sélectionné
-     */
-    parentIcon: PropTypes.node,
-    /**
-     * Icon affiché lorsque l'item n'est pas sélectionné et qu'on le survole
-     */
-    hoverIcon: PropTypes.node,
-    /**
-     * Icon affiché lorsque l'item est sélectionné
-     */
-    checkedIcon: PropTypes.node,
-    /**
-     * Affiche une checkbox
-     */
-    checkbox: PropTypes.bool,
-    /**
-     * Si "true", liste avec hierarchie
-     */
-    hierarchic: PropTypes.bool,
-    /**
-     * Padding par défaut des éléments
+     * Type de l'élément
      */
-    leftPadding: PropTypes.number
+    type: PropTypes.string
 } : {};
 export default withStyles(styles, { name: 'HmuiHiSelectableList' })(HiSelectableListItem);

package/es/HiSwitch/HiSwitchState.js

@@ -12,7 +12,7 @@ export const styles = theme => ({
         maxHeight: 40,
         marginRight: 12,
         padding: 4,
-        backgroundColor: theme.palette.background1,
+        backgroundColor: theme.palette.background2,
         borderRadius: '2px 2px 0 0',
         width: '100%',
         maxWidth: 200,

package/es/HiSwitch/index.js

@@ -1,2 +1,3 @@
 export { default } from './HiSwitch';
+export { default as HiSwitch } from './HiSwitch';
 export { default as HiSwitchState } from './HiSwitchState';

package/es/HiTable/BodyCellBuilder.js

@@ -18,55 +18,38 @@ export default class BodyCellBuilder extends React.PureComponent {
         this.collectContextMenuDatas = this.collectContextMenuDatas.bind(this);
     }
 
-    collectContextMenuDatas(props) {
-        let label = '';
-        let value = null;
+    /**
+     * CollecContextMenuDatas
+     *
+     * définit les données utilisées par le context menu (lookup, exclude, copy, redirect)
+     * - value : valeur sur laquelle on filtre
+     * - label : label de la value (traduite)
+     */
+    collectContextMenuDatas() {
+
+        const _props$data = this.props.data,
+              { value } = _props$data,
+              data = _objectWithoutProperties(_props$data, ['value']);
+
+        let contextLabel = data.label ? data.label : value;
+
         switch (this.props.type) {
-            case cst.TYPE_ADDRESS:
-                label = `${this.props.datas.name} ${this.props.datas.streetAddress} ${this.props.datas.city} ${this.props.datas.postalCode} ${this.props.datas.isoCountry}`;
-                break;
-            case cst.TYPE_SENTINEL:
-                label = `${this.props.datas.score}|${this.props.datas.fraudResult}`;
-                if (this.props.smartDecision && typeof this.props.datas.automaticFraudReviewResult !== 'undefined') {
-                    label += `|${this.props.datas.automaticFraudReviewResult}`;
-                }
-                break;
-            case cst.TYPE_ACCOUNT:
-            case cst.TYPE_ACCOUNT_NUMBER:
-            case cst.TYPE_ICON:
-            case cst.TYPE_IMAGE:
-            case cst.TYPE_NUMERIC:
-            case cst.TYPE_TEXT:
-            default:
-                label = this.props.datas.value;
-                break;
+
             case cst.TYPE_DATE:
                 const options = { year: 'numeric', month: '2-digit', day: '2-digit' };
-                const date = new Date(this.props.datas.value);
-                label = date.toLocaleString(this.props.dateLocale, options);
-                value = this.props.datas.value;
+                const date = new Date(value);
+                contextLabel = date.toLocaleString(this.props.dateLocale, options);
                 break;
+
             case cst.TYPE_RATE:
-                label = formatRate(this.props.datas.value, this.props.view, this.props.numberLocale);
-                value = this.props.datas.value;
+                contextLabel = formatRate(value, this.props.view, this.props.numberLocale);
                 break;
-            case cst.TYPE_THIRD_PARTY_SECURITY:
-            case cst.TYPE_STATUS:
-                label = this.props.datas.value;
-                value = this.props.datas.code;
-                break;
-            case cst.TYPE_COUNTRY:
-                label = this.props.datas.value;
-                value = this.props.datas.isoCode;
-                break;
-        }
-        if (value === null) {
-            value = label;
         }
+
         return {
             id: this.props.checkboxValue,
             column: this.props.colId,
-            label,
+            label: contextLabel,
             value
         };
     }
@@ -76,10 +59,9 @@ export default class BodyCellBuilder extends React.PureComponent {
               {
             ukey,
             type,
-            datas,
+            data,
             view,
             width,
-            fixedWidth,
             padding,
             align,
             dense,
@@ -92,15 +74,15 @@ export default class BodyCellBuilder extends React.PureComponent {
             numberLocale,
             childrenCount,
             onOpenDetails,
-            lookedUp
+            lookedUp,
+            fixedColumnWidth
         } = _props,
-              props = _objectWithoutProperties(_props, ['ukey', 'type', 'datas', 'view', 'width', 'fixedWidth', 'padding', 'align', 'dense', 'ellipsis', 'onSelect', 'selectable', 'selected', 'sticky', 'dateLocale', 'numberLocale', 'childrenCount', 'onOpenDetails', 'lookedUp']);
+              props = _objectWithoutProperties(_props, ['ukey', 'type', 'data', 'view', 'width', 'padding', 'align', 'dense', 'ellipsis', 'onSelect', 'selectable', 'selected', 'sticky', 'dateLocale', 'numberLocale', 'childrenCount', 'onOpenDetails', 'lookedUp', 'fixedColumnWidth']);
 
         const layoutProps = {
             type,
             view,
             width,
-            fixedWidth,
             align,
             dense,
             onSelect,
@@ -109,37 +91,41 @@ export default class BodyCellBuilder extends React.PureComponent {
             selected,
             sticky,
             childrenCount,
-            lookedUp
+            lookedUp,
+            fixedColumnWidth
         };
 
-        let cellElement;
+        let cellContent;
+        if (typeof data !== 'undefined') {
+
+            let cellElement;
+            let hasContextMenu = true;
 
-        if (typeof datas !== 'undefined') {
             switch (type) {
                 case cst.TYPE_ACCOUNT:
-                    cellElement = React.createElement(CellAccount, { value: datas.value, color: datas.color, sticky: sticky });
+                    cellElement = React.createElement(CellAccount, { value: data.value, color: data.color, sticky: sticky });
                     break;
 
                 case cst.TYPE_ACCOUNT_NUMBER:
                     cellElement = React.createElement(CellAccountNumber, {
-                        value: datas.value,
-                        country: datas.country,
-                        expirationDate: datas.expirationDate,
-                        expirationDateLabel: datas.expirationDateLabel,
-                        statusColor: datas.statusColor,
-                        issuer: datas.issuer,
+                        value: data.value,
+                        country: data.country,
+                        expirationDate: data.expirationDate,
+                        expirationDateLabel: data.expirationDateLabel,
+                        statusColor: data.statusColor,
+                        issuer: data.issuer,
                         sticky: sticky
                     });
                     break;
 
                 case cst.TYPE_ADDRESS:
                     cellElement = React.createElement(CellAddress, {
-                        name: datas.name,
-                        streetAddress: datas.streetAddress,
-                        city: datas.city,
-                        postalCode: datas.postalCode,
-                        country: datas.country,
-                        isoCountry: datas.isoCountry,
+                        name: data.name,
+                        streetAddress: data.value,
+                        city: data.city,
+                        postalCode: data.postalCode,
+                        country: data.country,
+                        isoCountry: data.isoCountry,
                         view: view,
                         sticky: sticky
                     });
@@ -147,8 +133,9 @@ export default class BodyCellBuilder extends React.PureComponent {
 
                 case cst.TYPE_COUNTRY:
                     cellElement = React.createElement(CellCountry, {
-                        value: datas.value,
-                        isoCode: datas.isoCode,
+                        label: data.label ? data.label : data.value,
+                        path: data.img,
+                        value: data.value,
                         view: view,
                         sticky: sticky
                     });
@@ -156,19 +143,19 @@ export default class BodyCellBuilder extends React.PureComponent {
 
                 case cst.TYPE_DATE:
                     cellElement = React.createElement(CellDate, {
-                        value: datas.value,
+                        value: data.value,
                         locale: dateLocale,
                         view: view,
                         displayTime: props.displayTime,
                         sticky: sticky
                     });
+                    hasContextMenu = false;
                     break;
 
                 case cst.TYPE_ICON:
-                    if (view === cst.VIEWS.SMALL) layoutProps.fixedWidth = true;
                     cellElement = React.createElement(CellIcon, {
-                        value: datas.value,
-                        icon: datas.icon,
+                        value: data.label ? data.label : data.value,
+                        icon: data.icon,
                         view: view,
                         sticky: sticky
                     });
@@ -176,8 +163,8 @@ export default class BodyCellBuilder extends React.PureComponent {
 
                 case cst.TYPE_IMAGE:
                     cellElement = React.createElement(CellImage, {
-                        value: datas.value,
-                        path: datas.path,
+                        value: data.label ? data.label : data.value,
+                        path: data.img,
                         view: view,
                         sticky: sticky
                     });
@@ -185,32 +172,34 @@ export default class BodyCellBuilder extends React.PureComponent {
 
                 case cst.TYPE_NUMERIC:
                     cellElement = React.createElement(CellNumeric, {
-                        value: datas.value,
-                        currency: datas.currency,
+                        value: data.value,
+                        currency: data.currency,
                         locale: numberLocale,
                         view: view,
                         sticky: sticky
                     });
+                    hasContextMenu = false;
                     break;
 
                 case cst.TYPE_RATE:
                     cellElement = React.createElement(CellRate, {
-                        value: datas.value,
-                        isPositive: datas.isPositive,
-                        trendchip: datas.trendchip,
-                        indicator: datas.indicator,
+                        value: data.value,
+                        isPositive: data.isPositive,
+                        trendchip: data.trendchip,
+                        indicator: data.indicator,
                         locale: numberLocale,
                         view: view,
                         sticky: sticky
                     });
+                    hasContextMenu = false;
                     break;
 
                 case cst.TYPE_SENTINEL:
                     cellElement = React.createElement(CellSentinel, {
-                        score: datas.score,
-                        fraudResult: datas.fraudResult,
-                        automaticFraudReviewResult: datas.automaticFraudReviewResult,
-                        pendingManualAction: datas.pendingManualAction,
+                        score: data.score,
+                        fraudResult: data.label,
+                        automaticFraudReviewResult: data.automaticFraudReviewResult,
+                        pendingManualAction: data.pendingManualAction,
                         smartDecision: props.smartDecision,
                         sticky: sticky
                     });
@@ -218,9 +207,9 @@ export default class BodyCellBuilder extends React.PureComponent {
 
                 case cst.TYPE_STATUS:
                     cellElement = React.createElement(CellStatus, {
-                        code: datas.code,
-                        nbOperations: datas.count_operations,
-                        value: datas.value,
+                        code: data.value,
+                        nbOperations: data.count_operations,
+                        value: data.label ? data.label : data.value,
                         onOpenDetails: onOpenDetails,
                         sticky: sticky
                     });
@@ -228,10 +217,9 @@ export default class BodyCellBuilder extends React.PureComponent {
 
                 case cst.TYPE_THIRD_PARTY_SECURITY:
                     layoutProps.align = 'center';
-                    layoutProps.fixedWidth = true;
                     cellElement = React.createElement(CellThirdPartySecurity, {
-                        value: datas.value,
-                        code: datas.code,
+                        value: data.value,
+                        label: data.label ? data.label : data.value,
                         sticky: sticky
                     });
                     break;
@@ -240,23 +228,23 @@ export default class BodyCellBuilder extends React.PureComponent {
                 default:
                     cellElement = React.createElement(CellText, {
                         ukey: ukey,
-                        value: datas.value,
+                        value: data.value,
                         ellipsis: ellipsis,
                         view: view,
                         sticky: sticky
                     });
                     break;
             }
-        }
 
-        const cellContent = cellElement ? React.createElement(
-            ContextMenuTrigger,
-            {
-                id: `hitable_context_menu_${this.props.tabId}`,
-                collect: this.collectContextMenuDatas
-            },
-            cellElement
-        ) : cellElement;
+            cellContent = hasContextMenu ? React.createElement(
+                ContextMenuTrigger,
+                {
+                    id: `hitable_context_menu_${this.props.tabId}`,
+                    collect: this.collectContextMenuDatas
+                },
+                cellElement
+            ) : cellElement;
+        }
 
         return React.createElement(
             CellLayout,
@@ -281,10 +269,14 @@ BodyCellBuilder.propTypes = process.env.NODE_ENV !== "production" ? {
      * Identifiant de la colonne
      */
     colId: PropTypes.string,
+    /**
+     * Données de références
+     */
+    columnDatas: PropTypes.array,
     /**
      * Données relatives au type de la cellule
      */
-    datas: PropTypes.object,
+    data: PropTypes.object,
     /**
      * Locale a utilisée pour l'affichage des dates
      */
@@ -298,9 +290,10 @@ BodyCellBuilder.propTypes = process.env.NODE_ENV !== "production" ? {
      */
     ellipsis: PropTypes.oneOf(['left', 'right', 'middle', 'name', 'after-first-word']),
     /**
-     * La largeur de la cellule est fixé (toutes les colonnes sauf une)
+     * Fixe la taille des colonnes selon le type de vue
+     * Sinon les colonnes s'adaptent à l'espace disponible
      */
-    fixedWidth: PropTypes.bool,
+    fixedColumnWidth: PropTypes.bool,
     /**
      * Recherche lookup sur cette colonne
      */