Skip to content

A local-first personal finance app

Mobile category and group functionalities (#1737)

Joel Jeremy Marquezc33dc6fbade7
diff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png
index 1855d82096..6de2e744ef 100644
Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png
index 32c77b8ac7..1e3ca8430d 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png differ
diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsx
index 2dc2423bd3..3b7b4b2f09 100644
--- a/packages/desktop-client/src/components/Modals.tsx
+++ b/packages/desktop-client/src/components/Modals.tsx
@@ -26,6 +26,7 @@ import ManageRulesModal from './modals/ManageRulesModal';
import MergeUnusedPayees from './modals/MergeUnusedPayees';
import PlaidExternalMsg from './modals/PlaidExternalMsg';
import SelectLinkedAccounts from './modals/SelectLinkedAccounts';
+import SingleInput from './modals/SingleInput';
import DiscoverSchedules from './schedules/DiscoverSchedules';
import ScheduleDetails from './schedules/EditSchedule';
import ScheduleLink from './schedules/LinkSchedule';
@@ -222,6 +223,30 @@ export default function Modals() {
/>
);
+ case 'new-category':
+ return (
+ <SingleInput
+ modalProps={modalProps}
+ title="New Category"
+ inputPlaceholder="Name"
+ buttonText="Add"
+ onValidate={options.onValidate}
+ onSubmit={options.onSubmit}
+ />
+ );
+
+ case 'new-category-group':
+ return (
+ <SingleInput
+ modalProps={modalProps}
+ title="New Category Group"
+ inputPlaceholder="Name"
+ buttonText="Add"
+ onValidate={options.onValidate}
+ onSubmit={options.onSubmit}
+ />
+ );
+
case 'budget-summary':
return (
<BudgetSummary
diff --git a/packages/desktop-client/src/components/budget/BudgetTotals.js b/packages/desktop-client/src/components/budget/BudgetTotals.js
index 3a811461fe..f9e907b015 100644
--- a/packages/desktop-client/src/components/budget/BudgetTotals.js
+++ b/packages/desktop-client/src/components/budget/BudgetTotals.js
@@ -69,7 +69,7 @@ const BudgetTotals = memo(function BudgetTotals({
>
<Menu
onMenuSelect={type => {
- if (type === 'toggleVisibility') {
+ if (type === 'toggle-visibility') {
toggleHiddenCategories();
} else if (type === 'expandAllCategories') {
expandAllCategories();
@@ -80,8 +80,8 @@ const BudgetTotals = memo(function BudgetTotals({
}}
items={[
{
- name: 'toggleVisibility',
- text: 'Toggle hidden',
+ name: 'toggle-visibility',
+ text: 'Toggle hidden categories',
},
{
name: 'expandAllCategories',
diff --git a/packages/desktop-client/src/components/budget/MobileBudget.js b/packages/desktop-client/src/components/budget/MobileBudget.js
index 5d4275b67f..1499783b72 100644
--- a/packages/desktop-client/src/components/budget/MobileBudget.js
+++ b/packages/desktop-client/src/components/budget/MobileBudget.js
@@ -5,8 +5,13 @@ import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
import { send, listen } from 'loot-core/src/platform/client/fetch';
import {
addCategory,
+ addGroup,
+ deleteCategory,
+ deleteGroup,
moveCategory,
moveCategoryGroup,
+ updateCategory,
+ updateGroup,
} from 'loot-core/src/shared/categories';
import * as monthUtils from 'loot-core/src/shared/months';
@@ -24,15 +29,13 @@ class Budget extends Component {
constructor(props) {
super(props);
- this.summary = 0;
-
const currentMonth = monthUtils.currentMonth();
this.state = {
bounds: { start: currentMonth, end: currentMonth },
currentMonth: currentMonth,
initialized: false,
editMode: false,
- categoryGroups: null,
+ categoryGroups: [],
};
}
@@ -72,7 +75,7 @@ class Budget extends Component {
}
componentWillUnmount() {
- // this.cleanup();
+ this.cleanup?.();
}
prewarmMonth = async (month, type = null) => {
@@ -101,25 +104,112 @@ class Budget extends Component {
this.props.applyBudgetAction(currentMonth, type, this.state.bounds);
};
- onAddCategory = groupId => {
- this.props.navigation.navigate('AddCategoryModal', {
- groupId,
- onAdd: async name => {
- let id = await this.props.createCategory(name, groupId);
- let { categoryGroups } = this.state;
-
- this.setState({
- categoryGroups: addCategory(categoryGroups, {
+ onAddGroup = () => {
+ this.props.pushModal('new-category-group', {
+ onValidate: name => (!name ? 'Name is required.' : null),
+ onSubmit: async name => {
+ const id = await this.props.createGroup(name);
+ this.setState(state => ({
+ categoryGroups: addGroup(state.categoryGroups, {
+ id,
name,
- cat_group: groupId,
+ categories: [],
is_income: 0,
+ }),
+ }));
+ },
+ });
+ };
+
+ onAddCategory = (groupId, isIncome) => {
+ this.props.pushModal('new-category', {
+ onValidate: name => (!name ? 'Name is required.' : null),
+ onSubmit: async name => {
+ const id = await this.props.createCategory(name, groupId, isIncome);
+ this.setState(state => ({
+ categoryGroups: addCategory(state.categoryGroups, {
id,
+ name,
+ cat_group: groupId,
+ is_income: isIncome ? 1 : 0,
}),
- });
+ }));
},
});
};
+ onSaveGroup = group => {
+ this.props.updateGroup(group);
+ this.setState(state => ({
+ categoryGroups: updateGroup(state.categoryGroups, group),
+ }));
+ };
+
+ onDeleteGroup = async groupId => {
+ let group = this.state.categoryGroups?.find(g => g.id === groupId);
+
+ if (!group) {
+ return;
+ }
+
+ let mustTransfer = false;
+ for (let category of group.categories) {
+ if (await send('must-category-transfer', { id: category.id })) {
+ mustTransfer = true;
+ break;
+ }
+ }
+
+ if (mustTransfer) {
+ this.props.pushModal('confirm-category-delete', {
+ group: groupId,
+ onDelete: transferCategory => {
+ this.props.deleteGroup(groupId, transferCategory);
+ this.setState(state => ({
+ categoryGroups: deleteGroup(state.categoryGroups, groupId),
+ }));
+ },
+ });
+ } else {
+ this.props.deleteGroup(groupId);
+ this.setState(state => ({
+ categoryGroups: deleteGroup(state.categoryGroups, groupId),
+ }));
+ }
+ };
+
+ onSaveCategory = category => {
+ this.props.updateCategory(category);
+ this.setState(state => ({
+ categoryGroups: updateCategory(state.categoryGroups, category),
+ }));
+ };
+
+ onDeleteCategory = async categoryId => {
+ const mustTransfer = await send('must-category-transfer', {
+ id: categoryId,
+ });
+
+ if (mustTransfer) {
+ this.props.pushModal('confirm-category-delete', {
+ category: categoryId,
+ onDelete: transferCategory => {
+ if (categoryId !== transferCategory) {
+ this.props.deleteCategory(categoryId, transferCategory);
+ this.setState(state => ({
+ categoryGroups: deleteCategory(state.categoryGroups, categoryId),
+ }));
+ }
+ },
+ });
+ } else {
+ this.props.deleteCategory(categoryId);
+ this.setState(state => ({
+ categoryGroups: deleteCategory(state.categoryGroups, categoryId),
+ }));
+ }
+ };
+
onReorderCategory = (id, { inGroup, aroundCategory }) => {
let { categoryGroups } = this.state;
let groupId, targetId;
@@ -237,6 +327,7 @@ class Budget extends Component {
categories,
categoryGroups,
prefs,
+ savePrefs,
budgetType,
navigation,
applyBudgetAction,
@@ -281,11 +372,17 @@ class Budget extends Component {
onShowBudgetDetails={this.onShowBudgetDetails}
onPrevMonth={this.onPrevMonth}
onNextMonth={this.onNextMonth}
+ onSaveGroup={this.onSaveGroup}
+ onDeleteGroup={this.onDeleteGroup}
+ onAddGroup={this.onAddGroup}
onAddCategory={this.onAddCategory}
+ onSaveCategory={this.onSaveCategory}
+ onDeleteCategory={this.onDeleteCategory}
onReorderCategory={this.onReorderCategory}
onReorderGroup={this.onReorderGroup}
onOpenActionSheet={() => {}} //this.onOpenActionSheet}
onBudgetAction={applyBudgetAction}
+ savePrefs={savePrefs}
/>
)}
</SyncRefresh>
diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.js b/packages/desktop-client/src/components/budget/MobileBudgetTable.js
index 9fd0ae8f18..f2ea06a3be 100644
--- a/packages/desktop-client/src/components/budget/MobileBudgetTable.js
+++ b/packages/desktop-client/src/components/budget/MobileBudgetTable.js
@@ -1,27 +1,23 @@
import React, { memo, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-// import {
-// RectButton,
-// PanGestureHandler,
-// NativeViewGestureHandler
-// } from 'react-native-gesture-handler';
-// import Animated, { Easing } from 'react-native-reanimated';
-// import AndroidKeyboardAvoidingView from './AndroidKeyboardAvoidingView';
+import { useSelector } from 'react-redux';
import memoizeOne from 'memoize-one';
-import { savePrefs } from 'loot-core/src/client/actions';
import { rolloverBudget, reportBudget } from 'loot-core/src/client/queries';
import * as monthUtils from 'loot-core/src/shared/months';
-import Add from '../../icons/v1/Add';
import ArrowThinLeft from '../../icons/v1/ArrowThinLeft';
import ArrowThinRight from '../../icons/v1/ArrowThinRight';
+import Close from '../../icons/v1/Close';
+import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
+import EditPencil from '../../icons/v1/EditPencil';
import { useResponsive } from '../../ResponsiveProvider';
import { theme, styles } from '../../style';
import Button from '../common/Button';
import Card from '../common/Card';
+import InputWithContent from '../common/InputWithContent';
import Label from '../common/Label';
+import Menu from '../common/Menu';
import Text from '../common/Text';
import View from '../common/View';
import { useServerURL } from '../ServerContext';
@@ -30,6 +26,7 @@ import NamespaceContext from '../spreadsheet/NamespaceContext';
import useFormat from '../spreadsheet/useFormat';
import useSheetValue from '../spreadsheet/useSheetValue';
import { SyncButton } from '../Titlebar';
+import { Tooltip, useTooltip } from '../tooltips';
import { AmountInput } from '../util/AmountInput';
// import {
// AmountAccessoryContext,
@@ -49,7 +46,11 @@ function ToBudget({ toBudget, onClick }) {
>
<Label
title={amount < 0 ? 'OVERBUDGETED' : 'TO BUDGET'}
- style={{ color: theme.formInputText, flexShrink: 0 }}
+ style={{
+ ...styles.underlinedText,
+ color: theme.formInputText,
+ flexShrink: 0,
+ }}
/>
<CellValue
binding={toBudget}
@@ -118,7 +119,7 @@ function BudgetCell({
categoryId,
month,
onBudgetAction,
- onEdit,
+ onEditing,
}) {
let sheetValue = useSheetValue(binding);
@@ -130,7 +131,7 @@ function BudgetCell({
}
function onAmountClick(e) {
- onEdit?.(categoryId);
+ onEditing?.(categoryId);
}
return (
@@ -142,6 +143,7 @@ function BudgetCell({
{editing ? (
<AmountInput
initialValue={sheetValue}
+ zeroSign="+"
style={{
height: ROW_HEIGHT - 4,
transform: 'translateX(6px)',
@@ -149,7 +151,8 @@ function BudgetCell({
focused={editing}
textStyle={{ ...styles.smallText, ...textStyle }}
onChange={updateBudgetAmount}
- onEdit={onEdit}
+ onEdit={onEditing}
+ onBlur={() => onEditing?.(null)}
/>
) : (
<View
@@ -161,7 +164,11 @@ function BudgetCell({
<CellValue
binding={binding}
type="financial"
- style={{ ...styles.smallText, ...textStyle }}
+ style={{
+ ...styles.smallText,
+ ...textStyle,
+ ...styles.underlinedText,
+ }}
data-testid={name}
/>
</View>
@@ -171,34 +178,8 @@ function BudgetCell({
}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function BudgetGroupPreview({ group, pending, style }) {
- // let opacity = useMemo(() => new Animated.Value(0), []);
-
- // useEffect(() => {
- // Animated.timing(opacity, {
- // toValue: 1,
- // duration: 100,
- // easing: Easing.inOut(Easing.ease)
- // }).start();
- // }, []);
-
+function ExpenseGroupPreview({ group, pending, style }) {
return (
- // <Animated.View
- // style={[
- // style,
- // { opacity },
- // pending && {
- // shadowColor: '#000',
- // shadowOffset: {
- // width: 0,
- // height: 3
- // },
- // shadowOpacity: 0.45,
- // shadowRadius: 20,
- // elevation: 5
- // }
- // ]}
- // >
<Card
style={{
marginTop: 7,
@@ -206,10 +187,10 @@ function BudgetGroupPreview({ group, pending, style }) {
opacity: pending ? 1 : 0.4,
}}
>
- <TotalsRow group={group} blank={true} />
+ <ExpenseGroupTotals group={group} blank={true} />
{group.categories.map((cat, index) => (
- <BudgetCategory
+ <ExpenseCategory
key={cat.id}
category={cat}
blank={true}
@@ -217,30 +198,12 @@ function BudgetGroupPreview({ group, pending, style }) {
/>
))}
</Card>
- // </Animated.View>
);
}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function BudgetCategoryPreview({ name, pending, style }) {
+function ExpenseCategoryPreview({ name, pending, style }) {
return (
- // <Animated.View
- // style={[
- // style,
- // { opacity: pending ? 1 : 0.4 },
- // {
- // backgroundColor: 'white',
- // shadowColor: '#000',
- // shadowOffset: {
- // width: 0,
- // height: 2
- // },
- // shadowOpacity: 0.25,
- // shadowRadius: 10,
- // elevation: 5
- // }
- // ]}
- // >
<ListItem
style={{
flex: 1,
@@ -250,11 +213,10 @@ function BudgetCategoryPreview({ name, pending, style }) {
>
<Text style={styles.smallText}>{name}</Text>
</ListItem>
- // </Animated.View>
);
}
-const BudgetCategory = memo(function BudgetCategory({
+const ExpenseCategory = memo(function ExpenseCategory({
category,
editing,
index,
@@ -263,52 +225,133 @@ const BudgetCategory = memo(function BudgetCategory({
blank,
style,
month,
- onEdit,
+ onEditingBudget,
+ onSave,
+ onDelete,
onBudgetAction,
show3Cols,
showBudgetedCol,
}) {
- // let opacity = new Animated.Value(editMode || blank ? 0 : 1);
let opacity = editMode || blank ? 0 : 1;
- // useEffect(() => {
- // if (editing && ACTScrollViewManager) {
- // ACTScrollViewManager.setFocused(findNodeHandle(container.current));
- // }
- // }, [editing]);
-
- // useEffect(() => {
- // Animated.timing(this.opacity, {
- // toValue: this.props.editMode ? 0 : 1,
- // duration: 200,
- // easing: Easing.inOut(Easing.ease),
- // }).start();
- // }, [editMode]);
+ let [categoryName, setCategoryName] = useState(category.name);
+ let [isHidden, setIsHidden] = useState(category.hidden);
let budgeted = rolloverBudget.catBudgeted(category.id);
let balance = rolloverBudget.catBalance(category.id);
let spent = rolloverBudget.catSumAmount(category.id);
- let content = !category.hidden && (
+ let tooltip = useTooltip();
+
+ let onTooltipClose = () => {
+ if (categoryName) {
+ onSave?.({
+ ...category,
+ name: categoryName,
+ });
+ } else {
+ setCategoryName(category.name);
+ }
+ tooltip.close();
+ };
+
+ let onMenuSelect = type => {
+ tooltip.close();
+ switch (type) {
+ case 'toggle-visibility':
+ setIsHidden(!isHidden);
+ onSave?.({
+ ...category,
+ hidden: !isHidden,
+ });
+ break;
+ case 'delete':
+ onDelete?.(category.id);
+ break;
+ default:
+ throw new Error(`Unrecognized category menu type: ${type}`);
+ }
+ };
+
+ let content = (
<ListItem
style={{
backgroundColor: editing ? theme.altTableTextEditing : 'transparent',
borderBottomWidth: 0,
borderTopWidth: index > 0 ? 1 : 0,
+ opacity: isHidden ? 0.5 : undefined,
...style,
}}
data-testid="row"
>
<View style={{ flex: 1 }}>
- <Text style={styles.smallText} data-testid="category-name">
+ <Text
+ style={{
+ ...styles.smallText,
+ ...styles.underlinedText,
+ whiteSpace: 'nowrap',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ }}
+ data-testid="category-name"
+ {...tooltip.getOpenEvents()}
+ >
{category.name}
+ {tooltip.isOpen && (
+ <Tooltip
+ position="bottom-left"
+ width={300}
+ offset={5}
+ style={{ padding: 0 }}
+ onClose={onTooltipClose}
+ >
+ <View style={{ flexDirection: 'row' }}>
+ <InputWithContent
+ style={{ flex: 1, margin: '10px 0px 10px 10px' }}
+ leftContent={
+ <Button type="bare" disabled>
+ <EditPencil width={9} height={9} />
+ </Button>
+ }
+ placeholder="Category Name"
+ value={categoryName}
+ onUpdate={setCategoryName}
+ onEnter={onTooltipClose}
+ />
+ <Button
+ type="bare"
+ style={{ padding: 10 }}
+ onPointerUp={() => {
+ setCategoryName(category.name);
+ tooltip.close();
+ }}
+ >
+ <Close width={9} height={9} />
+ </Button>
+ </View>
+ <Menu
+ onMenuSelect={onMenuSelect}
+ items={[
+ Menu.line,
+ {
+ name: 'toggle-visibility',
+ text: isHidden ? 'Show' : 'Hide',
+ },
+ {
+ name: 'delete',
+ text: 'Delete',
+ },
+ ]}
+ />
+ </Tooltip>
+ )}
</Text>
</View>
<View
style={{
alignItems: 'center',
flexDirection: 'row',
- opacity: opacity,
+ opacity,
}}
>
{show3Cols || showBudgetedCol ? (
@@ -321,7 +364,7 @@ const BudgetCategory = memo(function BudgetCategory({
categoryId={category.id}
month={month}
onBudgetAction={onBudgetAction}
- onEdit={onEdit}
+ onEditing={onEditingBudget}
/>
) : null}
{show3Cols || !showBudgetedCol ? (
@@ -385,54 +428,139 @@ const BudgetCategory = memo(function BudgetCategory({
// </Draggable>
});
-const TotalsRow = memo(function TotalsRow({
+const ExpenseGroupTotals = memo(function ExpenseGroupTotals({
group,
editMode,
blank,
onAddCategory,
+ onSave,
+ onDelete,
show3Cols,
showBudgetedCol,
}) {
- // useEffect(() => {
- // Animated.timing(this.animation, {
- // toValue: this.props.editMode ? 0 : 1,
- // duration: 200,
- // easing: Easing.inOut(Easing.ease),
- // }).start();
- // }, [editMode]);
-
- // let animation = new Animated.Value(editMode || blank ? 0 : 1);
let opacity = editMode || blank ? 0 : 1;
+ let [groupName, setGroupName] = useState(group.name);
+ let [isHidden, setIsHidden] = useState(group.hidden);
+
+ let tooltip = useTooltip();
+
+ let onTooltipClose = () => {
+ if (groupName) {
+ onSave?.({
+ ...group,
+ name: groupName,
+ });
+ } else {
+ setGroupName(group.name);
+ }
+ tooltip.close();
+ };
+
+ let onMenuSelect = type => {
+ tooltip.close();
+ switch (type) {
+ case 'add-category':
+ onAddCategory?.(group.id, group.is_income);
+ break;
+ case 'toggle-visibility':
+ setIsHidden(!isHidden);
+ onSave?.({
+ ...group,
+ hidden: !isHidden,
+ });
+ break;
+ case 'delete':
+ onDelete?.(group.id);
+ break;
+ default:
+ throw new Error(`Unrecognized group menu type: ${type}`);
+ }
+ };
+
let content = (
<ListItem
style={{
flexDirection: 'row',
alignItems: 'center',
- backgroundColor: theme.tableHeaderBackground,
+ backgroundColor: theme.tableRowHeaderBackground,
+ opacity: isHidden ? 0.5 : undefined,
}}
data-testid="totals"
>
<View style={{ flex: 1 }}>
<Text
- style={{ ...styles.smallText, fontWeight: '500' }}
+ style={{
+ ...styles.smallText,
+ ...styles.underlinedText,
+ fontWeight: '500',
+ whiteSpace: 'nowrap',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ }}
data-testid="name"
+ {...tooltip.getOpenEvents()}
>
{group.name}
+ {tooltip.isOpen && (
+ <Tooltip
+ position="bottom-left"
+ width={300}
+ offset={5}
+ style={{ padding: 0 }}
+ onClose={onTooltipClose}
+ >
+ <View style={{ flexDirection: 'row' }}>
+ <InputWithContent
+ style={{ flex: 1, margin: '10px 0px 10px 10px' }}
+ leftContent={
+ <Button type="bare" disabled>
+ <EditPencil width={9} height={9} />
+ </Button>
+ }
+ placeholder="Category Group Name"
+ value={groupName}
+ onUpdate={setGroupName}
+ onEnter={onTooltipClose}
+ />
+ <Button
+ type="bare"
+ style={{ padding: 10 }}
+ onPointerUp={() => {
+ setGroupName(group.name);
+ tooltip.close();
+ }}
+ >
+ <Close width={9} height={9} />
+ </Button>
+ </View>
+ <Menu
+ onMenuSelect={onMenuSelect}
+ items={[
+ Menu.line,
+ {
+ name: 'add-category',
+ text: 'Add category',
+ },
+ {
+ name: 'toggle-visibility',
+ text: isHidden ? 'Show' : 'Hide',
+ },
+ {
+ name: 'delete',
+ text: 'Delete',
+ },
+ ]}
+ />
+ </Tooltip>
+ )}
</Text>
</View>
- {/* <Animated.View
- style={{
- flexDirection: 'row',
- alignItems: 'center',
- opacity: animation
- }}
- > */}
<View
style={{
flexDirection: 'row',
alignItems: 'center',
- opacity: opacity,
+ opacity,
}}
>
{show3Cols || showBudgetedCol ? (
@@ -470,33 +598,17 @@ const TotalsRow = memo(function TotalsRow({
type="financial"
/>
</View>
- {/* </Animated.View> */}
-
- {editMode && (
- // <Animated.View
- // style={{
- // flexDirection: 'row',
- // alignItems: 'center',
- // opacity: opacity,
- // position: 'absolute',
- // top: 0,
- // bottom: 0,
- // right: animation.interpolate({
- // inputRange: [0, 1],
- // outputRange: [5, -30]
- // })
- // }}
- // >
+
+ {/* {editMode && (
<View>
<Button
- onClick={() => onAddCategory(group.id)}
+ onClick={() => onAddCategory(group.id, group.is_income)}
style={{ padding: 10 }}
>
<Add width={15} height={15} />
</Button>
</View>
- // </Animated.View>
- )}
+ )} */}
</ListItem>
);
@@ -518,18 +630,198 @@ const TotalsRow = memo(function TotalsRow({
// </Droppable>
});
+const IncomeGroupTotals = memo(function IncomeGroupTotals({
+ group,
+ budget,
+ balance,
+ style,
+ nameTextStyle,
+ amountTextStyle,
+ onAddCategory,
+ onSave,
+ onDelete,
+}) {
+ let [groupName, setGroupName] = useState(group.name);
+ let [isHidden, setIsHidden] = useState(group.hidden);
+
+ let tooltip = useTooltip();
+
+ let onTooltipClose = () => {
+ if (groupName) {
+ onSave?.({
+ ...group,
+ name: groupName,
+ });
+ } else {
+ setGroupName(group.name);
+ }
+ tooltip.close();
+ };
+
+ let onMenuSelect = type => {
+ tooltip.close();
+ switch (type) {
+ case 'add-category':
+ onAddCategory?.(group.id, group.is_income);
+ break;
+ case 'toggle-visibility':
+ setIsHidden(!isHidden);
+ onSave?.({
+ ...group,
+ hidden: !isHidden,
+ });
+ break;
+ case 'delete':
+ onDelete?.(group.id);
+ break;
+ default:
+ throw new Error(`Unrecognized group menu type: ${type}`);
+ }
+ };
+
+ return (
+ <ListItem
+ style={{
+ flexDirection: 'row',
+ alignItems: 'center',
+ padding: 10,
+ backgroundColor: theme.tableRowHeaderBackground,
+ opacity: isHidden ? 0.5 : undefined,
+ ...style,
+ }}
+ >
+ <View>
+ <Text
+ style={{ ...styles.smallText, ...nameTextStyle }}
+ data-testid="name"
+ {...tooltip.getOpenEvents()}
+ >
+ {group.name}
+ {tooltip.isOpen && (
+ <Tooltip
+ position="bottom-left"
+ width={300}
+ offset={5}
+ style={{ padding: 0 }}
+ onClose={onTooltipClose}
+ >
+ <View style={{ flexDirection: 'row' }}>
+ <InputWithContent
+ style={{ flex: 1, margin: '10px 0px 10px 10px' }}
+ leftContent={
+ <Button type="bare" disabled>
+ <EditPencil width={9} height={9} />
+ </Button>
+ }
+ placeholder="Category Group Name"
+ value={groupName}
+ onUpdate={setGroupName}
+ onEnter={onTooltipClose}
+ />
+ <Button
+ type="bare"
+ style={{ padding: 10 }}
+ onPointerUp={() => {
+ setGroupName(group.name);
+ tooltip.close();
+ }}
+ >
+ <Close width={9} height={9} />
+ </Button>
+ </View>
+ <Menu
+ onMenuSelect={onMenuSelect}
+ items={[
+ Menu.line,
+ {
+ name: 'add-category',
+ text: 'Add category',
+ },
+ {
+ name: 'toggle-visibility',
+ text: isHidden ? 'Show' : 'Hide',
+ },
+ {
+ name: 'delete',
+ text: 'Delete',
+ },
+ ]}
+ />
+ </Tooltip>
+ )}
+ </Text>
+ </View>
+ {budget && (
+ <CellValue
+ binding={budget}
+ style={{
+ ...styles.smallText,
+ textAlign: 'right',
+ ...amountTextStyle,
+ flex: 1,
+ }}
+ type="financial"
+ />
+ )}
+ <CellValue
+ binding={balance}
+ style={{
+ ...styles.smallText,
+ textAlign: 'right',
+ ...amountTextStyle,
+ flex: 1,
+ }}
+ type="financial"
+ />
+ </ListItem>
+ );
+});
+
const IncomeCategory = memo(function IncomeCategory({
- name,
+ category,
budget,
- hidden,
balance,
style,
nameTextStyle,
amountTextStyle,
+ onSave,
+ onDelete,
}) {
- if (hidden) {
- return null;
- }
+ let [categoryName, setCategoryName] = useState(category.name);
+ let [isHidden, setIsHidden] = useState(category.hidden);
+
+ let tooltip = useTooltip();
+
+ let onTooltipClose = () => {
+ if (categoryName) {
+ onSave?.({
+ ...category,
+ name: categoryName,
+ });
+ } else {
+ setCategoryName(category.name);
+ }
+ tooltip.close();
+ };
+
+ let onMenuSelect = type => {
+ tooltip.close();
+ switch (type) {
+ case 'toggle-visibility':
+ setIsHidden(!isHidden);
+ onSave?.({
+ ...category,
+ hidden: !isHidden,
+ });
+ break;
+ case 'delete':
+ onDelete?.(category.id);
+ break;
+ default:
+ throw new Error(`Unrecognized category menu type: ${type}`);
+ }
+ };
+
return (
<ListItem
style={{
@@ -537,15 +829,69 @@ const IncomeCategory = memo(function IncomeCategory({
alignItems: 'center',
padding: 10,
backgroundColor: 'transparent',
+ opacity: isHidden ? 0.5 : undefined,
...style,
}}
>
- <View style={{ flex: 1 }}>
+ <View>
<Text
- style={{ ...styles.smallText, ...nameTextStyle }}
+ style={{
+ ...styles.smallText,
+ ...nameTextStyle,
+ ...styles.underlinedText,
+ }}
data-testid="name"
+ {...tooltip.getOpenEvents()}
>
- {name}
+ {category.name}
+ {tooltip.isOpen && (
+ <Tooltip
+ position="bottom-left"
+ width={300}
+ offset={5}
+ style={{ padding: 0 }}
+ onClose={onTooltipClose}
+ >
+ <View style={{ flexDirection: 'row' }}>
+ <InputWithContent
+ style={{ flex: 1, margin: '10px 0px 10px 10px' }}
+ leftContent={
+ <Button type="bare" disabled>
+ <EditPencil width={9} height={9} />
+ </Button>
+ }
+ placeholder="Category Name"
+ value={categoryName}
+ onUpdate={setCategoryName}
+ onEnter={onTooltipClose}
+ />
+ <Button
+ type="bare"
+ style={{ padding: 10 }}
+ onPointerUp={() => {
+ setCategoryName(category.name);
+ tooltip.close();
+ }}
+ >
+ <Close width={9} height={9} />
+ </Button>
+ </View>
+ <Menu
+ onMenuSelect={onMenuSelect}
+ items={[
+ Menu.line,
+ {
+ name: 'toggle-visibility',
+ text: isHidden ? 'Show' : 'Hide',
+ },
+ {
+ name: 'delete',
+ text: 'Delete',
+ },
+ ]}
+ />
+ </Tooltip>
+ )}
</Text>
</View>
{budget && (
@@ -553,9 +899,9 @@ const IncomeCategory = memo(function IncomeCategory({
binding={budget}
style={{
...styles.smallText,
- width: 90,
textAlign: 'right',
...amountTextStyle,
+ flex: 1,
}}
type="financial"
/>
@@ -564,9 +910,9 @@ const IncomeCategory = memo(function IncomeCategory({
binding={balance}
style={{
...styles.smallText,
- width: 90,
textAlign: 'right',
...amountTextStyle,
+ flex: 1,
}}
type="financial"
/>
@@ -613,19 +959,24 @@ const IncomeCategory = memo(function IncomeCategory({
// );
// }
-const BudgetGroup = memo(function BudgetGroup({
+const ExpenseGroup = memo(function ExpenseGroup({
group,
editingId,
+ onEditingCategoryBudget,
editMode,
// gestures,
month,
- onEditCategory,
+ onSaveCategory,
+ onDeleteCategory,
// onReorderCategory,
// onReorderGroup,
onAddCategory,
+ onSave,
+ onDelete,
onBudgetAction,
showBudgetedCol,
show3Cols,
+ showHiddenCategories,
}) {
function editable(content) {
if (!editMode) {
@@ -656,10 +1007,6 @@ const BudgetGroup = memo(function BudgetGroup({
// </Draggable>
}
- if (group.hidden) {
- return null;
- }
-
return editable(
<Card
style={{
@@ -667,7 +1014,7 @@ const BudgetGroup = memo(function BudgetGroup({
marginBottom: 7,
}}
>
- <TotalsRow
+ <ExpenseGroupTotals
group={group}
showBudgetedCol={showBudgetedCol}
budgeted={rolloverBudget.groupBudgeted(group.id)}
@@ -675,33 +1022,48 @@ const BudgetGroup = memo(function BudgetGroup({
show3Cols={show3Cols}
editMode={editMode}
onAddCategory={onAddCategory}
+ onSave={onSave}
+ onDelete={onDelete}
// onReorderCategory={onReorderCategory}
/>
- {group.categories.map((category, index) => {
- const editing = editingId === category.id;
- return (
- <BudgetCategory
- show3Cols={show3Cols}
- key={category.id}
- index={index}
- category={category}
- showBudgetedCol={showBudgetedCol}
- editing={editing}
- editMode={editMode}
- // gestures={gestures}
- month={month}
- onEdit={onEditCategory}
- // onReorder={onReorderCategory}
- onBudgetAction={onBudgetAction}
- />
- );
- })}
+ {group.categories
+ .filter(category => !category.hidden || showHiddenCategories)
+ .map((category, index) => {
+ const editing = editingId === category.id;
+ return (
+ <ExpenseCategory
+ show3Cols={show3Cols}
+ key={category.id}
+ index={index}
+ category={category}
+ showBudgetedCol={showBudgetedCol}
+ editing={editing}
+ onEditingBudget={onEditingCategoryBudget}
+ editMode={editMode}
+ // gestures={gestures}
+ month={month}
+ onSave={onSaveCategory}
+ onDelete={onDeleteCategory}
+ // onReorder={onReorderCategory}
+ onBudgetAction={onBudgetAction}
+ />
+ );
+ })}
</Card>,
);
});
-function IncomeBudgetGroup({ type, group }) {
+function IncomeGroup({
+ type,
+ group,
+ onSave,
+ onDelete,
+ onAddCategory,
+ onSaveCategory,
+ onDeleteCategory,
+ showHiddenCategories,
+}) {
return (
<View>
<View
@@ -719,8 +1081,8 @@ function IncomeBudgetGroup({ type, group }) {
</View>
<Card style={{ marginTop: 0 }}>
- <IncomeCategory
- name={group.name}
+ <IncomeGroupTotals
+ group={group}
budget={
type === 'report' ? reportBudget.groupBudgeted(group.id) : null
}
@@ -729,32 +1091,40 @@ function IncomeBudgetGroup({ type, group }) {
? reportBudget.groupSumAmount(group.id)
: rolloverBudget.groupSumAmount(group.id)
}
- nameTextStyle={{ fontWeight: '500' }}
+ nameTextStyle={{ fontWeight: '500', ...styles.underlinedText }}
amountTextStyle={{ fontWeight: '500' }}
style={{
backgroundColor: theme.altTableBackground,
}}
+ onAddCategory={onAddCategory}
+ onSave={onSave}
+ onDelete={onDelete}
/>
- {group.categories.map((category, index) => {
- return (
- <IncomeCategory
- key={category.id}
- type={type}
- name={category.name}
- hidden={category.hidden}
- budget={
- type === 'report' ? reportBudget.catBudgeted(category.id) : null
- }
- balance={
- type === 'report'
- ? reportBudget.catSumAmount(category.id)
- : rolloverBudget.catSumAmount(category.id)
- }
- index={index}
- />
- );
- })}
+ {group.categories
+ .filter(category => !category.hidden || showHiddenCategories)
+ .map((category, index) => {
+ return (
+ <IncomeCategory
+ key={category.id}
+ category={category}
+ type={type}
+ budget={
+ type === 'report'
+ ? reportBudget.catBudgeted(category.id)
+ : null
+ }
+ balance={
+ type === 'report'
+ ? reportBudget.catSumAmount(category.id)
+ : rolloverBudget.catSumAmount(category.id)
+ }
+ index={index}
+ onSave={onSaveCategory}
+ onDelete={onDeleteCategory}
+ />
+ );
+ })}
</Card>
</View>
);
@@ -764,60 +1134,95 @@ function BudgetGroups({
type,
categoryGroups,
editingId,
+ onEditingCategoryBudget,
editMode,
gestures,
month,
- onEditCategory,
+ onSaveCategory,
+ onDeleteCategory,
onAddCategory,
+ onAddGroup,
+ onSaveGroup,
+ onDeleteGroup,
onReorderCategory,
onReorderGroup,
onBudgetAction,
showBudgetedCol,
show3Cols,
+ showHiddenCategories,
}) {
- const getGroups = memoizeOne(groups => {
+ const separateGroups = memoizeOne(groups => {
return {
incomeGroup: groups.find(group => group.is_income),
expenseGroups: groups.filter(group => !group.is_income),
};
});
- const { incomeGroup, expenseGroups } = getGroups(categoryGroups);
+ const { incomeGroup, expenseGroups } = separateGroups(categoryGroups);
return (
<View
data-testid="budget-groups"
style={{ flex: '1 0 auto', overflowY: 'auto', paddingBottom: 15 }}
>
- {expenseGroups.map(group => {
- return (
- <BudgetGroup
- key={group.id}
- group={group}
- editingId={editingId}
- showBudgetedCol={showBudgetedCol}
- editMode={editMode}
- gestures={gestures}
- month={month}
- onEditCategory={onEditCategory}
- onAddCategory={onAddCategory}
- onReorderCategory={onReorderCategory}
- onReorderGroup={onReorderGroup}
- onBudgetAction={onBudgetAction}
- show3Cols={show3Cols}
- />
- );
- })}
+ {expenseGroups
+ .filter(group => !group.hidden || showHiddenCategories)
+ .map(group => {
+ return (
+ <ExpenseGroup
+ key={group.id}
+ group={group}
+ editingId={editingId}
+ showBudgetedCol={showBudgetedCol}
+ editMode={editMode}
+ gestures={gestures}
+ month={month}
+ onEditingCategoryBudget={onEditingCategoryBudget}
+ onSaveCategory={onSaveCategory}
+ onDeleteCategory={onDeleteCategory}
+ onAddCategory={onAddCategory}
+ onSave={onSaveGroup}
+ onDelete={onDeleteGroup}
+ onReorderCategory={onReorderCategory}
+ onReorderGroup={onReorderGroup}
+ onBudgetAction={onBudgetAction}
+ show3Cols={show3Cols}
+ showHiddenCategories={showHiddenCategories}
+ />
+ );
+ })}
+
+ <View
+ style={{
+ alignItems: 'flex-start',
+ justifyContent: 'flex-start',
+ }}
+ >
+ <Button onPointerUp={onAddGroup} style={{ fontSize: 12, margin: 10 }}>
+ Add Group
+ </Button>
+ </View>
- {incomeGroup && <IncomeBudgetGroup type={type} group={incomeGroup} />}
+ {incomeGroup && (
+ <IncomeGroup
+ type={type}
+ group={incomeGroup}
+ onSave={onSaveGroup}
+ onDelete={onDeleteGroup}
+ onAddCategory={onAddCategory}
+ onSaveCategory={onSaveCategory}
+ onDeleteCategory={onDeleteCategory}
+ showHiddenCategories={showHiddenCategories}
+ />
+ )}
</View>
);
}
export function BudgetTable(props) {
- const [editingCategory, setEditingCategory] = useState(null);
- function onEditCategory(id) {
- setEditingCategory(id);
+ const [editingCategoryBudgetId, setEditingCategoryBudget] = useState(null);
+ function onEditingCategoryBudget(id) {
+ setEditingCategoryBudget(id);
}
const { width } = useResponsive();
const show3Cols = width >= 360;
@@ -830,13 +1235,19 @@ export function BudgetTable(props) {
// refreshControl,
onPrevMonth,
onNextMonth,
+ onSaveGroup,
+ onDeleteGroup,
+ onAddGroup,
onAddCategory,
+ onSaveCategory,
+ onDeleteCategory,
onEditMode,
onReorderCategory,
onReorderGroup,
onShowBudgetDetails,
onOpenActionSheet,
onBudgetAction,
+ savePrefs,
} = props;
// let editMode = false; // neuter editMode -- sorry, not rewriting drag-n-drop right now
@@ -844,9 +1255,11 @@ export function BudgetTable(props) {
let format = useFormat();
const mobileShowBudgetedColPref = useSelector(state => {
- return (
- (state.prefs.local && state.prefs.local.toggleMobileDisplayPref) || true
- );
+ return state.prefs?.local?.toggleMobileDisplayPref || true;
+ });
+
+ const showHiddenCategories = useSelector(state => {
+ return state.prefs?.local?.['budget.showHiddenCategories'] || false;
});
let [showBudgetedCol, setShowBudgetedCol] = useState(
@@ -854,15 +1267,13 @@ export function BudgetTable(props) {
!document.cookie.match(/mobileShowBudgetedColPref=true/),
);
- let dispatch = useDispatch();
-
function toggleDisplay() {
setShowBudgetedCol(!showBudgetedCol);
if (!showBudgetedCol) {
- // remember the pref indefinitely
- dispatch(savePrefs({ mobileShowBudgetedColPref: true }));
+ savePrefs({ mobileShowBudgetedColPref: true });
}
}
+
let buttonStyle = {
padding: 0,
backgroundColor: 'transparent',
@@ -883,6 +1294,8 @@ export function BudgetTable(props) {
onOpenActionSheet={onOpenActionSheet}
onPrevMonth={onPrevMonth}
onNextMonth={onNextMonth}
+ showHiddenCategories={showHiddenCategories}
+ savePrefs={savePrefs}
/>
<View
style={{
@@ -995,14 +1408,20 @@ export function BudgetTable(props) {
<BudgetGroups
type={type}
categoryGroups={categoryGroups}
- editingId={editingCategory}
+ editingId={editingCategoryBudgetId}
editMode={editMode}
showBudgetedCol={showBudgetedCol}
show3Cols={show3Cols}
+ showHiddenCategories={showHiddenCategories}
// gestures={gestures}
month={month}
- onEditCategory={onEditCategory}
+ onEditingCategoryBudget={onEditingCategoryBudget}
+ onSaveCategory={onSaveCategory}
+ onDeleteCategory={onDeleteCategory}
onAddCategory={onAddCategory}
+ onAddGroup={onAddGroup}
+ onSaveGroup={onSaveGroup}
+ onDeleteGroup={onDeleteGroup}
onReorderCategory={onReorderCategory}
onReorderGroup={onReorderGroup}
onBudgetAction={onBudgetAction}
@@ -1024,11 +1443,17 @@ export function BudgetTable(props) {
categoryGroups={categoryGroups}
showBudgetedCol={showBudgetedCol}
show3Cols={show3Cols}
- editingId={editingCategory}
+ showHiddenCategories={showHiddenCategories}
+ editingId={editingCategoryBudgetId}
editMode={editMode}
// gestures={gestures}
- onEditCategory={onEditCategory}
+ onEditingCategoryBudget={onEditingCategoryBudget}
+ onSaveCategory={onSaveCategory}
+ onDeleteCategory={onDeleteCategory}
onAddCategory={onAddCategory}
+ onAddGroup={onAddGroup}
+ onSaveGroup={onSaveGroup}
+ onDeleteGroup={onDeleteGroup}
onReorderCategory={onReorderCategory}
onReorderGroup={onReorderGroup}
onBudgetAction={onBudgetAction}
@@ -1056,22 +1481,11 @@ function BudgetHeader({
toggleDisplay,
showBudgetedCol,
show3Cols,
+ showHiddenCategories,
+ savePrefs,
}) {
let serverURL = useServerURL();
- // let [menuOpen, setMenuOpen] = useState(false);
-
- // let onMenuSelect = type => {
- // setMenuOpen(false);
-
- // switch (type) {
- // case 'sync':
- // sync();
- // break;
- // default:
- // }
- // };
-
let prevEnabled = currentMonth > monthBounds.start;
let nextEnabled = currentMonth < monthUtils.subMonths(monthBounds.end, 1);
@@ -1081,6 +1495,25 @@ function BudgetHeader({
backgroundColor: 'transparent',
};
+ let toggleHiddenCategories = () => {
+ savePrefs({
+ 'budget.showHiddenCategories': !showHiddenCategories,
+ });
+ };
+
+ let tooltip = useTooltip();
+
+ let onMenuSelect = name => {
+ tooltip.close();
+ switch (name) {
+ case 'toggle-hidden':
+ toggleHiddenCategories();
+ break;
+ default:
+ throw new Error(`Unrecognized menu option: ${name}`);
+ }
+ };
+
return (
<View
style={{
@@ -1096,7 +1529,6 @@ function BudgetHeader({
<Button
type="bare"
// hitSlop={{ top: 5, bottom: 5, left: 0, right: 30 }}
-
onClick={prevEnabled && onPrevMonth}
style={{
...buttonStyle,
@@ -1173,9 +1605,8 @@ function BudgetHeader({
}}
/>
)}
- {/* <Button
+ <Button
type="bare"
- onClick={() => setMenuOpen(true)}
style={{
position: 'absolute',
top: 0,
@@ -1183,31 +1614,31 @@ function BudgetHeader({
right: 0,
backgroundColor: 'transparent',
paddingLeft: 12,
- paddingRight: 12
+ paddingRight: 12,
}}
+ {...tooltip.getOpenEvents()}
>
- {menuOpen && (
+ {tooltip.isOpen && (
<Tooltip
position="bottom-right"
+ width={200}
style={{ padding: 0 }}
- onClose={() => setMenuOpen(false)}
+ onClose={tooltip.close}
>
<Menu
onMenuSelect={onMenuSelect}
items={[
- { name: 'change-password', text: 'Change password' },
- { name: 'sign-out', text: 'Sign out' }
- ].filter(x => x)}
+ { name: 'toggle-hidden', text: 'Toggle hidden categories' },
+ ]}
/>
</Tooltip>
- )} */}
-
- {/* <DotsHorizontalTriple
+ )}
+ <DotsHorizontalTriple
width="20"
height="20"
style={{ color: 'white' }}
- /> */}
- {/* </Button> */}
+ />
+ </Button>
</>
)}
</View>
diff --git a/packages/desktop-client/src/components/budget/SidebarCategory.js b/packages/desktop-client/src/components/budget/SidebarCategory.js
index cee13b3924..01e5d70cd4 100644
--- a/packages/desktop-client/src/components/budget/SidebarCategory.js
+++ b/packages/desktop-client/src/components/budget/SidebarCategory.js
@@ -77,14 +77,14 @@ function SidebarCategory({
onEditName(category.id);
} else if (type === 'delete') {
onDelete(category.id);
- } else if (type === 'toggleVisibility') {
+ } else if (type === 'toggle-visibility') {
onSave({ ...category, hidden: !category.hidden });
}
setMenuOpen(false);
}}
items={[
{
- name: 'toggleVisibility',
+ name: 'toggle-visibility',
text: category.hidden ? 'Show' : 'Hide',
},
{ name: 'rename', text: 'Rename' },
diff --git a/packages/desktop-client/src/components/budget/SidebarGroup.tsx b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
index c8473d2c0e..e9586d5ebc 100644
--- a/packages/desktop-client/src/components/budget/SidebarGroup.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
@@ -117,7 +117,7 @@ function SidebarGroup({
onShowNewCategory(group.id);
} else if (type === 'delete') {
onDelete(group.id);
- } else if (type === 'toggleVisibility') {
+ } else if (type === 'toggle-visibility') {
onSave({ ...group, hidden: !group.hidden });
}
setMenuOpen(false);
@@ -125,7 +125,7 @@ function SidebarGroup({
items={[
{ name: 'add-category', text: 'Add category' },
{
- name: 'toggleVisibility',
+ name: 'toggle-visibility',
text: group.hidden ? 'Show' : 'Hide',
},
{ name: 'rename', text: 'Rename' },
diff --git a/packages/desktop-client/src/components/budget/index.js b/packages/desktop-client/src/components/budget/index.js
index 5b8d8aed04..68a67017f9 100644
--- a/packages/desktop-client/src/components/budget/index.js
+++ b/packages/desktop-client/src/components/budget/index.js
@@ -216,13 +216,8 @@ function Budget(props) {
}),
);
} else {
- const cat = {
- ...category,
- hidden: category.hidden ? 1 : 0,
- };
-
- props.updateCategory(cat);
- setCategoryGroups(state => updateCategory(state, cat));
+ props.updateCategory(category);
+ setCategoryGroups(state => updateCategory(state, category));
}
};
@@ -260,13 +255,8 @@ function Budget(props) {
}),
);
} else {
- const grp = {
- ...group,
- hidden: group.hidden ? 1 : 0,
- };
-
- props.updateGroup(grp);
- setCategoryGroups(state => updateGroup(state, grp));
+ props.updateGroup(group);
+ setCategoryGroups(state => updateGroup(state, group));
}
};
diff --git a/packages/desktop-client/src/components/modals/BudgetSummary.tsx b/packages/desktop-client/src/components/modals/BudgetSummary.tsx
index 34aa66fe13..a65834f1f4 100644
--- a/packages/desktop-client/src/components/modals/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/modals/BudgetSummary.tsx
@@ -5,7 +5,6 @@ import { format, sheetForMonth, prevMonth } from 'loot-core/src/shared/months';
import { theme, styles } from '../../style';
import { type CommonModalProps } from '../../types/modals';
-import Button from '../common/Button';
import Modal from '../common/Modal';
import Text from '../common/Text';
import View from '../common/View';
@@ -20,7 +19,7 @@ function ToBudget({ toBudget }) {
return (
<View style={{ alignItems: 'center', marginBottom: 15 }}>
<Text style={styles.text}>
- {budgetAmount < 0 ? 'Overbudget:' : 'To budget:'}
+ {budgetAmount < 0 ? 'Overbudget:' : 'To Budget:'}
</Text>
<Text
style={{
@@ -97,18 +96,6 @@ function BudgetSummary({ month, modalProps }: BudgetSummaryProps) {
</View>
</View>
<ToBudget toBudget={rolloverBudget.toBudget} />
-
- <View
- style={{
- flexDirection: 'row',
- justifyContent: 'center',
- paddingBottom: 15,
- }}
- >
- <Button style={{ marginRight: 10 }} onClick={modalProps.onClose}>
- Close
- </Button>
- </View>
</NamespaceContext.Provider>
)}
</Modal>
diff --git a/packages/desktop-client/src/components/modals/SingleInput.tsx b/packages/desktop-client/src/components/modals/SingleInput.tsx
new file mode 100644
index 0000000000..675a441326
--- /dev/null
+++ b/packages/desktop-client/src/components/modals/SingleInput.tsx
@@ -0,0 +1,83 @@
+import React, { useState } from 'react';
+
+import { type CommonModalProps } from '../../types/modals';
+import Button from '../common/Button';
+import FormError from '../common/FormError';
+import InitialFocus from '../common/InitialFocus';
+import Input from '../common/Input';
+import Modal from '../common/Modal';
+import View from '../common/View';
+
+type SingleInputProps = {
+ modalProps: Partial<CommonModalProps>;
+ title: string;
+ buttonText: string;
+ onSubmit: (value: string) => void;
+ onValidate?: (value: string) => string[];
+ inputPlaceholder?: string;
+};
+
+function SingleInput({
+ modalProps,
+ title,
+ buttonText,
+ onSubmit,
+ onValidate,
+ inputPlaceholder,
+}: SingleInputProps) {
+ const [value, setValue] = useState('');
+ const [errorMessage, setErrorMessage] = useState(null);
+
+ const _onSubmit = value => {
+ const error = onValidate?.(value);
+ if (error) {
+ setErrorMessage(error);
+ return;
+ }
+
+ onSubmit?.(value);
+ modalProps.onClose();
+ };
+ return (
+ <Modal title={title} {...modalProps}>
+ {() => (
+ <>
+ <View
+ style={{
+ flexDirection: 'row',
+ justifyContent: 'center',
+ paddingBottom: 15,
+ }}
+ >
+ <View style={{ flexDirection: 'column', flex: 1 }}>
+ <InitialFocus>
+ <Input
+ placeholder={inputPlaceholder}
+ onUpdate={setValue}
+ onEnter={e => _onSubmit(e.currentTarget.value)}
+ />
+ </InitialFocus>
+ {errorMessage && (
+ <FormError style={{ paddingTop: 5 }}>
+ * {errorMessage}
+ </FormError>
+ )}
+ </View>
+ </View>
+
+ <View
+ style={{
+ flexDirection: 'row',
+ justifyContent: 'center',
+ paddingBottom: 15,
+ }}
+ >
+ <Button onPointerUp={e => _onSubmit(value)}>{buttonText}</Button>
+ </View>
+ </>
+ )}
+ </Modal>
+ );
+}
+
+export default SingleInput;
diff --git a/packages/desktop-client/src/components/tooltips.js b/packages/desktop-client/src/components/tooltips.js
index d3b667c9a9..ba82ea6560 100644
--- a/packages/desktop-client/src/components/tooltips.js
+++ b/packages/desktop-client/src/components/tooltips.js
@@ -36,7 +36,7 @@ export class Tooltip extends Component {
setup() {
this.layout();
- let mousedownHandler = e => {
+ let pointerDownHandler = e => {
let node = e.target;
while (node && node !== document.documentElement) {
@@ -61,11 +61,20 @@ export class Tooltip extends Component {
}
};
- window.document.addEventListener('mousedown', mousedownHandler, false);
- this.contentRef.current.addEventListener('keydown', escHandler, false);
+ window.document.addEventListener('pointerdown', pointerDownHandler, false);
+ this.contentRef.current?.addEventListener('keydown', escHandler, false);
this.cleanup = () => {
- window.document.removeEventListener('mousedown', mousedownHandler);
+ window.document.removeEventListener(
+ 'pointerdown',
+ pointerDownHandler,
+ false,
+ );
+ this.contentRef.current?.removeEventListener(
+ 'keydown',
+ escHandler,
+ false,
+ );
};
}
diff --git a/packages/desktop-client/src/components/util/AmountInput.js b/packages/desktop-client/src/components/util/AmountInput.js
index 4dbb8941e0..2aeb94ab9b 100644
--- a/packages/desktop-client/src/components/util/AmountInput.js
+++ b/packages/desktop-client/src/components/util/AmountInput.js
@@ -5,6 +5,7 @@ import {
integerToCurrency,
} from 'loot-core/src/shared/util';
+import { useMergedRefs } from '../../hooks/useMergedRefs';
import Add from '../../icons/v1/Add';
import Subtract from '../../icons/v1/Subtract';
import { theme } from '../../style';
@@ -16,13 +17,16 @@ export function AmountInput({
id,
inputRef,
initialValue = 0,
+ zeroSign = '-', // + or -
onChange,
- onEdit,
+ onBlur,
style,
textStyle,
focused,
}) {
- let [negative, setNegative] = useState(initialValue <= 0);
+ let [negative, setNegative] = useState(
+ (initialValue === 0 && zeroSign === '-') || initialValue < 0,
+ );
let initialValueAbsolute = integerToCurrency(Math.abs(initialValue || 0));
let [value, setValue] = useState(initialValueAbsolute);
let buttonRef = useRef();
@@ -45,17 +49,20 @@ export function AmountInput({
setValue(value ? value : '');
}
+ let ref = useRef();
+ let mergedRef = useMergedRefs(inputRef, ref);
+
function onInputAmountBlur(e) {
fireChange(value, negative);
- if (!buttonRef.current?.contains(e.relatedTarget)) {
- onEdit?.(null);
+ if (!ref.current?.contains(e.relatedTarget)) {
+ onBlur?.();
}
}
return (
<InputWithContent
id={id}
- inputRef={inputRef}
+ inputRef={mergedRef}
inputMode="decimal"
leftContent={
<Button
@@ -80,6 +87,7 @@ export function AmountInput({
onKeyUp={e => {
if (e.key === 'Enter') {
fireChange(value, negative);
+ onBlur?.();
}
}}
onUpdate={onInputAmountChange}
diff --git a/packages/desktop-client/src/style/styles.ts b/packages/desktop-client/src/style/styles.ts
index 7b8335a881..b6bca971ec 100644
--- a/packages/desktop-client/src/style/styles.ts
+++ b/packages/desktop-client/src/style/styles.ts
@@ -4,6 +4,7 @@ import * as Platform from 'loot-core/src/client/platform';
import tokens from '../tokens';
+import { theme } from './theme';
import { type CSSProperties } from './types';
export const styles = {
@@ -92,6 +93,11 @@ export const styles = {
animationFillMode: 'both',
animationDelay: '0.5s',
},
+ underlinedText: {
+ textDecoration: 'underline',
+ textDecorationThickness: 2,
+ textDecorationColor: theme.pillBorder,
+ },
// Dynamically set
lightScrollbar: null as CSSProperties | null,
darkScrollbar: null as CSSProperties | null,
diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.ts
index fd29a49b6a..52802c9365 100644
--- a/packages/loot-core/src/server/main.ts
+++ b/packages/loot-core/src/server/main.ts
@@ -427,7 +427,7 @@ handlers['must-category-transfer'] = async function ({ id }) {
const sheetName = monthUtils.sheetForMonth(month);
const value = sheet.get().getCellValue(sheetName, 'budget-' + id);
- return value !== 0;
+ return value != null && value !== 0;
});
};
diff --git a/packages/loot-core/src/server/models.ts b/packages/loot-core/src/server/models.ts
index 12968c9adc..1b2281553a 100644
--- a/packages/loot-core/src/server/models.ts
+++ b/packages/loot-core/src/server/models.ts
@@ -58,7 +58,7 @@ export const categoryModel = {
);
let { sort_order, ...rest } = category;
- return rest;
+ return { ...rest, hidden: rest.hidden ? 1 : 0 };
},
};
@@ -72,7 +72,7 @@ export const categoryGroupModel = {
);
let { sort_order, ...rest } = categoryGroup;
- return rest;
+ return { ...rest, hidden: rest.hidden ? 1 : 0 };
},
};
diff --git a/upcoming-release-notes/1737.md b/upcoming-release-notes/1737.md
new file mode 100644
index 0000000000..41fd66c85f
--- /dev/null
+++ b/upcoming-release-notes/1737.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [joel-jeremy]
+---
+
+Various mobile category and group functionalities.
\ No newline at end of file