Merge branch 'master' into calendar_report

actualbudget · Nov 18, 2024 · 79da7a9 · 79da7a9
2 parents 9eb38ac + 18f538c
commit 79da7a9
Show file tree

Hide file tree

Showing 54 changed files with 1,938 additions and 1,770 deletions.
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png
diff --git a/...cking--c18ad-l-redirects-to-the-category-transactions-page-1-chromium-linux.png b/...cking--c18ad-l-redirects-to-the-category-transactions-page-1-chromium-linux.png
diff --git a/...cking--e995e-l-redirects-to-the-category-transactions-page-3-chromium-linux.png b/...cking--e995e-l-redirects-to-the-category-transactions-page-3-chromium-linux.png
diff --git a/...cking--ff568-l-redirects-to-the-category-transactions-page-2-chromium-linux.png b/...cking--ff568-l-redirects-to-the-category-transactions-page-2-chromium-linux.png
diff --git a/...cking--11290-l-redirects-to-the-category-transactions-page-3-chromium-linux.png b/...cking--11290-l-redirects-to-the-category-transactions-page-3-chromium-linux.png
diff --git a/...cking--57d88-l-redirects-to-the-category-transactions-page-2-chromium-linux.png b/...cking--57d88-l-redirects-to-the-category-transactions-page-2-chromium-linux.png
diff --git a/...cking--5d90c-l-redirects-to-the-category-transactions-page-1-chromium-linux.png b/...cking--5d90c-l-redirects-to-the-category-transactions-page-1-chromium-linux.png
diff --git a/...ts/Mobile-Settings-checks-that-settings-page-can-be-opened-1-chromium-linux.png b/...ts/Mobile-Settings-checks-that-settings-page-can-be-opened-1-chromium-linux.png
diff --git a/...ts/Mobile-Settings-checks-that-settings-page-can-be-opened-2-chromium-linux.png b/...ts/Mobile-Settings-checks-that-settings-page-can-be-opened-2-chromium-linux.png
diff --git a/...ts/Mobile-Settings-checks-that-settings-page-can-be-opened-3-chromium-linux.png b/...ts/Mobile-Settings-checks-that-settings-page-can-be-opened-3-chromium-linux.png
diff --git a/...obile-Transactions-creates-a-transaction-via-footer-button-7-chromium-linux.png b/...obile-Transactions-creates-a-transaction-via-footer-button-7-chromium-linux.png
diff --git a/...obile-Transactions-creates-a-transaction-via-footer-button-8-chromium-linux.png b/...obile-Transactions-creates-a-transaction-via-footer-button-8-chromium-linux.png
diff --git a/...obile-Transactions-creates-a-transaction-via-footer-button-9-chromium-linux.png b/...obile-Transactions-creates-a-transaction-via-footer-button-9-chromium-linux.png
diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json
@@ -50,8 +50,8 @@
     "promise-retry": "^2.0.1",
     "re-resizable": "^6.9.17",
     "react": "18.2.0",
-    "react-aria": "^3.34.3",
-    "react-aria-components": "^1.3.3",
+    "react-aria": "^3.35.1",
+    "react-aria-components": "^1.4.1",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "18.2.0",
@@ -65,7 +65,7 @@
     "react-router-dom": "6.21.3",
     "react-simple-pull-to-refresh": "^1.3.3",
     "react-spring": "^9.7.3",
-    "react-stately": "^3.10.9",
+    "react-stately": "^3.33.0",
     "react-virtualized-auto-sizer": "^1.0.21",
     "recharts": "^2.10.4",
     "redux": "^4.2.1",

diff --git a/packages/desktop-client/src/components/App.tsx b/packages/desktop-client/src/components/App.tsx
@@ -40,7 +40,6 @@ import { FinancesApp } from './FinancesApp';
 import { ManagementApp } from './manager/ManagementApp';
 import { Modals } from './Modals';
 import { ResponsiveProvider } from './responsive/ResponsiveProvider';
-import { ScrollProvider } from './ScrollProvider';
 import { SidebarProvider } from './sidebar/SidebarProvider';
 import { UpdateNotification } from './UpdateNotification';
 
