Merge branch 'master' into useSheetValue-fix-and-ts

packages/desktop-client/src/components/reports/Overview.tsx

@@ -38,8 +38,8 @@ import { CustomReportListCards } from './reports/CustomReportListCards';
 import { MarkdownCard } from './reports/MarkdownCard';
 import { NetWorthCard } from './reports/NetWorthCard';
 import { SpendingCard } from './reports/SpendingCard';
-
 import './overview.scss';
+import { SummaryCard } from './reports/SummaryCard';
 
 const ResponsiveGridLayout = WidthProvider(Responsive);
 
@@ -381,6 +381,10 @@ export function Overview() {
                           name: 'markdown-card' as const,
                           text: t('Text widget'),
                         },
+                        {
+                          name: 'summary-card' as const,
+                          text: t('Summary card'),
+                        },
                         {
                           name: 'custom-report' as const,
                           text: t('New custom report'),
@@ -522,6 +526,14 @@ export function Overview() {
                     report={customReportMap.get(item.meta.id)}
                     onRemove={() => onRemoveWidget(item.i)}
                   />
+                ) : item.type === 'summary-card' ? (
+                  <SummaryCard
+                    widgetId={item.i}
+                    isEditing={isEditing}
+                    meta={item.meta}
+                    onMetaChange={newMeta => onMetaChange(item, newMeta)}
+                    onRemove={() => onRemoveWidget(item.i)}
+                  />
                 ) : null}
               </div>
             ))}

packages/desktop-client/src/components/reports/ReportRouter.tsx

@@ -6,6 +6,7 @@ import { CashFlow } from './reports/CashFlow';
 import { CustomReport } from './reports/CustomReport';
 import { NetWorth } from './reports/NetWorth';
 import { Spending } from './reports/Spending';
