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

fix: table: fix loading compare and updates default spinner size and position #627

Merged
merged 4 commits into from
May 31, 2023
Merged

fix: table: fix loading compare and updates default spinner size and position #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7acd9da
fix: table: fix loading compare and updates default spinner size and …
dkilgore-eightfold May 24, 2023
fadc41b
chore: table: inherit spinner div height
dkilgore-eightfold May 24, 2023
928a5ea
Merge branch 'main' into dkilgore-eightfold/default-table-loading-fixup
dkilgore-eightfold May 26, 2023
b675c6b
Merge branch 'main' into dkilgore-eightfold/default-table-loading-fixup
dkilgore-eightfold May 31, 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
7 changes: 7 additions & 0 deletions src/components/Table/Styles/table.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,13 @@
}
}

.table-spinner {
align-items: center;
display: flex;
height: inherit;
justify-content: center;
}

.table-filter-dropdown {
&-tree {
padding: 8px 8px 0;
Expand Down
5 changes: 5 additions & 0 deletions src/components/Table/Table.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ export default {
onRowHoverLeave: {
action: 'onMouseLeave',
},
loading: {
options: [true, false],
control: { type: 'inline-radio' },
},
},
} as ComponentMeta<typeof Component>;

Expand Down Expand Up @@ -1409,6 +1413,7 @@ const tableArgs: Object = {
bordered: true,
classNames: 'my-table-class',
id: 'myTableId',
loading: false,
columns: basicCols,
dataSource: data,
pagination: {
Expand Down
14 changes: 11 additions & 3 deletions src/components/Table/Table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,10 +687,18 @@ function InternalTable<RecordType extends object = any>(
}
}

if (typeof loading === 'boolean') {
return <Spinner size={SpinnerSize.Large} />;
if (typeof loading === 'boolean' && loading) {
return (
<div className={styles.tableSpinner}>
<Spinner />
</div>
);
} else if (typeof loading === 'object') {
return <Spinner size={SpinnerSize.Large} />;
return (
<div className={styles.tableSpinner}>
<Spinner {...loading} />
</div>
);
}

const renderEmpty = (
Expand Down
Loading