fix: changing name with context menu

actualbudget · Dec 17, 2024 · 568cd77 · 568cd77
1 parent 9a21ace
commit 568cd77
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 1 deletion.
diff --git a/packages/desktop-client/src/components/reports/ReportCard.tsx b/packages/desktop-client/src/components/reports/ReportCard.tsx
@@ -19,6 +19,7 @@ import { NON_DRAGGABLE_AREA_CLASS_NAME } from './constants';
 
 type ReportCardProps = {
   isEditing?: boolean;
+  disableClick?: boolean;
   to?: string;
   children: ReactNode;
   menuItems?: ComponentProps<typeof Menu>['items'];
@@ -29,6 +30,7 @@ type ReportCardProps = {
 
 export function ReportCard({
   isEditing,
+  disableClick,
   to,
   menuItems,
   onMenuSelect,
@@ -95,7 +97,7 @@ export function ReportCard({
       <Layout {...layoutProps}>
         <View
           role="button"
-          onClick={isEditing ? undefined : () => navigate(to)}
+          onClick={isEditing || disableClick ? undefined : () => navigate(to)}
           style={{
             height: '100%',
             width: '100%',

diff --git a/packages/desktop-client/src/components/reports/reports/CashFlowCard.tsx b/packages/desktop-client/src/components/reports/reports/CashFlowCard.tsx
@@ -119,6 +119,7 @@ export function CashFlowCard({
   return (
     <ReportCard
       isEditing={isEditing}
+      disableClick={nameMenuOpen}
       to={`/reports/cash-flow/${widgetId}`}
       menuItems={[
         {

diff --git a/packages/desktop-client/src/components/reports/reports/CustomReportListCards.tsx b/packages/desktop-client/src/components/reports/reports/CustomReportListCards.tsx
@@ -114,6 +114,7 @@ function CustomReportListCardsInner({
   return (
     <ReportCard
       isEditing={isEditing}
+      disableClick={nameMenuOpen}
       to={`/reports/custom/${report.id}`}
       menuItems={[
         {

diff --git a/packages/desktop-client/src/components/reports/reports/MarkdownCard.tsx b/packages/desktop-client/src/components/reports/reports/MarkdownCard.tsx
@@ -39,6 +39,7 @@ export function MarkdownCard({
   return (
     <ReportCard
       isEditing={isEditing}
+      disableClick={isVisibleTextArea}
       menuItems={[
         {
           type: Menu.label,

diff --git a/packages/desktop-client/src/components/reports/reports/NetWorthCard.tsx b/packages/desktop-client/src/components/reports/reports/NetWorthCard.tsx
@@ -65,6 +65,7 @@ export function NetWorthCard({
   return (
     <ReportCard
       isEditing={isEditing}
+      disableClick={nameMenuOpen}
       to={`/reports/net-worth/${widgetId}`}
       menuItems={[
         {

diff --git a/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx b/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx
@@ -69,6 +69,7 @@ export function SpendingCard({
   return (
     <ReportCard
       isEditing={isEditing}
+      disableClick={nameMenuOpen}
       to={`/reports/spending/${widgetId}`}
       menuItems={[
         {

diff --git a/packages/desktop-client/src/components/reports/reports/SummaryCard.tsx b/packages/desktop-client/src/components/reports/reports/SummaryCard.tsx
@@ -73,6 +73,7 @@ export function SummaryCard({
   return (
     <ReportCard
       isEditing={isEditing}
+      disableClick={nameMenuOpen}
       to={`/reports/summary/${widgetId}`}
       menuItems={[
         {