From: Janicki Artur <artur.janicki@contractors.roche.com>
Date: Thu, 6 Sep 2018 07:09:54 +0000 (+0200)
Subject: Merge branch 'master' into 14093-data-explorer-table-cell-width
X-Git-Tag: 1.3.0~111^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/9428e5c6a434e0f15e44e4afdd420f866caeffbd

Merge branch 'master' into 14093-data-explorer-table-cell-width

refs #14093

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>
---

9428e5c6a434e0f15e44e4afdd420f866caeffbd
diff --cc src/components/data-table/data-table.tsx
index 1d208d75,db7b484a..0b3819ac
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@@ -18,12 -19,13 +19,13 @@@ export interface DataTableDataProps<T> 
      onSortToggle: (column: DataColumn<T>) => void;
      onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn<T>) => void;
      extractKey?: (item: T) => React.Key;
+     defaultView?: React.ReactNode;
  }
  
- type CssRules = "tableBody" | "tableContainer" | "noItemsInfo" | 'tableCell';
 -type CssRules = "tableBody" | "root" | "content" | "noItemsInfo";
++type CssRules = "tableBody" | "root" | "content" | "noItemsInfo" | 'tableCell';
  
  const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
-     tableContainer: {
+     root: {
          overflowX: 'auto',
          overflowY: 'hidden'
      },
@@@ -97,9 -107,9 +110,9 @@@ export const DataTable = withStyles(sty
                  key={extractKey ? extractKey(item) : index}
                  onClick={event => onRowClick && onRowClick(event, item)}
                  onContextMenu={this.handleRowContextMenu(item)}
-                 onDoubleClick={event => onRowDoubleClick && onRowDoubleClick(event, item) }>
+                 onDoubleClick={event => onRowDoubleClick && onRowDoubleClick(event, item)}>
                  {this.mapVisibleColumns((column, index) => (
 -                    <TableCell key={column.key || index}>
 +                    <TableCell key={column.key || index} className={classes.tableCell}>
                          {column.render(item)}
                      </TableCell>
                  ))}