From cdd4708bc4951baca2b38efee32728a9e082daa4 Mon Sep 17 00:00:00 2001 From: Jordan Christiansen Date: Thu, 17 Feb 2022 09:03:23 -0600 Subject: [PATCH 1/2] fix-summary-context-circular-dependency --- src/Footer/Cell.tsx | 2 +- src/Footer/Summary.tsx | 10 ---------- src/Footer/SummaryContext.tsx | 12 ++++++++++++ src/Footer/index.tsx | 3 ++- 4 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 src/Footer/SummaryContext.tsx diff --git a/src/Footer/Cell.tsx b/src/Footer/Cell.tsx index 1efaae93d..1bcaa23e0 100644 --- a/src/Footer/Cell.tsx +++ b/src/Footer/Cell.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { SummaryContext } from './Summary'; +import SummaryContext from './SummaryContext'; import Cell from '../Cell'; import TableContext from '../context/TableContext'; import type { AlignType } from '../interface'; diff --git a/src/Footer/Summary.tsx b/src/Footer/Summary.tsx index abec05b65..8535ac5f4 100644 --- a/src/Footer/Summary.tsx +++ b/src/Footer/Summary.tsx @@ -1,15 +1,5 @@ -import * as React from 'react'; import Cell from './Cell'; import Row from './Row'; -import type { ColumnType, StickyOffsets } from '../interface'; - -type FlattenColumns = readonly (ColumnType & { scrollbar?: boolean })[]; - -export const SummaryContext = React.createContext<{ - stickyOffsets?: StickyOffsets; - scrollColumnIndex?: number; - flattenColumns?: FlattenColumns; -}>({}); export interface SummaryProps { fixed?: boolean | 'top' | 'bottom'; diff --git a/src/Footer/SummaryContext.tsx b/src/Footer/SummaryContext.tsx new file mode 100644 index 000000000..5e57c9200 --- /dev/null +++ b/src/Footer/SummaryContext.tsx @@ -0,0 +1,12 @@ +import * as React from 'react'; +import type { ColumnType, StickyOffsets } from '../interface'; + +type FlattenColumns = readonly (ColumnType & { scrollbar?: boolean })[]; + +const SummaryContext = React.createContext<{ + stickyOffsets?: StickyOffsets; + scrollColumnIndex?: number; + flattenColumns?: FlattenColumns; +}>({}); + +export default SummaryContext; diff --git a/src/Footer/index.tsx b/src/Footer/index.tsx index 0e5fc7903..2cc9b8951 100644 --- a/src/Footer/index.tsx +++ b/src/Footer/index.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; import TableContext from '../context/TableContext'; -import Summary, { SummaryContext } from './Summary'; +import Summary from './Summary'; +import SummaryContext from './SummaryContext'; import type { ColumnType, StickyOffsets } from '../interface'; type FlattenColumns = readonly (ColumnType & { scrollbar?: boolean })[]; From bfd8039f38ce40dcc4b3296526db70d9c13fbfd6 Mon Sep 17 00:00:00 2001 From: Jordan Christiansen Date: Thu, 17 Feb 2022 09:11:47 -0600 Subject: [PATCH 2/2] react type import --- src/Footer/Summary.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Footer/Summary.tsx b/src/Footer/Summary.tsx index 8535ac5f4..dbf0e10e1 100644 --- a/src/Footer/Summary.tsx +++ b/src/Footer/Summary.tsx @@ -1,3 +1,4 @@ +import type * as React from 'react'; import Cell from './Cell'; import Row from './Row';