A local-first personal finance app
[React Aria Button] Reports page buttons (#3159)
Joel Jeremy Marquez43ff1c033eb8
diff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.pngindex f62d415999..412fa61b69 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.pngindex 5d1c88fb7f..583945c0bd 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.pngindex e3429c77e9..18aa0dd90b 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.png differdiff --git a/packages/desktop-client/src/components/reports/CategorySelector.tsx b/packages/desktop-client/src/components/reports/CategorySelector.tsxindex 317ca37275..359aec51c8 100644--- a/packages/desktop-client/src/components/reports/CategorySelector.tsx+++ b/packages/desktop-client/src/components/reports/CategorySelector.tsx@@ -12,7 +12,7 @@ import {SvgViewHide,SvgViewShow,} from '../../icons/v2';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Text } from '../common/Text';import { View } from '../common/View';import { Checkbox } from '../forms';@@ -72,8 +72,8 @@ export function CategorySelector({}}><Button- type="bare"- onClick={() => setUncheckedHidden(state => !state)}+ variant="bare"+ onPress={() => setUncheckedHidden(state => !state)}style={{ padding: 8 }}><View>diff --git a/packages/desktop-client/src/components/reports/GraphButton.tsx b/packages/desktop-client/src/components/reports/GraphButton.tsxindex f62b771ebc..9502d24a13 100644--- a/packages/desktop-client/src/components/reports/GraphButton.tsx+++ b/packages/desktop-client/src/components/reports/GraphButton.tsx@@ -1,14 +1,14 @@import React, { type HTMLProps } from 'react';import { type CSSProperties, styles, theme } from '../../style';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Text } from '../common/Text';import { Tooltip } from '../common/Tooltip';type GraphButtonProps = HTMLProps<HTMLButtonElement> & {selected?: boolean;style?: CSSProperties;- onSelect?: (newValue: string) => void;+ onSelect?: () => void;title?: string;disabled?: boolean;};@@ -28,15 +28,15 @@ export const GraphButton = ({style={{ ...styles.tooltip, lineHeight: 1.5, padding: '6px 10px' }}><Button- type="bare"+ variant="bare"style={{...(selected && {backgroundColor: theme.buttonBareBackgroundHover,}),...style,}}- onClick={onSelect}- disabled={disabled}+ onPress={onSelect}+ isDisabled={disabled}>{children}</Button>diff --git a/packages/desktop-client/src/components/reports/Header.jsx b/packages/desktop-client/src/components/reports/Header.jsxindex a494746a3a..1f8e4bc78d 100644--- a/packages/desktop-client/src/components/reports/Header.jsx+++ b/packages/desktop-client/src/components/reports/Header.jsx@@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom';import * as monthUtils from 'loot-core/src/shared/months';import { useResponsive } from '../../ResponsiveProvider';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Select } from '../common/Select';import { View } from '../common/View';import { AppliedFilters } from '../filters/AppliedFilters';@@ -109,33 +109,33 @@ export function Header({>{show1Month && (<Button- type="bare"- onClick={() => onChangeDates(...getLatestRange(1))}+ variant="bare"+ onPress={() => onChangeDates(...getLatestRange(1))}>1 month</Button>)}<Button- type="bare"- onClick={() => onChangeDates(...getLatestRange(2))}+ variant="bare"+ onPress={() => onChangeDates(...getLatestRange(2))}>3 months</Button><Button- type="bare"- onClick={() => onChangeDates(...getLatestRange(5))}+ variant="bare"+ onPress={() => onChangeDates(...getLatestRange(5))}>6 months</Button><Button- type="bare"- onClick={() => onChangeDates(...getLatestRange(11))}+ variant="bare"+ onPress={() => onChangeDates(...getLatestRange(11))}>1 Year</Button><Button- type="bare"- onClick={() =>+ variant="bare"+ onPress={() =>onChangeDates(...getFullRange(allMonths[allMonths.length - 1].name),)diff --git a/packages/desktop-client/src/components/reports/ModeButton.tsx b/packages/desktop-client/src/components/reports/ModeButton.tsxindex e0bb035f91..94a208e1ff 100644--- a/packages/desktop-client/src/components/reports/ModeButton.tsx+++ b/packages/desktop-client/src/components/reports/ModeButton.tsx@@ -1,13 +1,15 @@-import React, { type MouseEventHandler, type ReactNode } from 'react';+import React, { type ReactNode } from 'react';++import { css } from 'glamor';import { type CSSProperties, theme } from '../../style';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';type ModeButtonProps = {selected: boolean;children: ReactNode;style?: CSSProperties;- onSelect: MouseEventHandler<HTMLButtonElement>;+ onSelect: () => void;};export function ModeButton({@@ -18,23 +20,25 @@ export function ModeButton({}: ModeButtonProps) {return (<Button- type="bare"- style={{- padding: '5px 10px',- backgroundColor: theme.menuBackground,- marginRight: 5,- fontSize: 'inherit',- ...style,- ...(selected && {- backgroundColor: theme.buttonPrimaryBackground,- color: theme.buttonPrimaryText,- ':hover': {- backgroundColor: theme.buttonPrimaryBackgroundHover,- color: theme.buttonPrimaryTextHover,- },+ variant="bare"+ className={String(+ css({+ padding: '5px 10px',+ backgroundColor: theme.menuBackground,+ marginRight: 5,+ fontSize: 'inherit',+ ...(selected && {+ backgroundColor: theme.buttonPrimaryBackground,+ color: theme.buttonPrimaryText,+ ':hover': {+ backgroundColor: theme.buttonPrimaryBackgroundHover,+ color: theme.buttonPrimaryTextHover,+ },+ }),+ ...style,}),- }}- onClick={onSelect}+ )}+ onPress={onSelect}>{children}</Button>diff --git a/packages/desktop-client/src/components/reports/Overview.tsx b/packages/desktop-client/src/components/reports/Overview.tsxindex a2a71ef832..49c7082755 100644--- a/packages/desktop-client/src/components/reports/Overview.tsx+++ b/packages/desktop-client/src/components/reports/Overview.tsx@@ -7,10 +7,9 @@ import { useReports } from 'loot-core/src/client/data-hooks/reports';import { useAccounts } from '../../hooks/useAccounts';import { useFeatureFlag } from '../../hooks/useFeatureFlag';+import { useNavigate } from '../../hooks/useNavigate';import { useResponsive } from '../../ResponsiveProvider';-import { Button } from '../common/Button';-import { Link } from '../common/Link';-import { Text } from '../common/Text';+import { Button } from '../common/Button2';import { View } from '../common/View';import { MOBILE_NAV_HEIGHT } from '../mobile/MobileNavTabs';import { MobilePageHeader, Page, PageHeader } from '../Page';@@ -23,6 +22,7 @@ import { SpendingCard } from './reports/SpendingCard';export function Overview() {const { data: customReports } = useReports();const { isNarrowWidth } = useResponsive();+ const navigate = useNavigate();const location = useLocation();sessionStorage.setItem('url', location.pathname);@@ -45,11 +45,12 @@ export function Overview() {><PageHeader title="Reports" />{!isNarrowWidth && (- <Link to="/reports/custom" style={{ textDecoration: 'none' }}>- <Button type="primary">- <Text>Create new custom report</Text>- </Button>- </Link>+ <Button+ variant="primary"+ onPress={() => navigate('/reports/custom')}+ >+ Create new custom report+ </Button>)}</View>)diff --git a/packages/desktop-client/src/components/reports/ReportSidebar.tsx b/packages/desktop-client/src/components/reports/ReportSidebar.tsxindex 5745827c34..3bf4fdcf3d 100644--- a/packages/desktop-client/src/components/reports/ReportSidebar.tsx+++ b/packages/desktop-client/src/components/reports/ReportSidebar.tsx@@ -9,7 +9,7 @@ import { type SyncedPrefs } from 'loot-core/types/prefs';import { styles } from '../../style/styles';import { theme } from '../../style/theme';import { Information } from '../alerts';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Menu } from '../common/Menu';import { Popover } from '../common/Popover';import { Select } from '../common/Select';@@ -275,7 +275,7 @@ export function ReportSidebar({<Text style={{ width: 50, textAlign: 'right', marginRight: 5 }} /><Buttonref={triggerRef}- onClick={() => {+ onPress={() => {setMenuOpen(true);}}style={{diff --git a/packages/desktop-client/src/components/reports/SaveReport.tsx b/packages/desktop-client/src/components/reports/SaveReport.tsxindex e961d8e2d1..09f7a0492c 100644--- a/packages/desktop-client/src/components/reports/SaveReport.tsx+++ b/packages/desktop-client/src/components/reports/SaveReport.tsx@@ -5,7 +5,7 @@ import { send, sendCatch } from 'loot-core/src/platform/client/fetch';import { type CustomReportEntity } from 'loot-core/src/types/models';import { SvgExpandArrow } from '../../icons/v0';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Popover } from '../common/Popover';import { Text } from '../common/Text';import { View } from '../common/View';@@ -159,8 +159,8 @@ export function SaveReport({><Buttonref={triggerRef}- type="bare"- onClick={() => {+ variant="bare"+ onPress={() => {setMenuOpen(true);}}>diff --git a/packages/desktop-client/src/components/reports/SaveReportChoose.tsx b/packages/desktop-client/src/components/reports/SaveReportChoose.tsxindex 0b747ee6ed..43f396176f 100644--- a/packages/desktop-client/src/components/reports/SaveReportChoose.tsx+++ b/packages/desktop-client/src/components/reports/SaveReportChoose.tsx@@ -1,7 +1,7 @@import React, { createRef, useEffect, useState } from 'react';import { theme } from '../../style/theme';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Stack } from '../common/Stack';import { Text } from '../common/Text';import { View } from '../common/View';@@ -48,9 +48,8 @@ export function SaveReportChoose({ onApply }: SaveReportChooseProps) {><View style={{ flex: 1 }} /><Button- type="primary"- onClick={e => {- e.preventDefault();+ variant="primary"+ onPress={() => {if (!value) {setErr('Invalid report entered');return;diff --git a/packages/desktop-client/src/components/reports/SaveReportDelete.tsx b/packages/desktop-client/src/components/reports/SaveReportDelete.tsxindex 3a5b95fedb..7a8da58a5b 100644--- a/packages/desktop-client/src/components/reports/SaveReportDelete.tsx+++ b/packages/desktop-client/src/components/reports/SaveReportDelete.tsx@@ -1,7 +1,7 @@import React from 'react';import { theme } from '../../style/theme';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Stack } from '../common/Stack';import { Text } from '../common/Text';import { View } from '../common/View';@@ -33,10 +33,10 @@ export function SaveReportDelete({style={{ marginTop: 15 }}><View style={{ flex: 1 }} />- <Button type="primary" onClick={onDelete}>+ <Button variant="primary" onPress={onDelete}>Yes</Button>- <Button type="primary" onClick={onClose}>+ <Button variant="primary" onPress={onClose}>No</Button></Stack>diff --git a/packages/desktop-client/src/components/reports/SaveReportName.tsx b/packages/desktop-client/src/components/reports/SaveReportName.tsxindex ee6bd8e51b..fd3f2c5e5a 100644--- a/packages/desktop-client/src/components/reports/SaveReportName.tsx+++ b/packages/desktop-client/src/components/reports/SaveReportName.tsx@@ -3,7 +3,7 @@ import React, { type RefObject, useEffect } from 'react';import { type CustomReportEntity } from 'loot-core/types/models/reports';import { theme } from '../../style';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Input } from '../common/Input';import { Stack } from '../common/Stack';import { Text } from '../common/Text';@@ -66,10 +66,9 @@ export function SaveReportName({/></FormField><Button- type="primary"+ variant="primary"style={{ marginTop: 30 }}- onClick={e => {- e.preventDefault();+ onPress={() => {onAddUpdate({menuChoice: menuItem ?? undefined,reportData: report ?? undefined,diff --git a/packages/desktop-client/src/components/reports/reports/CashFlow.tsx b/packages/desktop-client/src/components/reports/reports/CashFlow.tsxindex 949f7dd93f..88f6733ef4 100644--- a/packages/desktop-client/src/components/reports/reports/CashFlow.tsx+++ b/packages/desktop-client/src/components/reports/reports/CashFlow.tsx@@ -13,7 +13,7 @@ import { useResponsive } from '../../../ResponsiveProvider';import { theme } from '../../../style';import { AlignedText } from '../../common/AlignedText';import { Block } from '../../common/Block';-import { Button } from '../../common/Button';+import { Button } from '../../common/Button2';import { Paragraph } from '../../common/Paragraph';import { Text } from '../../common/Text';import { View } from '../../common/View';@@ -143,7 +143,7 @@ export function CashFlow() {justifyContent: 'flex-end',}}>- <Button onClick={() => setShowBalance(state => !state)}>+ <Button onPress={() => setShowBalance(state => !state)}>{showBalance ? 'Hide balance' : 'Show balance'}</Button></View>diff --git a/packages/desktop-client/src/components/reports/reports/Spending.tsx b/packages/desktop-client/src/components/reports/reports/Spending.tsxindex 8de238dfc1..efbff45ed1 100644--- a/packages/desktop-client/src/components/reports/reports/Spending.tsx+++ b/packages/desktop-client/src/components/reports/reports/Spending.tsx@@ -11,7 +11,7 @@ import { useResponsive } from '../../../ResponsiveProvider';import { theme, styles } from '../../../style';import { AlignedText } from '../../common/AlignedText';import { Block } from '../../common/Block';-import { Button } from '../../common/Button';+import { Button } from '../../common/Button2';import { Paragraph } from '../../common/Paragraph';import { Select } from '../../common/Select';import { Text } from '../../common/Text';@@ -261,12 +261,12 @@ export function Spending() {}}><Button- type="primary"+ variant="primary"style={{marginLeft: 10,}}- onClick={saveFilter}- disabled={filterSaved ? true : false}+ onPress={saveFilter}+ isDisabled={filterSaved}>{filterSaved ? 'Saved' : 'Save'}</Button>diff --git a/upcoming-release-notes/3159.md b/upcoming-release-notes/3159.mdnew file mode 100644index 0000000000..5694a09958--- /dev/null+++ b/upcoming-release-notes/3159.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [joel-jeremy]+---++Use new react-aria-components based Button on reports page.