Skip to content

Commit

Permalink
chore: use create immutable
Browse files Browse the repository at this point in the history
  • Loading branch information
zombieJ committed Aug 19, 2023
1 parent 33799fc commit 5b9d13d
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
},
"dependencies": {
"@babel/runtime": "^7.10.1",
"@rc-component/context": "^1.3.0",
"@rc-component/context": "^1.4.0",
"classnames": "^2.2.5",
"rc-resize-observer": "^1.1.0",
"rc-util": "^5.27.1",
Expand Down
4 changes: 2 additions & 2 deletions src/Body/BodyRow.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { responseImmutable, useContext } from '@rc-component/context';
import { useContext } from '@rc-component/context';
import classNames from 'classnames';
import { useEvent } from 'rc-util';
import * as React from 'react';
import Cell from '../Cell';
import TableContext, { type TableContextProps } from '../context/TableContext';
import TableContext, { responseImmutable, type TableContextProps } from '../context/TableContext';
import devRenderTimes from '../hooks/useRenderTimes';
import type { ColumnType, CustomizeComponent, GetComponentProps, GetRowKey } from '../interface';
import { getColumnsKey } from '../utils/valueUtil';
Expand Down
4 changes: 2 additions & 2 deletions src/Body/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { responseImmutable, useContext } from '@rc-component/context';
import { useContext } from '@rc-component/context';
import * as React from 'react';
import type { PerfRecord } from '../context/PerfContext';
import PerfContext from '../context/PerfContext';
import TableContext from '../context/TableContext';
import TableContext, { responseImmutable } from '../context/TableContext';
import useFlattenRecords from '../hooks/useFlattenRecords';
import devRenderTimes from '../hooks/useRenderTimes';
import type { GetComponentProps } from '../interface';
Expand Down
2 changes: 1 addition & 1 deletion src/Cell/useCellRender.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useImmutableMark } from '@rc-component/context';
import useMemo from 'rc-util/lib/hooks/useMemo';
import isEqual from 'rc-util/lib/isEqual';
import getValue from 'rc-util/lib/utils/get';
Expand All @@ -7,6 +6,7 @@ import * as React from 'react';
import PerfContext from '../context/PerfContext';
import type { CellType, ColumnType, DataIndex, RenderedCell } from '../interface';
import { validateValue } from '../utils/valueUtil';
import { useImmutableMark } from '../context/TableContext';

function isRenderCell<RecordType>(
data: React.ReactNode | RenderedCell<RecordType>,
Expand Down
6 changes: 3 additions & 3 deletions src/Footer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { responseImmutable, useContext } from '@rc-component/context';
import { useContext } from '@rc-component/context';
import * as React from 'react';
import TableContext from '../context/TableContext';
import TableContext, { responseImmutable } from '../context/TableContext';
import devRenderTimes from '../hooks/useRenderTimes';
import type { ColumnsType, ColumnType, StickyOffsets } from '../interface';
import Summary from './Summary';
Expand Down Expand Up @@ -32,7 +32,7 @@ function Footer<RecordType>(props: FooterProps<RecordType>) {
stickyOffsets,
flattenColumns,
scrollColumnIndex: scrollColumn?.scrollbar ? lastColumnIndex : null,
columns
columns,
}),
[scrollColumn, flattenColumns, lastColumnIndex, stickyOffsets, columns],
);
Expand Down
4 changes: 2 additions & 2 deletions src/Header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { responseImmutable, useContext } from '@rc-component/context';
import { useContext } from '@rc-component/context';
import * as React from 'react';
import TableContext from '../context/TableContext';
import TableContext, { responseImmutable } from '../context/TableContext';
import devRenderTimes from '../hooks/useRenderTimes';
import type {
CellType,
Expand Down
4 changes: 2 additions & 2 deletions src/StaticTable/BodyGrid.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { responseImmutable, useContext } from '@rc-component/context';
import { useContext } from '@rc-component/context';
import classNames from 'classnames';
import VirtualList, { type ListProps, type ListRef } from 'rc-virtual-list';
import * as React from 'react';
import TableContext from '../context/TableContext';
import TableContext, { responseImmutable } from '../context/TableContext';
import useFlattenRecords, { type FlattenData } from '../hooks/useFlattenRecords';
import type { ColumnType, OnCustomizeScroll } from '../interface';
import BodyLine from './BodyLine';
Expand Down
4 changes: 2 additions & 2 deletions src/StaticTable/BodyLine.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { responseImmutable, useContext } from '@rc-component/context';
import { useContext } from '@rc-component/context';
import classNames from 'classnames';
import * as React from 'react';
import { useRowInfo } from '../Body/BodyRow';
import TableContext from '../context/TableContext';
import TableContext, { responseImmutable } from '../context/TableContext';
import type { FlattenData } from '../hooks/useFlattenRecords';
import { StaticContext } from './context';
import VirtualCell from './VirtualCell';
Expand Down
3 changes: 2 additions & 1 deletion src/StaticTable/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { CompareProps, makeImmutable } from '@rc-component/context/lib/Immutable';
import type { CompareProps } from '@rc-component/context/lib/Immutable';
import * as React from 'react';
import { INTERNAL_HOOKS } from '..';
import type { CustomizeScrollBody } from '../interface';
import Table, { type TableProps } from '../Table';
import Grid from './BodyGrid';
import { StaticContext } from './context';
import useWidthColumns from './useWidthColumns';
import { makeImmutable } from '../context/TableContext';

const renderBody: CustomizeScrollBody<any> = (rawData, props) => {
const { ref, onScroll } = props;
Expand Down
3 changes: 1 addition & 2 deletions src/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
* - All expanded props, move into expandable
*/

import { makeImmutable } from '@rc-component/context';
import type { CompareProps } from '@rc-component/context/lib/Immutable';
import classNames from 'classnames';
import ResizeObserver from 'rc-resize-observer';
Expand All @@ -39,7 +38,7 @@ import * as React from 'react';
import Body from './Body';
import ColGroup from './ColGroup';
import { EXPAND_COLUMN, INTERNAL_HOOKS } from './constant';
import TableContext from './context/TableContext';
import TableContext, { makeImmutable } from './context/TableContext';
import type { FixedHeaderProps } from './FixedHolder';
import FixedHolder from './FixedHolder';
import Footer, { FooterComponents } from './Footer';
Expand Down
5 changes: 4 additions & 1 deletion src/context/TableContext.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createContext } from '@rc-component/context';
import { createContext, createImmutable } from '@rc-component/context';
import type {
ColumnsType,
ColumnType,
Expand All @@ -14,6 +14,9 @@ import type {
} from '../interface';
import type { FixedInfo } from '../utils/fixUtil';

const { makeImmutable, responseImmutable, useImmutableMark } = createImmutable();
export { makeImmutable, responseImmutable, useImmutableMark };

export interface TableContextProps<RecordType = any> {
// Table
prefixCls: string;
Expand Down

0 comments on commit 5b9d13d

Please sign in to comment.