From 96964224f4b725d5b0033d6ff006f4e4d827aa78 Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Mon, 17 Jun 2024 18:22:20 +0100
Subject: [PATCH] :bug: fix budget tooltip showing if panel is not collapsed
(#2887)
---
.../budget/rollover/budgetsummary/BudgetSummary.tsx | 1 +
.../components/budget/rollover/budgetsummary/ToBudget.tsx | 6 +++++-
.../budget/rollover/budgetsummary/ToBudgetAmount.tsx | 5 ++++-
upcoming-release-notes/2887.md | 6 ++++++
4 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 upcoming-release-notes/2887.md
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
index d74c0d999..b4d8f704d 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
@@ -200,6 +200,7 @@ export function BudgetSummary({ month }: BudgetSummaryProps) {
prevMonthName={prevMonthName}
month={month}
onBudgetAction={onBudgetAction}
+ isCollapsed
/>
</View>
) : (
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx b/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx
index f63f9c18e..538cb59d3 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx
@@ -19,6 +19,7 @@ type ToBudgetProps = {
prevMonthName: string;
style?: CSSProperties;
amountStyle?: CSSProperties;
+ isCollapsed?: boolean;
};
export function ToBudget({
month,
@@ -26,6 +27,7 @@ export function ToBudget({
onBudgetAction,
style,
amountStyle,
+ isCollapsed = false,
}: ToBudgetProps) {
const [menuOpen, setMenuOpen] = useState<string | null>(null);
const triggerRef = useRef(null);
@@ -34,6 +36,7 @@ export function ToBudget({
value: 0,
});
const availableValue = parseInt(sheetValue);
+ const isMenuOpen = Boolean(menuOpen);
return (
<>
@@ -43,13 +46,14 @@ export function ToBudget({
prevMonthName={prevMonthName}
style={style}
amountStyle={amountStyle}
+ isTotalsListTooltipDisabled={!isCollapsed || isMenuOpen}
/>
</View>
<Popover
triggerRef={triggerRef}
placement="bottom"
- isOpen={!!menuOpen}
+ isOpen={isMenuOpen}
onOpenChange={() => setMenuOpen(null)}
style={{ width: 200 }}
>
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudgetAmount.tsx b/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudgetAmount.tsx
index 693fb3a57..c9cd0e843 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudgetAmount.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudgetAmount.tsx
@@ -20,6 +20,7 @@ type ToBudgetAmountProps = {
style?: CSSProperties;
amountStyle?: CSSProperties;
onClick: () => void;
+ isTotalsListTooltipDisabled?: boolean;
};
export function ToBudgetAmount({
@@ -27,6 +28,7 @@ export function ToBudgetAmount({
style,
amountStyle,
onClick,
+ isTotalsListTooltipDisabled = false,
}: ToBudgetAmountProps) {
const sheetName = useSheetName(rolloverBudget.toBudget);
const sheetValue = useSheetValue({
@@ -52,7 +54,8 @@ export function ToBudgetAmount({
/>
}
placement="bottom"
- triggerProps={{ delay: 0 }}
+ offset={3}
+ triggerProps={{ isDisabled: isTotalsListTooltipDisabled }}
>
<PrivacyFilter blurIntensity={7}>
<Block
diff --git a/upcoming-release-notes/2887.md b/upcoming-release-notes/2887.md
new file mode 100644
index 000000000..add739aed
--- /dev/null
+++ b/upcoming-release-notes/2887.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [MatissJanis]
+---
+
+Fix budget tooltip showing on hover if the panel is not collapsed (the tooltip should show only if panel is collapsed).
--
GitLab