Merge branch 'master' into 14093-data-explorer-table-cell-width
authorJanicki Artur <artur.janicki@contractors.roche.com>
Thu, 6 Sep 2018 07:09:54 +0000 (09:09 +0200)
committerJanicki Artur <artur.janicki@contractors.roche.com>
Thu, 6 Sep 2018 07:09:54 +0000 (09:09 +0200)
refs #14093

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

1  2 
src/components/data-explorer/data-explorer.tsx
src/components/data-table/data-table.tsx
src/views/favorite-panel/favorite-panel.tsx
src/views/project-panel/project-panel.tsx
src/views/trash-panel/trash-panel.tsx

index 1d208d7590536f93412fbb564fcb27cd62e939d9,db7b484a09660241e9170c9b83e31ee8899a6f69..0b3819ac8072698058185a8c67c82264921eda96
@@@ -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>
                  ))}
Simple merge