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

Jump to bottom

refactor: Add AutoSizer to react-virtualized Grid #17606

Merged
merged 3 commits into from
Dec 2, 2021
Merged

refactor: Add AutoSizer to react-virtualized Grid #17606

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d01abb
remove styles from renderCell
hughhhh Nov 29, 2021
80b6a56
remove styling on grid
hughhhh Nov 30, 2021
b2682ca
Merge branch 'master' of https://github.com/apache/superset into grid…
hughhhh Nov 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
68 changes: 34 additions & 34 deletions superset-frontend/src/components/FilterableTable/FilterableTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import JSONbig from 'json-bigint';
import React, { PureComponent } from 'react';
import JSONTree from 'react-json-tree';
import {
AutoSizer,
Column,
Grid,
ScrollSync,
Expand Down Expand Up @@ -58,8 +59,8 @@ function safeJsonObjectParse(
}
}

const SCROLL_BAR_HEIGHT = 15;
const GRID_POSITION_ADJUSTMENT = 4;
const SCROLL_BAR_HEIGHT = 15;
const JSON_TREE_THEME = {
scheme: 'monokai',
author: 'wimer hazenberg (http://www.monokai.nl)',
Expand Down Expand Up @@ -479,39 +480,38 @@ export default class FilterableTable extends PureComponent<
return (
<StyledFilterableTable>
<ScrollSync>
{({ onScroll, scrollTop }) => (
<div
className="filterable-table-container Table"
data-test="filterable-table-container"
ref={this.container}
>
<div className="LeftColumn">
<Grid
cellRenderer={this.renderGridCellHeader}
columnCount={orderedColumnKeys.length}
columnWidth={getColumnWidth}
height={rowHeight}
rowCount={1}
rowHeight={rowHeight}
scrollTop={scrollTop}
width={this.totalTableWidth}
/>
</div>
<div className="RightColumn">
<Grid
cellRenderer={this.renderGridCell}
columnCount={orderedColumnKeys.length}
columnWidth={getColumnWidth}
height={totalTableHeight - rowHeight}
onScroll={onScroll}
overscanColumnCount={overscanColumnCount}
overscanRowCount={overscanRowCount}
rowCount={this.list.length}
rowHeight={rowHeight}
width={this.totalTableWidth}
/>
</div>
</div>
{({ onScroll, scrollLeft }) => (
<>
<AutoSizer disableHeight>
{({ width }) => (
<div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh you got rid of the two separate divs (and also got rid of their classnames). Has that affected any of the css for right and left Column?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For what I can see the class was mostly around positioning from the react virtualized, but the styling wise doesn't effect the component

<Grid
cellRenderer={this.renderGridCellHeader}
columnCount={orderedColumnKeys.length}
columnWidth={getColumnWidth}
height={rowHeight}
rowCount={1}
rowHeight={rowHeight}
scrollLeft={scrollLeft}
width={width}
style={{ overflow: 'hidden' }}
/>
<Grid
cellRenderer={this.renderGridCell}
columnCount={orderedColumnKeys.length}
columnWidth={getColumnWidth}
height={totalTableHeight - rowHeight}
onScroll={onScroll}
overscanColumnCount={overscanColumnCount}
overscanRowCount={overscanRowCount}
rowCount={this.list.length}
rowHeight={rowHeight}
width={width}
/>
</div>
)}
</AutoSizer>
</>
)}
</ScrollSync>
</StyledFilterableTable>
Expand Down