The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: duplicate modal instances from hotkey activation (#1058)
Deep Golanidb9899d29391
diff --git a/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx b/apps/web/src/components/(dashboard)/layout/desktop-nav.tsxindex 262e297d6..975ef7d0d 100644--- a/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx+++ b/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx@@ -1,5 +1,3 @@-'use client';-import type { HTMLAttributes } from 'react';import { useEffect, useState } from 'react';@@ -12,8 +10,6 @@ import { getRootHref } from '@documenso/lib/utils/params';import { cn } from '@documenso/ui/lib/utils';import { Button } from '@documenso/ui/primitives/button';-import { CommandMenu } from '../common/command-menu';-const navigationLinks = [{href: '/documents',@@ -25,13 +21,14 @@ const navigationLinks = [},];-export type DesktopNavProps = HTMLAttributes<HTMLDivElement>;+export type DesktopNavProps = HTMLAttributes<HTMLDivElement> & {+ setIsCommandMenuOpen: (value: boolean) => void;+};-export const DesktopNav = ({ className, ...props }: DesktopNavProps) => {+export const DesktopNav = ({ className, setIsCommandMenuOpen, ...props }: DesktopNavProps) => {const pathname = usePathname();const params = useParams();- const [open, setOpen] = useState(false);const [modifierKey, setModifierKey] = useState(() => 'Ctrl');const rootHref = getRootHref(params, { returnEmptyRootString: true });@@ -70,12 +67,10 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => {))}</div>- <CommandMenu open={open} onOpenChange={setOpen} />-<Buttonvariant="outline"className="text-muted-foreground flex w-96 items-center justify-between rounded-lg"- onClick={() => setOpen((open) => !open)}+ onClick={() => setIsCommandMenuOpen(true)}><div className="flex items-center"><Search className="mr-2 h-5 w-5" />diff --git a/apps/web/src/components/(dashboard)/layout/header.tsx b/apps/web/src/components/(dashboard)/layout/header.tsxindex eebfa4b02..f0a932b35 100644--- a/apps/web/src/components/(dashboard)/layout/header.tsx+++ b/apps/web/src/components/(dashboard)/layout/header.tsx@@ -58,7 +58,7 @@ export const Header = ({ className, user, teams, ...props }: HeaderProps) => {<Logo className="h-6 w-auto" /></Link>- <DesktopNav />+ <DesktopNav setIsCommandMenuOpen={setIsCommandMenuOpen} /><div className="flex gap-x-4 md:ml-8"><MenuSwitcher user={user} teams={teams} />