merge fixes

actualbudget · Jan 6, 2024 · 0927722 · 0927722
1 parent 7dd2682
commit 0927722
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/packages/desktop-client/src/components/reports/ChooseGraph.tsx b/packages/desktop-client/src/components/reports/ChooseGraph.tsx
@@ -9,11 +9,11 @@ import { BarLineGraph } from './graphs/BarLineGraph';
 import { DonutGraph } from './graphs/DonutGraph';
 import { LineGraph } from './graphs/LineGraph';
 import { StackedBarGraph } from './graphs/StackedBarGraph';
-import { ReportTable}  from './graphs/tableGraph/ReportTable';
-import ReportTableHeader from './graphs/tableGraph/ReportTableHeader';
-import ReportTableList from './graphs/tableGraph/ReportTableList';
-import ReportTableTotals from './graphs/tableGraph/ReportTableTotals';
 import { ReportOptions } from './ReportOptions';
+import { ReportTable}  from './graphs/tableGraph/ReportTable';
+import { ReportTableHeader } from './graphs/tableGraph/ReportTableHeader';
+import { ReportTableList } from './graphs/tableGraph/ReportTableList';
+import { ReportTableTotals } from './graphs/tableGraph/ReportTableTotals';
 
 type ChooseGraphProps = {
   data: DataEntity;

diff --git a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTable.tsx b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTable.tsx
@@ -7,7 +7,7 @@ import React, {
 import { type RefProp } from 'react-spring';
 
 import { type CSSProperties } from '../../../../style';
-import View from '../../../common/View';
+import { View } from '../../../common/View';
 
 type ReportTableProps = {
   saveScrollWidth?: (value: number) => void;
@@ -17,7 +17,7 @@ type ReportTableProps = {
   handleScroll?: UIEventHandler<HTMLDivElement>;
 };
 
-export default function ReportTable({
+export function ReportTable({
   saveScrollWidth,
   listScrollRef,
   style,

diff --git a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableHeader.tsx b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableHeader.tsx
@@ -2,7 +2,7 @@ import React, { type UIEventHandler } from 'react';
 import { type RefProp } from 'react-spring';
 
 import { styles, theme } from '../../../../style';
-import View from '../../../common/View';
+import { View } from '../../../common/View';
 import { Row, Cell } from '../../../table';
 import { type MonthData } from '../../entities';
 
@@ -15,7 +15,7 @@ type ReportTableHeaderProps = {
   handleScroll?: UIEventHandler<HTMLDivElement>;
 };
 
-function ReportTableHeader({
+export function ReportTableHeader({
   scrollWidth,
   groupBy,
   interval,
@@ -109,5 +109,3 @@ function ReportTableHeader({
     </Row>
   );
 }
-
-export default ReportTableHeader;
diff --git a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableList.tsx b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableList.tsx
@@ -7,7 +7,7 @@ import {
 } from 'loot-core/src/shared/util';
 
 import { type CSSProperties, styles, theme } from '../../../../style';
-import View from '../../../common/View';
+import { View } from '../../../common/View';
 import { Row, Cell } from '../../../table';
 
 type TableRowProps = {
@@ -186,7 +186,7 @@ function GroupedTableRow({
   );
 }
 
-export default function ReportTableList({
+export function ReportTableList({
   data,
   empty,
   monthsCount,

diff --git a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableTotals.tsx b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableTotals.tsx
@@ -8,7 +8,7 @@ import {
 } from 'loot-core/src/shared/util';
 
 import { styles, theme } from '../../../../style';
-import View from '../../../common/View';
+import { View } from '../../../common/View';
 import { Row, Cell } from '../../../table';
 import { type DataEntity } from '../../entities';
 
@@ -22,7 +22,7 @@ type ReportTableTotalsProps = {
   handleScroll: UIEventHandler<HTMLDivElement>;
 };
 
-function ReportTableTotals({
+export function ReportTableTotals({
   data,
   scrollWidth,
   balanceTypeOp,
@@ -154,5 +154,3 @@ function ReportTableTotals({
     </Row>
   );
 }
-
-export default ReportTableTotals;