react-alp-loading-bar 6.1.1 → 7.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/dist/definitions/index.d.ts +1 -2
- package/dist/definitions/index.d.ts.map +1 -1
- package/dist/index-browser.es.js +6 -10
- package/dist/index-browser.es.js.map +1 -1
- package/dist/index-node18.mjs +6 -10
- package/dist/index-node18.mjs.map +1 -1
- package/package.json +2 -4
- package/src/index.tsx +7 -12
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,20 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [7.0.0](https://github.com/christophehurpeau/alp/compare/react-alp-loading-bar@6.1.1...react-alp-loading-bar@7.0.0) (2024-01-06)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### ⚠ BREAKING CHANGES
|
|
10
|
+
|
|
11
|
+
* merge to alp-node to improve maintenability, remove alp-types
|
|
12
|
+
|
|
13
|
+
### Features
|
|
14
|
+
|
|
15
|
+
* merge to alp-node to improve maintenability, remove alp-types ([ead9a2f](https://github.com/christophehurpeau/alp/commit/ead9a2fd1bcbedce0be29ea0e444c5cead99c64d))
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
6
20
|
## [6.1.1](https://github.com/christophehurpeau/alp/compare/react-alp-loading-bar@6.1.0...react-alp-loading-bar@6.1.1) (2024-01-06)
|
|
7
21
|
|
|
8
22
|
Note: no notable changes
|
|
@@ -4,6 +4,7 @@ interface LoadingBarProps {
|
|
|
4
4
|
LoadingBarComponent: React.ComponentType<{
|
|
5
5
|
progress: number;
|
|
6
6
|
}>;
|
|
7
|
+
websocket: WebsocketInterface;
|
|
7
8
|
}
|
|
8
9
|
interface LoadingBarState {
|
|
9
10
|
loading: boolean;
|
|
@@ -15,7 +16,6 @@ interface WebsocketInterface {
|
|
|
15
16
|
on: (event: 'connect' | 'disconnect', callback: () => unknown) => void;
|
|
16
17
|
}
|
|
17
18
|
export default class LoadingBar extends PureComponent<LoadingBarProps, LoadingBarState> {
|
|
18
|
-
static contextType: import("react").Context<import("../../alp-types/lib").Context>;
|
|
19
19
|
state: {
|
|
20
20
|
loading: boolean;
|
|
21
21
|
hidden: boolean;
|
|
@@ -28,7 +28,6 @@ export default class LoadingBar extends PureComponent<LoadingBarProps, LoadingBa
|
|
|
28
28
|
componentDidMount(): void;
|
|
29
29
|
componentDidUpdate(prevProps: LoadingBarProps, prevState: LoadingBarState): void;
|
|
30
30
|
componentWillUnmount(): void;
|
|
31
|
-
getWebsocket(): WebsocketInterface;
|
|
32
31
|
private showBar;
|
|
33
32
|
private hideBar;
|
|
34
33
|
render(): ReactElement;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAmCtC,UAAU,eAAe;IACvB,mBAAmB,EAAE,KAAK,CAAC,aAAa,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/D,SAAS,EAAE,kBAAkB,CAAC;CAC/B;AAED,UAAU,eAAe;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,OAAO,CAAC;IAC3B,EAAE,EAAE,CAAC,KAAK,EAAE,SAAS,GAAG,YAAY,EAAE,QAAQ,EAAE,MAAM,OAAO,KAAK,IAAI,CAAC;CACxE;AAED,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,aAAa,CACnD,eAAe,EACf,eAAe,CAChB;IACU,KAAK;;;;MAIZ;IAEF,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAE/C,YAAY,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAE7C,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAE/C,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAErC,iBAAiB,IAAI,IAAI;IAgBzB,kBAAkB,CACzB,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,eAAe,GACzB,IAAI;IAaE,oBAAoB,IAAI,IAAI;IAOrC,OAAO,CAAC,OAAO;IAgBf,OAAO,CAAC,OAAO;IAkBN,MAAM,IAAI,YAAY;CAmBhC"}
|
package/dist/index-browser.es.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { PureComponent } from 'react';
|
|
2
|
-
import ReactAlpContext from 'react-alp-context';
|
|
3
2
|
import { jsx } from 'react/jsx-runtime';
|
|
4
3
|
|
|
5
4
|
const random = () => Math.ceil(Math.random() * 100) / 100;
|
|
@@ -25,20 +24,19 @@ class LoadingBar extends PureComponent {
|
|
|
25
24
|
};
|
|
26
25
|
}
|
|
27
26
|
componentDidMount() {
|
|
28
|
-
|
|
29
|
-
if (websocket.isConnected()) {
|
|
27
|
+
if (this.props.websocket.isConnected()) {
|
|
30
28
|
this.setState(prevState => ({
|
|
31
29
|
loading: false,
|
|
32
30
|
progress: 100,
|
|
33
31
|
hidden: prevState.hidden || prevState.progress === 100
|
|
34
32
|
}));
|
|
35
33
|
}
|
|
36
|
-
websocket.on('connect', () => {
|
|
34
|
+
this.props.websocket.on('connect', () => {
|
|
37
35
|
this.setState({
|
|
38
36
|
loading: false
|
|
39
37
|
});
|
|
40
38
|
});
|
|
41
|
-
websocket.on('disconnect', () => {
|
|
39
|
+
this.props.websocket.on('disconnect', () => {
|
|
42
40
|
this.setState({
|
|
43
41
|
loading: true,
|
|
44
42
|
progress: 1,
|
|
@@ -47,6 +45,9 @@ class LoadingBar extends PureComponent {
|
|
|
47
45
|
});
|
|
48
46
|
}
|
|
49
47
|
componentDidUpdate(prevProps, prevState) {
|
|
48
|
+
if (this.props.websocket !== prevProps.websocket) {
|
|
49
|
+
throw new Error('Unsupported at the moment');
|
|
50
|
+
}
|
|
50
51
|
if (this.state.loading !== prevState.loading) {
|
|
51
52
|
if (this.state.loading) {
|
|
52
53
|
this.showBar();
|
|
@@ -61,10 +62,6 @@ class LoadingBar extends PureComponent {
|
|
|
61
62
|
if (this.first20Timeout) clearTimeout(this.first20Timeout);
|
|
62
63
|
if (this.progressTimer) clearInterval(this.progressTimer);
|
|
63
64
|
}
|
|
64
|
-
getWebsocket() {
|
|
65
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
|
|
66
|
-
return this.context.app.websocket;
|
|
67
|
-
}
|
|
68
65
|
showBar() {
|
|
69
66
|
if (this.fadeOffTimeout) clearTimeout(this.fadeOffTimeout);
|
|
70
67
|
if (this.resetTimeout) clearTimeout(this.resetTimeout);
|
|
@@ -115,7 +112,6 @@ class LoadingBar extends PureComponent {
|
|
|
115
112
|
});
|
|
116
113
|
}
|
|
117
114
|
}
|
|
118
|
-
LoadingBar.contextType = ReactAlpContext;
|
|
119
115
|
|
|
120
116
|
export { LoadingBar as default };
|
|
121
117
|
//# sourceMappingURL=index-browser.es.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-browser.es.js","sources":["../src/index.tsx"],"sourcesContent":["import type { ReactElement } from 'react';\nimport { PureComponent } from 'react';\
|
|
1
|
+
{"version":3,"file":"index-browser.es.js","sources":["../src/index.tsx"],"sourcesContent":["import type { ReactElement } from 'react';\nimport { PureComponent } from 'react';\n\n/*\nExample with antd:\nimport { Progress } from 'antd';\n\nconst LoadingBarComponent = ({ progress }) => (\n <Progress\n type=\"line\"\n status=\"active\"\n percent={progress}\n showInfo={false}\n />\n);\n*/\n\n/* number between 0 and 1 */\nconst random = (): number => Math.ceil(Math.random() * 100) / 100;\n\n/**\n * around:\n * at 100ms 20%\n * at 1s 40%\n * at 2s 60%\n * at 3s 80%\n */\nconst calculatePercent = (percent: number): number => {\n if (percent < 60) return percent + random() * 10 + 5;\n if (percent < 70) return percent + random() * 10 + 3;\n else if (percent < 80) return percent + random() + 5;\n else if (percent < 90) return percent + random() + 1;\n else if (percent < 95) return percent + 0.1;\n else return percent;\n};\n\ninterface LoadingBarProps {\n LoadingBarComponent: React.ComponentType<{ progress: number }>;\n websocket: WebsocketInterface;\n}\n\ninterface LoadingBarState {\n loading: boolean;\n hidden: boolean;\n progress: number;\n}\n\ninterface WebsocketInterface {\n isConnected: () => boolean;\n on: (event: 'connect' | 'disconnect', callback: () => unknown) => void;\n}\n\nexport default class LoadingBar extends PureComponent<\n LoadingBarProps,\n LoadingBarState\n> {\n override state = {\n loading: true,\n hidden: true,\n progress: 1,\n };\n\n fadeOffTimeout?: ReturnType<typeof setTimeout>;\n\n resetTimeout?: ReturnType<typeof setTimeout>;\n\n first20Timeout?: ReturnType<typeof setTimeout>;\n\n progressTimer?: ReturnType<typeof setTimeout>;\n\n override componentDidMount(): void {\n if (this.props.websocket.isConnected()) {\n this.setState((prevState) => ({\n loading: false,\n progress: 100,\n hidden: prevState.hidden || prevState.progress === 100,\n }));\n }\n this.props.websocket.on('connect', () => {\n this.setState({ loading: false });\n });\n this.props.websocket.on('disconnect', () => {\n this.setState({ loading: true, progress: 1, hidden: false });\n });\n }\n\n override componentDidUpdate(\n prevProps: LoadingBarProps,\n prevState: LoadingBarState,\n ): void {\n if (this.props.websocket !== prevProps.websocket) {\n throw new Error('Unsupported at the moment');\n }\n if (this.state.loading !== prevState.loading) {\n if (this.state.loading) {\n this.showBar();\n } else {\n this.hideBar();\n }\n }\n }\n\n override componentWillUnmount(): void {\n if (this.fadeOffTimeout) clearTimeout(this.fadeOffTimeout);\n if (this.resetTimeout) clearTimeout(this.resetTimeout);\n if (this.first20Timeout) clearTimeout(this.first20Timeout);\n if (this.progressTimer) clearInterval(this.progressTimer);\n }\n\n private showBar(): void {\n if (this.fadeOffTimeout) clearTimeout(this.fadeOffTimeout);\n if (this.resetTimeout) clearTimeout(this.resetTimeout);\n\n this.first20Timeout = setTimeout(() => {\n this.setState({ progress: 20 });\n }, 100);\n\n this.progressTimer = setInterval(() => {\n this.setState((prevState) => {\n const newValue = calculatePercent(prevState.progress);\n return { progress: newValue };\n });\n }, 500);\n }\n\n private hideBar(): void {\n if (this.first20Timeout) clearTimeout(this.first20Timeout);\n if (this.progressTimer) clearInterval(this.progressTimer);\n\n this.fadeOffTimeout = setTimeout(() => {\n this.setState({\n progress: 100,\n });\n }, 500);\n\n this.resetTimeout = setTimeout(() => {\n this.setState({\n hidden: true,\n progress: 1,\n });\n }, 1000);\n }\n\n override render(): ReactElement {\n const LoadingBarComponent = this.props.LoadingBarComponent;\n\n return (\n <div\n hidden={this.state.hidden}\n style={{\n position: 'fixed',\n top: 0,\n left: 0,\n right: 0,\n zIndex: 4,\n pointerEvents: 'none',\n }}\n >\n <LoadingBarComponent progress={this.state.progress} />\n </div>\n );\n }\n}\n"],"names":["random","Math","ceil","calculatePercent","percent","LoadingBar","PureComponent","constructor","args","state","loading","hidden","progress","componentDidMount","props","websocket","isConnected","setState","prevState","on","componentDidUpdate","prevProps","Error","showBar","hideBar","componentWillUnmount","fadeOffTimeout","clearTimeout","resetTimeout","first20Timeout","progressTimer","clearInterval","setTimeout","setInterval","newValue","render","LoadingBarComponent","_jsx","style","position","top","left","right","zIndex","pointerEvents","children"],"mappings":"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"}
|
package/dist/index-node18.mjs
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { PureComponent } from 'react';
|
|
2
|
-
import ReactAlpContext from 'react-alp-context';
|
|
3
2
|
import { jsx } from 'react/jsx-runtime';
|
|
4
3
|
|
|
5
4
|
const random = () => Math.ceil(Math.random() * 100) / 100;
|
|
@@ -16,27 +15,25 @@ const calculatePercent = percent => {
|
|
|
16
15
|
if (percent < 70) return percent + random() * 10 + 3;else if (percent < 80) return percent + random() + 5;else if (percent < 90) return percent + random() + 1;else if (percent < 95) return percent + 0.1;else return percent;
|
|
17
16
|
};
|
|
18
17
|
class LoadingBar extends PureComponent {
|
|
19
|
-
static contextType = ReactAlpContext;
|
|
20
18
|
state = {
|
|
21
19
|
loading: true,
|
|
22
20
|
hidden: true,
|
|
23
21
|
progress: 1
|
|
24
22
|
};
|
|
25
23
|
componentDidMount() {
|
|
26
|
-
|
|
27
|
-
if (websocket.isConnected()) {
|
|
24
|
+
if (this.props.websocket.isConnected()) {
|
|
28
25
|
this.setState(prevState => ({
|
|
29
26
|
loading: false,
|
|
30
27
|
progress: 100,
|
|
31
28
|
hidden: prevState.hidden || prevState.progress === 100
|
|
32
29
|
}));
|
|
33
30
|
}
|
|
34
|
-
websocket.on('connect', () => {
|
|
31
|
+
this.props.websocket.on('connect', () => {
|
|
35
32
|
this.setState({
|
|
36
33
|
loading: false
|
|
37
34
|
});
|
|
38
35
|
});
|
|
39
|
-
websocket.on('disconnect', () => {
|
|
36
|
+
this.props.websocket.on('disconnect', () => {
|
|
40
37
|
this.setState({
|
|
41
38
|
loading: true,
|
|
42
39
|
progress: 1,
|
|
@@ -45,6 +42,9 @@ class LoadingBar extends PureComponent {
|
|
|
45
42
|
});
|
|
46
43
|
}
|
|
47
44
|
componentDidUpdate(prevProps, prevState) {
|
|
45
|
+
if (this.props.websocket !== prevProps.websocket) {
|
|
46
|
+
throw new Error('Unsupported at the moment');
|
|
47
|
+
}
|
|
48
48
|
if (this.state.loading !== prevState.loading) {
|
|
49
49
|
if (this.state.loading) {
|
|
50
50
|
this.showBar();
|
|
@@ -59,10 +59,6 @@ class LoadingBar extends PureComponent {
|
|
|
59
59
|
if (this.first20Timeout) clearTimeout(this.first20Timeout);
|
|
60
60
|
if (this.progressTimer) clearInterval(this.progressTimer);
|
|
61
61
|
}
|
|
62
|
-
getWebsocket() {
|
|
63
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
|
|
64
|
-
return this.context.app.websocket;
|
|
65
|
-
}
|
|
66
62
|
showBar() {
|
|
67
63
|
if (this.fadeOffTimeout) clearTimeout(this.fadeOffTimeout);
|
|
68
64
|
if (this.resetTimeout) clearTimeout(this.resetTimeout);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-node18.mjs","sources":["../src/index.tsx"],"sourcesContent":["import type { ReactElement } from 'react';\nimport { PureComponent } from 'react';\
|
|
1
|
+
{"version":3,"file":"index-node18.mjs","sources":["../src/index.tsx"],"sourcesContent":["import type { ReactElement } from 'react';\nimport { PureComponent } from 'react';\n\n/*\nExample with antd:\nimport { Progress } from 'antd';\n\nconst LoadingBarComponent = ({ progress }) => (\n <Progress\n type=\"line\"\n status=\"active\"\n percent={progress}\n showInfo={false}\n />\n);\n*/\n\n/* number between 0 and 1 */\nconst random = (): number => Math.ceil(Math.random() * 100) / 100;\n\n/**\n * around:\n * at 100ms 20%\n * at 1s 40%\n * at 2s 60%\n * at 3s 80%\n */\nconst calculatePercent = (percent: number): number => {\n if (percent < 60) return percent + random() * 10 + 5;\n if (percent < 70) return percent + random() * 10 + 3;\n else if (percent < 80) return percent + random() + 5;\n else if (percent < 90) return percent + random() + 1;\n else if (percent < 95) return percent + 0.1;\n else return percent;\n};\n\ninterface LoadingBarProps {\n LoadingBarComponent: React.ComponentType<{ progress: number }>;\n websocket: WebsocketInterface;\n}\n\ninterface LoadingBarState {\n loading: boolean;\n hidden: boolean;\n progress: number;\n}\n\ninterface WebsocketInterface {\n isConnected: () => boolean;\n on: (event: 'connect' | 'disconnect', callback: () => unknown) => void;\n}\n\nexport default class LoadingBar extends PureComponent<\n LoadingBarProps,\n LoadingBarState\n> {\n override state = {\n loading: true,\n hidden: true,\n progress: 1,\n };\n\n fadeOffTimeout?: ReturnType<typeof setTimeout>;\n\n resetTimeout?: ReturnType<typeof setTimeout>;\n\n first20Timeout?: ReturnType<typeof setTimeout>;\n\n progressTimer?: ReturnType<typeof setTimeout>;\n\n override componentDidMount(): void {\n if (this.props.websocket.isConnected()) {\n this.setState((prevState) => ({\n loading: false,\n progress: 100,\n hidden: prevState.hidden || prevState.progress === 100,\n }));\n }\n this.props.websocket.on('connect', () => {\n this.setState({ loading: false });\n });\n this.props.websocket.on('disconnect', () => {\n this.setState({ loading: true, progress: 1, hidden: false });\n });\n }\n\n override componentDidUpdate(\n prevProps: LoadingBarProps,\n prevState: LoadingBarState,\n ): void {\n if (this.props.websocket !== prevProps.websocket) {\n throw new Error('Unsupported at the moment');\n }\n if (this.state.loading !== prevState.loading) {\n if (this.state.loading) {\n this.showBar();\n } else {\n this.hideBar();\n }\n }\n }\n\n override componentWillUnmount(): void {\n if (this.fadeOffTimeout) clearTimeout(this.fadeOffTimeout);\n if (this.resetTimeout) clearTimeout(this.resetTimeout);\n if (this.first20Timeout) clearTimeout(this.first20Timeout);\n if (this.progressTimer) clearInterval(this.progressTimer);\n }\n\n private showBar(): void {\n if (this.fadeOffTimeout) clearTimeout(this.fadeOffTimeout);\n if (this.resetTimeout) clearTimeout(this.resetTimeout);\n\n this.first20Timeout = setTimeout(() => {\n this.setState({ progress: 20 });\n }, 100);\n\n this.progressTimer = setInterval(() => {\n this.setState((prevState) => {\n const newValue = calculatePercent(prevState.progress);\n return { progress: newValue };\n });\n }, 500);\n }\n\n private hideBar(): void {\n if (this.first20Timeout) clearTimeout(this.first20Timeout);\n if (this.progressTimer) clearInterval(this.progressTimer);\n\n this.fadeOffTimeout = setTimeout(() => {\n this.setState({\n progress: 100,\n });\n }, 500);\n\n this.resetTimeout = setTimeout(() => {\n this.setState({\n hidden: true,\n progress: 1,\n });\n }, 1000);\n }\n\n override render(): ReactElement {\n const LoadingBarComponent = this.props.LoadingBarComponent;\n\n return (\n <div\n hidden={this.state.hidden}\n style={{\n position: 'fixed',\n top: 0,\n left: 0,\n right: 0,\n zIndex: 4,\n pointerEvents: 'none',\n }}\n >\n <LoadingBarComponent progress={this.state.progress} />\n </div>\n );\n }\n}\n"],"names":["random","Math","ceil","calculatePercent","percent","LoadingBar","PureComponent","state","loading","hidden","progress","componentDidMount","props","websocket","isConnected","setState","prevState","on","componentDidUpdate","prevProps","Error","showBar","hideBar","componentWillUnmount","fadeOffTimeout","clearTimeout","resetTimeout","first20Timeout","progressTimer","clearInterval","setTimeout","setInterval","newValue","render","LoadingBarComponent","_jsx","style","position","top","left","right","zIndex","pointerEvents","children"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-alp-loading-bar",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "7.0.0",
|
|
4
4
|
"description": "loading bar",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Christophe Hurpeau <christophe@hurpeau.com> (https://christophe.hurpeau.com)",
|
|
@@ -74,9 +74,7 @@
|
|
|
74
74
|
"react": "^18.1.0"
|
|
75
75
|
},
|
|
76
76
|
"dependencies": {
|
|
77
|
-
"@babel/runtime": "^7.23.7"
|
|
78
|
-
"alp-types": "3.1.1",
|
|
79
|
-
"react-alp-context": "6.1.1"
|
|
77
|
+
"@babel/runtime": "^7.23.7"
|
|
80
78
|
},
|
|
81
79
|
"devDependencies": {
|
|
82
80
|
"@babel/core": "7.23.7",
|
package/src/index.tsx
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { ReactElement } from 'react';
|
|
2
2
|
import { PureComponent } from 'react';
|
|
3
|
-
import ReactAlpContext from 'react-alp-context';
|
|
4
3
|
|
|
5
4
|
/*
|
|
6
5
|
Example with antd:
|
|
@@ -37,6 +36,7 @@ const calculatePercent = (percent: number): number => {
|
|
|
37
36
|
|
|
38
37
|
interface LoadingBarProps {
|
|
39
38
|
LoadingBarComponent: React.ComponentType<{ progress: number }>;
|
|
39
|
+
websocket: WebsocketInterface;
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
interface LoadingBarState {
|
|
@@ -54,8 +54,6 @@ export default class LoadingBar extends PureComponent<
|
|
|
54
54
|
LoadingBarProps,
|
|
55
55
|
LoadingBarState
|
|
56
56
|
> {
|
|
57
|
-
static override contextType = ReactAlpContext;
|
|
58
|
-
|
|
59
57
|
override state = {
|
|
60
58
|
loading: true,
|
|
61
59
|
hidden: true,
|
|
@@ -71,18 +69,17 @@ export default class LoadingBar extends PureComponent<
|
|
|
71
69
|
progressTimer?: ReturnType<typeof setTimeout>;
|
|
72
70
|
|
|
73
71
|
override componentDidMount(): void {
|
|
74
|
-
|
|
75
|
-
if (websocket.isConnected()) {
|
|
72
|
+
if (this.props.websocket.isConnected()) {
|
|
76
73
|
this.setState((prevState) => ({
|
|
77
74
|
loading: false,
|
|
78
75
|
progress: 100,
|
|
79
76
|
hidden: prevState.hidden || prevState.progress === 100,
|
|
80
77
|
}));
|
|
81
78
|
}
|
|
82
|
-
websocket.on('connect', () => {
|
|
79
|
+
this.props.websocket.on('connect', () => {
|
|
83
80
|
this.setState({ loading: false });
|
|
84
81
|
});
|
|
85
|
-
websocket.on('disconnect', () => {
|
|
82
|
+
this.props.websocket.on('disconnect', () => {
|
|
86
83
|
this.setState({ loading: true, progress: 1, hidden: false });
|
|
87
84
|
});
|
|
88
85
|
}
|
|
@@ -91,6 +88,9 @@ export default class LoadingBar extends PureComponent<
|
|
|
91
88
|
prevProps: LoadingBarProps,
|
|
92
89
|
prevState: LoadingBarState,
|
|
93
90
|
): void {
|
|
91
|
+
if (this.props.websocket !== prevProps.websocket) {
|
|
92
|
+
throw new Error('Unsupported at the moment');
|
|
93
|
+
}
|
|
94
94
|
if (this.state.loading !== prevState.loading) {
|
|
95
95
|
if (this.state.loading) {
|
|
96
96
|
this.showBar();
|
|
@@ -107,11 +107,6 @@ export default class LoadingBar extends PureComponent<
|
|
|
107
107
|
if (this.progressTimer) clearInterval(this.progressTimer);
|
|
108
108
|
}
|
|
109
109
|
|
|
110
|
-
getWebsocket(): WebsocketInterface {
|
|
111
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
|
|
112
|
-
return (this.context as any).app.websocket;
|
|
113
|
-
}
|
|
114
|
-
|
|
115
110
|
private showBar(): void {
|
|
116
111
|
if (this.fadeOffTimeout) clearTimeout(this.fadeOffTimeout);
|
|
117
112
|
if (this.resetTimeout) clearTimeout(this.resetTimeout);
|