Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

refractor(react-top-loading-bar):functionality-inlined

Aswin Asoka5c51c00789c
diff --git a/web/apps/albums/package.json b/web/apps/albums/package.json
index 742e0f2c26..3181da8fe9 100644
--- a/web/apps/albums/package.json
+++ b/web/apps/albums/package.json
@@ -45,7 +45,6 @@
"react-dropzone": "14.2.10",
"react-i18next": "16.6.6",
"react-leaflet": "5.0.0",
- "react-top-loading-bar": "3.0.2",
"react-virtualized-auto-sizer": "1.0.26",
"react-window": "1.8.11",
"sanitize-filename": "1.6.4",
diff --git a/web/apps/photos/package.json b/web/apps/photos/package.json
index b7338ed0c8..c05f5a16fe 100644
--- a/web/apps/photos/package.json
+++ b/web/apps/photos/package.json
@@ -30,7 +30,6 @@
"react-i18next": "16.6.6",
"react-leaflet": "5.0.0",
"react-select": "5.10.2",
- "react-top-loading-bar": "3.0.2",
"react-virtualized-auto-sizer": "1.0.26",
"react-window": "1.8.11",
"sanitize-filename": "1.6.4",
diff --git a/web/package-lock.json b/web/package-lock.json
index b6038d438a..bd472160bb 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -74,7 +74,6 @@
"react-dropzone": "14.2.10",
"react-i18next": "16.6.6",
"react-leaflet": "5.0.0",
- "react-top-loading-bar": "3.0.2",
"react-virtualized-auto-sizer": "1.0.26",
"react-window": "1.8.11",
"sanitize-filename": "1.6.4",
@@ -313,7 +312,6 @@
"react-i18next": "16.6.6",
"react-leaflet": "5.0.0",
"react-select": "5.10.2",
- "react-top-loading-bar": "3.0.2",
"react-virtualized-auto-sizer": "1.0.26",
"react-window": "1.8.11",
"sanitize-filename": "1.6.4",
@@ -9110,18 +9108,6 @@
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
}
},
- "node_modules/react-top-loading-bar": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/react-top-loading-bar/-/react-top-loading-bar-3.0.2.tgz",
- "integrity": "sha512-hW0CHrHqKdBOBsVhms73ka0rgb9/aoiRfqo7jiS1vwIYDK7VkyMj52ypo5ewhshTQGHKE6mRvR99GZBZ+FuM/Q==",
- "license": "MIT",
- "engines": {
- "node": ">=14"
- },
- "peerDependencies": {
- "react": "^16 || ^17 || ^18 || ^19"
- }
- },
"node_modules/react-transition-group": {
"version": "4.4.5",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
@@ -11208,7 +11194,6 @@
"react": "19.2.7",
"react-dom": "19.2.7",
"react-i18next": "16.6.6",
- "react-top-loading-bar": "3.0.2",
"zod": "4.4.3"
},
"devDependencies": {
diff --git a/web/packages/base/components/ThemedLoadingBar.tsx b/web/packages/base/components/ThemedLoadingBar.tsx
index a185b4a1b7..3a895a2a8d 100644
--- a/web/packages/base/components/ThemedLoadingBar.tsx
+++ b/web/packages/base/components/ThemedLoadingBar.tsx
@@ -1,19 +1,50 @@
-import { useTheme } from "@mui/material";
+import { keyframes } from "@emotion/react";
+import { Box } from "@mui/material";
import type { LoadingBarController } from "ente-base/components/utils/use-loading-bar";
-import React from "react";
-import LoadingBar, { type LoadingBarRef } from "react-top-loading-bar";
+import React, { useImperativeHandle, useState } from "react";
interface ThemedLoadingBarProps {
ref: React.Ref<LoadingBarController>;
}
-export const ThemedLoadingBar: React.FC<ThemedLoadingBarProps> = ({ ref }) => {
- const theme = useTheme();
+const loadingBarProgress = keyframes({
+ from: { transform: "scaleX(0)" },
+ to: { transform: "scaleX(0.9)" },
+});
+
+export function ThemedLoadingBar({
+ ref,
+}: ThemedLoadingBarProps): React.JSX.Element {
+ const [isRunning, setIsRunning] = useState(false);
+
+ useImperativeHandle(ref, () => ({
+ continuousStart: () => setIsRunning(true),
+ complete: () => setIsRunning(false),
+ }));
return (
- <LoadingBar
- color={theme.vars.palette.accent.main}
- ref={ref as React.Ref<LoadingBarRef>}
+ <Box
+ aria-hidden={!isRunning}
+ role="progressbar"
+ sx={{
+ animation: isRunning
+ ? `${loadingBarProgress} 10s ease-out forwards`
+ : "none",
+ bgcolor: "accent.main",
+ height: "2px",
+ left: 0,
+ opacity: isRunning ? 1 : 0,
+ pointerEvents: "none",
+ position: "fixed",
+ top: 0,
+ transform: isRunning ? "scaleX(0)" : "scaleX(1)",
+ transformOrigin: "left",
+ transition: !isRunning
+ ? "transform 200ms ease-out, opacity 150ms ease-out 200ms"
+ : "none",
+ width: "100%",
+ zIndex: "calc(var(--mui-zIndex-tooltip) + 1)",
+ }}
/>
);
-};
+}
diff --git a/web/packages/base/package.json b/web/packages/base/package.json
index a9bcc2e8ae..24343d303d 100644
--- a/web/packages/base/package.json
+++ b/web/packages/base/package.json
@@ -21,7 +21,6 @@
"react": "19.2.7",
"react-dom": "19.2.7",
"react-i18next": "16.6.6",
- "react-top-loading-bar": "3.0.2",
"zod": "4.4.3"
},
"devDependencies": {