Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions src/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ import BodyContext from './context/BodyContext';
import Body from './Body';
import useColumns from './hooks/useColumns';
import { useLayoutState, useTimeoutLock } from './hooks/useFrame';
import { getPathValue, mergeObject, validateValue, getColumnsKey } from './utils/valueUtil';
import { getPathValue, validateValue, getColumnsKey } from './utils/valueUtil';
import ResizeContext from './context/ResizeContext';
import useStickyOffsets from './hooks/useStickyOffsets';
import ColGroup from './ColGroup';
Expand Down Expand Up @@ -226,16 +226,11 @@ function Table<RecordType extends DefaultRecordType>(props: TableProps<RecordTyp
}

// ==================== Customize =====================
const mergedComponents = React.useMemo(
() => mergeObject<TableComponents<RecordType>>(components, {}),
[components],
);

const getComponent = React.useCallback<GetComponent>(
(path, defaultComponent) =>
getPathValue<CustomizeComponent, TableComponents<RecordType>>(mergedComponents, path) ||
getPathValue<CustomizeComponent, TableComponents<RecordType>>(components || {}, path) ||
defaultComponent,
[mergedComponents],
[components],
);

const getRowKey = React.useMemo<GetRowKey<RecordType>>(() => {
Expand Down Expand Up @@ -811,15 +806,7 @@ function Table<RecordType extends DefaultRecordType>(props: TableProps<RecordTyp
),
isSticky,
}),
[
prefixCls,
getComponent,
scrollbarSize,
direction,
flattenColumns,
stickyOffsets,
isSticky,
],
[prefixCls, getComponent, scrollbarSize, direction, flattenColumns, stickyOffsets, isSticky],
);

const BodyContextValue = React.useMemo(
Expand Down
28 changes: 0 additions & 28 deletions src/utils/valueUtil.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,34 +58,6 @@ export function getColumnsKey(columns: readonly GetColumnKeyColumn[]) {
return columnKeys;
}

export function mergeObject<ReturnObject extends object>(
...objects: Partial<ReturnObject>[]
): ReturnObject {
const merged: Partial<ReturnObject> = {};

/* eslint-disable no-param-reassign */
function fillProps(obj: object, clone: object) {
if (clone) {
Object.keys(clone).forEach(key => {
const value = clone[key];
if (value && typeof value === 'object') {
obj[key] = obj[key] || {};
fillProps(obj[key], value);
} else {
obj[key] = value;
}
});
}
}
/* eslint-enable */

objects.forEach(clone => {
fillProps(merged, clone);
});

return merged as ReturnObject;
}

export function validateValue<T>(val: T) {
return val !== null && val !== undefined;
}
15 changes: 15 additions & 0 deletions tests/Table.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,21 @@ describe('Table.Basic', () => {
errSpy.mockRestore();
});
});

it('not crash', () => {
const Looper = React.forwardRef(() => <td />);
Looper.looper = Looper;

mount(
createTable({
components: {
body: {
cell: Looper,
},
},
}),
);
});
});

it('align column', () => {
Expand Down