A local-first personal finance app
⬆️ upgrade recharts to v3 (#5903)
Matt Fiddaman6147495003fb
diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.jsonindex 358aa9f1d4..008962a549 100644--- a/packages/desktop-client/package.json+++ b/packages/desktop-client/package.json@@ -64,7 +64,7 @@"react-spring": "10.0.0","react-swipeable": "^7.0.2","react-virtualized-auto-sizer": "^1.0.26",- "recharts": "^2.15.3",+ "recharts": "^3.2.1","rehype-external-links": "^3.0.0","remark-gfm": "^4.0.1","rollup-plugin-visualizer": "^6.0.4",diff --git a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsxindex 95dc115ad3..170dec7a75 100644--- a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx+++ b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx@@ -15,7 +15,6 @@ import {Tooltip,XAxis,YAxis,- type TooltipProps,} from 'recharts';import { chartTheme } from '@desktop-client/components/reports/chart-theme';@@ -27,7 +26,19 @@ import { usePrivacyMode } from '@desktop-client/hooks/usePrivacyMode';const MAX_BAR_SIZE = 50;const ANIMATION_DURATION = 1000; // in ms-type CustomTooltipProps = TooltipProps<number, 'date'> & {+type PayloadItem = {+ payload: {+ date: string;+ income: number;+ expenses: number;+ balance: number;+ transfers: number;+ };+};++type CustomTooltipProps = {+ active?: boolean;+ payload?: PayloadItem[];isConcise: boolean;format: (value: unknown, type?: FormatType) => string;};diff --git a/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx b/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsxindex 867636e175..29e894c72b 100644--- a/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx+++ b/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx@@ -2,11 +2,20 @@import React, { useState, type CSSProperties } from 'react';import { theme } from '@actual-app/components/theme';-import { PieChart, Pie, Cell, Sector, ResponsiveContainer } from 'recharts';+import {+ PieChart,+ Pie,+ Cell,+ Sector,+ ResponsiveContainer,+ Tooltip,+} from 'recharts';import {type balanceTypeOpType,type DataEntity,+ type GroupedEntity,+ type IntervalEntity,type RuleConditionEntity,} from 'loot-core/types/models';@@ -245,7 +254,7 @@ export function DonutGraph({const accounts = useAccounts();const [pointer, setPointer] = useState('');- const getVal = (obj: DataEntity) => {+ const getVal = (obj: GroupedEntity | IntervalEntity) => {if (['totalDebts', 'netDebts'].includes(balanceTypeOp)) {return -1 * obj[balanceTypeOp];} else {@@ -271,7 +280,6 @@ export function DonutGraph({style={{ cursor: pointer }}><Pie- activeIndex={activeIndex}activeShape={width < 220 || height < 130? undefined@@ -292,7 +300,11 @@ export function DonutGraph({dataKey={val => getVal(val)}nameKey={yAxis}isAnimationActive={false}- data={data[splitData]}+ data={+ data[splitData]?.map(item => ({+ ...item,+ })) ?? []+ }innerRadius={Math.min(width, height) * 0.2}fill="#8884d8"labelLine={false}@@ -341,6 +353,11 @@ export function DonutGraph({<Cell key={`cell-${index}`} fill={entry.color} />))}</Pie>+ <Tooltip+ content={() => null}+ defaultIndex={activeIndex}+ active={true}+ /></PieChart></div></ResponsiveContainer>diff --git a/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx b/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsxindex 1d084e6a1c..5d238638ba 100644--- a/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx+++ b/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx@@ -280,8 +280,8 @@ export function StackedBarGraph({showHiddenCategories,showOffBudget,type: 'time',- startDate: e.intervalStartDate,- endDate: e.intervalEndDate,+ startDate: e.payload?.intervalStartDate,+ endDate: e.payload?.intervalEndDate,field: groupBy.toLowerCase(),id: entry.id,interval,diff --git a/upcoming-release-notes/5903.md b/upcoming-release-notes/5903.mdnew file mode 100644index 0000000000..4f09f579c8--- /dev/null+++ b/upcoming-release-notes/5903.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [matt-fidd]+---++Upgrade recharts to v3diff --git a/yarn.lock b/yarn.lockindex cddde17237..2cb643e20f 100644--- a/yarn.lock+++ b/yarn.lock@@ -186,7 +186,7 @@ __metadata:react-spring: "npm:10.0.0"react-swipeable: "npm:^7.0.2"react-virtualized-auto-sizer: "npm:^1.0.26"- recharts: "npm:^2.15.3"+ recharts: "npm:^3.2.1"rehype-external-links: "npm:^3.0.0"remark-gfm: "npm:^4.0.1"rollup-plugin-visualizer: "npm:^6.0.4"@@ -1400,7 +1400,7 @@ __metadata:languageName: nodelinkType: hard-"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.24.5, @babel/runtime@npm:^7.25.0, @babel/runtime@npm:^7.26.10, @babel/runtime@npm:^7.27.6, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":+"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.24.5, @babel/runtime@npm:^7.25.0, @babel/runtime@npm:^7.26.10, @babel/runtime@npm:^7.27.6, @babel/runtime@npm:^7.9.2":version: 7.28.4resolution: "@babel/runtime@npm:7.28.4"checksum: 10/6c9a70452322ea80b3c9b2a412bcf60771819213a67576c8cec41e88a95bb7bf01fc983754cda35dc19603eef52df22203ccbf7777b9d6316932f9fb77c25163@@ -4938,7 +4938,7 @@ __metadata:languageName: nodelinkType: hard-"@reduxjs/toolkit@npm:^2.9.0":+"@reduxjs/toolkit@npm:1.x.x || 2.x.x, @reduxjs/toolkit@npm:^2.9.0":version: 2.9.0resolution: "@reduxjs/toolkit@npm:2.9.0"dependencies:@@ -9222,7 +9222,7 @@ __metadata:languageName: nodelinkType: hard-"decimal.js-light@npm:^2.4.1":+"decimal.js-light@npm:^2.5.1":version: 2.5.1resolution: "decimal.js-light@npm:2.5.1"checksum: 10/6360911e31221a9b8b90e23020aa969d104e182c5c6518589cdfedc3ced31bf1f19cf931e265bd451ae6ee3a35ee15e81f5456a86813606fda96f8374616688f@@ -9568,16 +9568,6 @@ __metadata:languageName: nodelinkType: hard-"dom-helpers@npm:^5.0.1":- version: 5.2.1- resolution: "dom-helpers@npm:5.2.1"- dependencies:- "@babel/runtime": "npm:^7.8.7"- csstype: "npm:^3.0.2"- checksum: 10/bed2341adf8864bf932b3289c24f35fdd99930af77df46688abf2d753ff291df49a15850c874d686d9be6ec4e1c6835673906e64dbd8b2839d227f117a11fd41- languageName: node- linkType: hard-"dom-serializer@npm:^2.0.0":version: 2.0.0resolution: "dom-serializer@npm:2.0.0"@@ -10074,6 +10064,18 @@ __metadata:languageName: nodelinkType: hard+"es-toolkit@npm:^1.39.3":+ version: 1.40.0+ resolution: "es-toolkit@npm:1.40.0"+ dependenciesMeta:+ "@trivago/[email protected]":+ unplugged: true+ unplugged: true+ checksum: 10/97aba253de03c0e1632d3bd5e0460b223eba7808192e0fb0123696b4eb3892eb546b7e782233072d571b04a6c6ca02828dc7b52a6bf12c75af45c2fc721d0cd6+ languageName: node+ linkType: hard+"es6-error@npm:^4.1.1":version: 4.1.1resolution: "es6-error@npm:4.1.1"@@ -10623,7 +10625,7 @@ __metadata:languageName: nodelinkType: hard-"eventemitter3@npm:^4.0.0, eventemitter3@npm:^4.0.1":+"eventemitter3@npm:^4.0.0":version: 4.0.7resolution: "eventemitter3@npm:4.0.7"checksum: 10/8030029382404942c01d0037079f1b1bc8fed524b5849c237b80549b01e2fc49709e1d0c557fa65ca4498fc9e24cff1475ef7b855121fcc15f9d61f93e282346@@ -10835,13 +10837,6 @@ __metadata:languageName: nodelinkType: hard-"fast-equals@npm:^5.0.1":- version: 5.3.2- resolution: "fast-equals@npm:5.3.2"- checksum: 10/01236bf0b64c091dec9d3781515b493a3ca7ca3cd466fad071bdc13b275403a9119933f3d6473178b1b935a6f685fbe2e7aff0c68baef358f48547e3c7f683dc- languageName: node- linkType: hard-"fast-fifo@npm:^1.3.2":version: 1.3.2resolution: "fast-fifo@npm:1.3.2"@@ -12098,7 +12093,7 @@ __metadata:languageName: nodelinkType: hard-"immer@npm:^10.0.3":+"immer@npm:^10.0.3, immer@npm:^10.1.1":version: 10.1.3resolution: "immer@npm:10.1.3"checksum: 10/672faf5fc84177eecbfb49143ea8f6b5c1f981bd78c57e1562469354f6df658921ed6e0372b9ceed1e07c031e0c6d66863c4df80605928c6c774840b945aef83@@ -15891,7 +15886,7 @@ __metadata:languageName: nodelinkType: hard-"prop-types@npm:15.x, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1":+"prop-types@npm:15.x, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1":version: 15.8.1resolution: "prop-types@npm:15.8.1"dependencies:@@ -16388,7 +16383,7 @@ __metadata:languageName: nodelinkType: hard-"react-redux@npm:^9.2.0":+"react-redux@npm:8.x.x || 9.x.x, react-redux@npm:^9.2.0":version: 9.2.0resolution: "react-redux@npm:9.2.0"dependencies:@@ -16487,20 +16482,6 @@ __metadata:languageName: nodelinkType: hard-"react-smooth@npm:^4.0.4":- version: 4.0.4- resolution: "react-smooth@npm:4.0.4"- dependencies:- fast-equals: "npm:^5.0.1"- prop-types: "npm:^15.8.1"- react-transition-group: "npm:^4.4.5"- peerDependencies:- react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0- react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0- checksum: 10/cc5593356d154253f61a2c0b7b2fa8a979527495e2fe47c4252628d86e93c72c75df988c5438867d373de4e5a47d871ab9262474c02e66c411f94f047ecb5b0f- languageName: node- linkType: hard-"react-spring@npm:10.0.0":version: 10.0.0resolution: "react-spring@npm:10.0.0"@@ -16579,21 +16560,6 @@ __metadata:languageName: nodelinkType: hard-"react-transition-group@npm:^4.4.5":- version: 4.4.5- resolution: "react-transition-group@npm:4.4.5"- dependencies:- "@babel/runtime": "npm:^7.5.5"- dom-helpers: "npm:^5.0.1"- loose-envify: "npm:^1.4.0"- prop-types: "npm:^15.6.2"- peerDependencies:- react: ">=16.6.0"- react-dom: ">=16.6.0"- checksum: 10/ca32d3fd2168c976c5d90a317f25d5f5cd723608b415fb3b9006f9d793c8965c619562d0884503a3e44e4b06efbca4fdd1520f30e58ca3e00a0890e637d55419- languageName: node- linkType: hard-"react-virtualized-auto-sizer@npm:^1.0.26":version: 1.0.26resolution: "react-virtualized-auto-sizer@npm:1.0.26"@@ -16687,31 +16653,26 @@ __metadata:languageName: nodelinkType: hard-"recharts-scale@npm:^0.4.4":- version: 0.4.5- resolution: "recharts-scale@npm:0.4.5"- dependencies:- decimal.js-light: "npm:^2.4.1"- checksum: 10/6e1118635018bd0622b5e978e56a8764ced5741140709e025c5989a0cb40c4b0bebb7c4e231c11ab8d6127a85fef8c68d92662c6f3c22af9551737a767cea014- languageName: node- linkType: hard--"recharts@npm:^2.15.3":- version: 2.15.4- resolution: "recharts@npm:2.15.4"+"recharts@npm:^3.2.1":+ version: 3.2.1+ resolution: "recharts@npm:3.2.1"dependencies:- clsx: "npm:^2.0.0"- eventemitter3: "npm:^4.0.1"- lodash: "npm:^4.17.21"- react-is: "npm:^18.3.1"- react-smooth: "npm:^4.0.4"- recharts-scale: "npm:^0.4.4"- tiny-invariant: "npm:^1.3.1"- victory-vendor: "npm:^36.6.8"+ "@reduxjs/toolkit": "npm:1.x.x || 2.x.x"+ clsx: "npm:^2.1.1"+ decimal.js-light: "npm:^2.5.1"+ es-toolkit: "npm:^1.39.3"+ eventemitter3: "npm:^5.0.1"+ immer: "npm:^10.1.1"+ react-redux: "npm:8.x.x || 9.x.x"+ reselect: "npm:5.1.1"+ tiny-invariant: "npm:^1.3.3"+ use-sync-external-store: "npm:^1.2.2"+ victory-vendor: "npm:^37.0.2"peerDependencies:- react: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0+ react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0- checksum: 10/d29656d465ccdfcf95de7bc35e53c1f30fbd45e3d7b53c70bc2cd1892707058606eab8b0a648c1e1d0b3f21cc3b6774abf3f304da4d4534f550500909623492f+ react-is: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0+ checksum: 10/9342f6ab07e57d9c079bf492afb533a0cdb1b41a50e2d0586a7daaaf10e76e24cd91cefa9e0906b487dd77ed234b729e4c3cd6fe6ccb6424a93769a1e675bb94languageName: nodelinkType: hard@@ -16950,7 +16911,7 @@ __metadata:languageName: nodelinkType: hard-"reselect@npm:^5.1.0":+"reselect@npm:5.1.1, reselect@npm:^5.1.0":version: 5.1.1resolution: "reselect@npm:5.1.1"checksum: 10/1fdae11a39ed9c8d85a24df19517c8372ee24fefea9cce3fae9eaad8e9cefbba5a3d4940c6fe31296b6addf76e035588c55798f7e6e147e1b7c0855f119e7fa5@@ -18603,7 +18564,7 @@ __metadata:languageName: nodelinkType: hard-"tiny-invariant@npm:^1.3.1":+"tiny-invariant@npm:^1.3.3":version: 1.3.3resolution: "tiny-invariant@npm:1.3.3"checksum: 10/5e185c8cc2266967984ce3b352a4e57cb89dad5a8abb0dea21468a6ecaa67cd5bb47a3b7a85d08041008644af4f667fb8b6575ba38ba5fb00b3b5068306e59fe@@ -19482,7 +19443,7 @@ __metadata:languageName: nodelinkType: hard-"use-sync-external-store@npm:^1.4.0":+"use-sync-external-store@npm:^1.2.2, use-sync-external-store@npm:^1.4.0":version: 1.6.0resolution: "use-sync-external-store@npm:1.6.0"peerDependencies:@@ -19609,9 +19570,9 @@ __metadata:languageName: nodelinkType: hard-"victory-vendor@npm:^36.6.8":- version: 36.9.2- resolution: "victory-vendor@npm:36.9.2"+"victory-vendor@npm:^37.0.2":+ version: 37.3.6+ resolution: "victory-vendor@npm:37.3.6"dependencies:"@types/d3-array": "npm:^3.0.3""@types/d3-ease": "npm:^3.0.0"@@ -19627,7 +19588,7 @@ __metadata:d3-shape: "npm:^3.1.0"d3-time: "npm:^3.0.0"d3-timer: "npm:^3.0.1"- checksum: 10/db67b3d9b8070d4eae4122edc72be7067b4e32363340cdd4d5b628e7dd65bea0c7c5b4116016658d223adaa575bcc6b7b3a71507aa4f34b2609ed61dbfbba1ea+ checksum: 10/1babc3ada56f182056af6edc10e592534b887116e37cf07b42fa909efd5edf41b7693bfaca3dbdf1a991e43c684549cd15e15a1b1b51a16fa2ee1e828d508bc7languageName: nodelinkType: hard