react-alp-loading-bar 7.0.0 → 8.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 CHANGED
@@ -3,6 +3,23 @@
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
+ ## [8.0.0](https://github.com/christophehurpeau/alp/compare/react-alp-loading-bar@7.0.0...react-alp-loading-bar@8.0.0) (2025-08-02)
7
+
8
+ ### ⚠ BREAKING CHANGES
9
+
10
+ * update dependencies and drop node 20
11
+ * update dev dependencies, replace parse-json-object-as-map with native JSON.parse, update koa
12
+
13
+ ### Features
14
+
15
+ * update babel ([a4bf455](https://github.com/christophehurpeau/alp/commit/a4bf455c715134973c56693b7425aa05de5b10f9))
16
+ * update dependencies and drop node 20 ([fc5b322](https://github.com/christophehurpeau/alp/commit/fc5b322e076e9a3c7c4a235d16734b89fd85e211))
17
+ * update dev dependencies, replace parse-json-object-as-map with native JSON.parse, update koa ([5ae7723](https://github.com/christophehurpeau/alp/commit/5ae77238cafc573fe72c5eb63b103802b8b2e537))
18
+
19
+ ### Bug Fixes
20
+
21
+ * **deps:** update react monorepo ([#611](https://github.com/christophehurpeau/alp/issues/611)) ([b9ece4d](https://github.com/christophehurpeau/alp/commit/b9ece4dc070bcd49fa6c4a40534162d10087405b))
22
+
6
23
  ## [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
24
 
8
25
 
package/README.md CHANGED
@@ -1,16 +1,16 @@
1
- <h3 align="center">
1
+ <h1 align="center">
2
2
  react-alp-loading-bar
3
- </h3>
3
+ </h1>
4
4
 
5
5
  <p align="center">
6
6
  loading bar
7
7
  </p>
8
8
 
9
9
  <p align="center">
10
- <a href="https://npmjs.org/package/react-alp-loading-bar"><img src="https://img.shields.io/npm/v/react-alp-loading-bar.svg?style=flat-square"></a>
11
- <a href="https://npmjs.org/package/react-alp-loading-bar"><img src="https://img.shields.io/npm/dw/react-alp-loading-bar.svg?style=flat-square"></a>
12
- <a href="https://npmjs.org/package/react-alp-loading-bar"><img src="https://img.shields.io/node/v/react-alp-loading-bar.svg?style=flat-square"></a>
13
- <a href="https://npmjs.org/package/react-alp-loading-bar"><img src="https://img.shields.io/npm/types/react-alp-loading-bar.svg?style=flat-square"></a>
10
+ <a href="https://npmjs.org/package/react-alp-loading-bar"><img src="https://img.shields.io/npm/v/react-alp-loading-bar.svg?style=flat-square" alt="npm version"></a>
11
+ <a href="https://npmjs.org/package/react-alp-loading-bar"><img src="https://img.shields.io/npm/dw/react-alp-loading-bar.svg?style=flat-square" alt="npm downloads"></a>
12
+ <a href="https://npmjs.org/package/react-alp-loading-bar"><img src="https://img.shields.io/node/v/react-alp-loading-bar.svg?style=flat-square" alt="node version"></a>
13
+ <a href="https://npmjs.org/package/react-alp-loading-bar"><img src="https://img.shields.io/npm/types/react-alp-loading-bar.svg?style=flat-square" alt="types"></a>
14
14
  </p>
15
15
 
16
16
  ## Install
@@ -1,5 +1,5 @@
1
- import type { ReactElement } from 'react';
2
- import { PureComponent } from 'react';
1
+ import type { ReactElement } from "react";
2
+ import { PureComponent } from "react";
3
3
  interface LoadingBarProps {
4
4
  LoadingBarComponent: React.ComponentType<{
5
5
  progress: number;
@@ -13,7 +13,7 @@ interface LoadingBarState {
13
13
  }
14
14
  interface WebsocketInterface {
15
15
  isConnected: () => boolean;
16
- on: (event: 'connect' | 'disconnect', callback: () => unknown) => void;
16
+ on: (event: "connect" | "disconnect", callback: () => unknown) => void;
17
17
  }
18
18
  export default class LoadingBar extends PureComponent<LoadingBarProps, LoadingBarState> {
19
19
  state: {
@@ -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;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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AACA,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"}
@@ -1,6 +1,8 @@
1
1
  import { PureComponent } from 'react';
2
2
  import { jsx } from 'react/jsx-runtime';
3
3
 
4
+ /* eslint-disable react/destructuring-assignment */
5
+
4
6
  const random = () => Math.ceil(Math.random() * 100) / 100;
5
7
 
6
8
  /**
@@ -15,14 +17,11 @@ const calculatePercent = percent => {
15
17
  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;
16
18
  };
17
19
  class LoadingBar extends PureComponent {
18
- constructor(...args) {
19
- super(...args);
20
- this.state = {
21
- loading: true,
22
- hidden: true,
23
- progress: 1
24
- };
25
- }
20
+ state = {
21
+ loading: true,
22
+ hidden: true,
23
+ progress: 1
24
+ };
26
25
  componentDidMount() {
27
26
  if (this.props.websocket.isConnected()) {
28
27
  this.setState(prevState => ({
@@ -31,12 +30,12 @@ class LoadingBar extends PureComponent {
31
30
  hidden: prevState.hidden || prevState.progress === 100
32
31
  }));
33
32
  }
34
- this.props.websocket.on('connect', () => {
33
+ this.props.websocket.on("connect", () => {
35
34
  this.setState({
36
35
  loading: false
37
36
  });
38
37
  });
39
- this.props.websocket.on('disconnect', () => {
38
+ this.props.websocket.on("disconnect", () => {
40
39
  this.setState({
41
40
  loading: true,
42
41
  progress: 1,
@@ -46,7 +45,7 @@ class LoadingBar extends PureComponent {
46
45
  }
47
46
  componentDidUpdate(prevProps, prevState) {
48
47
  if (this.props.websocket !== prevProps.websocket) {
49
- throw new Error('Unsupported at the moment');
48
+ throw new Error("Unsupported at the moment");
50
49
  }
51
50
  if (this.state.loading !== prevState.loading) {
52
51
  if (this.state.loading) {
@@ -99,12 +98,12 @@ class LoadingBar extends PureComponent {
99
98
  return /*#__PURE__*/jsx("div", {
100
99
  hidden: this.state.hidden,
101
100
  style: {
102
- position: 'fixed',
101
+ position: "fixed",
103
102
  top: 0,
104
103
  left: 0,
105
104
  right: 0,
106
105
  zIndex: 4,
107
- pointerEvents: 'none'
106
+ pointerEvents: "none"
108
107
  },
109
108
  children: /*#__PURE__*/jsx(LoadingBarComponent, {
110
109
  progress: this.state.progress
@@ -1 +1 @@
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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"}
1
+ {"version":3,"file":"index-browser.es.js","sources":["../src/index.tsx"],"sourcesContent":["/* eslint-disable react/destructuring-assignment */\nimport 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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"}
@@ -1,6 +1,8 @@
1
1
  import { PureComponent } from 'react';
2
2
  import { jsx } from 'react/jsx-runtime';
3
3
 
4
+ /* eslint-disable react/destructuring-assignment */
5
+
4
6
  const random = () => Math.ceil(Math.random() * 100) / 100;
5
7
 
6
8
  /**
@@ -28,12 +30,12 @@ class LoadingBar extends PureComponent {
28
30
  hidden: prevState.hidden || prevState.progress === 100
29
31
  }));
30
32
  }
31
- this.props.websocket.on('connect', () => {
33
+ this.props.websocket.on("connect", () => {
32
34
  this.setState({
33
35
  loading: false
34
36
  });
35
37
  });
36
- this.props.websocket.on('disconnect', () => {
38
+ this.props.websocket.on("disconnect", () => {
37
39
  this.setState({
38
40
  loading: true,
39
41
  progress: 1,
@@ -43,7 +45,7 @@ class LoadingBar extends PureComponent {
43
45
  }
44
46
  componentDidUpdate(prevProps, prevState) {
45
47
  if (this.props.websocket !== prevProps.websocket) {
46
- throw new Error('Unsupported at the moment');
48
+ throw new Error("Unsupported at the moment");
47
49
  }
48
50
  if (this.state.loading !== prevState.loading) {
49
51
  if (this.state.loading) {
@@ -96,12 +98,12 @@ class LoadingBar extends PureComponent {
96
98
  return /*#__PURE__*/jsx("div", {
97
99
  hidden: this.state.hidden,
98
100
  style: {
99
- position: 'fixed',
101
+ position: "fixed",
100
102
  top: 0,
101
103
  left: 0,
102
104
  right: 0,
103
105
  zIndex: 4,
104
- pointerEvents: 'none'
106
+ pointerEvents: "none"
105
107
  },
106
108
  children: /*#__PURE__*/jsx(LoadingBarComponent, {
107
109
  progress: this.state.progress
@@ -111,4 +113,4 @@ class LoadingBar extends PureComponent {
111
113
  }
112
114
 
113
115
  export { LoadingBar as default };
114
- //# sourceMappingURL=index-node18.mjs.map
116
+ //# sourceMappingURL=index-node20.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index-node20.mjs","sources":["../src/index.tsx"],"sourcesContent":["/* eslint-disable react/destructuring-assignment */\nimport 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": "7.0.0",
3
+ "version": "8.0.0",
4
4
  "description": "loading bar",
5
5
  "keywords": [],
6
6
  "author": "Christophe Hurpeau <christophe@hurpeau.com> (https://christophe.hurpeau.com)",
@@ -13,10 +13,10 @@
13
13
  "homepage": "https://github.com/christophehurpeau/alp",
14
14
  "type": "module",
15
15
  "engines": {
16
- "node": ">=18.12.0"
16
+ "node": ">=20.11.0"
17
17
  },
18
18
  "sideEffects": false,
19
- "main": "./dist/index-node18.mjs",
19
+ "main": "./dist/index-node20.mjs",
20
20
  "types": "./dist/definitions/index.d.ts",
21
21
  "module": "./dist/index-browser.es.js",
22
22
  "browser": "./dist/index-browser.es.js",
@@ -25,7 +25,7 @@
25
25
  ".": {
26
26
  "types": "./dist/definitions/index.d.ts",
27
27
  "node": {
28
- "import": "./dist/index-node18.mjs"
28
+ "import": "./dist/index-node20.mjs"
29
29
  },
30
30
  "browser": {
31
31
  "import": "./dist/index-browser.es.js"
@@ -42,7 +42,7 @@
42
42
  "clean": "yarn clean:build",
43
43
  "clean:build": "pob-babel-clean-out dist",
44
44
  "lint": "yarn run lint:eslint",
45
- "lint:eslint": "yarn ../.. run eslint --report-unused-disable-directives --resolve-plugins-relative-to . --quiet packages/react-alp-loading-bar",
45
+ "lint:eslint": "yarn ../.. run eslint --quiet packages/react-alp-loading-bar",
46
46
  "watch": "yarn clean:build && rollup --config rollup.config.mjs --watch"
47
47
  },
48
48
  "browserslist": {
@@ -55,33 +55,34 @@
55
55
  ]
56
56
  },
57
57
  "pob": {
58
- "babelEnvs": [
58
+ "bundler": "rollup-babel",
59
+ "entries": [
60
+ "index"
61
+ ],
62
+ "envs": [
59
63
  {
60
64
  "target": "node",
61
- "version": "18"
65
+ "version": "20"
62
66
  },
63
67
  {
64
68
  "target": "browser"
65
69
  }
66
70
  ],
67
- "entries": [
68
- "index"
69
- ],
70
71
  "jsx": true
71
72
  },
72
73
  "prettier": "@pob/root/prettier-config",
73
74
  "peerDependencies": {
74
- "react": "^18.1.0"
75
+ "react": "^19.0.0"
75
76
  },
76
77
  "dependencies": {
77
- "@babel/runtime": "^7.23.7"
78
+ "@babel/runtime": "^7.28.2"
78
79
  },
79
80
  "devDependencies": {
80
- "@babel/core": "7.23.7",
81
- "@babel/preset-env": "7.23.7",
82
- "@babel/preset-react": "7.23.3",
83
- "pob-babel": "38.0.2",
84
- "react": "18.2.0",
85
- "typescript": "5.3.3"
81
+ "@babel/core": "7.28.0",
82
+ "@babel/preset-env": "7.28.0",
83
+ "@babel/preset-react": "7.27.1",
84
+ "pob-babel": "43.7.0",
85
+ "react": "19.1.1",
86
+ "typescript": "5.8.3"
86
87
  }
87
88
  }
package/src/index.tsx CHANGED
@@ -1,5 +1,6 @@
1
- import type { ReactElement } from 'react';
2
- import { PureComponent } from 'react';
1
+ /* eslint-disable react/destructuring-assignment */
2
+ import type { ReactElement } from "react";
3
+ import { PureComponent } from "react";
3
4
 
4
5
  /*
5
6
  Example with antd:
@@ -47,7 +48,7 @@ interface LoadingBarState {
47
48
 
48
49
  interface WebsocketInterface {
49
50
  isConnected: () => boolean;
50
- on: (event: 'connect' | 'disconnect', callback: () => unknown) => void;
51
+ on: (event: "connect" | "disconnect", callback: () => unknown) => void;
51
52
  }
52
53
 
53
54
  export default class LoadingBar extends PureComponent<
@@ -76,10 +77,10 @@ export default class LoadingBar extends PureComponent<
76
77
  hidden: prevState.hidden || prevState.progress === 100,
77
78
  }));
78
79
  }
79
- this.props.websocket.on('connect', () => {
80
+ this.props.websocket.on("connect", () => {
80
81
  this.setState({ loading: false });
81
82
  });
82
- this.props.websocket.on('disconnect', () => {
83
+ this.props.websocket.on("disconnect", () => {
83
84
  this.setState({ loading: true, progress: 1, hidden: false });
84
85
  });
85
86
  }
@@ -89,7 +90,7 @@ export default class LoadingBar extends PureComponent<
89
90
  prevState: LoadingBarState,
90
91
  ): void {
91
92
  if (this.props.websocket !== prevProps.websocket) {
92
- throw new Error('Unsupported at the moment');
93
+ throw new Error("Unsupported at the moment");
93
94
  }
94
95
  if (this.state.loading !== prevState.loading) {
95
96
  if (this.state.loading) {
@@ -148,12 +149,12 @@ export default class LoadingBar extends PureComponent<
148
149
  <div
149
150
  hidden={this.state.hidden}
150
151
  style={{
151
- position: 'fixed',
152
+ position: "fixed",
152
153
  top: 0,
153
154
  left: 0,
154
155
  right: 0,
155
156
  zIndex: 4,
156
- pointerEvents: 'none',
157
+ pointerEvents: "none",
157
158
  }}
158
159
  >
159
160
  <LoadingBarComponent progress={this.state.progress} />
@@ -1 +0,0 @@
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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"}
@@ -1,31 +0,0 @@
1
- {
2
- "root": true,
3
- "parser": "@typescript-eslint/parser",
4
- "parserOptions": {
5
- "EXPERIMENTAL_useProjectService": true,
6
- "project": "packages/react-alp-loading-bar/tsconfig.json"
7
- },
8
- "plugins": ["@typescript-eslint"],
9
- "extends": [
10
- "@pob/eslint-config-typescript",
11
- "@pob/eslint-config-typescript-react"
12
- ],
13
- "ignorePatterns": ["*.d.ts"],
14
- "overrides": [
15
- {
16
- "files": ["**/*.test.{ts,tsx}", "__tests__/**/*.{ts,tsx}"],
17
- "extends": ["@pob/eslint-config-typescript/test"],
18
- "env": {
19
- "jest": true
20
- },
21
- "rules": {
22
- "import/no-extraneous-dependencies": [
23
- "error",
24
- {
25
- "devDependencies": true
26
- }
27
- ]
28
- }
29
- }
30
- ]
31
- }