Skip to content

A local-first personal finance app

Move spreadsheet bindings to spreadsheets feature folder and move hooks in src/components/spreadsheets to src/hooks (#5007)

Joel Jeremy Marquez53e3694a3854
diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsx
index 1ce860eee2..d3315fc67c 100644
--- a/packages/desktop-client/src/components/Modals.tsx
+++ b/packages/desktop-client/src/components/Modals.tsx
@@ -74,10 +74,10 @@ import { PostsOfflineNotification } from './schedules/PostsOfflineNotification';
import { ScheduleDetails } from './schedules/ScheduleDetails';
import { ScheduleLink } from './schedules/ScheduleLink';
import { UpcomingLength } from './schedules/UpcomingLength';
-import { NamespaceContext } from './spreadsheet/NamespaceContext';
import { useMetadataPref } from '@desktop-client/hooks/useMetadataPref';
import { useModalState } from '@desktop-client/hooks/useModalState';
+import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import { closeModal } from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
@@ -204,12 +204,12 @@ export function Modals() {
case 'envelope-budget-summary':
return (
- <NamespaceContext.Provider
+ <SheetNameProvider
key={key}
- value={monthUtils.sheetForMonth(modal.options.month)}
+ name={monthUtils.sheetForMonth(modal.options.month)}
>
<EnvelopeBudgetSummaryModal key={key} {...modal.options} />
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
case 'tracking-budget-summary':
@@ -241,22 +241,22 @@ export function Modals() {
case 'envelope-budget-menu':
return (
- <NamespaceContext.Provider
+ <SheetNameProvider
key={key}
- value={monthUtils.sheetForMonth(modal.options.month)}
+ name={monthUtils.sheetForMonth(modal.options.month)}
>
<EnvelopeBudgetMenuModal {...modal.options} />
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
case 'tracking-budget-menu':
return (
- <NamespaceContext.Provider
+ <SheetNameProvider
key={key}
- value={monthUtils.sheetForMonth(modal.options.month)}
+ name={monthUtils.sheetForMonth(modal.options.month)}
>
<TrackingBudgetMenuModal {...modal.options} />
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
case 'category-group-menu':
@@ -267,52 +267,52 @@ export function Modals() {
case 'envelope-balance-menu':
return (
- <NamespaceContext.Provider
+ <SheetNameProvider
key={key}
- value={monthUtils.sheetForMonth(modal.options.month)}
+ name={monthUtils.sheetForMonth(modal.options.month)}
>
<EnvelopeBalanceMenuModal {...modal.options} />
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
case 'envelope-income-balance-menu':
return (
- <NamespaceContext.Provider
+ <SheetNameProvider
key={key}
- value={monthUtils.sheetForMonth(modal.options.month)}
+ name={monthUtils.sheetForMonth(modal.options.month)}
>
<EnvelopeIncomeBalanceMenuModal {...modal.options} />
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
case 'envelope-summary-to-budget-menu':
return (
- <NamespaceContext.Provider
+ <SheetNameProvider
key={key}
- value={monthUtils.sheetForMonth(modal.options.month)}
+ name={monthUtils.sheetForMonth(modal.options.month)}
>
<EnvelopeToBudgetMenuModal {...modal.options} />
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
case 'hold-buffer':
return (
- <NamespaceContext.Provider
+ <SheetNameProvider
key={key}
- value={monthUtils.sheetForMonth(modal.options.month)}
+ name={monthUtils.sheetForMonth(modal.options.month)}
>
<HoldBufferModal {...modal.options} />
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
case 'tracking-balance-menu':
return (
- <NamespaceContext.Provider
+ <SheetNameProvider
key={key}
- value={monthUtils.sheetForMonth(modal.options.month)}
+ name={monthUtils.sheetForMonth(modal.options.month)}
>
<TrackingBalanceMenuModal {...modal.options} />
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
case 'transfer':
@@ -329,22 +329,22 @@ export function Modals() {
case 'envelope-budget-month-menu':
return (
- <NamespaceContext.Provider
+ <SheetNameProvider
key={key}
- value={monthUtils.sheetForMonth(modal.options.month)}
+ name={monthUtils.sheetForMonth(modal.options.month)}
>
<EnvelopeBudgetMonthMenuModal {...modal.options} />
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
case 'tracking-budget-month-menu':
return (
- <NamespaceContext.Provider
+ <SheetNameProvider
key={key}
- value={monthUtils.sheetForMonth(modal.options.month)}
+ name={monthUtils.sheetForMonth(modal.options.month)}
>
<TrackingBudgetMonthMenuModal {...modal.options} />
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
case 'budget-file-selection':
diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx
index 49b0d04008..1b1511ad85 100644
--- a/packages/desktop-client/src/components/Titlebar.tsx
+++ b/packages/desktop-client/src/components/Titlebar.tsx
@@ -34,19 +34,19 @@ import { HelpMenu } from './HelpMenu';
import { LoggedInUser } from './LoggedInUser';
import { useServerURL } from './ServerContext';
import { useSidebar } from './sidebar/SidebarProvider';
-import { useSheetValue } from './spreadsheet/useSheetValue';
import { ThemeSelector } from './ThemeSelector';
import { sync } from '@desktop-client/app/appSlice';
import { useGlobalPref } from '@desktop-client/hooks/useGlobalPref';
import { useMetadataPref } from '@desktop-client/hooks/useMetadataPref';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
-import * as queries from '@desktop-client/queries/queries';
import { useDispatch } from '@desktop-client/redux';
+import * as bindings from '@desktop-client/spreadsheet/bindings';
function UncategorizedButton() {
- const count: number | null = useSheetValue(queries.uncategorizedCount());
+ const count: number | null = useSheetValue(bindings.uncategorizedCount());
if (count === null || count <= 0) {
return null;
}
diff --git a/packages/desktop-client/src/components/accounts/Account.tsx b/packages/desktop-client/src/components/accounts/Account.tsx
index 8be44b74db..f1b69e00c7 100644
--- a/packages/desktop-client/src/components/accounts/Account.tsx
+++ b/packages/desktop-client/src/components/accounts/Account.tsx
@@ -73,12 +73,12 @@ import {
replaceModal,
} from '@desktop-client/modals/modalsSlice';
import { addNotification } from '@desktop-client/notifications/notificationsSlice';
+import * as queries from '@desktop-client/queries';
import { aqlQuery } from '@desktop-client/queries/aqlQuery';
import {
pagedQuery,
type PagedQuery,
} from '@desktop-client/queries/pagedQuery';
-import * as queries from '@desktop-client/queries/queries';
import {
createPayee,
initiallyLoadPayees,
diff --git a/packages/desktop-client/src/components/accounts/Balance.tsx b/packages/desktop-client/src/components/accounts/Balance.tsx
index 129ef05037..db5e4fdeab 100644
--- a/packages/desktop-client/src/components/accounts/Balance.tsx
+++ b/packages/desktop-client/src/components/accounts/Balance.tsx
@@ -14,15 +14,15 @@ import { isPreviewId } from 'loot-core/shared/transactions';
import { type AccountEntity } from 'loot-core/types/models';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
-import { type Binding } from '@desktop-client/components/spreadsheet';
import {
CellValue,
CellValueText,
} from '@desktop-client/components/spreadsheet/CellValue';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
import { useCachedSchedules } from '@desktop-client/hooks/useCachedSchedules';
+import { useFormat } from '@desktop-client/hooks/useFormat';
import { useSelectedItems } from '@desktop-client/hooks/useSelected';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
+import { type Binding } from '@desktop-client/spreadsheet';
type DetailedBalanceProps = {
name: string;
diff --git a/packages/desktop-client/src/components/accounts/Reconcile.tsx b/packages/desktop-client/src/components/accounts/Reconcile.tsx
index dbbbbe7d78..ac6a6fcceb 100644
--- a/packages/desktop-client/src/components/accounts/Reconcile.tsx
+++ b/packages/desktop-client/src/components/accounts/Reconcile.tsx
@@ -17,10 +17,10 @@ import { currencyToInteger, tsToRelativeTime } from 'loot-core/shared/util';
import { type AccountEntity } from 'loot-core/types/models';
import { type TransObjectLiteral } from 'loot-core/types/util';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
+import { useFormat } from '@desktop-client/hooks/useFormat';
import { useLocale } from '@desktop-client/hooks/useLocale';
-import * as queries from '@desktop-client/queries/queries';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
+import * as bindings from '@desktop-client/spreadsheet/bindings';
type ReconcilingMessageProps = {
balanceQuery: { name: `balance-query-${string}`; query: Query };
@@ -128,7 +128,7 @@ export function ReconcileMenu({
onReconcile,
onClose,
}: ReconcileMenuProps) {
- const balanceQuery = queries.accountBalance(account.id);
+ const balanceQuery = bindings.accountBalance(account.id);
const clearedBalance = useSheetValue<'account', `balance-${string}-cleared`>({
name: (balanceQuery.name + '-cleared') as `balance-${string}-cleared`,
value: null,
diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
index b28229e64d..05edc26de9 100644
--- a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
@@ -33,13 +33,13 @@ import { ItemHeader } from './ItemHeader';
import { useEnvelopeSheetValue } from '@desktop-client/components/budget/envelope/EnvelopeBudgetComponents';
import { makeAmountFullStyle } from '@desktop-client/components/budget/util';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
import { useCategories } from '@desktop-client/hooks/useCategories';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import {
trackingBudget,
envelopeBudget,
-} from '@desktop-client/queries/queries';
+} from '@desktop-client/spreadsheet/bindings';
type CategoryAutocompleteItem = Omit<CategoryEntity, 'group'> & {
group?: CategoryGroupEntity;
diff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
index e3b058d7c2..e3957dfa28 100644
--- a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
+++ b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
@@ -19,14 +19,14 @@ import { type TransObjectLiteral } from 'loot-core/types/util';
import { makeBalanceAmountStyle } from './util';
-import { type Binding } from '@desktop-client/components/spreadsheet';
import {
CellValue,
CellValueText,
} from '@desktop-client/components/spreadsheet/CellValue';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
import { useFeatureFlag } from '@desktop-client/hooks/useFeatureFlag';
+import { useFormat } from '@desktop-client/hooks/useFormat';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
+import { type Binding } from '@desktop-client/spreadsheet';
type CarryoverIndicatorProps = {
style?: CSSProperties;
diff --git a/packages/desktop-client/src/components/budget/RenderMonths.tsx b/packages/desktop-client/src/components/budget/RenderMonths.tsx
index cc8fb10dc9..6d4c366b3e 100644
--- a/packages/desktop-client/src/components/budget/RenderMonths.tsx
+++ b/packages/desktop-client/src/components/budget/RenderMonths.tsx
@@ -13,7 +13,7 @@ import * as monthUtils from 'loot-core/shared/months';
import { MonthsContext } from './MonthsContext';
-import { NamespaceContext } from '@desktop-client/components/spreadsheet/NamespaceContext';
+import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
type RenderMonthsProps = {
component?: ComponentType<{ month: string; editing: boolean }>;
@@ -34,10 +34,7 @@ export function RenderMonths({
const editing = editingMonth === month;
return (
- <NamespaceContext.Provider
- key={index}
- value={monthUtils.sheetForMonth(month)}
- >
+ <SheetNameProvider key={index} name={monthUtils.sheetForMonth(month)}>
<View
style={{
flex: 1,
@@ -47,7 +44,7 @@ export function RenderMonths({
>
<Component month={month} editing={editing} {...args} />
</View>
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
}) as unknown as JSX.Element;
}
diff --git a/packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsx b/packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsx
index e80bcaebf4..188066827c 100644
--- a/packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsx
@@ -5,7 +5,7 @@ import { Menu } from '@actual-app/components/menu';
import { useEnvelopeSheetValue } from './EnvelopeBudgetComponents';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type BalanceMenuProps = Omit<
ComponentPropsWithoutRef<typeof Menu>,
diff --git a/packages/desktop-client/src/components/budget/envelope/BalanceMovementMenu.tsx b/packages/desktop-client/src/components/budget/envelope/BalanceMovementMenu.tsx
index cabf3d9478..769776ca0c 100644
--- a/packages/desktop-client/src/components/budget/envelope/BalanceMovementMenu.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/BalanceMovementMenu.tsx
@@ -5,7 +5,7 @@ import { CoverMenu } from './CoverMenu';
import { useEnvelopeSheetValue } from './EnvelopeBudgetComponents';
import { TransferMenu } from './TransferMenu';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type BalanceMovementMenuProps = {
categoryId: string;
diff --git a/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
index f48da6b865..f94a187d22 100644
--- a/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
@@ -33,16 +33,10 @@ import { IncomeMenu } from './IncomeMenu';
import { BalanceWithCarryover } from '@desktop-client/components/budget/BalanceWithCarryover';
import { makeAmountGrey } from '@desktop-client/components/budget/util';
-import {
- type Binding,
- type SheetFields,
-} from '@desktop-client/components/spreadsheet';
import {
CellValue,
CellValueText,
} from '@desktop-client/components/spreadsheet/CellValue';
-import { useSheetName } from '@desktop-client/components/spreadsheet/useSheetName';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
import {
Row,
Field,
@@ -52,8 +46,11 @@ import {
import { useCategoryScheduleGoalTemplateIndicator } from '@desktop-client/hooks/useCategoryScheduleGoalTemplateIndicator';
import { useContextMenu } from '@desktop-client/hooks/useContextMenu';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
+import { useSheetName } from '@desktop-client/hooks/useSheetName';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import { useUndo } from '@desktop-client/hooks/useUndo';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { type Binding, type SheetFields } from '@desktop-client/spreadsheet';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
export function useEnvelopeSheetName<
FieldName extends SheetFields<'envelope-budget'>,
diff --git a/packages/desktop-client/src/components/budget/envelope/HoldMenu.tsx b/packages/desktop-client/src/components/budget/envelope/HoldMenu.tsx
index 6571fa56c8..9c3a3d187e 100644
--- a/packages/desktop-client/src/components/budget/envelope/HoldMenu.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/HoldMenu.tsx
@@ -10,7 +10,7 @@ import { View } from '@actual-app/components/view';
import { evalArithmetic } from 'loot-core/shared/arithmetic';
import { integerToCurrency, amountToInteger } from 'loot-core/shared/util';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
type HoldMenuProps = {
onSubmit: (amount: number) => void;
diff --git a/packages/desktop-client/src/components/budget/envelope/IncomeMenu.tsx b/packages/desktop-client/src/components/budget/envelope/IncomeMenu.tsx
index b5746e77d3..1a553f8e0c 100644
--- a/packages/desktop-client/src/components/budget/envelope/IncomeMenu.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/IncomeMenu.tsx
@@ -6,7 +6,7 @@ import { type CategoryEntity } from 'loot-core/types/models';
import { useEnvelopeSheetValue } from './EnvelopeBudgetComponents';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type IncomeMenuProps = {
categoryId: string;
diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx
index 722786e791..a351ef074b 100644
--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx
@@ -21,8 +21,8 @@ import { TotalsList } from './TotalsList';
import { useEnvelopeBudget } from '@desktop-client/components/budget/envelope/EnvelopeBudgetContext';
import { NotesButton } from '@desktop-client/components/NotesButton';
-import { NamespaceContext } from '@desktop-client/components/spreadsheet/NamespaceContext';
import { useLocale } from '@desktop-client/hooks/useLocale';
+import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import { useUndo } from '@desktop-client/hooks/useUndo';
type BudgetSummaryProps = {
@@ -88,7 +88,7 @@ export const BudgetSummary = memo(({ month }: BudgetSummaryProps) => {
},
}}
>
- <NamespaceContext.Provider value={monthUtils.sheetForMonth(month)}>
+ <SheetNameProvider name={monthUtils.sheetForMonth(month)}>
<View
style={{
padding: '0 13px',
@@ -287,7 +287,7 @@ export const BudgetSummary = memo(({ month }: BudgetSummaryProps) => {
</View>
</>
)}
- </NamespaceContext.Provider>
+ </SheetNameProvider>
</View>
);
});
diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
index 4c6a449e26..df903976ca 100644
--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
@@ -16,7 +16,7 @@ import { useEnvelopeSheetValue } from '@desktop-client/components/budget/envelop
import { HoldMenu } from '@desktop-client/components/budget/envelope/HoldMenu';
import { TransferMenu } from '@desktop-client/components/budget/envelope/TransferMenu';
import { useContextMenu } from '@desktop-client/hooks/useContextMenu';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type ToBudgetProps = {
month: string;
diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx
index 630754059e..39d13ee0a0 100644
--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx
@@ -15,8 +15,8 @@ import {
useEnvelopeSheetValue,
} from '@desktop-client/components/budget/envelope/EnvelopeBudgetComponents';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { useFormat } from '@desktop-client/hooks/useFormat';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type ToBudgetAmountProps = {
prevMonthName: string;
diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsx
index 0d81419134..5f5f08d3f3 100644
--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
import { Menu } from '@actual-app/components/menu';
import { useEnvelopeSheetValue } from '@desktop-client/components/budget/envelope/EnvelopeBudgetComponents';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type ToBudgetMenuProps = Omit<
ComponentPropsWithoutRef<typeof Menu>,
diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/TotalsList.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/TotalsList.tsx
index 3b77f3040c..db8ace2e99 100644
--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/TotalsList.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/TotalsList.tsx
@@ -9,8 +9,8 @@ import { View } from '@actual-app/components/view';
import { EnvelopeCellValue } from '@desktop-client/components/budget/envelope/EnvelopeBudgetComponents';
import { CellValueText } from '@desktop-client/components/spreadsheet/CellValue';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { useFormat } from '@desktop-client/hooks/useFormat';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type TotalsListProps = {
prevMonthName: string;
diff --git a/packages/desktop-client/src/components/budget/index.tsx b/packages/desktop-client/src/components/budget/index.tsx
index d5e6bbe42c..0cf1f48ac6 100644
--- a/packages/desktop-client/src/components/budget/index.tsx
+++ b/packages/desktop-client/src/components/budget/index.tsx
@@ -15,11 +15,11 @@ import * as trackingBudget from './tracking/TrackingBudgetComponents';
import { TrackingBudgetProvider } from './tracking/TrackingBudgetContext';
import { prewarmAllMonths, prewarmMonth } from './util';
-import { NamespaceContext } from '@desktop-client/components/spreadsheet/NamespaceContext';
import { useCategories } from '@desktop-client/hooks/useCategories';
import { useGlobalPref } from '@desktop-client/hooks/useGlobalPref';
import { useLocalPref } from '@desktop-client/hooks/useLocalPref';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
+import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import { useSpreadsheet } from '@desktop-client/hooks/useSpreadsheet';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import { pushModal } from '@desktop-client/modals/modalsSlice';
@@ -388,9 +388,9 @@ function BudgetInner(props: BudgetInnerProps) {
}
return (
- <NamespaceContext.Provider value={monthUtils.sheetForMonth(startMonth)}>
+ <SheetNameProvider name={monthUtils.sheetForMonth(startMonth)}>
<View style={{ flex: 1 }}>{table}</View>
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
}
diff --git a/packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsx b/packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsx
index 898602da3a..106a87363f 100644
--- a/packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsx
@@ -5,7 +5,7 @@ import { Menu } from '@actual-app/components/menu';
import { useTrackingSheetValue } from './TrackingBudgetComponents';
-import { trackingBudget } from '@desktop-client/queries/queries';
+import { trackingBudget } from '@desktop-client/spreadsheet/bindings';
type BalanceMenuProps = Omit<
ComponentPropsWithoutRef<typeof Menu>,
diff --git a/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx
index 6e960c2944..ea4f6bfb64 100644
--- a/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx
@@ -34,15 +34,10 @@ import { BudgetMenu } from './BudgetMenu';
import { BalanceWithCarryover } from '@desktop-client/components/budget/BalanceWithCarryover';
import { makeAmountGrey } from '@desktop-client/components/budget/util';
-import {
- type Binding,
- type SheetFields,
-} from '@desktop-client/components/spreadsheet';
import {
CellValue,
CellValueText,
} from '@desktop-client/components/spreadsheet/CellValue';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
import {
Field,
SheetCell,
@@ -50,8 +45,10 @@ import {
} from '@desktop-client/components/table';
import { useCategoryScheduleGoalTemplateIndicator } from '@desktop-client/hooks/useCategoryScheduleGoalTemplateIndicator';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import { useUndo } from '@desktop-client/hooks/useUndo';
-import { trackingBudget } from '@desktop-client/queries/queries';
+import { type Binding, type SheetFields } from '@desktop-client/spreadsheet';
+import { trackingBudget } from '@desktop-client/spreadsheet/bindings';
export const useTrackingSheetValue = <
FieldName extends SheetFields<'tracking-budget'>,
diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx
index 11a6dcbdb3..858a575e8d 100644
--- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx
@@ -24,8 +24,8 @@ import { Saved } from './Saved';
import { useTrackingBudget } from '@desktop-client/components/budget/tracking/TrackingBudgetContext';
import { NotesButton } from '@desktop-client/components/NotesButton';
-import { NamespaceContext } from '@desktop-client/components/spreadsheet/NamespaceContext';
import { useLocale } from '@desktop-client/hooks/useLocale';
+import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import { useUndo } from '@desktop-client/hooks/useUndo';
type BudgetSummaryProps = {
@@ -84,7 +84,7 @@ export function BudgetSummary({ month }: BudgetSummaryProps) {
},
}}
>
- <NamespaceContext.Provider value={monthUtils.sheetForMonth(month)}>
+ <SheetNameProvider name={monthUtils.sheetForMonth(month)}>
<View
style={{
padding: '0 13px',
@@ -265,7 +265,7 @@ export function BudgetSummary({ month }: BudgetSummaryProps) {
style={{ marginTop: 13, marginBottom: 20 }}
/>
)}
- </NamespaceContext.Provider>
+ </SheetNameProvider>
</View>
);
}
diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx
index 3d4a4dce33..667877eddd 100644
--- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx
@@ -11,14 +11,11 @@ import { Text } from '@actual-app/components/text';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
-import {
- type SheetFields,
- type Binding,
-} from '@desktop-client/components/spreadsheet';
import {
CellValue,
CellValueText,
} from '@desktop-client/components/spreadsheet/CellValue';
+import { type SheetFields, type Binding } from '@desktop-client/spreadsheet';
type BudgetTotalProps<
CurrentField extends SheetFields<'tracking-budget'>,
diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx
index 7c8bbc7432..9176003556 100644
--- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx
@@ -6,7 +6,7 @@ import { fraction } from './fraction';
import { PieProgress } from './PieProgress';
import { useTrackingSheetValue } from '@desktop-client/components/budget/tracking/TrackingBudgetComponents';
-import { type Binding } from '@desktop-client/components/spreadsheet';
+import { type Binding } from '@desktop-client/spreadsheet';
type ExpenseProgressProps = {
current: Binding<'tracking-budget', 'total-spent'>;
diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseTotal.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseTotal.tsx
index ff1095f1f8..7c953e5ecd 100644
--- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseTotal.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseTotal.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
import { BudgetTotal } from './BudgetTotal';
import { ExpenseProgress } from './ExpenseProgress';
-import { trackingBudget } from '@desktop-client/queries/queries';
+import { trackingBudget } from '@desktop-client/spreadsheet/bindings';
type ExpenseTotalProps = {
style?: CSSProperties;
diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeProgress.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeProgress.tsx
index a16b8fdf3b..608afea503 100644
--- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeProgress.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeProgress.tsx
@@ -6,7 +6,7 @@ import { fraction } from './fraction';
import { PieProgress } from './PieProgress';
import { type CellValue } from '@desktop-client/components/spreadsheet/CellValue';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
type IncomeProgressProps = {
current: ComponentProps<typeof CellValue>['binding'];
diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeTotal.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeTotal.tsx
index df63504649..99e6f9a9db 100644
--- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeTotal.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeTotal.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
import { BudgetTotal } from './BudgetTotal';
import { IncomeProgress } from './IncomeProgress';
-import { trackingBudget } from '@desktop-client/queries/queries';
+import { trackingBudget } from '@desktop-client/spreadsheet/bindings';
type IncomeTotalProps = {
style?: CSSProperties;
diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx
index 4c79d6048f..0d2039012c 100644
--- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx
@@ -12,8 +12,8 @@ import { css } from '@emotion/css';
import { useTrackingSheetValue } from '@desktop-client/components/budget/tracking/TrackingBudgetComponents';
import { makeAmountFullStyle } from '@desktop-client/components/budget/util';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
-import { trackingBudget } from '@desktop-client/queries/queries';
+import { useFormat } from '@desktop-client/hooks/useFormat';
+import { trackingBudget } from '@desktop-client/spreadsheet/bindings';
type SavedProps = {
projected: boolean;
diff --git a/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx b/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
index 674531bcab..1e7ef9d3c8 100644
--- a/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
+++ b/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
@@ -39,13 +39,14 @@ import {
openAccountCloseModal,
pushModal,
} from '@desktop-client/modals/modalsSlice';
-import * as queries from '@desktop-client/queries/queries';
+import * as queries from '@desktop-client/queries';
import {
markAccountRead,
reopenAccount,
updateAccount,
} from '@desktop-client/queries/queriesSlice';
import { useSelector, useDispatch } from '@desktop-client/redux';
+import * as bindings from '@desktop-client/spreadsheet/bindings';
export function AccountTransactions({
account,
@@ -387,27 +388,27 @@ function queriesFromAccountId(
switch (id) {
case 'onbudget':
return {
- balance: queries.onBudgetAccountBalance(),
+ balance: bindings.onBudgetAccountBalance(),
};
case 'offbudget':
return {
- balance: queries.offBudgetAccountBalance(),
+ balance: bindings.offBudgetAccountBalance(),
};
case 'closed':
return {
- balance: queries.closedAccountBalance(),
+ balance: bindings.closedAccountBalance(),
};
case 'uncategorized':
return {
- balance: queries.uncategorizedBalance(),
+ balance: bindings.uncategorizedBalance(),
};
default:
return entity
? {
- balance: queries.accountBalance(entity.id),
- cleared: queries.accountBalanceCleared(entity.id),
- uncleared: queries.accountBalanceUncleared(entity.id),
+ balance: bindings.accountBalance(entity.id),
+ cleared: bindings.accountBalanceCleared(entity.id),
+ uncleared: bindings.accountBalanceUncleared(entity.id),
}
- : { balance: queries.allAccountBalance() };
+ : { balance: bindings.allAccountBalance() };
}
}
diff --git a/packages/desktop-client/src/components/mobile/accounts/Accounts.tsx b/packages/desktop-client/src/components/mobile/accounts/Accounts.tsx
index 750d3abbfd..2af0ddf57c 100644
--- a/packages/desktop-client/src/components/mobile/accounts/Accounts.tsx
+++ b/packages/desktop-client/src/components/mobile/accounts/Accounts.tsx
@@ -35,10 +35,6 @@ import { makeAmountFullStyle } from '@desktop-client/components/budget/util';
import { MOBILE_NAV_HEIGHT } from '@desktop-client/components/mobile/MobileNavTabs';
import { PullToRefresh } from '@desktop-client/components/mobile/PullToRefresh';
import { MobilePageHeader, Page } from '@desktop-client/components/Page';
-import {
- type Binding,
- type SheetFields,
-} from '@desktop-client/components/spreadsheet';
import {
CellValue,
CellValueText,
@@ -49,8 +45,9 @@ import { useLocalPref } from '@desktop-client/hooks/useLocalPref';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import { replaceModal } from '@desktop-client/modals/modalsSlice';
-import * as queries from '@desktop-client/queries/queries';
import { useDispatch, useSelector } from '@desktop-client/redux';
+import { type Binding, type SheetFields } from '@desktop-client/spreadsheet';
+import * as bindings from '@desktop-client/spreadsheet/bindings';
type AccountHeaderProps<SheetFieldName extends SheetFields<'account'>> = {
id: string;
@@ -528,10 +525,10 @@ export function Accounts() {
// format changes
key={numberFormat + hideFraction}
accounts={accounts}
- getAccountBalance={queries.accountBalance}
- getOnBudgetBalance={queries.onBudgetAccountBalance}
- getOffBudgetBalance={queries.offBudgetAccountBalance}
- getClosedAccountsBalance={queries.closedAccountBalance}
+ getAccountBalance={bindings.accountBalance}
+ getOnBudgetBalance={bindings.onBudgetAccountBalance}
+ getOffBudgetBalance={bindings.offBudgetAccountBalance}
+ getClosedAccountsBalance={bindings.closedAccountBalance}
onAddAccount={onAddAccount}
onOpenAccount={onOpenAccount}
onSync={onSync}
diff --git a/packages/desktop-client/src/components/mobile/budget/BalanceCell.tsx b/packages/desktop-client/src/components/mobile/budget/BalanceCell.tsx
index 99c40c07f9..68ce348040 100644
--- a/packages/desktop-client/src/components/mobile/budget/BalanceCell.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/BalanceCell.tsx
@@ -15,13 +15,13 @@ import { getColumnWidth, PILL_STYLE } from './BudgetTable';
import { BalanceWithCarryover } from '@desktop-client/components/budget/BalanceWithCarryover';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
-import { type Binding } from '@desktop-client/components/spreadsheet';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
+import { useFormat } from '@desktop-client/hooks/useFormat';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
+import { type Binding } from '@desktop-client/spreadsheet';
import {
envelopeBudget,
trackingBudget,
-} from '@desktop-client/queries/queries';
+} from '@desktop-client/spreadsheet/bindings';
type BalanceCellProps = {
binding: Binding<
diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetCell.tsx b/packages/desktop-client/src/components/mobile/budget/BudgetCell.tsx
index d0a023a385..ddac18795d 100644
--- a/packages/desktop-client/src/components/mobile/budget/BudgetCell.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/BudgetCell.tsx
@@ -13,14 +13,14 @@ import { getColumnWidth, PILL_STYLE } from './BudgetTable';
import { makeAmountGrey } from '@desktop-client/components/budget/util';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
-import { type SheetFields } from '@desktop-client/components/spreadsheet';
import { CellValue } from '@desktop-client/components/spreadsheet/CellValue';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
+import { useFormat } from '@desktop-client/hooks/useFormat';
import { useNotes } from '@desktop-client/hooks/useNotes';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import { useUndo } from '@desktop-client/hooks/useUndo';
import { pushModal } from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
+import { type SheetFields } from '@desktop-client/spreadsheet';
type BudgetCellProps<
SheetFieldName extends SheetFields<'envelope-budget' | 'tracking-budget'>,
diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
index 346422800b..4056dc37f9 100644
--- a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
+++ b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
@@ -35,23 +35,23 @@ import { PullToRefresh } from '@desktop-client/components/mobile/PullToRefresh';
import { MobilePageHeader, Page } from '@desktop-client/components/Page';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
import { CellValue } from '@desktop-client/components/spreadsheet/CellValue';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
import { SchedulesProvider } from '@desktop-client/hooks/useCachedSchedules';
import { useCategories } from '@desktop-client/hooks/useCategories';
+import { useFormat } from '@desktop-client/hooks/useFormat';
import { useLocale } from '@desktop-client/hooks/useLocale';
import { useLocalPref } from '@desktop-client/hooks/useLocalPref';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
import { useOverspentCategories } from '@desktop-client/hooks/useOverspentCategories';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import { useUndo } from '@desktop-client/hooks/useUndo';
import { pushModal } from '@desktop-client/modals/modalsSlice';
+import { useDispatch } from '@desktop-client/redux';
import {
envelopeBudget,
trackingBudget,
uncategorizedCount,
-} from '@desktop-client/queries/queries';
-import { useDispatch } from '@desktop-client/redux';
+} from '@desktop-client/spreadsheet/bindings';
export const ROW_HEIGHT = 50;
diff --git a/packages/desktop-client/src/components/mobile/budget/CategoryTransactions.tsx b/packages/desktop-client/src/components/mobile/budget/CategoryTransactions.tsx
index e3949ce256..40abfc7e5f 100644
--- a/packages/desktop-client/src/components/mobile/budget/CategoryTransactions.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/CategoryTransactions.tsx
@@ -23,8 +23,8 @@ import { useLocale } from '@desktop-client/hooks/useLocale';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
import { useTransactions } from '@desktop-client/hooks/useTransactions';
import { useTransactionsSearch } from '@desktop-client/hooks/useTransactionsSearch';
-import * as queries from '@desktop-client/queries/queries';
import { useDispatch } from '@desktop-client/redux';
+import * as bindings from '@desktop-client/spreadsheet/bindings';
type CategoryTransactionsProps = {
category: CategoryEntity;
@@ -131,9 +131,12 @@ function TransactionListWithPreviews({
[navigate],
);
- const balance = queries.categoryBalance(category.id, month);
- const balanceCleared = queries.categoryBalanceCleared(category.id, month);
- const balanceUncleared = queries.categoryBalanceUncleared(category.id, month);
+ const balance = bindings.categoryBalance(category.id, month);
+ const balanceCleared = bindings.categoryBalanceCleared(category.id, month);
+ const balanceUncleared = bindings.categoryBalanceUncleared(
+ category.id,
+ month,
+ );
const { previewTransactions } = useCategoryPreviewTransactions({
categoryId: category.id,
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
index 6b1599624a..088c27fbe2 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
@@ -19,17 +19,17 @@ import { BudgetCell } from './BudgetCell';
import { getColumnWidth, ROW_HEIGHT } from './BudgetTable';
import { SpentCell } from './SpentCell';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
import { useCategories } from '@desktop-client/hooks/useCategories';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import { useUndo } from '@desktop-client/hooks/useUndo';
import { collapseModals, pushModal } from '@desktop-client/modals/modalsSlice';
+import { useDispatch } from '@desktop-client/redux';
import {
envelopeBudget,
trackingBudget,
-} from '@desktop-client/queries/queries';
-import { useDispatch } from '@desktop-client/redux';
+} from '@desktop-client/spreadsheet/bindings';
type ExpenseCategoryNameProps = {
category: CategoryEntity;
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
index 11e746f512..8dfe9f296e 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
@@ -23,12 +23,12 @@ import { ExpenseCategoryList } from './ExpenseCategoryList';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
import { CellValue } from '@desktop-client/components/spreadsheet/CellValue';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
+import { useFormat } from '@desktop-client/hooks/useFormat';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import {
envelopeBudget,
trackingBudget,
-} from '@desktop-client/queries/queries';
+} from '@desktop-client/spreadsheet/bindings';
type ExpenseGroupListItemProps = ComponentPropsWithoutRef<
typeof GridListItem<CategoryGroupEntity>
diff --git a/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx b/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx
index d144668358..fa50c6ec63 100644
--- a/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx
@@ -19,11 +19,11 @@ import { getColumnWidth, ROW_HEIGHT } from './BudgetTable';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import { collapseModals, pushModal } from '@desktop-client/modals/modalsSlice';
+import { useDispatch } from '@desktop-client/redux';
import {
envelopeBudget,
trackingBudget,
-} from '@desktop-client/queries/queries';
-import { useDispatch } from '@desktop-client/redux';
+} from '@desktop-client/spreadsheet/bindings';
type IncomeCategoryNameProps = {
category: CategoryEntity;
diff --git a/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx b/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
index 5f8ffba2c1..d4183e09a2 100644
--- a/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
@@ -21,12 +21,12 @@ import { IncomeCategoryList } from './IncomeCategoryList';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
import { CellValue } from '@desktop-client/components/spreadsheet/CellValue';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
+import { useFormat } from '@desktop-client/hooks/useFormat';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import {
envelopeBudget,
trackingBudget,
-} from '@desktop-client/queries/queries';
+} from '@desktop-client/spreadsheet/bindings';
type IncomeGroupProps = {
categoryGroup: CategoryGroupEntity;
diff --git a/packages/desktop-client/src/components/mobile/budget/SpentCell.tsx b/packages/desktop-client/src/components/mobile/budget/SpentCell.tsx
index 31b0d5e0d1..11653eb1d9 100644
--- a/packages/desktop-client/src/components/mobile/budget/SpentCell.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/SpentCell.tsx
@@ -16,10 +16,10 @@ import { getColumnWidth, PILL_STYLE } from './BudgetTable';
import { makeAmountGrey } from '@desktop-client/components/budget/util';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
-import { type Binding } from '@desktop-client/components/spreadsheet';
import { CellValue } from '@desktop-client/components/spreadsheet/CellValue';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
import { useCategoryScheduleGoalTemplateIndicator } from '@desktop-client/hooks/useCategoryScheduleGoalTemplateIndicator';
+import { useFormat } from '@desktop-client/hooks/useFormat';
+import { type Binding } from '@desktop-client/spreadsheet';
type SpentCellProps = {
binding: Binding<'envelope-budget' | 'tracking-budget', 'sum-amount'>;
diff --git a/packages/desktop-client/src/components/mobile/budget/index.tsx b/packages/desktop-client/src/components/mobile/budget/index.tsx
index 498688fd82..96e8d60337 100644
--- a/packages/desktop-client/src/components/mobile/budget/index.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/index.tsx
@@ -12,11 +12,11 @@ import { BudgetTable } from './BudgetTable';
import { sync } from '@desktop-client/app/appSlice';
import { prewarmMonth } from '@desktop-client/components/budget/util';
-import { NamespaceContext } from '@desktop-client/components/spreadsheet/NamespaceContext';
import { SyncRefresh } from '@desktop-client/components/SyncRefresh';
import { useCategories } from '@desktop-client/hooks/useCategories';
import { useLocale } from '@desktop-client/hooks/useLocale';
import { useLocalPref } from '@desktop-client/hooks/useLocalPref';
+import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import { useSpreadsheet } from '@desktop-client/hooks/useSpreadsheet';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import { collapseModals, pushModal } from '@desktop-client/modals/modalsSlice';
@@ -508,7 +508,7 @@ export function Budget() {
}
return (
- <NamespaceContext.Provider value={monthUtils.sheetForMonth(startMonth)}>
+ <SheetNameProvider name={monthUtils.sheetForMonth(startMonth)}>
<SyncRefresh
onSync={async () => {
dispatch(sync());
@@ -535,6 +535,6 @@ export function Budget() {
/>
)}
</SyncRefresh>
- </NamespaceContext.Provider>
+ </SheetNameProvider>
);
}
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.tsx b/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.tsx
index 02fbbe22b3..3297de169a 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.tsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.tsx
@@ -15,20 +15,20 @@ import { TransactionList } from './TransactionList';
import { Search } from '@desktop-client/components/common/Search';
import { PullToRefresh } from '@desktop-client/components/mobile/PullToRefresh';
-import type {
- Binding,
- SheetNames,
- SheetFields,
-} from '@desktop-client/components/spreadsheet';
import {
CellValue,
CellValueText,
} from '@desktop-client/components/spreadsheet/CellValue';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
import {
SelectedProvider,
useSelected,
} from '@desktop-client/hooks/useSelected';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
+import type {
+ Binding,
+ SheetNames,
+ SheetFields,
+} from '@desktop-client/spreadsheet';
type TransactionSearchInputProps = {
placeholder: string;
diff --git a/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx
index 7d7025e4df..d14d985df1 100644
--- a/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx
@@ -15,7 +15,7 @@ import {
ModalHeader,
} from '@desktop-client/components/common/Modal';
import { SectionLabel } from '@desktop-client/components/forms';
-import { NamespaceContext } from '@desktop-client/components/spreadsheet/NamespaceContext';
+import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
type CategoryAutocompleteModalProps = Extract<
@@ -84,8 +84,8 @@ export function CategoryAutocompleteModal({
/>
)}
<View style={{ flex: 1 }}>
- <NamespaceContext.Provider
- value={month ? monthUtils.sheetForMonth(month) : ''}
+ <SheetNameProvider
+ name={month ? monthUtils.sheetForMonth(month) : ''}
>
<CategoryAutocomplete
focused={true}
@@ -101,7 +101,7 @@ export function CategoryAutocompleteModal({
showHiddenCategories={showHiddenCategories}
value={null}
/>
- </NamespaceContext.Provider>
+ </SheetNameProvider>
</View>
</View>
</>
diff --git a/packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsx
index 2eaa4602d6..a7b7581f4a 100644
--- a/packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsx
@@ -20,7 +20,7 @@ import {
import { CellValueText } from '@desktop-client/components/spreadsheet/CellValue';
import { useCategory } from '@desktop-client/hooks/useCategory';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type EnvelopeBalanceMenuModalProps = Omit<
Extract<ModalType, { name: 'envelope-balance-menu' }>['options'],
diff --git a/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx
index 086f1e33cd..3cb687f6c9 100644
--- a/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx
@@ -20,7 +20,7 @@ import {
import { FocusableAmountInput } from '@desktop-client/components/mobile/transactions/FocusableAmountInput';
import { useCategory } from '@desktop-client/hooks/useCategory';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type EnvelopeBudgetMenuModalProps = Omit<
Extract<ModalType, { name: 'envelope-budget-menu' }>['options'],
diff --git a/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx
index 96e44f6a2c..44b0043aa1 100644
--- a/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx
@@ -14,17 +14,17 @@ import {
ModalCloseButton,
ModalHeader,
} from '@desktop-client/components/common/Modal';
-import { NamespaceContext } from '@desktop-client/components/spreadsheet/NamespaceContext';
import { useCategories } from '@desktop-client/hooks/useCategories';
import { useLocale } from '@desktop-client/hooks/useLocale';
+import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import { useUndo } from '@desktop-client/hooks/useUndo';
import {
collapseModals,
type Modal as ModalType,
pushModal,
} from '@desktop-client/modals/modalsSlice';
-import { envelopeBudget } from '@desktop-client/queries/queries';
import { useDispatch } from '@desktop-client/redux';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type EnvelopeBudgetSummaryModalProps = Extract<
ModalType,
@@ -155,7 +155,7 @@ export function EnvelopeBudgetSummaryModal({
title={t('Budget Summary')}
rightContent={<ModalCloseButton onPress={close} />}
/>
- <NamespaceContext.Provider value={sheetForMonth(month)}>
+ <SheetNameProvider name={sheetForMonth(month)}>
<TotalsList
prevMonthName={prevMonthName}
style={{
@@ -174,7 +174,7 @@ export function EnvelopeBudgetSummaryModal({
onClick={() => onClick({ close })}
isTotalsListTooltipDisabled={true}
/>
- </NamespaceContext.Provider>
+ </SheetNameProvider>
</>
)}
</Modal>
diff --git a/packages/desktop-client/src/components/modals/EnvelopeIncomeBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeIncomeBalanceMenuModal.tsx
index eef9f1f572..9244307017 100644
--- a/packages/desktop-client/src/components/modals/EnvelopeIncomeBalanceMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeIncomeBalanceMenuModal.tsx
@@ -21,7 +21,7 @@ import {
import { CellValueText } from '@desktop-client/components/spreadsheet/CellValue';
import { useCategory } from '@desktop-client/hooks/useCategory';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type EnvelopeIncomeBalanceMenuModalProps = Omit<
Extract<ModalType, { name: 'envelope-income-balance-menu' }>['options'],
diff --git a/packages/desktop-client/src/components/modals/HoldBufferModal.tsx b/packages/desktop-client/src/components/modals/HoldBufferModal.tsx
index 7a65ef040d..73462f08ad 100644
--- a/packages/desktop-client/src/components/modals/HoldBufferModal.tsx
+++ b/packages/desktop-client/src/components/modals/HoldBufferModal.tsx
@@ -15,7 +15,7 @@ import {
import { FieldLabel } from '@desktop-client/components/mobile/MobileForms';
import { AmountInput } from '@desktop-client/components/util/AmountInput';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
-import { envelopeBudget } from '@desktop-client/queries/queries';
+import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
type HoldBufferModalProps = Extract<
ModalType,
diff --git a/packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsx
index 9de6a6e525..e3c0885d9d 100644
--- a/packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsx
@@ -20,7 +20,7 @@ import {
import { CellValueText } from '@desktop-client/components/spreadsheet/CellValue';
import { useCategory } from '@desktop-client/hooks/useCategory';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
-import { trackingBudget } from '@desktop-client/queries/queries';
+import { trackingBudget } from '@desktop-client/spreadsheet/bindings';
type TrackingBalanceMenuModalProps = Omit<
Extract<ModalType, { name: 'tracking-balance-menu' }>['options'],
diff --git a/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx
index 1f3eb65f0b..b6529a9d23 100644
--- a/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx
@@ -20,7 +20,7 @@ import {
import { FocusableAmountInput } from '@desktop-client/components/mobile/transactions/FocusableAmountInput';
import { useCategory } from '@desktop-client/hooks/useCategory';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
-import { trackingBudget } from '@desktop-client/queries/queries';
+import { trackingBudget } from '@desktop-client/spreadsheet/bindings';
type TrackingBudgetMenuModalProps = Omit<
Extract<ModalType, { name: 'tracking-budget-menu' }>['options'],
diff --git a/packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsx b/packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsx
index ba2e3671df..c98ad9b89b 100644
--- a/packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsx
+++ b/packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsx
@@ -15,7 +15,7 @@ import {
ModalCloseButton,
ModalHeader,
} from '@desktop-client/components/common/Modal';
-import { NamespaceContext } from '@desktop-client/components/spreadsheet/NamespaceContext';
+import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
type TrackingBudgetSummaryModalProps = Extract<
@@ -36,7 +36,7 @@ export function TrackingBudgetSummaryModal({
title={t('Budget Summary')}
rightContent={<ModalCloseButton onPress={close} />}
/>
- <NamespaceContext.Provider value={sheetForMonth(month)}>
+ <SheetNameProvider name={sheetForMonth(month)}>
<Stack
spacing={2}
style={{
@@ -52,7 +52,7 @@ export function TrackingBudgetSummaryModal({
projected={month >= currentMonth}
style={{ ...styles.mediumText, marginTop: 20 }}
/>
- </NamespaceContext.Provider>
+ </SheetNameProvider>
</>
)}
</Modal>
diff --git a/packages/desktop-client/src/components/sidebar/Account.tsx b/packages/desktop-client/src/components/sidebar/Account.tsx
index 6555f025cc..36be0443ee 100644
--- a/packages/desktop-client/src/components/sidebar/Account.tsx
+++ b/packages/desktop-client/src/components/sidebar/Account.tsx
@@ -27,10 +27,6 @@ import {
type OnDragChangeCallback,
type OnDropCallback,
} from '@desktop-client/components/sort';
-import {
- type SheetFields,
- type Binding,
-} from '@desktop-client/components/spreadsheet';
import { CellValue } from '@desktop-client/components/spreadsheet/CellValue';
import { useContextMenu } from '@desktop-client/hooks/useContextMenu';
import { useDragRef } from '@desktop-client/hooks/useDragRef';
@@ -41,6 +37,7 @@ import {
updateAccount,
} from '@desktop-client/queries/queriesSlice';
import { useDispatch } from '@desktop-client/redux';
+import { type SheetFields, type Binding } from '@desktop-client/spreadsheet';
export const accountNameStyle: CSSProperties = {
marginTop: -2,
diff --git a/packages/desktop-client/src/components/sidebar/Accounts.tsx b/packages/desktop-client/src/components/sidebar/Accounts.tsx
index 42a1e63838..2d462e8d81 100644
--- a/packages/desktop-client/src/components/sidebar/Accounts.tsx
+++ b/packages/desktop-client/src/components/sidebar/Accounts.tsx
@@ -17,8 +17,8 @@ import { useLocalPref } from '@desktop-client/hooks/useLocalPref';
import { useOffBudgetAccounts } from '@desktop-client/hooks/useOffBudgetAccounts';
import { useOnBudgetAccounts } from '@desktop-client/hooks/useOnBudgetAccounts';
import { useUpdatedAccounts } from '@desktop-client/hooks/useUpdatedAccounts';
-import * as queries from '@desktop-client/queries/queries';
import { useSelector, useDispatch } from '@desktop-client/redux';
+import * as bindings from '@desktop-client/spreadsheet/bindings';
const fontWeight = 600;
@@ -94,7 +94,7 @@ export function Accounts() {
<Account
name={t('All accounts')}
to="/accounts"
- query={queries.allAccountBalance()}
+ query={bindings.allAccountBalance()}
style={{ fontWeight, marginTop: 15 }}
/>
@@ -102,7 +102,7 @@ export function Accounts() {
<Account
name={t('On budget')}
to="/accounts/onbudget"
- query={queries.onBudgetAccountBalance()}
+ query={bindings.onBudgetAccountBalance()}
style={{
fontWeight,
marginTop: 13,
@@ -122,7 +122,7 @@ export function Accounts() {
failed={failedAccounts.has(account.id)}
updated={updatedAccounts.includes(account.id)}
to={getAccountPath(account)}
- query={queries.accountBalance(account.id)}
+ query={bindings.accountBalance(account.id)}
onDragChange={onDragChange}
onDrop={onReorder}
outerStyle={makeDropPadding(i)}
@@ -133,7 +133,7 @@ export function Accounts() {
<Account
name={t('Off budget')}
to="/accounts/offbudget"
- query={queries.offBudgetAccountBalance()}
+ query={bindings.offBudgetAccountBalance()}
style={{
fontWeight,
marginTop: 13,
@@ -153,7 +153,7 @@ export function Accounts() {
failed={failedAccounts.has(account.id)}
updated={updatedAccounts.includes(account.id)}
to={getAccountPath(account)}
- query={queries.accountBalance(account.id)}
+ query={bindings.accountBalance(account.id)}
onDragChange={onDragChange}
onDrop={onReorder}
outerStyle={makeDropPadding(i)}
@@ -180,7 +180,7 @@ export function Accounts() {
name={account.name}
account={account}
to={getAccountPath(account)}
- query={queries.accountBalance(account.id)}
+ query={bindings.accountBalance(account.id)}
onDragChange={onDragChange}
onDrop={onReorder}
/>
diff --git a/packages/desktop-client/src/components/spreadsheet/CellValue.tsx b/packages/desktop-client/src/components/spreadsheet/CellValue.tsx
index 4a9daddf09..8d991db127 100644
--- a/packages/desktop-client/src/components/spreadsheet/CellValue.tsx
+++ b/packages/desktop-client/src/components/spreadsheet/CellValue.tsx
@@ -8,18 +8,16 @@ import React, {
import { styles } from '@actual-app/components/styles';
import { Text } from '@actual-app/components/text';
-import { type FormatType, useFormat } from './useFormat';
-import { useSheetName } from './useSheetName';
-import { useSheetValue } from './useSheetValue';
-
+import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
+import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
+import { useSheetName } from '@desktop-client/hooks/useSheetName';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import {
type Binding,
type SheetNames,
type SheetFields,
type Spreadsheets,
-} from '.';
-
-import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
+} from '@desktop-client/spreadsheet';
type CellValueProps<
SheetName extends SheetNames,
diff --git a/packages/desktop-client/src/components/spreadsheet/NamespaceContext.ts b/packages/desktop-client/src/components/spreadsheet/NamespaceContext.ts
deleted file mode 100644
index 9de034c71c..0000000000
--- a/packages/desktop-client/src/components/spreadsheet/NamespaceContext.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { createContext } from 'react';
-
-export const NamespaceContext = createContext<string | undefined>(undefined);
diff --git a/packages/desktop-client/src/components/table.tsx b/packages/desktop-client/src/components/table.tsx
index 2fa97721b2..28e8877efa 100644
--- a/packages/desktop-client/src/components/table.tsx
+++ b/packages/desktop-client/src/components/table.tsx
@@ -36,21 +36,21 @@ import {
ConditionalPrivacyFilter,
mergeConditionalPrivacyFilterProps,
} from './PrivacyFilter';
-import {
- type Spreadsheets,
- type SheetFields,
- type SheetNames,
- type Binding,
-} from './spreadsheet';
-import { type FormatType, useFormat } from './spreadsheet/useFormat';
-import { useSheetValue } from './spreadsheet/useSheetValue';
+import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
import { useModalState } from '@desktop-client/hooks/useModalState';
import {
AvoidRefocusScrollProvider,
useProperFocus,
} from '@desktop-client/hooks/useProperFocus';
import { useSelectedItems } from '@desktop-client/hooks/useSelected';
+import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
+import {
+ type Spreadsheets,
+ type SheetFields,
+ type SheetNames,
+ type Binding,
+} from '@desktop-client/spreadsheet';
export const ROW_HEIGHT = 32;
diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.tsx b/packages/desktop-client/src/components/transactions/TransactionsTable.tsx
index 3a4f9fb125..c60c6e3abe 100644
--- a/packages/desktop-client/src/components/transactions/TransactionsTable.tsx
+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.tsx
@@ -89,7 +89,6 @@ import {
type StatusTypes,
} from '@desktop-client/components/schedules/StatusBadge';
import { DateSelect } from '@desktop-client/components/select/DateSelect';
-import { NamespaceContext } from '@desktop-client/components/spreadsheet/NamespaceContext';
import {
Cell,
CellButton,
@@ -116,6 +115,7 @@ import {
useSelectedDispatch,
useSelectedItems,
} from '@desktop-client/hooks/useSelected';
+import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import {
type SplitsExpandedContextValue,
useSplitsExpanded,
@@ -1528,8 +1528,8 @@ const Transaction = memo(function Transaction({
shouldSaveFromKey,
inputStyle,
}) => (
- <NamespaceContext.Provider
- value={monthUtils.sheetForMonth(
+ <SheetNameProvider
+ name={monthUtils.sheetForMonth(
monthUtils.monthFromDate(transaction.date),
)}
>
@@ -1545,7 +1545,7 @@ const Transaction = memo(function Transaction({
onSelect={onSave}
showHiddenCategories={false}
/>
- </NamespaceContext.Provider>
+ </SheetNameProvider>
)}
</CustomCell>
)}
diff --git a/packages/desktop-client/src/components/util/AmountInput.tsx b/packages/desktop-client/src/components/util/AmountInput.tsx
index 7522b2ced5..d67eeb88f6 100644
--- a/packages/desktop-client/src/components/util/AmountInput.tsx
+++ b/packages/desktop-client/src/components/util/AmountInput.tsx
@@ -20,7 +20,7 @@ import { css, cx } from '@emotion/css';
import { evalArithmetic } from 'loot-core/shared/arithmetic';
import { amountToInteger, appendDecimals } from 'loot-core/shared/util';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
+import { useFormat } from '@desktop-client/hooks/useFormat';
import { useMergedRefs } from '@desktop-client/hooks/useMergedRefs';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
diff --git a/packages/desktop-client/src/components/util/PercentInput.tsx b/packages/desktop-client/src/components/util/PercentInput.tsx
index f4bd93cddf..04dc264b90 100644
--- a/packages/desktop-client/src/components/util/PercentInput.tsx
+++ b/packages/desktop-client/src/components/util/PercentInput.tsx
@@ -12,7 +12,7 @@ import { Input } from '@actual-app/components/input';
import { evalArithmetic } from 'loot-core/shared/arithmetic';
-import { useFormat } from '@desktop-client/components/spreadsheet/useFormat';
+import { useFormat } from '@desktop-client/hooks/useFormat';
import { useMergedRefs } from '@desktop-client/hooks/useMergedRefs';
type PercentInputProps = {
diff --git a/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts b/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts
index b10786807d..08e9171ade 100644
--- a/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts
+++ b/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts
@@ -11,9 +11,9 @@ import {
import { useAccounts } from './useAccounts';
import { usePayees } from './usePayees';
import { usePreviewTransactions } from './usePreviewTransactions';
+import { useSheetValue } from './useSheetValue';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
-import { accountBalance } from '@desktop-client/queries/queries';
+import { accountBalance } from '@desktop-client/spreadsheet/bindings';
type UseAccountPreviewTransactionsProps = {
accountId?: AccountEntity['id'] | undefined;
diff --git a/packages/desktop-client/src/hooks/useCategoryPreviewTransactions.ts b/packages/desktop-client/src/hooks/useCategoryPreviewTransactions.ts
index 28841538c3..7bdd64b6a1 100644
--- a/packages/desktop-client/src/hooks/useCategoryPreviewTransactions.ts
+++ b/packages/desktop-client/src/hooks/useCategoryPreviewTransactions.ts
@@ -9,9 +9,9 @@ import {
import { useCategory } from './useCategory';
import { useCategoryScheduleGoalTemplates } from './useCategoryScheduleGoalTemplates';
import { usePreviewTransactions } from './usePreviewTransactions';
+import { useSheetValue } from './useSheetValue';
-import { useSheetValue } from '@desktop-client/components/spreadsheet/useSheetValue';
-import { categoryBalance } from '@desktop-client/queries/queries';
+import { categoryBalance } from '@desktop-client/spreadsheet/bindings';
type UseCategoryPreviewTransactionsProps = {
categoryId: CategoryEntity['id'];
diff --git a/packages/desktop-client/src/components/spreadsheet/useFormat.ts b/packages/desktop-client/src/hooks/useFormat.ts
similarity index 97%
rename from packages/desktop-client/src/components/spreadsheet/useFormat.ts
rename to packages/desktop-client/src/hooks/useFormat.ts
index 6d25904cf6..783d3bf683 100644
--- a/packages/desktop-client/src/components/spreadsheet/useFormat.ts
+++ b/packages/desktop-client/src/hooks/useFormat.ts
@@ -7,7 +7,7 @@ import {
setNumberFormat,
} from 'loot-core/shared/util';
-import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
+import { useSyncedPref } from './useSyncedPref';
export type FormatType =
| 'string'
diff --git a/packages/desktop-client/src/hooks/useOverspentCategories.ts b/packages/desktop-client/src/hooks/useOverspentCategories.ts
index 318587e74f..5596c0a233 100644
--- a/packages/desktop-client/src/hooks/useOverspentCategories.ts
+++ b/packages/desktop-client/src/hooks/useOverspentCategories.ts
@@ -9,7 +9,7 @@ import { useSyncedPref } from './useSyncedPref';
import {
envelopeBudget,
trackingBudget,
-} from '@desktop-client/queries/queries';
+} from '@desktop-client/spreadsheet/bindings';
type UseOverspentCategoriesProps = {
month: string;
diff --git a/packages/desktop-client/src/hooks/useSchedules.ts b/packages/desktop-client/src/hooks/useSchedules.ts
index a4853000ac..f42228f649 100644
--- a/packages/desktop-client/src/hooks/useSchedules.ts
+++ b/packages/desktop-client/src/hooks/useSchedules.ts
@@ -14,8 +14,8 @@ import type {
import { useSyncedPref } from './useSyncedPref';
+import { accountFilter } from '@desktop-client/queries';
import { liveQuery, type LiveQuery } from '@desktop-client/queries/liveQuery';
-import { accountFilter } from '@desktop-client/queries/queries';
export type ScheduleStatusType = ReturnType<typeof getStatus>;
export type ScheduleStatuses = Map<ScheduleEntity['id'], ScheduleStatusType>;
diff --git a/packages/desktop-client/src/components/spreadsheet/useSheetName.ts b/packages/desktop-client/src/hooks/useSheetName.tsx
similarity index 67%
rename from packages/desktop-client/src/components/spreadsheet/useSheetName.ts
rename to packages/desktop-client/src/hooks/useSheetName.tsx
index 2d5d287897..6067eb3144 100644
--- a/packages/desktop-client/src/components/spreadsheet/useSheetName.ts
+++ b/packages/desktop-client/src/hooks/useSheetName.tsx
@@ -1,9 +1,11 @@
// @ts-strict-ignore
-import { useContext } from 'react';
+import { createContext, type PropsWithChildren, useContext } from 'react';
-import { NamespaceContext } from './NamespaceContext';
-
-import { type SheetNames, type SheetFields, type Binding } from '.';
+import {
+ type SheetNames,
+ type SheetFields,
+ type Binding,
+} from '@desktop-client/spreadsheet';
function unresolveName(name) {
const idx = name.indexOf('!');
@@ -16,6 +18,18 @@ function unresolveName(name) {
return { sheet: null, name };
}
+const SheetNameContext = createContext<string | undefined>(undefined);
+
+type SheetNameProviderProps = PropsWithChildren<{ name: string }>;
+
+export function SheetNameProvider({ children, name }: SheetNameProviderProps) {
+ return (
+ <SheetNameContext.Provider value={name}>
+ {children}
+ </SheetNameContext.Provider>
+ );
+}
+
export function useSheetName<
SheetName extends SheetNames,
FieldName extends SheetFields<SheetName>,
@@ -38,7 +52,7 @@ export function useSheetName<
// Get the current sheet name, and unresolve the binding name if
// necessary (you might pass a fully resolved name like foo!name)
- let sheetName = useContext(NamespaceContext) || '__global';
+ let sheetName = useContext(SheetNameContext) || '__global';
const unresolved = unresolveName(bindingName);
if (unresolved.sheet) {
sheetName = unresolved.sheet;
diff --git a/packages/desktop-client/src/components/spreadsheet/useSheetValue.ts b/packages/desktop-client/src/hooks/useSheetValue.ts
similarity index 97%
rename from packages/desktop-client/src/components/spreadsheet/useSheetValue.ts
rename to packages/desktop-client/src/hooks/useSheetValue.ts
index 1db2eb0bd9..a380200ead 100644
--- a/packages/desktop-client/src/components/spreadsheet/useSheetValue.ts
+++ b/packages/desktop-client/src/hooks/useSheetValue.ts
@@ -1,6 +1,7 @@
import { useState, useRef, useLayoutEffect } from 'react';
import { useSheetName } from './useSheetName';
+import { useSpreadsheet } from './useSpreadsheet';
import {
type Spreadsheets,
@@ -8,9 +9,7 @@ import {
type SheetNames,
type Binding,
type BindingObject,
-} from '.';
-
-import { useSpreadsheet } from '@desktop-client/hooks/useSpreadsheet';
+} from '@desktop-client/spreadsheet';
type SheetValueResult<
SheetName extends SheetNames,
diff --git a/packages/desktop-client/src/hooks/useTransactionsSearch.ts b/packages/desktop-client/src/hooks/useTransactionsSearch.ts
index 8a697060a6..77b6a25827 100644
--- a/packages/desktop-client/src/hooks/useTransactionsSearch.ts
+++ b/packages/desktop-client/src/hooks/useTransactionsSearch.ts
@@ -4,7 +4,7 @@ import { debounce } from 'lodash';
import type { Query } from 'loot-core/shared/query';
-import * as queries from '@desktop-client/queries/queries';
+import * as queries from '@desktop-client/queries';
type UseTransactionsSearchProps = {
updateQuery: (updateFn: (searchQuery: Query) => Query) => void;
diff --git a/packages/desktop-client/src/queries/index.ts b/packages/desktop-client/src/queries/index.ts
new file mode 100644
index 0000000000..2a13a9d630
--- /dev/null
+++ b/packages/desktop-client/src/queries/index.ts
@@ -0,0 +1,119 @@
+// @ts-strict-ignore
+import { parse as parseDate, isValid as isDateValid } from 'date-fns';
+
+import {
+ dayFromDate,
+ getDayMonthRegex,
+ getDayMonthFormat,
+ getShortYearRegex,
+ getShortYearFormat,
+} from 'loot-core/shared/months';
+import { q, type Query } from 'loot-core/shared/query';
+import { currencyToAmount, amountToInteger } from 'loot-core/shared/util';
+import { type AccountEntity } from 'loot-core/types/models';
+import { type SyncedPrefs } from 'loot-core/types/prefs';
+
+export function accountFilter(
+ accountId?:
+ | AccountEntity['id']
+ | 'onbudget'
+ | 'offbudget'
+ | 'closed'
+ | 'uncategorized',
+ field = 'account',
+) {
+ if (accountId) {
+ if (accountId === 'onbudget') {
+ return {
+ $and: [
+ { [`${field}.offbudget`]: false },
+ { [`${field}.closed`]: false },
+ ],
+ };
+ } else if (accountId === 'offbudget') {
+ return {
+ $and: [
+ { [`${field}.offbudget`]: true },
+ { [`${field}.closed`]: false },
+ ],
+ };
+ } else if (accountId === 'closed') {
+ return { [`${field}.closed`]: true };
+ } else if (accountId === 'uncategorized') {
+ return {
+ [`${field}.offbudget`]: false,
+ category: null,
+ is_parent: false,
+ $or: [
+ {
+ 'payee.transfer_acct.offbudget': true,
+ 'payee.transfer_acct': null,
+ },
+ ],
+ };
+ } else {
+ return { [field]: accountId };
+ }
+ }
+
+ return null;
+}
+
+export function transactions(
+ accountId?:
+ | AccountEntity['id']
+ | 'onbudget'
+ | 'offbudget'
+ | 'closed'
+ | 'uncategorized',
+) {
+ let query = q('transactions').options({ splits: 'grouped' });
+
+ const filter = accountFilter(accountId);
+ if (filter) {
+ query = query.filter(filter);
+ }
+
+ return query;
+}
+
+export function transactionsSearch(
+ currentQuery: Query,
+ search: string,
+ dateFormat: SyncedPrefs['dateFormat'],
+) {
+ const amount = currencyToAmount(search);
+
+ // Support various date formats
+ let parsedDate;
+ if (getDayMonthRegex(dateFormat).test(search)) {
+ parsedDate = parseDate(search, getDayMonthFormat(dateFormat), new Date());
+ } else if (getShortYearRegex(dateFormat).test(search)) {
+ parsedDate = parseDate(search, getShortYearFormat(dateFormat), new Date());
+ } else {
+ parsedDate = parseDate(search, dateFormat, new Date());
+ }
+
+ return currentQuery.filter({
+ $or: {
+ 'payee.name': { $like: `%${search}%` },
+ 'payee.transfer_acct.name': { $like: `%${search}%` },
+ notes: { $like: `%${search}%` },
+ 'category.name': { $like: `%${search}%` },
+ 'account.name': { $like: `%${search}%` },
+ $or: [
+ isDateValid(parsedDate) && { date: dayFromDate(parsedDate) },
+ amount != null && {
+ amount: { $transform: '$abs', $eq: amountToInteger(amount) },
+ },
+ amount != null &&
+ Number.isInteger(amount) && {
+ amount: {
+ $transform: { $abs: { $idiv: ['$', 100] } },
+ $eq: amount,
+ },
+ },
+ ].filter(Boolean),
+ },
+ });
+}
diff --git a/packages/desktop-client/src/queries/queries.ts b/packages/desktop-client/src/spreadsheet/bindings.ts
similarity index 67%
rename from packages/desktop-client/src/queries/queries.ts
rename to packages/desktop-client/src/spreadsheet/bindings.ts
index 1670f573ed..aa0161c6de 100644
--- a/packages/desktop-client/src/queries/queries.ts
+++ b/packages/desktop-client/src/spreadsheet/bindings.ts
@@ -1,27 +1,12 @@
-// @ts-strict-ignore
-import { parse as parseDate, isValid as isDateValid } from 'date-fns';
-
-import {
- dayFromDate,
- getDayMonthRegex,
- getDayMonthFormat,
- getShortYearRegex,
- getShortYearFormat,
-} from 'loot-core/shared/months';
-import { q, type Query } from 'loot-core/shared/query';
-import { currencyToAmount, amountToInteger } from 'loot-core/shared/util';
-import {
- type CategoryEntity,
- type AccountEntity,
-} from 'loot-core/types/models';
-import { type SyncedPrefs } from 'loot-core/types/prefs';
+import { q } from 'loot-core/shared/query';
+import type { AccountEntity, CategoryEntity } from 'loot-core/types/models';
import {
parametrizedField,
type SheetFields,
type Binding,
type SheetNames,
-} from '@desktop-client/components/spreadsheet';
+} from '.';
type BudgetType<SheetName extends SheetNames> = Record<
string,
@@ -33,111 +18,6 @@ const categoryParametrizedField = parametrizedField<'category'>();
const envelopeParametrizedField = parametrizedField<'envelope-budget'>();
const trackingParametrizedField = parametrizedField<'tracking-budget'>();
-export function accountFilter(
- accountId?:
- | AccountEntity['id']
- | 'onbudget'
- | 'offbudget'
- | 'closed'
- | 'uncategorized',
- field = 'account',
-) {
- if (accountId) {
- if (accountId === 'onbudget') {
- return {
- $and: [
- { [`${field}.offbudget`]: false },
- { [`${field}.closed`]: false },
- ],
- };
- } else if (accountId === 'offbudget') {
- return {
- $and: [
- { [`${field}.offbudget`]: true },
- { [`${field}.closed`]: false },
- ],
- };
- } else if (accountId === 'closed') {
- return { [`${field}.closed`]: true };
- } else if (accountId === 'uncategorized') {
- return {
- [`${field}.offbudget`]: false,
- category: null,
- is_parent: false,
- $or: [
- {
- 'payee.transfer_acct.offbudget': true,
- 'payee.transfer_acct': null,
- },
- ],
- };
- } else {
- return { [field]: accountId };
- }
- }
-
- return null;
-}
-
-export function transactions(
- accountId?:
- | AccountEntity['id']
- | 'onbudget'
- | 'offbudget'
- | 'closed'
- | 'uncategorized',
-) {
- let query = q('transactions').options({ splits: 'grouped' });
-
- const filter = accountFilter(accountId);
- if (filter) {
- query = query.filter(filter);
- }
-
- return query;
-}
-
-export function transactionsSearch(
- currentQuery: Query,
- search: string,
- dateFormat: SyncedPrefs['dateFormat'],
-) {
- const amount = currencyToAmount(search);
-
- // Support various date formats
- let parsedDate;
- if (getDayMonthRegex(dateFormat).test(search)) {
- parsedDate = parseDate(search, getDayMonthFormat(dateFormat), new Date());
- } else if (getShortYearRegex(dateFormat).test(search)) {
- parsedDate = parseDate(search, getShortYearFormat(dateFormat), new Date());
- } else {
- parsedDate = parseDate(search, dateFormat, new Date());
- }
-
- return currentQuery.filter({
- $or: {
- 'payee.name': { $like: `%${search}%` },
- 'payee.transfer_acct.name': { $like: `%${search}%` },
- notes: { $like: `%${search}%` },
- 'category.name': { $like: `%${search}%` },
- 'account.name': { $like: `%${search}%` },
- $or: [
- isDateValid(parsedDate) && { date: dayFromDate(parsedDate) },
- amount != null && {
- amount: { $transform: '$abs', $eq: amountToInteger(amount) },
- },
- amount != null &&
- Number.isInteger(amount) && {
- amount: {
- $transform: { $abs: { $idiv: ['$', 100] } },
- $eq: amount,
- },
- },
- ].filter(Boolean),
- },
- });
-}
-
export function accountBalance(accountId: AccountEntity['id']) {
return {
name: accountParametrizedField('balance')(accountId),
@@ -253,7 +133,6 @@ export function categoryBalanceUncleared(
.calculate({ $sum: '$amount' }),
} satisfies Binding<'category', 'balanceUncleared'>;
}
-
const uncategorizedQuery = q('transactions').filter({
'account.offbudget': false,
category: null,
diff --git a/packages/desktop-client/src/components/spreadsheet/index.ts b/packages/desktop-client/src/spreadsheet/index.ts
similarity index 100%
rename from packages/desktop-client/src/components/spreadsheet/index.ts
rename to packages/desktop-client/src/spreadsheet/index.ts
diff --git a/upcoming-release-notes/5007.md b/upcoming-release-notes/5007.md
new file mode 100644
index 0000000000..dcbc4b74a0
--- /dev/null
+++ b/upcoming-release-notes/5007.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+Move spreadsheet bindings to spreadsheets feature folder and move hooks from src/components/spreadsheets to src/hooks