@hipay/hipay-material-ui 1.0.0-beta.19 → 1.0.0-beta.2

package/es/HiTable/BodyRow.js

@@ -50,10 +50,6 @@ class BodyRow extends React.PureComponent {
     constructor(props) {
         super();
 
-        this.handleOpenRowDetails = type => () => {
-            this.props.onOpenRowDetails(this.props.row.rowId, type);
-        };
-
         this.state = {
             live: props.live,
             style: {
@@ -101,6 +97,10 @@ class BodyRow extends React.PureComponent {
         }
     }
 
+    handleOpenRowDetails() {
+        this.props.onOpenRowDetails(this.props.row.rowId);
+    }
+
     handleSelect() {
         this.props.onSelect(this.props.row);
     }
@@ -112,7 +112,6 @@ class BodyRow extends React.PureComponent {
             theme,
             row,
             columns,
-            lookupColumns,
             orderedColumns,
             selectable,
             selected,
@@ -123,13 +122,13 @@ class BodyRow extends React.PureComponent {
             numberLocale,
             sticky,
             innerRow,
-            isDetail,
-            detailRowsOptions
+            isDetail
         } = _props,
-              other = _objectWithoutProperties(_props, ['classes', 'theme', 'row', 'columns', 'lookupColumns', 'orderedColumns', 'selectable', 'selected', 'onClick', 'view', 'dense', 'dateLocale', 'numberLocale', 'sticky', 'innerRow', 'isDetail', 'detailRowsOptions']);
+              other = _objectWithoutProperties(_props, ['classes', 'theme', 'row', 'columns', 'orderedColumns', 'selectable', 'selected', 'onClick', 'view', 'dense', 'dateLocale', 'numberLocale', 'sticky', 'innerRow', 'isDetail']);
 
         const { style } = this.state;
 
+        let firstCol = true;
         let unfixedCol = true;
 
         const rowStyle = _extends({}, style, {
@@ -144,19 +143,6 @@ class BodyRow extends React.PureComponent {
         // If there is no datas don't display the row
         if (!row.hasOwnProperty('datas')) return false;
 
-        let detailsInfos = {};
-        if (row.details && row.details.length > 0) {
-            detailsInfos = row.details.reduce((memo, item) => {
-                if (item.rows.length > 0 && detailRowsOptions[item.type] && detailRowsOptions[item.type].anchor) {
-                    memo[detailRowsOptions[item.type].anchor] = _extends({
-                        type: item.type,
-                        total: item.rows.length
-                    }, detailRowsOptions[item.type]);
-                }
-                return memo;
-            }, {});
-        }
-
         return React.createElement(
             TableRow,
             {
@@ -174,85 +160,65 @@ class BodyRow extends React.PureComponent {
                 key: `${row.rowId}-left-cell`,
                 className: patchDivClass
             }),
-            orderedColumns.map((colRef, index) => {
-
-                // Dynamic column settings (from OrderColumns)
-                const {
-                    colId: colRefId,
-                    displayed,
-                    view: colView
-                } = colRef,
+            orderedColumns.map(colRef => {
+                const { colId: colRefId, displayed, view: colView } = colRef,
                       colRefProps = _objectWithoutProperties(colRef, ['colId', 'displayed', 'view']);
+                if (displayed !== false) {
+                    // the first column is sticky (except checkbox)
+                    const first = firstCol;
+                    firstCol = false;
+                    const _columns$colRef$colId = columns[colRef.colId],
+                          {
+                        colId,
+                        align,
+                        datas,
+                        ellipsis,
+                        fixedWidth,
+                        type,
+                        width
+                    } = _columns$colRef$colId,
+                          columnProps = _objectWithoutProperties(_columns$colRef$colId, ['colId', 'align', 'datas', 'ellipsis', 'fixedWidth', 'type', 'width']);
+                    const data = row.datas[colRef.colId];
 
-                if (displayed === false) return null;
-
-                // the first column is sticky (except checkbox)
-                const first = index === 0;
-
-                // Static column settings
-                const _columns$colRefId = columns[colRefId],
-                      {
-                    colId,
-                    align,
-                    data: colData,
-                    ellipsis,
-                    fixedWidth,
-                    type,
-                    width
-                } = _columns$colRefId,
-                      columnProps = _objectWithoutProperties(_columns$colRefId, ['colId', 'align', 'data', 'ellipsis', 'fixedWidth', 'type', 'width']);
+                    const effectiveView = colView || view;
+                    // add clickable badge in cell to open children
+                    const isParentAnchor = row.hasOwnProperty('parentAnchorColumn') && row.parentAnchorColumn === colId && row.hasOwnProperty('children') && row.children.length > 0;
 
-                // view define in OrderColumn or table prop view by default
-                const effectiveView = colView || view;
+                    // the first non fixed column is the only one not fixed
+                    const unfixed = unfixedCol && fixedWidth !== true;
+                    unfixedCol = unfixedCol && fixedWidth !== true ? false : unfixedCol;
 
-                // add clickable badge in cell to open children
-                const isParentAnchor = row.hasOwnProperty('parentAnchorColumn') && row.parentAnchorColumn === colId && row.hasOwnProperty('children') && row.children.length > 0;
-
-                // the first non fixed column is the only one not fixed
-                const unfixed = unfixedCol && fixedWidth !== true;
-                unfixedCol = unfixed ? false : unfixedCol;
-
-                // add lookedUp style
-                const lookedUp = Array.isArray(lookupColumns) && lookupColumns.includes(colId);
-
-                // Cell data
-                let data = row.datas[colRefId];
-                // Get object data for column based on reference datas
-                if (data !== undefined && colData !== undefined) {
-                    const colItem = colData.find(item => item.id === data.value);
-                    if (colItem) {
-                        // Hydrate data object with reference item
-                        data = _extends({}, colItem, data);
+                    let lookedUp = false;
+                    if (this.props.lookupColumns && this.props.lookupColumns.includes(colId)) {
+                        lookedUp = true;
                     }
-                }
 
-                return React.createElement(BodyCellBuilder, _extends({}, other, {
-                    key: `${row.rowId}-${colId}-cell`,
-                    ukey: `${row.rowId}-${colId}-cell`,
-                    checkboxValue: row.rowId,
-                    type: type,
-                    data: data,
-                    ellipsis: ellipsis,
-                    align: align,
-                    view: effectiveView,
-                    padding: cst.DEFAULT_PADDING[view],
-                    width: width,
-                    fixedWidth: !unfixed,
-                    sticky: sticky && first,
-                    selectable: selectable && first,
-                    dateLocale: dateLocale,
-                    numberLocale: numberLocale,
-                    dense: dense,
-                    selected: selected,
-                    onSelect: this.handleSelect
-                }, detailsInfos[colId] && {
-                    onOpenDetails: this.handleOpenRowDetails(detailsInfos[colId].type),
-                    detailInfos: detailsInfos[colId]
-                }, {
-                    childrenCount: isParentAnchor ? row.children.length : null,
-                    colId: colId,
-                    lookedUp: lookedUp
-                }, columnProps, colRefProps));
+                    return React.createElement(BodyCellBuilder, _extends({}, other, {
+                        key: `${row.rowId}-${colId}-cell`,
+                        ukey: `${row.rowId}-${colId}-cell`,
+                        checkboxValue: row.rowId,
+                        type: type,
+                        datas: data,
+                        ellipsis: ellipsis,
+                        align: align,
+                        view: effectiveView,
+                        padding: cst.DEFAULT_PADDING[view],
+                        width: width,
+                        fixedWidth: !unfixed,
+                        sticky: sticky && first,
+                        selectable: selectable && first,
+                        dateLocale: dateLocale,
+                        numberLocale: numberLocale,
+                        dense: dense,
+                        selected: selected,
+                        onSelect: this.handleSelect,
+                        onOpenDetails: this.handleOpenRowDetails,
+                        childrenCount: isParentAnchor ? row.children.length : null,
+                        colId: colId,
+                        lookedUp: lookedUp
+                    }, columnProps, colRefProps));
+                }
+                return null;
             }),
             React.createElement(TableCell, {
                 style: {
@@ -275,9 +241,7 @@ BodyRow.defaultProps = {
     sticky: false,
     live: false,
     innerRow: false,
-    lookupColumns: [],
-    fixedColumnWidth: true,
-    detailRowsOptions: {}
+    lookupColumns: []
 };
 BodyRow.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
@@ -288,15 +252,6 @@ BodyRow.propTypes = process.env.NODE_ENV !== "production" ? {
      * Densité d'affichage (joue sur la hauteur des lignes)
      */
     dense: PropTypes.bool,
-    /**
-     * Options utilisées pour décrire le comportement de lignes de détails
-     */
-    detailRowsOptions: PropTypes.object,
-    /**
-     * Fixe la taille des colonnes selon le type de vue
-     * Sinon les colonnes s'adaptent à l'espace disponible
-     */
-    fixedColumnWidth: PropTypes.bool,
     /**
      * Applique le style d'une ligne intégrée a un sous-tableau
      */

package/es/HiTable/ChildRow.js

@@ -112,9 +112,9 @@ class ChildRow extends React.PureComponent {
             parentIndicatorColumn, parentLabel, parentLabelIcon,
             children, columns, orderedColumns,
             selectable, selected,
-            dateLocale, dense, sticky, view, row
+            dateLocale, dense, sticky, view
         } = _props,
-              other = _objectWithoutProperties(_props, ['classes', 'theme', 'onClose', 'parentRowId', 'parentRowDatas', 'parentIndicatorColumn', 'parentLabel', 'parentLabelIcon', 'children', 'columns', 'orderedColumns', 'selectable', 'selected', 'dateLocale', 'dense', 'sticky', 'view', 'row']);
+              other = _objectWithoutProperties(_props, ['classes', 'theme', 'onClose', 'parentRowId', 'parentRowDatas', 'parentIndicatorColumn', 'parentLabel', 'parentLabelIcon', 'children', 'columns', 'orderedColumns', 'selectable', 'selected', 'dateLocale', 'dense', 'sticky', 'view']);
 
         let indicator = '';
         if (parentIndicatorColumn && columns.hasOwnProperty(parentIndicatorColumn)) {
@@ -141,7 +141,10 @@ class ChildRow extends React.PureComponent {
                 TableBody,
                 null,
                 React.createElement(BodyRow, _extends({
-                    row: row,
+                    row: {
+                        rowId: parentRowId,
+                        datas: parentRowDatas
+                    },
                     selectable: selectable,
                     selected: selected,
                     columns: columns,
@@ -274,6 +277,10 @@ ChildRow.propTypes = process.env.NODE_ENV !== "production" ? {
      * Données de la ligne parente
      */
     parentRowDatas: PropTypes.object.isRequired,
+    /**
+     * Ligne des détails de la ligne parente
+     */
+    parentDetailRows: PropTypes.array,
     /**
      * Indicateur du sous-ensemble (en général la date)
      */

package/es/HiTable/ColumnFilter.js

@@ -1,4 +1,3 @@
-import _Set from 'babel-runtime/core-js/set';
 import _extends from 'babel-runtime/helpers/extends';
 import React from 'react';
 import Popover from 'material-ui/Popover';
@@ -143,20 +142,20 @@ class ColumnFilter extends React.Component {
      * Sélectionne tous les items filtrés
      */
     selectAllFilters() {
-        this.setState(prevState => ({
-            selectedIdList: [...new _Set([...prevState.selectedIdList, ...prevState.suggestions.map(item => item.id)])]
-        }));
+        this.setState({ selectedIdList: this.state.suggestions.map(item => item.id) });
     }
 
     /**
      * Désélectionne tous les items filtrés
      */
     deselectAllFilters() {
-        this.setState(prevState => {
-            return {
-                selectedIdList: prevState.selectedIdList.filter(item => prevState.suggestions.find(suggestion => suggestion.id === item) === undefined)
-            };
+        const selectedIdList = this.state.selectedIdList;
+        this.state.suggestions.map(item => {
+            if (this.state.selectedIdList.includes(item.id)) {
+                selectedIdList.splice(this.state.selectedIdList.indexOf(item.id), 1);
+            }
         });
+        this.setState({ selectedIdList });
     }
 
     handleSort(direction) {
@@ -254,11 +253,7 @@ class ColumnFilter extends React.Component {
             React.createElement(
                 'div',
                 { className: classes.menuItemFilter },
-                React.createElement(
-                    'span',
-                    { style: { marginRight: 4 } },
-                    translations.filter
-                ),
+                translations.filter,
                 React.createElement(
                     HiPins,
                     {
@@ -302,8 +297,7 @@ class ColumnFilter extends React.Component {
                 itemList: suggestions,
                 selectedIdList: selectedIdList,
                 onSelect: this.toggleSelectItem,
-                leftPadding: 28,
-                checkbox: type !== 'icon'
+                leftPadding: 28
             }),
             React.createElement(
                 'div',

package/es/HiTable/HeaderCell.js

@@ -130,7 +130,6 @@ class HeaderCell extends React.PureComponent {
             classes,
             type,
             title,
-            smallTitle,
             selectable,
             selected,
             onSelect,
@@ -142,7 +141,7 @@ class HeaderCell extends React.PureComponent {
             view,
             dense,
             width = cst.DEFAULT_WIDTHS[type][view],
-            fixedColumnWidth,
+            fixedWidth,
             align = cst.ALIGN_RIGHT_TYPES.includes(type) ? 'right' : 'left',
             sticky,
             padding,
@@ -179,22 +178,19 @@ class HeaderCell extends React.PureComponent {
 
         const lookedUpClassName = classNames({ [classes.lookedUp]: lookedUp });
 
-        const cellStyle = {
-            padding: 0,
-            zIndex: sticky ? 13 : 12, // la cellule sticky doit être au dessus des autres cellules du header
-            backgroundColor: 'inherit',
-            textAlign: align
-        };
-
-        if (fixedColumnWidth) {
-            cellStyle.maxWidth = _width;
-            cellStyle.minWidth = _width;
-            cellStyle.width = _width;
-        }
-
         return React.createElement(
             TableCell,
-            { style: cellStyle },
+            {
+                style: {
+                    maxWidth: _width,
+                    minWidth: _width,
+                    width: _width,
+                    padding: 0,
+                    zIndex: sticky ? 13 : 12, // la cellule sticky doit être au dessus des autres cellules du header
+                    backgroundColor: 'inherit',
+                    textAlign: align
+                }
+            },
             React.createElement(
                 'div',
                 null,
@@ -237,7 +233,7 @@ class HeaderCell extends React.PureComponent {
                             {
                                 className: classes.labelContainer + (_sorted ? ' ' + classes.labelContainerOrdered : '')
                             },
-                            view !== 's' ? title : smallTitle ? smallTitle : title
+                            title
                         ),
                         align !== 'right' && _icons
                     ) : React.createElement(
@@ -254,7 +250,7 @@ class HeaderCell extends React.PureComponent {
                         React.createElement(
                             'span',
                             { className: classes.labelContainer, style: { width: '100%' } },
-                            view !== 's' ? title : smallTitle ? smallTitle : title
+                            title
                         )
                     )
                 ),
@@ -283,7 +279,7 @@ HeaderCell.defaultProps = {
     sortDirection: 'asc',
     view: 'l',
     dense: false,
-    fixedColumnWidth: true,
+    fixedWidth: false,
     sticky: true,
     padding: 8
 };
@@ -363,7 +359,7 @@ HeaderCell.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
      * La largeur de la cellule est fixé (toutes les colonnes sauf une)
      */
-    fixedColumnWidth: PropTypes.bool,
+    fixedWidth: PropTypes.bool,
     /**
      * Title alignement, est déduit de type par défaut
      */

package/es/HiTable/HiTable.js

@@ -5,11 +5,10 @@ import ArrowUp from 'mdi-material-ui/ArrowUp';
 import isRequiredIf from 'react-proptype-conditional-require';
 import HiButton from '../HiButton';
 
-import { withStyles } from '../styles';
+import { withStyles, withTheme } from '../styles';
 import HiTableHead from './HiTableHead';
 import HiTableBody from './HiTableBody';
 import HiTableFooterScroll from './HiTableFooterScroll';
-import HiTableFooter from './HiTableFooter';
 import * as cst from './constants';
 import HiTableContextMenu from './HiTableContextMenu';
 
@@ -582,25 +581,13 @@ class HiTable extends React.Component {
             translations,
             view,
             groupBy,
-            lookupColumns,
-            loading,
-            fixedColumnWidth,
-            disableContextMenu,
-            footerContent,
-            detailRowsOptions
+            lookupColumns
         } = this.props;
 
         const { dateUpdate, isScrollToBottom, groupByIds } = this.state;
 
         const headerHeight = dense ? cst.CELL_HEADER_HEIGHT_DENSE : cst.CELL_HEADER_HEIGHT;
 
-        let nbColumnsDisplayed = 0;
-        orderedColumns.forEach(column => {
-            if (column.displayed !== false) {
-                nbColumnsDisplayed += 1;
-            }
-        });
-
         return React.createElement(
             'div',
             { className: classes.root },
@@ -640,8 +627,7 @@ class HiTable extends React.Component {
                         sticky: sticky,
                         view: view,
                         translations: translations,
-                        lookupColumns: lookupColumns,
-                        fixedColumnWidth: fixedColumnWidth
+                        lookupColumns: lookupColumns
                     }),
                     React.createElement(HiTableBody, {
                         tabId: tabId,
@@ -666,11 +652,7 @@ class HiTable extends React.Component {
                         groupBy: groupBy,
                         onClickNext: this.handleNextStickyRow,
                         groupByIds: groupByIds,
-                        lookupColumns: lookupColumns,
-                        loading: loading,
-                        fixedColumnWidth: fixedColumnWidth,
-                        disableContextMenu: disableContextMenu,
-                        detailRowsOptions: detailRowsOptions
+                        lookupColumns: lookupColumns
                     }),
                     infiniteScroll && React.createElement(HiTableFooterScroll, {
                         tabId: tabId,
@@ -679,15 +661,7 @@ class HiTable extends React.Component {
                         maxAutoRequest: 3,
                         isScrollToBottom: isScrollToBottom,
                         translations: translations
-                    }),
-                    !infiniteScroll && footerContent && React.createElement(
-                        HiTableFooter,
-                        {
-                            nbColumnsDisplayed: nbColumnsDisplayed,
-                            view: view
-                        },
-                        footerContent
-                    )
+                    })
                 ),
                 React.createElement(HiTableContextMenu, {
                     tabId: tabId,
@@ -700,7 +674,7 @@ class HiTable extends React.Component {
                     React.createElement(
                         HiButton,
                         {
-                            variant: 'raised',
+                            raised: true,
                             color: 'primary',
                             className: classes.backToTopButton,
                             onClick: () => this.scrollToTop()
@@ -727,7 +701,6 @@ HiTable.defaultProps = {
     dateLocale: 'en-EN',
     numberLocale: 'en-EN',
     dense: false,
-    detailRowsOptions: {},
     height: 450,
     sticky: true,
     translations: {
@@ -744,10 +717,7 @@ HiTable.defaultProps = {
         }
     },
     view: 'l',
-    lookupColumns: [],
-    loading: false,
-    fixedColumnWidth: true,
-    disableContextMenu: true
+    lookupColumns: []
 };
 HiTable.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
@@ -770,42 +740,14 @@ HiTable.propTypes = process.env.NODE_ENV !== "production" ? {
      * Locale utilisé pour le format des dates
      */
     dateLocale: PropTypes.string,
-    /**
-     * Options utilisées pour décrire le comportement de lignes de détails
-     * ex: {
-     *     payment_operation: {
-     *         anchor: 'transaction_id'
-     *     }
-     * }
-     * dans cet exemple, on veut que les lignes de détails de type payment_operation
-     * soient affichable à partir d'un chip button dans les cellules transaction_id
-     */
-    detailRowsOptions: PropTypes.object,
     /**
      * Densité d'affichage (joue sur la hauteur des lignes)
      */
     dense: PropTypes.bool,
-    /**
-     * Active/désactive le menu contextuel au clic droit sur les cellules du tableau
-     */
-    disableContextMenu: PropTypes.bool.isRequired,
     /**
      * Active le filtre sur les colonnes filtrables
      */
     filterable: PropTypes.bool,
-    /**
-     * Fixe la taille des colonnes selon le type de vue
-     * Sinon les colonnes s'adaptent à l'espace disponible
-     */
-    fixedColumnWidth: PropTypes.bool,
-    /**
-     * Ajoute un footer avec le contenu footerContent à l'intérieur
-     */
-    footerContent: PropTypes.node,
-    /**
-     * Id de la colonne par laquelle sont regroupé les éléments
-     */
-    groupBy: PropTypes.string,
     /**
      * Ajoute le loader et le requestNextDatas en fin de tableau (si infiniteScroll activé)
      */
@@ -818,10 +760,6 @@ HiTable.propTypes = process.env.NODE_ENV !== "production" ? {
      * Ajoute l'infinite scroll
      */
     infiniteScroll: PropTypes.bool,
-    /**
-     * État du tableau en cours de chargement des données
-     */
-    loading: PropTypes.bool,
     /**
      * Identifiant de la ou des colonnes sur la/lesquelles il y a une 'lookup' search
      */
@@ -874,9 +812,6 @@ HiTable.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
      * Fonction de callback sur le tri d'une colonne
      * Passe l'id de la colonne et la direction du tri (ou false si tri par défaut)
-     *
-     * @param {string} column id
-     * @param {string} direction
      */
     onSort: PropTypes.func,
     /**
@@ -932,6 +867,10 @@ HiTable.propTypes = process.env.NODE_ENV !== "production" ? {
      * Taille du tableau (L/M/S),
      * définit l'espace entre les cellules et leurs tailles par default
      */
-    view: PropTypes.oneOf(['l', 'm', 's'])
+    view: PropTypes.oneOf(['l', 'm', 's']),
+    /**
+     * Id de la colonne par laquelle sont regroupé les éléments
+     */
+    groupBy: PropTypes.string
 } : {};
 export default withStyles(styles, { withTheme: true, name: 'HmuiHiTable' })(HiTable);