A local-first personal finance app
Fix nested button error in budget file selection page (#4625)
Joel Jeremy Marqueza85dc890e5d1
diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsxindex da7236595b..87ace6ec99 100644--- a/packages/desktop-client/src/components/Modals.tsx+++ b/packages/desktop-client/src/components/Modals.tsx@@ -13,7 +13,7 @@ import { useDispatch } from '../redux';import { EditSyncAccount } from './banksync/EditSyncAccount';import { AccountAutocompleteModal } from './modals/AccountAutocompleteModal';import { AccountMenuModal } from './modals/AccountMenuModal';-import { BudgetListModal } from './modals/BudgetListModal';+import { BudgetFileSelectionModal } from './modals/BudgetListModal';import { BudgetPageMenuModal } from './modals/BudgetPageMenuModal';import { CategoryAutocompleteModal } from './modals/CategoryAutocompleteModal';import { CategoryGroupMenuModal } from './modals/CategoryGroupMenuModal';@@ -336,7 +336,7 @@ export function Modals() {);case 'budget-list':- return <BudgetListModal key={name} />;+ return <BudgetFileSelectionModal key={name} />;case 'delete-budget':return <DeleteFileModal key={name} {...modal.options} />;case 'duplicate-budget':diff --git a/packages/desktop-client/src/components/manager/BudgetList.tsx b/packages/desktop-client/src/components/manager/BudgetFileSelection.tsxsimilarity index 87%rename from packages/desktop-client/src/components/manager/BudgetList.tsxrename to packages/desktop-client/src/components/manager/BudgetFileSelection.tsxindex 1cf731f2f6..7f0af2d1a9 100644--- a/packages/desktop-client/src/components/manager/BudgetList.tsx+++ b/packages/desktop-client/src/components/manager/BudgetFileSelection.tsx@@ -4,7 +4,9 @@ import React, {useEffect,type CSSProperties,useCallback,+ type ComponentPropsWithoutRef,} from 'react';+import { GridList, GridListItem } from 'react-aria-components';import { Trans, useTranslation } from 'react-i18next';import { Button } from '@actual-app/components/button';@@ -32,6 +34,7 @@ import { theme } from '@actual-app/components/theme';import { tokens } from '@actual-app/components/tokens';import { Tooltip } from '@actual-app/components/tooltip';import { View } from '@actual-app/components/view';+import { css } from '@emotion/css';import {closeAndDownloadBudget,@@ -82,15 +85,17 @@ function isLocalFile(file: File): file is LocalFile {return file.state === 'local';}-function FileMenu({- onDelete,- onClose,- onDuplicate,-}: {+type BudgetFileMenuProps = {onDelete: () => void;onClose: () => void;onDuplicate?: () => void;-}) {+};++function BudgetFileMenu({+ onDelete,+ onClose,+ onDuplicate,+}: BudgetFileMenuProps) {function onMenuSelect(type: string) {onClose();@@ -115,13 +120,15 @@ function FileMenu({return <Menu onMenuSelect={onMenuSelect} items={items} />;}-function FileMenuButton({- onDelete,- onDuplicate,-}: {+type BudgetFileMenuButtonProps = {onDelete: () => void;onDuplicate?: () => void;-}) {+};++function BudgetFileMenuButton({+ onDelete,+ onDuplicate,+}: BudgetFileMenuButtonProps) {const triggerRef = useRef(null);const [menuOpen, setMenuOpen] = useState(false);@@ -143,7 +150,7 @@ function FileMenuButton({isOpen={menuOpen}onOpenChange={() => setMenuOpen(false)}>- <FileMenu+ <BudgetFileMenuonDelete={onDelete}onClose={() => setMenuOpen(false)}onDuplicate={onDuplicate}@@ -153,13 +160,12 @@ function FileMenuButton({);}-function FileState({- file,- currentUserId,-}: {+type BudgetFileStateProps = {file: File;currentUserId: string;-}) {+};++function BudgetFileState({ file, currentUserId }: BudgetFileStateProps) {const { t } = useTranslation();const multiuserEnabled = useMultiuserEnabled();@@ -263,21 +269,24 @@ function FileState({);}-function FileItem({- file,- quickSwitchMode,- onSelect,- onDelete,- onDuplicate,- currentUserId,-}: {- file: File;+type BudgetFileListItemProps = ComponentPropsWithoutRef<+ typeof GridListItem<File>+> & {quickSwitchMode: boolean;onSelect: (file: File) => void;onDelete: (file: File) => void;onDuplicate: (file: File) => void;currentUserId: string;-}) {+};++function BudgetFileListItem({+ quickSwitchMode,+ onSelect,+ onDelete,+ onDuplicate,+ currentUserId,+ ...props+}: BudgetFileListItemProps) {const { t } = useTranslation();const multiuserEnabled = useMultiuserEnabled();@@ -293,25 +302,33 @@ function FileItem({}}+ const { value: file } = props;++ if (!file) {+ return null;+ }+return (- <Button- onPress={() => _onSelect(file)}- style={{- ...styles.shadow,- margin: 10,- padding: '12px 15px',- cursor: 'pointer',- borderRadius: 6,- borderColor: 'transparent',- }}+ <GridListItem+ textValue={file.name}+ onAction={() => _onSelect(file)}+ {...props}><View- style={{+ className={css({+ ...styles.shadow,flexDirection: 'row',- flex: 1,justifyContent: 'space-between',alignItems: 'center',- }}+ margin: '5px 10px',+ padding: 15,+ cursor: 'pointer',+ borderRadius: 6,+ backgroundColor: theme.buttonNormalBackground,+ '&:hover': {+ backgroundColor: theme.buttonNormalBackgroundHover,+ },+ })}><Viewtitle={getFileDescription(file, t) || ''}@@ -327,7 +344,7 @@ function FileItem({)}</View>- <FileState file={file} currentUserId={currentUserId} />+ <BudgetFileState file={file} currentUserId={currentUserId} /></View><View@@ -351,45 +368,46 @@ function FileItem({)}{!quickSwitchMode && (- <FileMenuButton+ <BudgetFileMenuButtononDelete={() => onDelete(file)}onDuplicate={'id' in file ? () => onDuplicate(file) : undefined}/>)}</View></View>- </Button>+ </GridListItem>);}-function BudgetFiles({- files,- quickSwitchMode,- onSelect,- onDelete,- onDuplicate,- currentUserId,-}: {+type BudgetFileListProps = {files: File[];quickSwitchMode: boolean;onSelect: (file: File) => void;onDelete: (file: File) => void;onDuplicate: (file: File) => void;currentUserId: string;-}) {+};++function BudgetFileList({+ files,+ quickSwitchMode,+ onSelect,+ onDelete,+ onDuplicate,+ currentUserId,+}: BudgetFileListProps) {+ const { t } = useTranslation();return (- <View+ <GridList+ aria-label={t('Budget files')}+ items={files}style={{- flexGrow: 1,- [`@media (min-width: ${tokens.breakpoint_small})`]: {- flexGrow: 0,- },- maxHeight: '100%',overflow: 'auto',- '& *': { userSelect: 'none' },+ display: 'flex',+ flexDirection: 'column',+ gap: 8,}}- >- {!files || files.length === 0 ? (+ renderEmptyState={() => (<Textstyle={{...styles.mediumText,@@ -399,30 +417,29 @@ function BudgetFiles({><Trans>No budget files</Trans></Text>- ) : (- files.map(file => (- <FileItem- key={isLocalFile(file) ? file.id : file.cloudFileId}- file={file}- currentUserId={currentUserId}- quickSwitchMode={quickSwitchMode}- onSelect={onSelect}- onDelete={onDelete}- onDuplicate={onDuplicate}- />- )))}- </View>+ >+ {file => (+ <BudgetFileListItem+ key={isLocalFile(file) ? file.id : file.cloudFileId}+ value={file}+ currentUserId={currentUserId}+ quickSwitchMode={quickSwitchMode}+ onSelect={onSelect}+ onDelete={onDelete}+ onDuplicate={onDuplicate}+ />+ )}+ </GridList>);}-function RefreshButton({- style,- onRefresh,-}: {+type RefreshButtonProps = {style?: CSSProperties;onRefresh: () => void;-}) {+};++function RefreshButton({ style, onRefresh }: RefreshButtonProps) {const [loading, setLoading] = useState(false);async function _onRefresh() {@@ -445,7 +462,11 @@ function RefreshButton({);}-function SettingsButton({ onOpenSettings }: { onOpenSettings: () => void }) {+type SettingsButtonProps = {+ onOpenSettings: () => void;+};++function SettingsButton({ onOpenSettings }: SettingsButtonProps) {const { t } = useTranslation();return (@@ -464,15 +485,17 @@ function SettingsButton({ onOpenSettings }: { onOpenSettings: () => void }) {);}-function BudgetListHeader({- quickSwitchMode,- onRefresh,- onOpenSettings,-}: {+type BudgetFileSelectionHeaderProps = {quickSwitchMode: boolean;onRefresh: () => void;onOpenSettings: () => void;-}) {+};++function BudgetFileSelectionHeader({+ quickSwitchMode,+ onRefresh,+ onOpenSettings,+}: BudgetFileSelectionHeaderProps) {return (<Viewstyle={{@@ -503,7 +526,15 @@ function BudgetListHeader({);}-export function BudgetList({ showHeader = true, quickSwitchMode = false }) {+type BudgetFileSelectionProps = {+ showHeader?: boolean;+ quickSwitchMode?: boolean;+};++export function BudgetFileSelection({+ showHeader = true,+ quickSwitchMode = false,+}: BudgetFileSelectionProps) {const dispatch = useDispatch();const allFiles = useSelector(state => state.budgets.allFiles || []);const multiuserEnabled = useMultiuserEnabled();@@ -595,7 +626,7 @@ export function BudgetList({ showHeader = true, quickSwitchMode = false }) {}}>{showHeader && (- <BudgetListHeader+ <BudgetFileSelectionHeaderquickSwitchMode={quickSwitchMode}onRefresh={refresh}onOpenSettings={() =>@@ -603,7 +634,7 @@ export function BudgetList({ showHeader = true, quickSwitchMode = false }) {}/>)}- <BudgetFiles+ <BudgetFileListfiles={files}currentUserId={currentUserId}quickSwitchMode={quickSwitchMode}diff --git a/packages/desktop-client/src/components/manager/ManagementApp.tsx b/packages/desktop-client/src/components/manager/ManagementApp.tsxindex b191312fa0..62363b805e 100644--- a/packages/desktop-client/src/components/manager/ManagementApp.tsx+++ b/packages/desktop-client/src/components/manager/ManagementApp.tsx@@ -23,7 +23,7 @@ import { LoggedInUser } from '../LoggedInUser';import { Notifications } from '../Notifications';import { useMultiuserEnabled, useServerVersion } from '../ServerContext';-import { BudgetList } from './BudgetList';+import { BudgetFileSelection } from './BudgetFileSelection';import { ConfigServer } from './ConfigServer';import { ServerURL } from './ServerURL';import { Bootstrap } from './subscribe/Bootstrap';@@ -134,7 +134,7 @@ export function ManagementApp() {<Route path="/change-password" element={<ChangePassword />} />{files && files.length > 0 ? (- <Route path="/" element={<BudgetList />} />+ <Route path="/" element={<BudgetFileSelection />} />) : (<Route path="/" element={<WelcomeScreen />} />)}diff --git a/packages/desktop-client/src/components/modals/BudgetListModal.tsx b/packages/desktop-client/src/components/modals/BudgetListModal.tsxindex 7e51f6b9bf..344327d972 100644--- a/packages/desktop-client/src/components/modals/BudgetListModal.tsx+++ b/packages/desktop-client/src/components/modals/BudgetListModal.tsx@@ -7,9 +7,9 @@ import { View } from '@actual-app/components/view';import { useMetadataPref } from '../../hooks/useMetadataPref';import { useSelector } from '../../redux';import { Modal, ModalHeader, ModalCloseButton } from '../common/Modal';-import { BudgetList } from '../manager/BudgetList';+import { BudgetFileSelection } from '../manager/BudgetFileSelection';-export function BudgetListModal() {+export function BudgetFileSelectionModal() {const { t } = useTranslation();const [id] = useMetadataPref('id');const currentFile = useSelector(state =>@@ -38,7 +38,7 @@ export function BudgetListModal() {{currentFile?.name}</Text></View>- <BudgetList showHeader={false} quickSwitchMode={true} />+ <BudgetFileSelection showHeader={false} quickSwitchMode={true} /></>)}</Modal>diff --git a/upcoming-release-notes/4625.md b/upcoming-release-notes/4625.mdnew file mode 100644index 0000000000..532635e927--- /dev/null+++ b/upcoming-release-notes/4625.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [joel-jeremy]+---++Fix nested button error in budget file selection page\ No newline at end of file