Skip to content

Commit

Permalink
fix more type errors
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinVandy committed Jan 7, 2025
1 parent 1458242 commit 4c8ba70
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
1 change: 1 addition & 0 deletions examples/vue/sub-components/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ const expanded = ref<ExpandedState>({})
const rerender = () => {
data.value = defaultData
}
const table = tableHelper.useTable({
// features and row models are already defined in the tableHelper
get data() {
Expand Down
8 changes: 3 additions & 5 deletions packages/angular-table/src/createTableHelper.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import {
constructTableHelper,
TableHelperOptions,
} from './constructTableHelper'
import { constructTableHelper } from './constructTableHelper'
import { injectTable } from './injectTable'
import type { TableHelperOptions } from './constructTableHelper'
import type { Signal } from '@angular/core'
import type {
RowData,
Expand All @@ -12,7 +10,7 @@ import type {
TableOptions,
} from '@tanstack/table-core'

type TableHelper<
export type TableHelper<
TFeatures extends TableFeatures,
TData extends RowData = any,
> = Omit<TableHelper_Core<TFeatures, TData>, 'tableCreator'> & {
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-table/src/flex-render.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export class FlexRenderDirective<TProps extends NonNullable<unknown>>

if ('table' in this.props) {
this.experimentalReactivity =
(this.props.table as Partial<Table<any, any>>).options
(this.props.table as Partial<Table<any, any>>)['options']
?.enableExperimentalReactivity ?? false
}

Expand Down
11 changes: 6 additions & 5 deletions packages/angular-table/tests/createTableHelper.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import {
createTableHelper,
stockFeatures,
} from '../src'
import type { ColumnDef, StockTableFeatures, Table, TableHelper } from '../src'
import type { TableHelper } from '../src/createTableHelper'
import type { ColumnDef, StockFeatures, Table } from '../src'

test('infer data type from TData', () => {
type TestDataType = { firstName: string; lastName: string; age: number }
Expand All @@ -18,11 +19,11 @@ test('infer data type from TData', () => {
})

expectTypeOf<typeof tableHelper>().toEqualTypeOf<
TableHelper<Required<StockTableFeatures>, TestDataType>
TableHelper<Required<StockFeatures>, TestDataType>
>()

expectTypeOf<(typeof tableHelper)['features']>().toEqualTypeOf<
Required<StockTableFeatures>
Required<StockFeatures>
>()

const columns = [
Expand All @@ -48,7 +49,7 @@ test('infer data type given by injectTable', () => {
})

expectTypeOf<typeof tableHelper>().toEqualTypeOf<
TableHelper<Required<StockTableFeatures>, any>
TableHelper<Required<StockFeatures>, any>
>()

const injectTable = tableHelper.injectTable
Expand All @@ -58,6 +59,6 @@ test('infer data type given by injectTable', () => {
}))

expectTypeOf<typeof table>().toEqualTypeOf<
Table<Required<StockTableFeatures>, TestDataType>
Table<Required<StockFeatures>, TestDataType>
>()
})

0 comments on commit 4c8ba70

Please sign in to comment.