Skip to content
Draft
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
2 changes: 2 additions & 0 deletions examples/solid/row-selection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
},
"dependencies": {
"@tanstack/solid-table": "^9.0.0-alpha.10",
"@tanstack/solid-devtools": "^0.7.26",
"@tanstack/solid-table-devtools": "9.0.0-alpha.11",
"solid-js": "^1.9.11"
}
}
51 changes: 30 additions & 21 deletions examples/solid/row-selection/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
import type {
Column,
ColumnDef,
SolidTable,
Table,
} from '@tanstack/solid-table'
import {
columnFilteringFeature,
createFilteredRowModel,
Expand All @@ -11,15 +17,11 @@ import {
tableFeatures,
} from '@tanstack/solid-table'
import { For, Show, createEffect, createSignal } from 'solid-js'
import { makeData } from './makeData'
import type {
Column,
ColumnDef,
SolidTable,
Table,
} from '@tanstack/solid-table'
import type { Person } from './makeData'
import { makeData } from './makeData'
import './index.css'
import { TanStackDevtools } from '@tanstack/solid-devtools'
import { tableDevtoolsPlugin } from '@tanstack/solid-table-devtools'

export const _features = tableFeatures({
rowPaginationFeature,
Expand Down Expand Up @@ -51,16 +53,18 @@ function App() {
</table.Subscribe>
)
},
cell: ({ row }) => (
<div class="px-1">
<IndeterminateCheckbox
checked={row.getIsSelected()}
disabled={!row.getCanSelect()}
indeterminate={row.getIsSomeSelected()}
onChange={row.getToggleSelectedHandler()}
/>
</div>
),
cell: ({ row }) => {
return (
<div class="px-1">
<IndeterminateCheckbox
checked={row.getIsSelected()}
disabled={!row.getCanSelect()}
indeterminate={row.getIsSomeSelected()}
onChange={row.getToggleSelectedHandler()}
/>
</div>
)
},
},
{
header: 'Name',
Expand Down Expand Up @@ -113,6 +117,8 @@ function App() {
},
]

const [enableRowSelection, setEnableRowSelection] = createSignal(true)

table = createTable({
_features,
_rowModels: {
Expand All @@ -124,11 +130,14 @@ function App() {
},
columns,
getRowId: (row) => row.id,
enableRowSelection: true, // enable row selection for all rows
// enableRowSelection: row => row.original.age > 18, // or enable row selection conditionally per row
get enableRowSelection() {
return enableRowSelection()
},
debugTable: true,
})

window.setEnable = setEnableRowSelection

return (
// <table.Subscribe
// selector={(state) => ({
Expand All @@ -140,6 +149,8 @@ function App() {
// >
// {(state) => (
<div class="p-2">
<TanStackDevtools plugins={[tableDevtoolsPlugin({ table })]} />

<div>
<table.Subscribe
selector={(state) => ({ globalFilter: state.globalFilter })}
Expand Down Expand Up @@ -333,8 +344,6 @@ function App() {
</table.Subscribe>
</div>
</div>
// )}
// </table.Subscribe>
)
}

Expand Down
1 change: 0 additions & 1 deletion packages/angular-table/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { FlexRenderDirective } from './flexRender'

export * from '@tanstack/table-core'

export * from './angularReactivityFeature'
export * from './flexRender'
export * from './injectTable'
export * from './flex-render/flexRenderComponent'
Expand Down
21 changes: 18 additions & 3 deletions packages/angular-table/src/injectTable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ import {
assertInInjectionContext,
computed,
inject,
isSignal,
signal,
untracked,
} from '@angular/core'
import { constructTable } from '@tanstack/table-core'
import {
constructReactivityFeature,
constructTable,
} from '@tanstack/table-core'
import { injectStore } from '@tanstack/angular-store'
import { lazyInit } from './lazySignalInitializer'
import { angularReactivityFeature } from './angularReactivityFeature'
import type {
RowData,
Table,
Expand Down Expand Up @@ -104,6 +108,16 @@ export function injectTable<
assertInInjectionContext(injectTable)
const injector = inject(Injector)

const angularReactivityFeature = constructReactivityFeature({
createSignal: (value) => {
return signal(value) as any
},
createMemo: (fn) => {
return computed(() => fn())
},
isSignal: (value) => isSignal(value),
})

return lazyInit(() => {
const resolvedOptions: TableOptions<TFeatures, TData> = {
...options(),
Expand Down Expand Up @@ -142,7 +156,8 @@ export function injectTable<
const tableSignalNotifier = computed(
() => {
tableState()
table.setOptions(updatedOptions())
const newOptions = updatedOptions()
untracked(() => table.setOptions(newOptions))
untracked(() => table.baseStore.setState((prev) => ({ ...prev })))
return table
},
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-table/tests/injectTable.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ describe('injectTable', () => {
})

test('supports "Object.keys"', () => {
const keys = Object.keys(table.get()).concat('state')
const keys = Object.keys(table.value()).concat('state')
expect(Object.keys(table)).toEqual(keys)
})

Expand Down
210 changes: 0 additions & 210 deletions packages/angular-table/tests/reactivityUtils.test.ts

This file was deleted.

8 changes: 8 additions & 0 deletions packages/solid-table-devtools/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// @ts-check

import rootConfig from '../../eslint.config.js'

/** @type {any} */
const config = [...rootConfig]

export default config
Loading
Loading