A local-first personal finance app
Move the “…” menu to the budget name (#459)
Jed Foxd2e3e44d0d05
diff --git a/packages/desktop-client/src/components/SidebarWithData.js b/packages/desktop-client/src/components/SidebarWithData.jsindex 831c7f03d7..5ef3125feb 100644--- a/packages/desktop-client/src/components/SidebarWithData.js+++ b/packages/desktop-client/src/components/SidebarWithData.js@@ -1,23 +1,59 @@import React, { useState, useEffect } from 'react';import { connect } from 'react-redux';-import { withRouter } from 'react-router-dom';+import { useDispatch } from 'react-redux';+import { withRouter, useHistory } from 'react-router';import { bindActionCreators } from 'redux';import * as actions from 'loot-core/src/client/actions';+import { closeBudget } from 'loot-core/src/client/actions/budgets';+import Platform from 'loot-core/src/client/platform';import * as queries from 'loot-core/src/client/queries';import { send } from 'loot-core/src/platform/client/fetch';import {Button,Input,InitialFocus,- Text+ Text,+ Tooltip,+ Menu} from 'loot-design/src/components/common';import { Sidebar } from 'loot-design/src/components/sidebar';import { styles, colors } from 'loot-design/src/style';+import ExpandArrow from 'loot-design/src/svg/ExpandArrow';function EditableBudgetName({ prefs, savePrefs }) {+ let dispatch = useDispatch();+ let history = useHistory();const [editing, setEditing] = useState(false);+ const [menuOpen, setMenuOpen] = useState(false);++ function onMenuSelect(type) {+ setMenuOpen(false);++ switch (type) {+ case 'rename':+ setEditing(true);+ break;+ case 'settings':+ history.push('/settings');+ break;+ case 'help':+ window.open('https://actualbudget.github.io/docs', '_blank');+ break;+ case 'close':+ dispatch(closeBudget());+ break;+ default:+ }+ }++ let items = [+ { name: 'rename', text: 'Rename Budget' },+ { name: 'settings', text: 'Settings' },+ ...(Platform.isBrowser ? [{ name: 'help', text: 'Help' }] : []),+ { name: 'close', text: 'Close File' }+ ];if (editing) {return (@@ -53,11 +89,25 @@ function EditableBudgetName({ prefs, savePrefs }) {marginLeft: -5,flex: '0 auto'}}- onClick={() => setEditing(true)}+ onClick={() => setMenuOpen(true)}><Text style={{ whiteSpace: 'nowrap', overflow: 'hidden' }}>{prefs.budgetName || 'A budget has no name'}</Text>+ <ExpandArrow+ width={7}+ height={7}+ style={{ color: 'inherit', marginLeft: 5 }}+ />+ {menuOpen && (+ <Tooltip+ position="bottom-left"+ style={{ padding: 0 }}+ onClose={() => setMenuOpen(false)}+ >+ <Menu onMenuSelect={onMenuSelect} items={items} />+ </Tooltip>+ )}</Button>);}diff --git a/packages/loot-design/src/components/sidebar.js b/packages/loot-design/src/components/sidebar.jsindex 5af7b54430..29544d7ca8 100644--- a/packages/loot-design/src/components/sidebar.js+++ b/packages/loot-design/src/components/sidebar.js@@ -446,62 +446,6 @@ function ToggleButton({ style, onFloat }) {);}-const MenuButton = withRouter(function MenuButton({ history }) {- let dispatch = useDispatch();- let [menuOpen, setMenuOpen] = useState(false);-- function onMenuSelect(type) {- setMenuOpen(false);-- switch (type) {- case 'settings':- history.push('/settings');- break;- case 'help':- window.open('https://actualbudget.github.io/docs', '_blank');- break;- case 'close':- dispatch(closeBudget());- break;- default:- }- }-- let items = [- { name: 'settings', text: 'Settings' },- { name: 'help', text: 'Help' },- { name: 'close', text: 'Close File' }- ];-- return (- <Button- bare- style={{- color: colors.n5,- flexShrink: 0- }}- activeStyle={{ color: colors.p7 }}- onClick={() => setMenuOpen(true)}- aria-label="Menu"- >- <DotsHorizontalTriple- width={15}- height={15}- style={{ color: 'inherit', transform: 'rotateZ(0deg)' }}- />- {menuOpen && (- <Tooltip- position="bottom-right"- style={{ padding: 0 }}- onClose={() => setMenuOpen(false)}- >- <Menu onMenuSelect={onMenuSelect} items={items} />- </Tooltip>- )}- </Button>- );-});-function Tools() {let [isOpen, setOpen] = useState(false);let onToggle = useCallback(() => setOpen(open => !open), []);@@ -638,7 +582,6 @@ export function Sidebar({<View style={{ flex: 1, flexDirection: 'row' }} />{!hasWindowButtons && <ToggleButton onFloat={onFloat} />}- {Platform.isBrowser && <MenuButton />}</View><View style={{ overflow: 'auto' }}>