You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by hu...@apache.org on 2021/11/30 21:42:02 UTC
[superset] branch grid-improv updated (b699e9d -> 80b6a56)
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a change to branch grid-improv
in repository https://gitbox.apache.org/repos/asf/superset.git.
discard b699e9d remove styling on grid
new 80b6a56 remove styling on grid
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b699e9d)
\
N -- N -- N refs/heads/grid-improv (80b6a56)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/components/FilterableTable/FilterableTable.tsx | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
[superset] 01/01: remove styling on grid
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a commit to branch grid-improv
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 80b6a56d61e1d67cc3b65d0e0ef02e4a6251ce7f
Author: hughhhh <hu...@gmail.com>
AuthorDate: Tue Nov 30 09:37:50 2021 -0800
remove styling on grid
---
.../components/FilterableTable/FilterableTable.tsx | 85 +++++++++++++---------
1 file changed, 49 insertions(+), 36 deletions(-)
diff --git a/superset-frontend/src/components/FilterableTable/FilterableTable.tsx b/superset-frontend/src/components/FilterableTable/FilterableTable.tsx
index d8313b6..46ceab4 100644
--- a/superset-frontend/src/components/FilterableTable/FilterableTable.tsx
+++ b/superset-frontend/src/components/FilterableTable/FilterableTable.tsx
@@ -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,
@@ -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)',
@@ -426,9 +427,22 @@ export default class FilterableTable extends PureComponent<
}) {
const columnKey = this.props.orderedColumnKeys[columnIndex];
const cellData = this.list[rowIndex][columnKey];
+ const cellText = this.getCellContent({ cellData, columnKey });
+ const content =
+ cellData === null ? <i className="text-muted">{cellText}</i> : cellText;
const cellNode = (
- <div key={key} style={style}>
- {this.getCellContent({ cellData, columnKey })}
+ <div
+ key={key}
+ style={{
+ ...style,
+ top:
+ typeof style.top === 'number'
+ ? style.top - GRID_POSITION_ADJUSTMENT
+ : style.top,
+ }}
+ className={`grid-cell ${this.rowClassName({ index: rowIndex })}`}
+ >
+ <div css={{ width: 'inherit' }}>{content}</div>
</div>
);
@@ -466,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>
+ <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>