Skip to content

Commit 02530cd

Browse files
Merge branch 'master' into chore/codecov
2 parents 041e1f5 + e911922 commit 02530cd

File tree

4 files changed

+19
-72
lines changed

4 files changed

+19
-72
lines changed

packages/charts/src/internal/Loader/Loader.jss.ts

Lines changed: 0 additions & 41 deletions
This file was deleted.

packages/charts/src/internal/Loader/index.tsx

Lines changed: 0 additions & 16 deletions
This file was deleted.

packages/charts/src/internal/Placeholder.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
import { Loader } from './Loader';
2-
import React from 'react';
1+
import { Loader } from '@ui5/webcomponents-react/lib/Loader';
2+
import React, { CSSProperties } from 'react';
3+
4+
const loaderStyles: CSSProperties = {
5+
position: 'absolute'
6+
};
37

48
export const getLoadingState = (loading, datasets, Placeholder) => {
59
if (!loading) {
610
return null;
711
}
812

913
if (loading && datasets.length > 0) {
10-
return <Loader />;
14+
return <Loader style={loaderStyles} />;
1115
}
1216

1317
if (loading && datasets.length === 0) {

scripts/rollup/results.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"filename": "charts.development.js",
55
"bundleType": "NODE_DEV",
66
"packageName": "charts",
7-
"size": 18056,
8-
"gzip": 5173
7+
"size": 18083,
8+
"gzip": 5180
99
},
1010
{
1111
"filename": "charts.production.min.js",
1212
"bundleType": "NODE_PROD",
1313
"packageName": "charts",
14-
"size": 18056,
15-
"gzip": 5173
14+
"size": 18083,
15+
"gzip": 5180
1616
},
1717
{
1818
"filename": "base.development.js",
@@ -32,22 +32,22 @@
3232
"filename": "main.development.js",
3333
"bundleType": "NODE_DEV",
3434
"packageName": "main",
35-
"size": 113686,
36-
"gzip": 29814
35+
"size": 115370,
36+
"gzip": 30233
3737
},
3838
{
3939
"filename": "main.production.min.js",
4040
"bundleType": "NODE_PROD",
4141
"packageName": "main",
42-
"size": 113686,
43-
"gzip": 29814
42+
"size": 115370,
43+
"gzip": 30233
4444
},
4545
{
4646
"filename": "main.js",
4747
"bundleType": "NODE_ES",
4848
"packageName": "main",
49-
"size": 211218,
50-
"gzip": 41316
49+
"size": 213865,
50+
"gzip": 41812
5151
},
5252
{
5353
"filename": "base.js",
@@ -60,8 +60,8 @@
6060
"filename": "charts.js",
6161
"bundleType": "NODE_ES",
6262
"packageName": "charts",
63-
"size": 36160,
64-
"gzip": 6804
63+
"size": 36195,
64+
"gzip": 6811
6565
}
6666
]
6767
}

0 commit comments

Comments
 (0)