+import { Summary } from './reports/Summary';
 
 export function ReportRouter() {
   return (
@@ -19,6 +20,8 @@ export function ReportRouter() {
       <Route path="/custom/:id" element={<CustomReport />} />
       <Route path="/spending" element={<Spending />} />
       <Route path="/spending/:id" element={<Spending />} />
+      <Route path="/summary" element={<Summary />} />
+      <Route path="/summary/:id" element={<Summary />} />
     </Routes>
   );
 }

packages/desktop-client/src/components/reports/SummaryNumber.tsx

@@ -0,0 +1,148 @@
+import React, { type Ref, useRef, useState } from 'react';
+
+import { debounce } from 'debounce';
+
+import { amountToCurrency } from 'loot-core/shared/util';
+
+import { useMergedRefs } from '../../hooks/useMergedRefs';
+import { useResizeObserver } from '../../hooks/useResizeObserver';
+import { View } from '../common/View';
+import { PrivacyFilter } from '../PrivacyFilter';
+
+import { chartTheme } from './chart-theme';
+import { LoadingIndicator } from './LoadingIndicator';
+
+const FONT_SIZE_SCALE_FACTOR = 0.9;
+const MAX_RECURSION_DEPTH = 10;
+
+type SummaryNumberProps = {
+  value: number;
+  animate?: boolean;
+  suffix?: string;
+  loading?: boolean;
+  initialFontSize?: number;
+  fontSizeChanged?: (fontSize: number) => void;
+};
+
+export function SummaryNumber({
+  value,
+  animate = false,
+  suffix = '',
+  loading = true,
+  initialFontSize = 14,
+  fontSizeChanged,
+}: SummaryNumberProps) {
+  const [fontSize, setFontSize] = useState<number>(0);
+  const refDiv = useRef<HTMLDivElement>(null);
+  const offScreenRef = useRef<HTMLDivElement>(null);
+
+  const adjustFontSizeBinary = (minFontSize: number, maxFontSize: number) => {
+    if (!offScreenRef.current || !refDiv.current) return;
+
+    const offScreenDiv = offScreenRef.current;
+    const refDivCurrent = refDiv.current;
+
+    const binarySearchFontSize = (
+      min: number,
+      max: number,
+      depth: number = 0,
+    ) => {
+      if (depth >= MAX_RECURSION_DEPTH) {
+        setFontSize(min);
+        return;
+      }
+
+      const testFontSize = (min + max) / 2;
+      offScreenDiv.style.fontSize = `${testFontSize}px`;
+
+      requestAnimationFrame(() => {
+        const isOverflowing =
+          offScreenDiv.scrollWidth > refDivCurrent.clientWidth ||
+          offScreenDiv.scrollHeight > refDivCurrent.clientHeight;
+
+        if (isOverflowing) {
+          binarySearchFontSize(min, testFontSize, depth + 1);
+        } else {
+          const isUnderflowing =
+            offScreenDiv.scrollWidth <=
+              refDivCurrent.clientWidth * FONT_SIZE_SCALE_FACTOR ||
+            offScreenDiv.scrollHeight <=
+              refDivCurrent.clientHeight * FONT_SIZE_SCALE_FACTOR;
+
+          if (isUnderflowing && testFontSize < max) {
+            binarySearchFontSize(testFontSize, max, depth + 1);
+          } else {
+            setFontSize(testFontSize);
+            if (initialFontSize !== testFontSize && fontSizeChanged) {
+              fontSizeChanged(testFontSize);
+            }
+          }
+        }
+      });
+    };
+
+    binarySearchFontSize(minFontSize, maxFontSize);
+  };
+
+  const handleResize = debounce(() => {
+    adjustFontSizeBinary(14, 200);
+  }, 250);
+
+  const ref = useResizeObserver(handleResize);
+  const mergedRef = useMergedRefs(ref, refDiv);
+
+  return (
+    <>
+      {loading && <LoadingIndicator />}
+      {!loading && (
+        <>
+          <div
+            ref={offScreenRef}
+            style={{
+              position: 'fixed',
+              left: '-999px',
+              top: '-999px',
+              fontSize: `${initialFontSize}px`,
+              lineHeight: 1,
+              visibility: 'hidden',
+              whiteSpace: 'nowrap',
+              padding: 8,
+            }}
+          >
+            <PrivacyFilter>
+              {amountToCurrency(Math.abs(value))}
+              {suffix}
+            </PrivacyFilter>
+          </div>
+
+          <View
+            ref={mergedRef as Ref<HTMLDivElement>}
+            role="text"
+            aria-label={`${value < 0 ? 'Negative' : 'Positive'} amount: ${amountToCurrency(Math.abs(value))}${suffix}`}
+            style={{
+              alignItems: 'center',
+              flexGrow: 1,
+              flexShrink: 1,
+              width: '100%',
+              height: '100%',
+              maxWidth: '100%',
+              fontSize: `${fontSize}px`,
+              lineHeight: 1,
+              padding: 8,
+              justifyContent: 'center',
+              transition: animate ? 'font-size 0.3s ease' : '',
+              color: value < 0 ? chartTheme.colors.red : chartTheme.colors.blue,
+            }}
+          >
+            <span aria-hidden="true">
+              <PrivacyFilter>
+                {amountToCurrency(Math.abs(value))}
+                {suffix}
+              </PrivacyFilter>
+            </span>
+          </View>
+        </>
+      )}
+    </>
+  );
+}

packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableHeader.tsx

@@ -70,6 +70,7 @@ export function ReportTableHeader({
           style={{
             width: compact ? 80 : 125,
             flexShrink: 0,
+            flexGrow: 1,
           }}
           valueStyle={compactStyle}
           value={

packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableRow.tsx

@@ -123,6 +123,7 @@ export const ReportTableRow = memo(
             style={{
               width: compact ? 80 : 125,
               flexShrink: 0,
+              flexGrow: 1,
             }}
             valueStyle={compactStyle}
           />