Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(capture): enables scrolling in Capture page #182

Merged
merged 5 commits into from
Oct 30, 2021
Merged

fix(capture): enables scrolling in Capture page #182

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ed6006
fix(capture): enables scrolling in Capture page
mqnguyen5 Oct 28, 2021
b69ec7c
fix(capture-view, capture-table): adjustments to allow scrollbar to s…
mqnguyen5 Oct 28, 2021
a7a11f1
fix(capture-table): removes 'overflowX' style
mqnguyen5 Oct 28, 2021
1746531
fix(capture-table): fixes pagination bug
mqnguyen5 Oct 29, 2021
70d3257
fix(capture-table): removes unnecessary local 'page' state
mqnguyen5 Oct 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/components/CaptureTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,10 @@ const CaptureTable = () => {
)}
</Navbar>
</Grid>
<Grid item>
<Grid
item
style={{ height: '100%', overflowX: 'hidden', overflowY: 'scroll' }}
nmcharlton marked this conversation as resolved.
Show resolved Hide resolved
>
<div className={classes.tableContainer} ref={scrollRef}>
<Grid
container
Expand Down
16 changes: 7 additions & 9 deletions src/views/CapturesView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ function CapturesView() {
direction="column"
style={{ flexWrap: 'nowrap', height: '100%' }}
>
<Grid item container style={{ height: '100%', overflow: 'hidden' }}>
<CapturesProvider>
<SpeciesProvider>
<TagsProvider>
<CaptureTable />
</TagsProvider>
</SpeciesProvider>
</CapturesProvider>
</Grid>
<CapturesProvider>
<SpeciesProvider>
<TagsProvider>
<CaptureTable />
</TagsProvider>
</SpeciesProvider>
</CapturesProvider>
</Grid>
);
}
Expand Down