From 0927722faf1732de59132497b252d5a92ec9545b Mon Sep 17 00:00:00 2001 From: carkom Date: Sat, 6 Jan 2024 23:27:39 +0000 Subject: [PATCH] merge fixes --- .../desktop-client/src/components/reports/ChooseGraph.tsx | 8 ++++---- .../components/reports/graphs/tableGraph/ReportTable.tsx | 4 ++-- .../reports/graphs/tableGraph/ReportTableHeader.tsx | 6 ++---- .../reports/graphs/tableGraph/ReportTableList.tsx | 4 ++-- .../reports/graphs/tableGraph/ReportTableTotals.tsx | 6 ++---- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/packages/desktop-client/src/components/reports/ChooseGraph.tsx b/packages/desktop-client/src/components/reports/ChooseGraph.tsx index 005f974c806..c3da8837524 100644 --- 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 index 5f30b471753..91a5ca1457a 100644 --- 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; }; -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 index 565f1d7de60..c95fb518f41 100644 --- 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; }; -function ReportTableHeader({ +export function ReportTableHeader({ scrollWidth, groupBy, interval, @@ -109,5 +109,3 @@ function ReportTableHeader({ ); } - -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 index 3a332bbd081..0cda809d6b4 100644 --- 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 index 1b168740c04..be418de80c6 100644 --- 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; }; -function ReportTableTotals({ +export function ReportTableTotals({ data, scrollWidth, balanceTypeOp, @@ -154,5 +154,3 @@ function ReportTableTotals({ ); } - -export default ReportTableTotals;