From 09c570ec9d7a71b3e2f3acb7b0b964134d6850fa Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Fri, 9 Nov 2018 17:46:36 -0800
Subject: [PATCH] Fix table subview layout
---
src/client/components/ResultTable.js | 95 +++++++++++++++-------------
src/client/containers/MapApp.js | 1 -
2 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/src/client/components/ResultTable.js b/src/client/components/ResultTable.js
index 19006337..4bb0f666 100644
--- a/src/client/components/ResultTable.js
+++ b/src/client/components/ResultTable.js
@@ -13,10 +13,15 @@ import ResultTableHead from './ResultTableHead';
import { has, orderBy } from 'lodash';
const styles = (theme) => ({
- table: {
+ tableContainer: {
marginTop: 72,
+ overflow: 'auto',
+ width: '100% - 8px'
+ },
+ table: {
+ //marginTop: 72,
minWidth: 700,
- overflowX: 'auto',
+ //overflowX: 'auto',
backgroundColor: theme.palette.background.paper
},
paginationRow: {
@@ -215,50 +220,52 @@ class ResultTable extends React.Component {
);
} else {
return (
- <Table className={classes.table}>
- <ResultTableHead
- fetchFacet={this.props.fetchFacet}
- fetchManuscripts={this.props.fetchManuscripts}
- facet={this.props.facet}
- results={this.props.results}
- page={this.props.page}
- />
- <TableBody>
- {rows.map(row => {
- return (
- <TableRow key={row.id}>
- <TableCell component="th" scope="row" >
- {this.idRenderer(row)}
- </TableCell>
- <TableCell className={classes.withFilter} >
- {this.stringListRenderer(row.prefLabel)}
- </TableCell>
- <TableCell className={classes.withFilter}>
- {this.objectListRenderer(row.author, true)}
- </TableCell>
- <TableCell className={classes.withFilter}>
- {this.objectListRenderer(row.creationPlace, true)}
- </TableCell>
- <TableCell className={classes.withFilter}>
- {this.objectListRenderer(row.timespan)}
- </TableCell>
- <TableCell className={classes.withFilter}>
- {this.stringListRenderer(row.language)}
- </TableCell>
- {/*<TableCell className={classes.withFilter}>
+ <div className={classes.tableContainer}>
+ <Table className={classes.table}>
+ <ResultTableHead
+ fetchFacet={this.props.fetchFacet}
+ fetchManuscripts={this.props.fetchManuscripts}
+ facet={this.props.facet}
+ results={this.props.results}
+ page={this.props.page}
+ />
+ <TableBody>
+ {rows.map(row => {
+ return (
+ <TableRow key={row.id}>
+ <TableCell component="th" scope="row" >
+ {this.idRenderer(row)}
+ </TableCell>
+ <TableCell className={classes.withFilter} >
+ {this.stringListRenderer(row.prefLabel)}
+ </TableCell>
+ <TableCell className={classes.withFilter}>
+ {this.objectListRenderer(row.author, true)}
+ </TableCell>
+ <TableCell className={classes.withFilter}>
+ {this.objectListRenderer(row.creationPlace, true)}
+ </TableCell>
+ <TableCell className={classes.withFilter}>
+ {this.objectListRenderer(row.timespan)}
+ </TableCell>
+ <TableCell className={classes.withFilter}>
+ {this.stringListRenderer(row.language)}
+ </TableCell>
+ {/*<TableCell className={classes.withFilter}>
{this.stringListRenderer(row.material)}
</TableCell>*/}
- <TableCell className={classes.withFilter}>
- {this.transactionRenderer(row.acquisition)}
- </TableCell>
- <TableCell className={classes.withFilter}>
- {this.ownerRenderer(row.owner)}
- </TableCell>
- </TableRow>
- );
- })}
- </TableBody>
- </Table>
+ <TableCell className={classes.withFilter}>
+ {this.transactionRenderer(row.acquisition)}
+ </TableCell>
+ <TableCell className={classes.withFilter}>
+ {this.ownerRenderer(row.owner)}
+ </TableCell>
+ </TableRow>
+ );
+ })}
+ </TableBody>
+ </Table>
+ </div>
);
}
}
diff --git a/src/client/containers/MapApp.js b/src/client/containers/MapApp.js
index 5cde7cbb..8e9ffd89 100644
--- a/src/client/containers/MapApp.js
+++ b/src/client/containers/MapApp.js
@@ -41,7 +41,6 @@ const styles = theme => ({
//minHeight: 700
},
mainContainer: {
- overflow: 'auto',
display: 'flex',
width: '100%',
marginTop: 64,
--
GitLab