Skip to content

Table: Separate controls for Fixed Header and Fixed Toolbar #549

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

Merged
merged 2 commits into from
Dec 1, 2023
Merged

Table: Separate controls for Fixed Header and Fixed Toolbar #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2b423d
fix: make table rows interactive when fixed header
raheeliftikhar5 Dec 1, 2023
e959fd1
fix: separate options to fix header and toolbar
raheeliftikhar5 Dec 1, 2023
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
247 changes: 130 additions & 117 deletions client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,91 +63,64 @@ const getStyle = (
const alternateBackground = genLinerGradient(rowStyle.alternateBackground);

return css`
border-color: ${style.border};
border-radius: ${style.radius};

& > div > div > div > .ant-table > .ant-table-container > .ant-table-content > table {
> thead > tr > th,
> tbody > tr > td {
border-color: ${style.border};
}

> .ant-table-thead > tr > th::before {
background-color: ${style.border};
.ant-table-body {
background: white;
}
.ant-table-tbody {
> tr:nth-of-type(2n + 1) {
&,
> td {
background: ${genLinerGradient(rowStyle.background)};
}
}

> .ant-table-thead {
> tr > th {
background-color: ${style.headerBackground};
border-color: ${style.border};
color: ${style.headerText};

&.ant-table-column-has-sorters:hover {
background-color: ${darkenColor(style.headerBackground, 0.05)};
}

> .ant-table-column-sorters > .ant-table-column-sorter {
color: ${style.headerText === defaultTheme.textDark ? "#bfbfbf" : style.headerText};
}
> tr:nth-of-type(2n) {
&,
> td {
background: ${alternateBackground};
}
}

> .ant-table-tbody {
> tr:nth-of-type(2n + 1) {
&,
> td {
background: ${genLinerGradient(rowStyle.background)};
}
// selected row
> tr:nth-of-type(2n + 1).ant-table-row-selected {
> td {
background: ${selectedRowBackground}, ${rowStyle.background} !important;
}

> tr:nth-of-type(2n) {
&,
> td {
background: ${alternateBackground};
}
> td.ant-table-cell-row-hover,
&:hover > td {
background: ${hoverRowBackground}, ${selectedRowBackground}, ${rowStyle.background} !important;
}
}

// selected row
> tr:nth-of-type(2n + 1).ant-table-row-selected {
> td {
background: ${selectedRowBackground}, ${rowStyle.background} !important;
}

> td.ant-table-cell-row-hover,
&:hover > td {
background: ${hoverRowBackground}, ${selectedRowBackground}, ${rowStyle.background} !important;
}
> tr:nth-of-type(2n).ant-table-row-selected {
> td {
background: ${selectedRowBackground}, ${alternateBackground} !important;
}

> tr:nth-of-type(2n).ant-table-row-selected {
> td {
background: ${selectedRowBackground}, ${alternateBackground} !important;
}

> td.ant-table-cell-row-hover,
&:hover > td {
background: ${hoverRowBackground}, ${selectedRowBackground}, ${alternateBackground} !important;
}
> td.ant-table-cell-row-hover,
&:hover > td {
background: ${hoverRowBackground}, ${selectedRowBackground}, ${alternateBackground} !important;
}
}

// hover row
> tr:nth-of-type(2n + 1) > td.ant-table-cell-row-hover {
&,
> div:nth-of-type(2) {
background: ${hoverRowBackground}, ${rowStyle.background} !important;
}
// hover row
> tr:nth-of-type(2n + 1) > td.ant-table-cell-row-hover {
&,
> div:nth-of-type(2) {
background: ${hoverRowBackground}, ${rowStyle.background} !important;
}
}

> tr:nth-of-type(2n) > td.ant-table-cell-row-hover {
&,
> div:nth-of-type(2) {
background: ${hoverRowBackground}, ${alternateBackground} !important;
}
> tr:nth-of-type(2n) > td.ant-table-cell-row-hover {
&,
> div:nth-of-type(2) {
background: ${hoverRowBackground}, ${alternateBackground} !important;
}
}

> tr.ant-table-expanded-row > td {
background: ${background};
}
> tr.ant-table-expanded-row > td {
background: ${background};
}
}
`;
Expand All @@ -157,11 +130,14 @@ const TableWrapper = styled.div<{
$style: TableStyleType;
$rowStyle: TableRowStyleType;
toolbarPosition: "above" | "below" | "close";
fixedHeader: boolean;
fixedToolbar: boolean;
}>`
max-height: 100%;
overflow-y: auto;
background: white;
border: 1px solid #d7d9e0;
border: ${(props) => `1px solid ${props.$style.border}`};
border-radius: ${(props) => props.$style.radius};

.ant-table-wrapper {
border-top: ${(props) => (props.toolbarPosition === "above" ? "1px solid" : "unset")};
Expand Down Expand Up @@ -194,63 +170,102 @@ const TableWrapper = styled.div<{
border-inline-start: none !important;

.ant-table-content {
// A table expand row contains table
.ant-table-tbody .ant-table-wrapper:only-child .ant-table {
margin: 0;
}
overflow: unset !important;
}

table {
border-top: unset;
// A table expand row contains table
.ant-table-tbody .ant-table-wrapper:only-child .ant-table {
margin: 0;
}

td {
padding: 0px 0px;
}
table {
border-top: unset;

> .ant-table-thead {
> tr > th {
background-color: ${(props) => props.$style.headerBackground};
border-color: ${(props) => props.$style.border};
color: ${(props) => props.$style.headerText};
border-inline-end: ${(props) => `1px solid ${props.$style.border}`} !important;
${(props) =>
props.fixedHeader && `
position: sticky;
position: -webkit-sticky;
top: ${props.fixedToolbar ? '47px' : '0'};
z-index: 99;
`
}

&:last-child {
border-inline-end: none !important;
}
&.ant-table-column-has-sorters:hover {
background-color: ${(props) => darkenColor(props.$style.headerBackground, 0.05)};
}

> .ant-table-column-sorters > .ant-table-column-sorter {
color: ${(props) => props.$style.headerText === defaultTheme.textDark ? "#bfbfbf" : props.$style.headerText};
}

thead > tr:first-child {
th:last-child {
border-right: unset;
&::before {
background-color: ${(props) => props.$style.border};
}
}
}

tbody > tr > td:last-child {
> thead > tr > th,
> tbody > tr > td {
border-color: ${(props) => props.$style.border};
}

td {
padding: 0px 0px;
}

thead > tr:first-child {
th:last-child {
border-right: unset;
}
}

.ant-empty-img-simple-g {
fill: #fff;
}
tbody > tr > td:last-child {
border-right: unset;
}

> thead > tr:first-child {
th:first-child {
border-top-left-radius: 0px;
}
.ant-empty-img-simple-g {
fill: #fff;
}

th:last-child {
border-top-right-radius: 0px;
}
> thead > tr:first-child {
th:first-child {
border-top-left-radius: 0px;
}

// hide the bottom border of the last row
${(props) =>
props.toolbarPosition !== "below" &&
`
tbody > tr:last-child > td {
border-bottom: unset;
}
`}
th:last-child {
border-top-right-radius: 0px;
}
}

.ant-table-expanded-row-fixed:after {
border-right: unset !important;
}
// hide the bottom border of the last row
${(props) =>
props.toolbarPosition !== "below" &&
`
tbody > tr:last-child > td {
border-bottom: unset;
}
`}
}

.ant-table-expanded-row-fixed:after {
border-right: unset !important;
}
}
}

${(props) =>
props.$style && getStyle(props.$style, props.$rowStyle)}
`;

const TableTh = styled.th<{ width?: number }>`
overflow: hidden;

Expand All @@ -272,6 +287,11 @@ const TableTd = styled.td<{
.ant-table-row-indent {
display: ${(props) => (props.$isEditing ? "none" : "initial")};
}
&.ant-table-row-expand-icon-cell {
background: ${(props) => props.background};
border-color: ${(props) => props.$style.border};
}

background: ${(props) => props.background} !important;
border-color: ${(props) => props.$style.border} !important;
border-width: ${(props) => props.$style.borderWidth} !important;
Expand Down Expand Up @@ -364,9 +384,6 @@ type CustomTableProps<RecordType> = Omit<TableProps<RecordType>, "components" |
viewModeResizable: boolean;
rowColorFn: RowColorViewType;
columnsStyle: TableColumnStyleType;
fixedHeader: boolean;
height?: number;
autoHeight?: boolean;
};

function TableCellView(props: {
Expand Down Expand Up @@ -540,9 +557,7 @@ function ResizeableTable<RecordType extends object>(props: CustomTableProps<Reco
columns={columns}
scroll={{
x: COL_MIN_WIDTH * columns.length,
y: props.fixedHeader && props.height && !props.autoHeight
? `${props.height - 100}px`
: undefined,
y: undefined,
}}
></Table>
);
Expand All @@ -556,10 +571,10 @@ export function TableCompView(props: {
onDownload: (fileName: string) => void;
}) {
const editorState = useContext(EditorContext);
const { width, height, ref } = useResizeDetector({
const { width, ref } = useResizeDetector({
refreshMode: "debounce",
refreshRate: 600,
handleHeight: true,
handleHeight: false,
});
const viewMode = useUserViewMode();
const compName = useContext(CompNameContext);
Expand All @@ -584,7 +599,6 @@ export function TableCompView(props: {
() => compChildren.dynamicColumnConfig.getView(),
[compChildren.dynamicColumnConfig]
);
const autoHeight = compChildren.autoHeight.getView();
const columnsAggrData = comp.columnAggrData;
const expansion = useMemo(() => compChildren.expansion.getView(), [compChildren.expansion]);
const antdColumns = useMemo(
Expand Down Expand Up @@ -681,6 +695,8 @@ export function TableCompView(props: {
$style={style}
$rowStyle={rowStyle}
toolbarPosition={toolbar.position}
fixedHeader={compChildren.fixedHeader.getView()}
fixedToolbar={toolbar.fixedToolbar && toolbar.position === 'above'}
>
{toolbar.position === "above" && toolbarView}
<ResizeableTable<RecordType>
Expand All @@ -701,15 +717,12 @@ export function TableCompView(props: {
onTableChange(pagination, filters, sorter, extra, comp.dispatch, onEvent);
}}
showHeader={!compChildren.hideHeader.getView()}
fixedHeader={compChildren.fixedHeader.getView()}
columns={antdColumns}
columnsStyle={columnsStyle}
viewModeResizable={compChildren.viewModeResizable.getView()}
dataSource={pageDataInfo.data}
size={compChildren.size.getView()}
tableLayout="fixed"
height={height}
autoHeight={autoHeight}
loading={
loading ||
// fixme isLoading type
Expand Down
Loading