@@ -180,36 +179,34 @@ export function App() {
             <SidebarProvider>
               <BudgetMonthCountProvider>
                 <DndProvider backend={HTML5Backend}>
-                  <ScrollProvider>
+                  <View
+                    data-theme={theme}
+                    style={{
+                      height: '100%',
+                      display: 'flex',
+                      flexDirection: 'column',
+                    }}
+                  >
                     <View
-                      data-theme={theme}
+                      key={
+                        hiddenScrollbars ? 'hidden-scrollbars' : 'scrollbars'
+                      }
                       style={{
-                        height: '100%',
-                        display: 'flex',
-                        flexDirection: 'column',
+                        flexGrow: 1,
+                        overflow: 'hidden',
+                        ...styles.lightScrollbar,
                       }}
                     >
-                      <View
-                        key={
-                          hiddenScrollbars ? 'hidden-scrollbars' : 'scrollbars'
-                        }
-                        style={{
-                          flexGrow: 1,
-                          overflow: 'hidden',
-                          ...styles.lightScrollbar,
-                        }}
-                      >
-                        <ErrorBoundary FallbackComponent={ErrorFallback}>
-                          {process.env.REACT_APP_REVIEW_ID &&
-                            !Platform.isPlaywright && <DevelopmentTopBar />}
-                          <AppInner />
-                        </ErrorBoundary>
-                        <ThemeStyle />
-                        <Modals />
-                        <UpdateNotification />
-                      </View>
+                      <ErrorBoundary FallbackComponent={ErrorFallback}>
+                        {process.env.REACT_APP_REVIEW_ID &&
+                          !Platform.isPlaywright && <DevelopmentTopBar />}
+                        <AppInner />
+                      </ErrorBoundary>
+                      <ThemeStyle />
+                      <Modals />
+                      <UpdateNotification />
                     </View>
-                  </ScrollProvider>
+                  </View>
                 </DndProvider>
               </BudgetMonthCountProvider>
             </SidebarProvider>

diff --git a/packages/desktop-client/src/components/FinancesApp.tsx b/packages/desktop-client/src/components/FinancesApp.tsx
@@ -1,5 +1,5 @@
 // @ts-strict-ignore
-import React, { type ReactElement, useEffect } from 'react';
+import React, { type ReactElement, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import {
@@ -34,6 +34,7 @@ import { Reports } from './reports';
 import { LoadingIndicator } from './reports/LoadingIndicator';
 import { NarrowAlternate, WideComponent } from './responsive';
 import { useResponsive } from './responsive/ResponsiveProvider';
+import { ScrollProvider } from './ScrollProvider';
 import { Settings } from './settings';
 import { FloatableSidebar } from './sidebar';
 import { Titlebar } from './Titlebar';
@@ -156,6 +157,8 @@ export function FinancesApp() {
     run();
   }, [lastUsedVersion, setLastUsedVersion]);
 
+  const scrollableRef = useRef<HTMLDivElement>(null);
+
   return (
     <View style={{ height: '100%' }}>
       <RouterBehaviors />
@@ -179,113 +182,119 @@ export function FinancesApp() {
             width: '100%',
           }}
         >
-          <View
-            style={{
-              flex: 1,
-              overflow: 'auto',
-              position: 'relative',
-            }}
+          <ScrollProvider
+            isDisabled={!isNarrowWidth}
+            scrollableRef={scrollableRef}
           >
-            <Titlebar
+            <View
+              ref={scrollableRef}
               style={{
-                WebkitAppRegion: 'drag',
-                position: 'absolute',
-                top: 0,
-                left: 0,
-                right: 0,
-                zIndex: 1000,
+                flex: 1,
+                overflow: 'auto',
+                position: 'relative',
               }}
-            />
-            <Notifications />
-            <BankSyncStatus />
-
-            <Routes>
-              <Route
-                path="/"
-                element={
-                  accountsLoaded ? (
-                    accounts.length > 0 ? (
-                      <Navigate to="/budget" replace />
+            >
+              <Titlebar
+                style={{
+                  WebkitAppRegion: 'drag',
+                  position: 'absolute',
+                  top: 0,
+                  left: 0,
+                  right: 0,
+                  zIndex: 1000,
+                }}
+              />
+              <Notifications />
+              <BankSyncStatus />
+
+              <Routes>
+                <Route
+                  path="/"
+                  element={
+                    accountsLoaded ? (
+                      accounts.length > 0 ? (
+                        <Navigate to="/budget" replace />
+                      ) : (
+                        // If there are no accounts, we want to redirect the user to
+                        // the All Accounts screen which will prompt them to add an account
+                        <Navigate to="/accounts" replace />
+                      )
                     ) : (
-                      // If there are no accounts, we want to redirect the user to
-                      // the All Accounts screen which will prompt them to add an account
-                      <Navigate to="/accounts" replace />
+                      <LoadingIndicator />
                     )
-                  ) : (
-                    <LoadingIndicator />
-                  )
-                }
-              />
-
-              <Route path="/reports/*" element={<Reports />} />
+                  }
+                />
+
+                <Route path="/reports/*" element={<Reports />} />
+
+                <Route
+                  path="/budget"
+                  element={<NarrowAlternate name="Budget" />}
+                />
+
+                <Route
+                  path="/schedules"
+                  element={
+                    <NarrowNotSupported>
+                      <WideComponent name="Schedules" />
+                    </NarrowNotSupported>
+                  }
+                />
+
+                <Route path="/payees" element={<ManagePayeesPage />} />
+                <Route path="/rules" element={<ManageRulesPage />} />
+                <Route path="/settings" element={<Settings />} />
+
+                <Route
+                  path="/gocardless/link"
+                  element={
+                    <NarrowNotSupported>
+                      <WideComponent name="GoCardlessLink" />
+                    </NarrowNotSupported>
+                  }
+                />
+
+                <Route
+                  path="/accounts"
+                  element={<NarrowAlternate name="Accounts" />}
+                />
+
+                <Route
+                  path="/accounts/:id"
+                  element={<NarrowAlternate name="Account" />}
+                />
+
+                <Route
+                  path="/transactions/:transactionId"
+                  element={
+                    <WideNotSupported>
+                      <TransactionEdit />
+                    </WideNotSupported>
+                  }
+                />
+
+                <Route
+                  path="/categories/:id"
+                  element={
+                    <WideNotSupported>
+                      <Category />
+                    </WideNotSupported>
+                  }
+                />
+
+                {/* redirect all other traffic to the budget page */}
+                <Route path="/*" element={<Navigate to="/budget" replace />} />
+              </Routes>
+            </View>
 
-              <Route
-                path="/budget"
-                element={<NarrowAlternate name="Budget" />}
-              />
-
-              <Route
-                path="/schedules"
-                element={
-                  <NarrowNotSupported>
-                    <WideComponent name="Schedules" />
-                  </NarrowNotSupported>
-                }
-              />
-
-              <Route path="/payees" element={<ManagePayeesPage />} />
-              <Route path="/rules" element={<ManageRulesPage />} />
-              <Route path="/settings" element={<Settings />} />
-
-              <Route
-                path="/gocardless/link"
-                element={
-                  <NarrowNotSupported>
-                    <WideComponent name="GoCardlessLink" />
-                  </NarrowNotSupported>
-                }
-              />
-
-              <Route
-                path="/accounts"
-                element={<NarrowAlternate name="Accounts" />}
-              />
-
-              <Route
-                path="/accounts/:id"
-                element={<NarrowAlternate name="Account" />}
-              />
-
-              <Route
-                path="/transactions/:transactionId"
-                element={
-                  <WideNotSupported>
-                    <TransactionEdit />
-                  </WideNotSupported>
-                }
-              />
-
-              <Route
-                path="/categories/:id"
-                element={
-                  <WideNotSupported>
-                    <Category />
-                  </WideNotSupported>
-                }
-              />
-
-              {/* redirect all other traffic to the budget page */}
-              <Route path="/*" element={<Navigate to="/budget" replace />} />
+            <Routes>
+              <Route path="/budget" element={<MobileNavTabs />} />
+              <Route path="/accounts" element={<MobileNavTabs />} />
+              <Route path="/settings" element={<MobileNavTabs />} />
+              <Route path="/reports" element={<MobileNavTabs />} />
+              <Route path="*" element={null} />
             </Routes>
-          </View>
-
-          <Routes>
-            <Route path="/budget" element={<MobileNavTabs />} />
-            <Route path="/accounts" element={<MobileNavTabs />} />
-            <Route path="/settings" element={<MobileNavTabs />} />
-            <Route path="/reports" element={<MobileNavTabs />} />
-            <Route path="*" element={null} />
-          </Routes>
+          </ScrollProvider>
         </View>
       </View>
     </View>