Skip to content

feat: show skeleton as loading indicator in data browser while data is loading #2273

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.

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
Sep 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 25 additions & 2 deletions src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { DndProvider } from 'react-dnd'

export default class DataBrowserHeaderBar extends React.Component {
render() {
let { headers, onResize, selectAll, onAddColumn, updateOrdering, readonly, preventSchemaEdits, selected } = this.props;
let { headers, onResize, selectAll, onAddColumn, updateOrdering, readonly, preventSchemaEdits, selected, isDataLoaded } = this.props;
let elements = [
<div key='check' className={[styles.wrap, styles.check].join(' ')}>
{readonly
Expand Down Expand Up @@ -85,9 +85,32 @@ export default class DataBrowserHeaderBar extends React.Component {
);
}

function renderSkeleton() {
if (isDataLoaded) return null;
var skeletons = [1, 0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1];
return (
<div className={styles.skeleton}>
{skeletons.map(function (opacity, index) {
return (
<div
key={index}
className={styles.skeletonRow}
style={{
opacity,
}}
></div>
);
})}
</div>
);
}

return (
<DndProvider backend={HTML5Backend}>
<div className={styles.bar}>{elements}</div>
<div className={styles.bar}>
{elements}
{renderSkeleton()}
</div>
</DndProvider>
)
}
Expand Down
29 changes: 29 additions & 0 deletions src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,32 @@
cursor: not-allowed;
}
}

.skeleton {
position: absolute;
width: 100%;
height: 100%;
top: 30px;
}

.skeletonRow {
border-top: 1px solid #e3e3ea;
border-bottom: 1px solid #e3e3ea;
height: 30px;
width:100%;
vertical-align: middle;
padding-left: 2px;
margin-top: 30px;
line-height: 31px;
animation: skeleton-loading 1s linear infinite alternate;
}

@keyframes skeleton-loading {
0% {
background-color:#ffffff;
}
100% {
background-color: #e3e3ea;

}
}
4 changes: 3 additions & 1 deletion src/dashboard/Data/Browser/BrowserTable.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,9 @@ export default class BrowserTable extends React.Component {
handleDragDrop={this.props.handleHeaderDragDrop}
onResize={this.props.handleResize}
onAddColumn={this.props.onAddColumn}
preventSchemaEdits={this.context.preventSchemaEdits} />
preventSchemaEdits={this.context.preventSchemaEdits}
isDataLoaded={!!this.props.data}
/>
</div>
);
}
Expand Down