From 626464513d9e81f2a7e01125f131d6d302f31b53 Mon Sep 17 00:00:00 2001 From: Prateek Shourya Date: Fri, 28 Jun 2024 20:39:19 +0530 Subject: [PATCH] chore: add custom n-progress component to fix unwanted n-progress trigger issues. (#4965) * chore: add n-progress lib. * chore: prevent unwanted n-progress from projects and notifications. * fix: lint errors. --- web/app/provider.tsx | 3 +- web/core/components/project/card.tsx | 5 +- web/core/hooks/use-app-router.tsx | 2 +- web/core/lib/n-progress/AppProgressBar.tsx | 303 ++++++++++++++++++ web/core/lib/n-progress/index.tsx | 68 ++++ .../lib/n-progress/utils/getAnchorProperty.ts | 59 ++++ web/core/lib/n-progress/utils/sameURL.ts | 16 + web/core/lib/n-progress/withSuspense.tsx | 11 + web/package.json | 1 - yarn.lock | 7 - 10 files changed, 463 insertions(+), 12 deletions(-) create mode 100644 web/core/lib/n-progress/AppProgressBar.tsx create mode 100644 web/core/lib/n-progress/index.tsx create mode 100644 web/core/lib/n-progress/utils/getAnchorProperty.ts create mode 100644 web/core/lib/n-progress/utils/sameURL.ts create mode 100644 web/core/lib/n-progress/withSuspense.tsx diff --git a/web/app/provider.tsx b/web/app/provider.tsx index 5bca25748..9ae53330c 100644 --- a/web/app/provider.tsx +++ b/web/app/provider.tsx @@ -2,7 +2,6 @@ import { FC, ReactNode } from "react"; import dynamic from "next/dynamic"; -import { AppProgressBar } from "next-nprogress-bar"; import { useTheme, ThemeProvider } from "next-themes"; import { SWRConfig } from "swr"; // ui @@ -11,6 +10,8 @@ import { Toast } from "@plane/ui"; import { SWR_CONFIG } from "@/constants/swr-config"; //helpers import { resolveGeneralTheme } from "@/helpers/theme.helper"; +// nprogress +import { AppProgressBar } from "@/lib/n-progress"; // mobx store provider import { StoreProvider } from "@/lib/store-context"; // wrappers diff --git a/web/core/components/project/card.tsx b/web/core/components/project/card.tsx index 3f8f1db7d..36c1f7268 100644 --- a/web/core/components/project/card.tsx +++ b/web/core/components/project/card.tsx @@ -100,7 +100,7 @@ export const ProjectCard: React.FC = observer((props) => { const handleCopyText = () => copyUrlToClipboard(projectLink).then(() => setToast({ - type: TOAST_TYPE.SUCCESS, + type: TOAST_TYPE.INFO, title: "Link Copied!", message: "Project link copied to clipboard.", }) @@ -189,6 +189,7 @@ export const ProjectCard: React.FC = observer((props) => { if (!isArchived) setJoinProjectModal(true); } }} + data-prevent-nprogress={!project.is_member || isArchived} className="flex flex-col rounded border border-custom-border-200 bg-custom-background-100" > @@ -220,7 +221,7 @@ export const ProjectCard: React.FC = observer((props) => { {!isArchived && ( -
+