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 d74c0d999ff638adedc5a8b89beedf4ed553c567..b4d8f704dff26b969b393317dd16d96dc1874141 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 f63f9c18e830cf5dc4ead5b33dd906acdc032d02..538cb59d30c999f76c2a96656e2e119c6070088e 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 693fb3a57f5e3d6fc59b52ca2d65d51b20b50894..c9cd0e8431acfba53bf5b6cc18f007197ce03da0 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 0000000000000000000000000000000000000000..add739aed447e94150aa350a819bb26843f4a5ff --- /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).