Skip to content
Closed
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
13 changes: 13 additions & 0 deletions packages/table-core/src/core/table/constructTable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,19 @@ export function constructTable<

const mergedOptions = { ...defaultOptions, ...tableOptions }

// Optional options passed through wrapper components commonly arrive as
// explicit `undefined` values. Treat those the same as omitted options so
// they do not replace feature defaults such as state updater callbacks.
for (const key in tableOptions) {
if (
tableOptions[key as keyof typeof tableOptions] === undefined &&
defaultOptions[key as keyof typeof defaultOptions] !== undefined
) {
;(mergedOptions as Record<string, unknown>)[key] =
defaultOptions[key as keyof typeof defaultOptions]
}
}

if (_reactivity.wrapExternalAtoms && mergedOptions.atoms) {
for (const [atomKey, _atom] of Object.entries(mergedOptions.atoms)) {
const atom = _atom as Atom<any>
Expand Down
19 changes: 15 additions & 4 deletions packages/table-core/src/core/table/coreTablesFeature.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,16 @@ export function table_syncExternalStateToBaseAtoms<

table._reactivity.batch(() => {
for (const key in state) {
const externalState = state[key as keyof typeof state]
if (externalState === undefined) {
continue
}

const baseAtom = (table.baseAtoms as Record<string, any>)[key]
if (!baseAtom) {
continue
}

const externalState = state[key as keyof typeof state]
if (externalState !== table._reactivity.untrack(() => baseAtom.get())) {
baseAtom.set(() => externalState)
}
Expand Down Expand Up @@ -94,13 +98,20 @@ export function table_mergeOptions<

// simple merge if no mergeOptions is provided - performant
if (!table.options.mergeOptions) {
const mergedOptions = { ...table.options }
for (const key in newOptions) {
const value = newOptions[key as keyof typeof newOptions]
if (value !== undefined) {
;(mergedOptions as Record<string, unknown>)[key] = value
}
}

return {
...table.options,
...newOptions,
...mergedOptions,
features,
atoms,
initialState,
}
} as TableOptions<TFeatures, TData>
}

// else use the mergeOptions function and preserve getters/setters
Expand Down
20 changes: 20 additions & 0 deletions packages/table-core/tests/unit/core/tableAtoms.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,26 @@ describe('three-layer atom architecture', () => {
expect(table.store.state.sorting).toEqual(external)
})

it('treats undefined controlled state and callbacks as omitted', () => {
const table = makeTable({
// Simulate optional wrapper props passed through without conditionally
// removing their keys.
state: { sorting: undefined } as unknown as { sorting: SortingState },
onSortingChange: undefined,
})

expect(table.atoms.sorting.get()).toEqual([])

table.setOptions((old) => ({
...old,
state: { sorting: undefined },
onSortingChange: undefined,
}))
table.setSorting([{ id: 'name', desc: false }])

expect(table.atoms.sorting.get()).toEqual([{ id: 'name', desc: false }])
})

it('options.atoms[key] takes precedence over options.state[key] when both are present', () => {
const externalAtom = createAtom<SortingState>([
{ id: 'fromAtom', desc: true },
Expand Down
Loading