Skip to content

Dataviews: Fix sticky table headers #59467

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
jameskoster merged 7 commits into from
Mar 5, 2024
Merged

Dataviews: Fix sticky table headers #59467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d20341
Fix sticky table headers
jameskoster Feb 29, 2024
4a84da5
Pagination styles
jameskoster Feb 29, 2024
e41dd28
Rebase
jameskoster Mar 4, 2024
3bb5198
Fix z-index
jameskoster Mar 4, 2024
3cb93aa
Merge branch 'trunk' into fix/dataviews-sticky-table-header
jameskoster Mar 5, 2024
eb16c39
Remove unnecessary wrapper(s)
jameskoster Mar 5, 2024
2d3a0db
Linting error
jameskoster Mar 5, 2024
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
3 changes: 3 additions & 0 deletions packages/base-styles/_z-index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@ $z-layers: (

// Ensure modal footer actions appear above modal contents
".edit-site-start-template-options__modal__actions": 1,

// Ensure checkbox + actions don't overlap table header
".dataviews-view-table thead": 1,
);

@function z-index( $key ) {
Expand Down
99 changes: 47 additions & 52 deletions packages/dataviews/src/dataviews.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/**
* WordPress dependencies
*/
import {
__experimentalVStack as VStack,
__experimentalHStack as HStack,
} from '@wordpress/components';
import { __experimentalHStack as HStack } from '@wordpress/components';
import { useMemo, useState, useCallback, useEffect } from '@wordpress/element';

/**
Expand Down Expand Up @@ -92,69 +89,67 @@ export default function DataViews( {
);
return (
<div className="dataviews-wrapper">
<VStack spacing={ 3 } justify="flex-start">
<HStack
alignment="top"
justify="start"
className="dataviews-filters__view-actions"
>
<HStack
alignment="top"
justify="start"
className="dataviews-filters__view-actions"
className="dataviews-filters__container"
wrap
>
<HStack
justify="start"
className="dataviews-filters__container"
wrap
>
{ search && (
<Search
label={ searchLabel }
view={ view }
onChangeView={ onChangeView }
/>
) }
<Filters
fields={ _fields }
{ search && (
<Search
label={ searchLabel }
view={ view }
onChangeView={ onChangeView }
openedFilter={ openedFilter }
setOpenedFilter={ setOpenedFilter }
/>
</HStack>
{ [ LAYOUT_TABLE, LAYOUT_GRID ].includes( view.type ) &&
hasPossibleBulkAction && (
<BulkActions
actions={ actions }
data={ data }
onSelectionChange={ onSetSelection }
selection={ selection }
getItemId={ getItemId }
/>
) }
<ViewActions
) }
<Filters
fields={ _fields }
view={ view }
onChangeView={ onChangeView }
supportedLayouts={ supportedLayouts }
openedFilter={ openedFilter }
setOpenedFilter={ setOpenedFilter }
/>
</HStack>
<ViewComponent
{ [ LAYOUT_TABLE, LAYOUT_GRID ].includes( view.type ) &&
hasPossibleBulkAction && (
<BulkActions
actions={ actions }
data={ data }
onSelectionChange={ onSetSelection }
selection={ selection }
getItemId={ getItemId }
/>
) }
<ViewActions
fields={ _fields }
view={ view }
onChangeView={ onChangeView }
actions={ actions }
data={ data }
getItemId={ getItemId }
isLoading={ isLoading }
onSelectionChange={ onSetSelection }
onDetailsChange={ onDetailsChange }
selection={ selection }
deferredRendering={ deferredRendering }
setOpenedFilter={ setOpenedFilter }
/>
<Pagination
view={ view }
onChangeView={ onChangeView }
paginationInfo={ paginationInfo }
supportedLayouts={ supportedLayouts }
/>
</VStack>
</HStack>
<ViewComponent
fields={ _fields }
view={ view }
onChangeView={ onChangeView }
actions={ actions }
data={ data }
getItemId={ getItemId }
isLoading={ isLoading }
onSelectionChange={ onSetSelection }
onDetailsChange={ onDetailsChange }
selection={ selection }
deferredRendering={ deferredRendering }
setOpenedFilter={ setOpenedFilter }
/>
<Pagination
view={ view }
onChangeView={ onChangeView }
paginationInfo={ paginationInfo }
/>
</div>
);
}
29 changes: 12 additions & 17 deletions packages/dataviews/src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
overflow: auto;
box-sizing: border-box;
scroll-padding-bottom: $grid-unit-80;

> div {
min-height: 100%;
}
}

.dataviews-filters__view-actions {
padding: $grid-unit-15 $grid-unit-40 0;
margin-bottom: $grid-unit-15;
flex-shrink: 0;
position: sticky;
left: 0;

.components-search-control {
.components-base-control__field {
max-width: 240px;
Expand All @@ -28,14 +29,14 @@
}

.dataviews-pagination {
margin-top: auto;
position: sticky;
bottom: 0;
background-color: rgba($white, 0.8);
backdrop-filter: blur(6px);
left: 0;
background-color: $white;
padding: $grid-unit-15 $grid-unit-40;
border-top: $border-width solid $gray-100;
color: $gray-700;
flex-shrink: 0;
}

.dataviews-pagination__page-selection {
Expand All @@ -49,13 +50,6 @@
margin: $grid-unit-40 0 $grid-unit-20;
}

.dataviews-view-table-wrapper {
overflow-x: auto;
flex-grow: 1;
display: flex;
flex-direction: column;
}

.dataviews-view-table {
width: 100%;
text-indent: 0;
Expand Down Expand Up @@ -149,17 +143,18 @@
}
}
thead {
position: sticky;
inset-block-start: 0;
z-index: z-index(".dataviews-view-table thead");

tr {
border: 0;
}
th {
position: sticky;
top: -1px;
background-color: $white;
box-shadow: inset 0 -#{$border-width} 0 $gray-100;
padding-top: $grid-unit-10;
padding-bottom: $grid-unit-10;
z-index: 1;
font-size: 11px;
text-transform: uppercase;
font-weight: 500;
Expand Down
4 changes: 2 additions & 2 deletions packages/dataviews/src/view-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ function ViewTable( {
);

return (
<div className="dataviews-view-table-wrapper">
<>
<table
className="dataviews-view-table"
aria-busy={ isLoading }
Expand Down Expand Up @@ -468,7 +468,7 @@ function ViewTable( {
<p>{ isLoading ? <Spinner /> : __( 'No results' ) }</p>
) }
</div>
</div>
</>
);
}

Expand Down