A local-first personal finance app
enhance: context menu on sidebar elements (#3777)
Koen van Staverend894281465d5
diff --git a/packages/desktop-client/src/components/common/Link.tsx b/packages/desktop-client/src/components/common/Link.tsxindex 5ecd098cb7..1c89a9c868 100644--- a/packages/desktop-client/src/components/common/Link.tsx+++ b/packages/desktop-client/src/components/common/Link.tsx@@ -35,6 +35,7 @@ type InternalLinkProps = {activeStyle?: CSSProperties;children?: ReactNode;report?: CustomReportEntity;+ isDisabled?: boolean;};const externalLinkColors = {@@ -121,6 +122,7 @@ const InternalLink = ({activeStyle,children,report,+ isDisabled,}: InternalLinkProps) => {const path = to ?? '';const match = useMatch({ path });@@ -130,6 +132,11 @@ const InternalLink = ({to={path}state={report ? { report } : {}}className={css([styles.smallText, style, match ? activeStyle : null])}+ onClick={e => {+ if (isDisabled) {+ e.preventDefault();+ }+ }}>{children}</NavLink>diff --git a/packages/desktop-client/src/components/sidebar/Account.tsx b/packages/desktop-client/src/components/sidebar/Account.tsxindex eebfd7c98c..d11549f2a0 100644--- a/packages/desktop-client/src/components/sidebar/Account.tsx+++ b/packages/desktop-client/src/components/sidebar/Account.tsx@@ -1,15 +1,26 @@// @ts-strict-ignore-import React, { type CSSProperties } from 'react';+import React, { type CSSProperties, useRef, useState } from 'react';+import { useDispatch } from 'react-redux';import { css, cx } from '@emotion/css';+import {+ openAccountCloseModal,+ reopenAccount,+ updateAccount,+} from 'loot-core/client/actions';import * as Platform from 'loot-core/client/platform';import { type AccountEntity } from 'loot-core/src/types/models';+import { useContextMenu } from '../../hooks/useContextMenu';import { useNotes } from '../../hooks/useNotes';import { styles, theme } from '../../style';import { AlignedText } from '../common/AlignedText';+import { InitialFocus } from '../common/InitialFocus';+import { Input } from '../common/Input';import { Link } from '../common/Link';+import { Menu } from '../common/Menu';+import { Popover } from '../common/Popover';import { Text } from '../common/Text';import { Tooltip } from '../common/Tooltip';import { View } from '../common/View';@@ -74,6 +85,10 @@ export function Account<FieldName extends SheetFields<'account'>>({: 'account-onbudget': 'title';+ const triggerRef = useRef(null);+ const { setMenuOpen, menuOpen, handleContextMenu, position } =+ useContextMenu();+const { dragRef } = useDraggable({type,onDragChange,@@ -87,17 +102,26 @@ export function Account<FieldName extends SheetFields<'account'>>({onDrop,});+ const dispatch = useDispatch();++ const [isEditing, setIsEditing] = useState(false);+const accountNote = useNotes(`account-${account?.id}`);const needsTooltip = !!account?.id;const accountRow = (- <View innerRef={dropRef} style={{ flexShrink: 0, ...outerStyle }}>- <View>+ <View+ innerRef={dropRef}+ style={{ flexShrink: 0, ...outerStyle }}+ onContextMenu={needsTooltip ? handleContextMenu : undefined}+ >+ <View innerRef={triggerRef}><DropHighlight pos={dropPos} /><View innerRef={dragRef}><Linkvariant="internal"to={to}+ isDisabled={isEditing}style={{...accountNameStyle,...style,@@ -158,10 +182,76 @@ export function Account<FieldName extends SheetFields<'account'>>({paddingBottom: '3px',}}- left={name}+ left={+ isEditing ? (+ <InitialFocus>+ <Input+ style={{+ padding: 0,+ width: '100%',+ }}+ onBlur={() => setIsEditing(false)}+ onEnter={e => {+ const inputEl = e.target as HTMLInputElement;+ const newAccountName = inputEl.value;+ if (newAccountName.trim() !== '') {+ dispatch(+ updateAccount({+ ...account,+ name: newAccountName,+ }),+ );+ }+ setIsEditing(false);+ }}+ onEscape={() => setIsEditing(false)}+ defaultValue={name}+ />+ </InitialFocus>+ ) : (+ name+ )+ }right={<CellValue binding={query} type="financial" />}/></Link>+ {account && (+ <Popover+ triggerRef={triggerRef}+ placement="bottom start"+ isOpen={menuOpen}+ onOpenChange={() => setMenuOpen(false)}+ style={{ width: 200, margin: 1 }}+ isNonModal+ {...position}+ >+ <Menu+ onMenuSelect={type => {+ switch (type) {+ case 'close': {+ dispatch(openAccountCloseModal(account.id));+ break;+ }+ case 'reopen': {+ dispatch(reopenAccount(account.id));+ break;+ }+ case 'rename': {+ setIsEditing(true);+ break;+ }+ }+ setMenuOpen(false);+ }}+ items={[+ { name: 'rename', text: 'Rename' },+ account.closed+ ? { name: 'reopen', text: 'Reopen' }+ : { name: 'close', text: 'Close' },+ ]}+ />+ </Popover>+ )}</View></View></View>@@ -202,6 +292,7 @@ export function Account<FieldName extends SheetFields<'account'>>({placement="right top"triggerProps={{delay: 1000,+ isDisabled: menuOpen,}}>{accountRow}diff --git a/packages/desktop-client/src/components/sidebar/BudgetName.tsx b/packages/desktop-client/src/components/sidebar/BudgetName.tsxindex d7b97e4365..9499bc20ca 100644--- a/packages/desktop-client/src/components/sidebar/BudgetName.tsx+++ b/packages/desktop-client/src/components/sidebar/BudgetName.tsx@@ -5,6 +5,7 @@ import { useDispatch } from 'react-redux';import { closeBudget } from 'loot-core/src/client/actions';import * as Platform from 'loot-core/src/client/platform';+import { useContextMenu } from '../../hooks/useContextMenu';import { useMetadataPref } from '../../hooks/useMetadataPref';import { useNavigate } from '../../hooks/useNavigate';import { SvgExpandArrow } from '../../icons/v0';@@ -54,9 +55,10 @@ function EditableBudgetName() {const [budgetName, setBudgetNamePref] = useMetadataPref('budgetName');const dispatch = useDispatch();const navigate = useNavigate();- const [menuOpen, setMenuOpen] = useState(false);const triggerRef = useRef<HTMLButtonElement>(null);const [editing, setEditing] = useState(false);+ const { setMenuOpen, menuOpen, handleContextMenu, resetPosition, position } =+ useContextMenu();function onMenuSelect(type: string) {setMenuOpen(false);@@ -106,7 +108,7 @@ function EditableBudgetName() {}return (- <>+ <View onContextMenu={handleContextMenu}><Buttonref={triggerRef}variant="bare"@@ -117,7 +119,10 @@ function EditableBudgetName() {marginLeft: -5,flex: '0 auto',}}- onPress={() => setMenuOpen(true)}+ onPress={() => {+ resetPosition();+ setMenuOpen(true);+ }}><Text style={{ whiteSpace: 'nowrap', overflow: 'hidden' }}>{budgetName || t('A budget has no name')}@@ -134,9 +139,11 @@ function EditableBudgetName() {placement="bottom start"isOpen={menuOpen}onOpenChange={() => setMenuOpen(false)}+ style={{ margin: 1 }}+ {...position}><Menu onMenuSelect={onMenuSelect} items={items} /></Popover>- </>+ </View>);}diff --git a/upcoming-release-notes/3777.md b/upcoming-release-notes/3777.mdnew file mode 100644index 0000000000..7093c48c38--- /dev/null+++ b/upcoming-release-notes/3777.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [UnderKoen]+---++Add context menu's on the sidebar account names and the budget name at the top left.