From ca1001641320e7321487dd41cc7abd1c6c609f9d Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 12 Jan 2025 14:19:42 -0800 Subject: [PATCH 1/3] fix: inject data type to features --- packages/angular-table/src/injectTable.ts | 9 ++++--- packages/qwik-table/src/useTable.ts | 8 +++--- packages/react-table/src/createTableHelper.ts | 5 ++-- .../src/core/table/constructTable.ts | 6 +++-- .../columnFilteringFeature.types.ts | 4 +-- .../columnGroupingFeature.types.ts | 4 +-- .../row-sorting/rowSortingFeature.types.ts | 4 +-- packages/table-core/src/types/ColumnDef.ts | 26 ------------------ .../table-core/src/types/TableFeatures.ts | 27 +++++++++++++------ 9 files changed, 42 insertions(+), 51 deletions(-) diff --git a/packages/angular-table/src/injectTable.ts b/packages/angular-table/src/injectTable.ts index ff61fd9da8..df7020e763 100644 --- a/packages/angular-table/src/injectTable.ts +++ b/packages/angular-table/src/injectTable.ts @@ -21,8 +21,9 @@ export function injectTable< TFeatures extends TableFeatures, TData extends RowData, >( - options: () => TableOptions, -): Table & Signal> { + options: () => TableOptions, +): Table & + Signal> { return lazyInit(() => { const features = () => { return { @@ -47,7 +48,9 @@ export function injectTable< // Compose table options using computed. // This is to allow `tableSignal` to listen and set table option - const updatedOptions = computed>(() => { + const updatedOptions = computed< + TableOptions + >(() => { // listen to table state changed const tableState = state() // listen to input options changed diff --git a/packages/qwik-table/src/useTable.ts b/packages/qwik-table/src/useTable.ts index d0d40f8d3f..f9f836d370 100644 --- a/packages/qwik-table/src/useTable.ts +++ b/packages/qwik-table/src/useTable.ts @@ -16,14 +16,16 @@ import type { export function useTable< TFeatures extends TableFeatures, TData extends RowData, ->(tableOptions: TableOptions): Table { +>( + tableOptions: TableOptions, +): Table { const _features = { ...coreFeatures, ...tableOptions._features } const state = useSignal( getInitialTableState(_features, tableOptions.initialState), ) - const statefulOptions: TableOptions = { + const statefulOptions: TableOptions = { ...tableOptions, _features, state: { @@ -37,7 +39,7 @@ export function useTable< } const table = useStore<{ - instance: NoSerialize> + instance: NoSerialize> }>({ instance: noSerialize(constructTable(statefulOptions)), }) diff --git a/packages/react-table/src/createTableHelper.ts b/packages/react-table/src/createTableHelper.ts index cb82307e7f..8caf89ee45 100644 --- a/packages/react-table/src/createTableHelper.ts +++ b/packages/react-table/src/createTableHelper.ts @@ -28,10 +28,9 @@ export function createTableHelper< tableHelperOptions: TableHelperOptions, ): TableHelper { const tableHelper = constructTableHelper(useTable, tableHelperOptions) - return { - ...tableHelper, + return Object.assign(tableHelper, { useTable: tableHelper.tableCreator, - } as unknown as TableHelper + }) as unknown as TableHelper } // test diff --git a/packages/table-core/src/core/table/constructTable.ts b/packages/table-core/src/core/table/constructTable.ts index 1e838a9d93..809954d647 100644 --- a/packages/table-core/src/core/table/constructTable.ts +++ b/packages/table-core/src/core/table/constructTable.ts @@ -23,7 +23,9 @@ export function getInitialTableState( export function constructTable< TFeatures extends TableFeatures, TData extends RowData, ->(options: TableOptions): Table { +>( + options: TableOptions, +): Table { const { _features = {} as TFeatures } = options const featuresList: Array> = Object.values(_features) @@ -35,7 +37,7 @@ export function constructTable< ) } - const table = {} as unknown as Table + const table = {} as unknown as Table const defaultOptions = featuresList.reduce((obj, feature) => { return Object.assign(obj, feature.getDefaultTableOptions?.(table as any)) diff --git a/packages/table-core/src/features/column-filtering/columnFilteringFeature.types.ts b/packages/table-core/src/features/column-filtering/columnFilteringFeature.types.ts index 9db4b93eec..b038eaee8f 100644 --- a/packages/table-core/src/features/column-filtering/columnFilteringFeature.types.ts +++ b/packages/table-core/src/features/column-filtering/columnFilteringFeature.types.ts @@ -6,7 +6,7 @@ import type { RowData, Updater, } from '../../types/type-utils' -import type { TableFeatures } from '../../types/TableFeatures' +import type { GetFeatureData, TableFeatures } from '../../types/TableFeatures' import type { RowModel } from '../../core/row-models/coreRowModelsFeature.types' import type { Row } from '../../types/Row' import type { Column } from '../../types/Column' @@ -80,7 +80,7 @@ export type FilterFnOption< export interface ColumnDef_ColumnFiltering< TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, > { /** * Enables/disables the **column** filter for this column. diff --git a/packages/table-core/src/features/column-grouping/columnGroupingFeature.types.ts b/packages/table-core/src/features/column-grouping/columnGroupingFeature.types.ts index f86c962285..20a5fa18ad 100644 --- a/packages/table-core/src/features/column-grouping/columnGroupingFeature.types.ts +++ b/packages/table-core/src/features/column-grouping/columnGroupingFeature.types.ts @@ -7,7 +7,7 @@ import type { RowData, Updater, } from '../../types/type-utils' -import type { TableFeatures } from '../../types/TableFeatures' +import type { GetFeatureData, TableFeatures } from '../../types/TableFeatures' import type { Row } from '../../types/Row' import type { Cell } from '../../types/Cell' import type { ColumnDefTemplate } from '../../types/ColumnDef' @@ -52,7 +52,7 @@ export type AggregationFnOption< export interface ColumnDef_ColumnGrouping< TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, TValue extends CellData = CellData, > { /** diff --git a/packages/table-core/src/features/row-sorting/rowSortingFeature.types.ts b/packages/table-core/src/features/row-sorting/rowSortingFeature.types.ts index f4c655e96a..4557fc3110 100644 --- a/packages/table-core/src/features/row-sorting/rowSortingFeature.types.ts +++ b/packages/table-core/src/features/row-sorting/rowSortingFeature.types.ts @@ -2,7 +2,7 @@ import type { RowModel } from '../../core/row-models/coreRowModelsFeature.types' import type { Table } from '../../types/Table' import type { BuiltInSortFn } from '../../fns/sortFns' import type { OnChangeFn, RowData, Updater } from '../../types/type-utils' -import type { TableFeatures } from '../../types/TableFeatures' +import type { GetFeatureData, TableFeatures } from '../../types/TableFeatures' import type { Row } from '../../types/Row' export type SortDirection = 'asc' | 'desc' @@ -50,7 +50,7 @@ export type SortFnOption< export interface ColumnDef_RowSorting< TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, > { /** * Enables/Disables multi-sorting for this column. diff --git a/packages/table-core/src/types/ColumnDef.ts b/packages/table-core/src/types/ColumnDef.ts index 0a2ba4b16e..24d1ee697f 100644 --- a/packages/table-core/src/types/ColumnDef.ts +++ b/packages/table-core/src/types/ColumnDef.ts @@ -77,32 +77,6 @@ export type ColumnDefBase< TData extends RowData, TValue extends CellData = CellData, > = ColumnDefBase_Core & - UnionToIntersection< - | ('columnVisibilityFeature' extends keyof TFeatures - ? ColumnDef_ColumnVisibility - : never) - | ('columnPinningFeature' extends keyof TFeatures - ? ColumnDef_ColumnPinning - : never) - | ('columnFilteringFeature' extends keyof TFeatures - ? ColumnDef_ColumnFiltering - : never) - | ('globalFilteringFeature' extends keyof TFeatures - ? ColumnDef_GlobalFiltering - : never) - | ('rowSortingFeature' extends keyof TFeatures - ? ColumnDef_RowSorting - : never) - | ('columnGroupingFeature' extends keyof TFeatures - ? ColumnDef_ColumnGrouping - : never) - | ('columnSizingFeature' extends keyof TFeatures - ? ColumnDef_ColumnSizing - : never) - | ('columnResizingFeature' extends keyof TFeatures - ? ColumnDef_ColumnResizing - : never) - > & ExtractFeatureTypes<'ColumnDef', TFeatures> & ColumnDef_Plugins diff --git a/packages/table-core/src/types/TableFeatures.ts b/packages/table-core/src/types/TableFeatures.ts index 866a914d51..6068e66f37 100644 --- a/packages/table-core/src/types/TableFeatures.ts +++ b/packages/table-core/src/types/TableFeatures.ts @@ -26,6 +26,7 @@ export type ExtractFeatureTypes< > interface FeatureConstructors { + Data?: RowData CachedRowModel?: any Cell?: any Column?: any @@ -45,11 +46,16 @@ export interface Plugins {} export interface TableFeatures extends Partial, Partial, - Partial {} + Partial { + Data?: RowData +} + +export type GetFeatureData = + TFeatures['Data'] extends undefined ? RowData : NonNullable export type ConstructCellAPIs = < TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, TValue extends CellData = CellData, >( cell: Cell & @@ -65,7 +71,7 @@ export type ConstructCellAPIs = < export type ConstructColumnAPIs = < TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, TValue extends CellData = CellData, >( column: Column & @@ -77,7 +83,7 @@ export type ConstructColumnAPIs = < export type ConstructHeaderAPIs = < TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, TValue extends CellData = CellData, >( header: Header & @@ -92,14 +98,14 @@ export type ConstructHeaderAPIs = < export type ConstructRowAPIs = < TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, >( row: Row & Partial, ) => void export type ConstructTableAPIs = < TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, >( table: Table_Internal & Partial & { @@ -109,13 +115,18 @@ export type ConstructTableAPIs = < export type GetDefaultColumnDef = < TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, TValue extends CellData = CellData, >() => ColumnDefBase_All & Partial export type GetDefaultTableOptions = - ( + < + TFeatures extends TableFeatures, + TData extends RowData = TConstructors['Data'] extends undefined + ? RowData + : NonNullable, + >( table: Table_Internal & Partial, ) => Partial> & Partial From 80a74d84fd3423407beee85d6eae01e0e2870b4b Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 12 Jan 2025 22:23:28 -0800 Subject: [PATCH 2/3] save prog --- .../src/core/headers/coreHeadersFeature.ts | 2 +- .../core/headers/coreHeadersFeature.utils.ts | 4 ++-- .../column-faceting/createFacetedRowModel.ts | 16 +++++++-------- .../columnFilteringFeature.ts | 2 +- .../columnFilteringFeature.types.ts | 20 +++++++------------ .../createFilteredRowModel.ts | 8 +++----- .../column-filtering/filterRowsUtils.ts | 9 +++------ packages/table-core/src/types/ColumnDef.ts | 8 ++++---- packages/table-core/src/types/Row.ts | 2 +- .../table-core/src/types/TableFeatures.ts | 4 +--- packages/table-core/src/types/TableOptions.ts | 4 ++-- 11 files changed, 33 insertions(+), 46 deletions(-) diff --git a/packages/table-core/src/core/headers/coreHeadersFeature.ts b/packages/table-core/src/core/headers/coreHeadersFeature.ts index 1403bb38dd..064d06cd95 100644 --- a/packages/table-core/src/core/headers/coreHeadersFeature.ts +++ b/packages/table-core/src/core/headers/coreHeadersFeature.ts @@ -47,7 +47,7 @@ export function constructCoreHeadersFeature< constructTableAPIs: (table) => { assignAPIs('coreHeadersFeature', table, [ { - fn: () => table_getHeaderGroups(table), + fn: () => table_getHeaderGroups(table as any), fnName: 'table_getHeaderGroups', memoDeps: () => [ table.options.columns, diff --git a/packages/table-core/src/core/headers/coreHeadersFeature.utils.ts b/packages/table-core/src/core/headers/coreHeadersFeature.utils.ts index f39a8edf1b..9ce5477290 100644 --- a/packages/table-core/src/core/headers/coreHeadersFeature.utils.ts +++ b/packages/table-core/src/core/headers/coreHeadersFeature.utils.ts @@ -48,7 +48,7 @@ export function header_getContext< export function table_getHeaderGroups< TFeatures extends TableFeatures, TData extends RowData, ->(table: Table_Internal) { +>(table: Table_Internal) { const { left, right } = table.options.state?.columnPinning ?? getDefaultColumnPinningState() const allColumns = table.getAllColumns() @@ -56,7 +56,7 @@ export function table_getHeaderGroups< table, 'getVisibleLeafColumns', table_getVisibleLeafColumns, - ) as unknown as Array> + ) as unknown as Array> const leftColumns = left .map((columnId) => leafColumns.find((d) => d.id === columnId)!) diff --git a/packages/table-core/src/features/column-faceting/createFacetedRowModel.ts b/packages/table-core/src/features/column-faceting/createFacetedRowModel.ts index cef79b8fae..ba155a823e 100644 --- a/packages/table-core/src/features/column-faceting/createFacetedRowModel.ts +++ b/packages/table-core/src/features/column-faceting/createFacetedRowModel.ts @@ -5,18 +5,18 @@ import type { ColumnFiltersState, Row_ColumnFiltering, } from '../column-filtering/columnFilteringFeature.types' -import type { TableFeatures } from '../../types/TableFeatures' +import type { GetFeatureData, TableFeatures } from '../../types/TableFeatures' import type { RowModel } from '../../core/row-models/coreRowModelsFeature.types' import type { Row } from '../../types/Row' import type { RowData } from '../../types/type-utils' export function createFacetedRowModel< TFeatures extends TableFeatures, - TData extends RowData = any, + TData extends RowData = GetFeatureData, >(): ( - table: Table_Internal, + table: Table_Internal, columnId: string, -) => () => RowModel { +) => () => RowModel { return (table, columnId) => tableMemo({ feature: 'columnFacetingFeature', @@ -41,11 +41,11 @@ export function createFacetedRowModel< function _createFacetedRowModel< TFeatures extends TableFeatures, - TData extends RowData = any, + TData extends RowData = GetFeatureData, >( - table: Table_Internal, + table: Table_Internal, columnId: string, - preRowModel: RowModel, + preRowModel: RowModel, columnFilters?: ColumnFiltersState, globalFilter?: string, ) { @@ -59,7 +59,7 @@ function _createFacetedRowModel< ].filter(Boolean) as Array const filterRowsImpl = ( - row: Row & Partial>, + row: Row & Partial, ) => { // Horizontally filter rows through each column for (const colId of filterableIds) { diff --git a/packages/table-core/src/features/column-filtering/columnFilteringFeature.ts b/packages/table-core/src/features/column-filtering/columnFilteringFeature.ts index 9fdd82e756..fb63dce129 100644 --- a/packages/table-core/src/features/column-filtering/columnFilteringFeature.ts +++ b/packages/table-core/src/features/column-filtering/columnFilteringFeature.ts @@ -33,7 +33,7 @@ interface ColumnFilteringFeatureConstructors< // Column: Column_ColumnFiltering // ColumnDef: ColumnDef_ColumnFiltering // CreateRowModels: CreateRowModel_Filtered - // Row: Row_ColumnFiltering + // Row: Row_ColumnFiltering // RowModelFns: RowModelFns_ColumnFiltering // Table: Table_ColumnFiltering // TableOptions: TableOptions_ColumnFiltering diff --git a/packages/table-core/src/features/column-filtering/columnFilteringFeature.types.ts b/packages/table-core/src/features/column-filtering/columnFilteringFeature.types.ts index b038eaee8f..45b38985c7 100644 --- a/packages/table-core/src/features/column-filtering/columnFilteringFeature.types.ts +++ b/packages/table-core/src/features/column-filtering/columnFilteringFeature.types.ts @@ -98,7 +98,7 @@ export interface ColumnDef_ColumnFiltering< export interface Column_ColumnFiltering< TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, > { /** * Returns an automatically calculated filter function for the column based off of the columns first known value. @@ -144,10 +144,7 @@ export interface Column_ColumnFiltering< setFilterValue: (updater: Updater) => void } -export interface Row_ColumnFiltering< - TFeatures extends TableFeatures, - TData extends RowData, -> { +export interface Row_ColumnFiltering { /** * The column filters map for the row. This object tracks whether a row is passing/failing specific filters by their column ID. * [API Docs](https://tanstack.com/table/v8/docs/api/features/column-filtering#columnfilters) @@ -162,10 +159,7 @@ export interface Row_ColumnFiltering< columnFiltersMeta: Record } -export interface TableOptions_ColumnFiltering< - TFeatures extends TableFeatures, - TData extends RowData, -> { +export interface TableOptions_ColumnFiltering { /** * Enables/disables **column** filtering for all columns. * [API Docs](https://tanstack.com/table/v8/docs/api/features/column-filtering#enablecolumnfilters) @@ -206,7 +200,7 @@ export interface TableOptions_ColumnFiltering< onColumnFiltersChange?: OnChangeFn } -export interface Table_ColumnFiltering<> { +export interface Table_ColumnFiltering { /** * Resets the **columnFilters** state to `initialState.columnFilters`, or `true` can be passed to force a default blank state reset to `[]`. * [API Docs](https://tanstack.com/table/v8/docs/api/features/column-filtering#resetcolumnfilters) @@ -223,7 +217,7 @@ export interface Table_ColumnFiltering<> { export interface Table_RowModels_Filtered< TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, > { /** * Returns the row model for the table after **column** filtering has been applied. @@ -241,7 +235,7 @@ export interface Table_RowModels_Filtered< export interface CreateRowModel_Filtered< TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, > { /** * If provided, this function is called **once** per table and should return a **new function** which will calculate and return the row model for the table when it's filtered. @@ -257,7 +251,7 @@ export interface CreateRowModel_Filtered< export interface CachedRowModel_Filtered< TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, > { filteredRowModel: () => RowModel } diff --git a/packages/table-core/src/features/column-filtering/createFilteredRowModel.ts b/packages/table-core/src/features/column-filtering/createFilteredRowModel.ts index eb4e4ede8e..de3fe12702 100644 --- a/packages/table-core/src/features/column-filtering/createFilteredRowModel.ts +++ b/packages/table-core/src/features/column-filtering/createFilteredRowModel.ts @@ -53,7 +53,7 @@ function _createFilteredRowModel< if (!rowModel.rows.length || (!columnFilters?.length && !globalFilter)) { for (const row of rowModel.flatRows as Array< - Row & Partial> + Row & Partial >) { row.columnFilters = {} row.columnFiltersMeta = {} @@ -106,7 +106,7 @@ function _createFilteredRowModel< // Flag the pre-filtered row model with each filter state for (const row of rowModel.flatRows as Array< - Row & Partial> + Row & Partial >) { row.columnFilters = {} @@ -155,9 +155,7 @@ function _createFilteredRowModel< } } - const filterRowsImpl = ( - row: Row & Row_ColumnFiltering, - ) => { + const filterRowsImpl = (row: Row & Row_ColumnFiltering) => { // Horizontally filter rows through each column for (const columnId of filterableIds) { if (row.columnFilters[columnId] === false) { diff --git a/packages/table-core/src/features/column-filtering/filterRowsUtils.ts b/packages/table-core/src/features/column-filtering/filterRowsUtils.ts index 084ca3304a..f7285edd0e 100644 --- a/packages/table-core/src/features/column-filtering/filterRowsUtils.ts +++ b/packages/table-core/src/features/column-filtering/filterRowsUtils.ts @@ -36,13 +36,11 @@ function filterRowModelFromLeafs< const maxDepth = table.options.maxLeafRowFilterDepth ?? 100 const recurseFilterRows = ( - rowsToFilter: Array< - Row & Partial> - >, + rowsToFilter: Array & Partial>, depth = 0, ) => { const filteredRows: Array> & - Partial> = [] + Partial = [] // Filter from children up first for (let row of rowsToFilter) { @@ -54,8 +52,7 @@ function filterRowModelFromLeafs< row.depth, undefined, row.parentId, - ) as Row & - Partial> + ) as Row & Partial newRow.columnFilters = row.columnFilters if (row.subRows.length && depth < maxDepth) { diff --git a/packages/table-core/src/types/ColumnDef.ts b/packages/table-core/src/types/ColumnDef.ts index 24d1ee697f..eda4b33e84 100644 --- a/packages/table-core/src/types/ColumnDef.ts +++ b/packages/table-core/src/types/ColumnDef.ts @@ -92,14 +92,14 @@ export type ColumnDefBase_All< TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData, -> = ColumnDefBase_Core & +> = ColumnDefBase_Core & Partial< ColumnDef_ColumnVisibility & ColumnDef_ColumnPinning & - ColumnDef_ColumnFiltering & + ColumnDef_ColumnFiltering & ColumnDef_GlobalFiltering & - ColumnDef_RowSorting & - ColumnDef_ColumnGrouping & + ColumnDef_RowSorting & + ColumnDef_ColumnGrouping & ColumnDef_ColumnSizing & ColumnDef_ColumnResizing > diff --git a/packages/table-core/src/types/Row.ts b/packages/table-core/src/types/Row.ts index 7ce3e0c127..8fbf7fb7c0 100644 --- a/packages/table-core/src/types/Row.ts +++ b/packages/table-core/src/types/Row.ts @@ -29,7 +29,7 @@ export type Row< > = Row_Core & UnionToIntersection< | ('columnFilteringFeature' extends keyof TFeatures - ? Row_ColumnFiltering + ? Row_ColumnFiltering : never) | ('columnGroupingFeature' extends keyof TFeatures ? Row_ColumnGrouping diff --git a/packages/table-core/src/types/TableFeatures.ts b/packages/table-core/src/types/TableFeatures.ts index 6068e66f37..232e3b40b6 100644 --- a/packages/table-core/src/types/TableFeatures.ts +++ b/packages/table-core/src/types/TableFeatures.ts @@ -123,9 +123,7 @@ export type GetDefaultColumnDef = < export type GetDefaultTableOptions = < TFeatures extends TableFeatures, - TData extends RowData = TConstructors['Data'] extends undefined - ? RowData - : NonNullable, + TData extends RowData = GetFeatureData, >( table: Table_Internal & Partial, ) => Partial> & diff --git a/packages/table-core/src/types/TableOptions.ts b/packages/table-core/src/types/TableOptions.ts index bb3bf1d8ab..96f472a901 100644 --- a/packages/table-core/src/types/TableOptions.ts +++ b/packages/table-core/src/types/TableOptions.ts @@ -52,7 +52,7 @@ export type TableOptions< > = TableOptions_Core & UnionToIntersection< | ('columnFilteringFeature' extends keyof TFeatures - ? TableOptions_ColumnFiltering + ? TableOptions_ColumnFiltering : never) | ('columnGroupingFeature' extends keyof TFeatures ? TableOptions_ColumnGrouping @@ -107,7 +107,7 @@ export type TableOptions_All< TData extends RowData, > = TableOptions_Core & Partial< - TableOptions_ColumnFiltering & + TableOptions_ColumnFiltering & TableOptions_ColumnGrouping & TableOptions_ColumnOrdering & TableOptions_ColumnPinning & From 9f2b7d55dbc86980b2ddb4659e158db752b4a07d Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 12 Jan 2025 23:33:02 -0800 Subject: [PATCH 3/3] uncomment features --- .../src/core/cells/coreCellsFeature.ts | 6 +-- .../src/core/columns/coreColumnsFeature.ts | 16 +++---- .../src/core/headers/coreHeadersFeature.ts | 6 +-- .../core/row-models/coreRowModelsFeature.ts | 4 +- .../src/core/rows/coreRowsFeature.ts | 16 +++---- .../src/core/table/coreTablesFeature.ts | 6 +-- .../column-faceting/columnFacetingFeature.ts | 16 +++---- .../columnFilteringFeature.ts | 40 ++++++++--------- .../column-grouping/columnGroupingFeature.ts | 44 +++++++++---------- .../column-ordering/columnOrderingFeature.ts | 20 ++++----- .../column-pinning/columnPinningFeature.ts | 28 ++++++------ .../column-resizing/columnResizingFeature.ts | 24 +++++----- .../column-sizing/columnSizingFeature.ts | 28 ++++++------ .../columnVisibilityFeature.ts | 28 ++++++------ .../globalFilteringFeature.ts | 24 +++++----- .../row-expanding/rowExpandingFeature.ts | 28 ++++++------ .../row-pagination/rowPaginationFeature.ts | 24 +++++----- .../features/row-pinning/rowPinningFeature.ts | 20 ++++----- .../row-selection/rowSelectionFeature.ts | 20 ++++----- .../features/row-sorting/rowSortingFeature.ts | 44 ++++++++++--------- 20 files changed, 223 insertions(+), 219 deletions(-) diff --git a/packages/table-core/src/core/cells/coreCellsFeature.ts b/packages/table-core/src/core/cells/coreCellsFeature.ts index a7e15cac04..ed7d6f22ee 100644 --- a/packages/table-core/src/core/cells/coreCellsFeature.ts +++ b/packages/table-core/src/core/cells/coreCellsFeature.ts @@ -6,14 +6,14 @@ import { } from './coreCellsFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { Cell_Cell, TableOptions_Cell } from './coreCellsFeature.types' +import type { Cell_Cell, TableOptions_Cell } from './coreCellsFeature.types' interface CoreCellsFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Cell: Cell_Cell - // TableOptions: TableOptions_Cell + Cell: Cell_Cell + TableOptions: TableOptions_Cell } export function constructCoreCellsFeature< diff --git a/packages/table-core/src/core/columns/coreColumnsFeature.ts b/packages/table-core/src/core/columns/coreColumnsFeature.ts index 90fbe721b6..5c1af4ebb8 100644 --- a/packages/table-core/src/core/columns/coreColumnsFeature.ts +++ b/packages/table-core/src/core/columns/coreColumnsFeature.ts @@ -11,19 +11,19 @@ import { } from './coreColumnsFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// Column_Column, -// TableOptions_Columns, -// Table_Columns, -// } from './coreColumnsFeature.types' +import type { + Column_Column, + TableOptions_Columns, + Table_Columns, +} from './coreColumnsFeature.types' interface CoreColumnsFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Column: Column_Column - // Table: Table_Columns - // TableOptions: TableOptions_Columns + Column: Column_Column + Table: Table_Columns + TableOptions: TableOptions_Columns } export function constructCoreColumnsFeature< diff --git a/packages/table-core/src/core/headers/coreHeadersFeature.ts b/packages/table-core/src/core/headers/coreHeadersFeature.ts index 064d06cd95..6174c1753b 100644 --- a/packages/table-core/src/core/headers/coreHeadersFeature.ts +++ b/packages/table-core/src/core/headers/coreHeadersFeature.ts @@ -14,14 +14,14 @@ import { } from './coreHeadersFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { Header_Header, Table_Headers } from './coreHeadersFeature.types' +import type { Header_Header, Table_Headers } from './coreHeadersFeature.types' interface CoreHeadersFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Header: Header_Header - // Table: Table_Headers + Header: Header_Header + Table: Table_Headers } export function constructCoreHeadersFeature< diff --git a/packages/table-core/src/core/row-models/coreRowModelsFeature.ts b/packages/table-core/src/core/row-models/coreRowModelsFeature.ts index da5a27d400..6a3222fd99 100644 --- a/packages/table-core/src/core/row-models/coreRowModelsFeature.ts +++ b/packages/table-core/src/core/row-models/coreRowModelsFeature.ts @@ -15,13 +15,13 @@ import { } from './coreRowModelsFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { Table_RowModels } from './coreRowModelsFeature.types' +import type { Table_RowModels } from './coreRowModelsFeature.types' interface CoreRowModelsFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Table: Table_RowModels + Table: Table_RowModels } export function constructCoreRowModelsFeature< diff --git a/packages/table-core/src/core/rows/coreRowsFeature.ts b/packages/table-core/src/core/rows/coreRowsFeature.ts index 1ab9b8fa96..2107466abe 100644 --- a/packages/table-core/src/core/rows/coreRowsFeature.ts +++ b/packages/table-core/src/core/rows/coreRowsFeature.ts @@ -13,19 +13,19 @@ import { } from './coreRowsFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// Row_Row, -// TableOptions_Rows, -// Table_Rows, -// } from './coreRowsFeature.types' +import type { + Row_Row, + TableOptions_Rows, + Table_Rows, +} from './coreRowsFeature.types' interface CoreRowsFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Row: Row_Row - // TableOptions: TableOptions_Rows - // Table: Table_Rows + Row: Row_Row + TableOptions: TableOptions_Rows + Table: Table_Rows } export function constructCoreRowsFeature< diff --git a/packages/table-core/src/core/table/coreTablesFeature.ts b/packages/table-core/src/core/table/coreTablesFeature.ts index 2a381105b1..1753643b48 100644 --- a/packages/table-core/src/core/table/coreTablesFeature.ts +++ b/packages/table-core/src/core/table/coreTablesFeature.ts @@ -7,14 +7,14 @@ import { } from './coreTablesFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { TableOptions_Table, Table_Table } from './coreTablesFeature.types' +import type { TableOptions_Table, Table_Table } from './coreTablesFeature.types' interface CoreTablesFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Table: Table_Table - // TableOptions: TableOptions_Table + Table: Table_Table + TableOptions: TableOptions_Table } export function constructCoreTablesFeature< diff --git a/packages/table-core/src/features/column-faceting/columnFacetingFeature.ts b/packages/table-core/src/features/column-faceting/columnFacetingFeature.ts index 0fea420410..a1724eb2f9 100644 --- a/packages/table-core/src/features/column-faceting/columnFacetingFeature.ts +++ b/packages/table-core/src/features/column-faceting/columnFacetingFeature.ts @@ -9,19 +9,19 @@ import { } from './columnFacetingFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// CachedRowModel_Faceted, -// Column_ColumnFaceting, -// CreateRowModel_Faceted, -// } from './columnFacetingFeature.types' +import type { + CachedRowModel_Faceted, + Column_ColumnFaceting, + CreateRowModel_Faceted, +} from './columnFacetingFeature.types' interface ColumnFacetingFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // CachedRowModel: CachedRowModel_Faceted - // Column: Column_ColumnFaceting - // CreateRowModels: CreateRowModel_Faceted + CachedRowModel: CachedRowModel_Faceted + Column: Column_ColumnFaceting + CreateRowModels: CreateRowModel_Faceted } export function constructColumnFacetingFeature< diff --git a/packages/table-core/src/features/column-filtering/columnFilteringFeature.ts b/packages/table-core/src/features/column-filtering/columnFilteringFeature.ts index fb63dce129..c4ee00d15f 100644 --- a/packages/table-core/src/features/column-filtering/columnFilteringFeature.ts +++ b/packages/table-core/src/features/column-filtering/columnFilteringFeature.ts @@ -13,31 +13,31 @@ import { } from './columnFilteringFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// CachedRowModel_Filtered, -// ColumnDef_ColumnFiltering, -// Column_ColumnFiltering, -// CreateRowModel_Filtered, -// RowModelFns_ColumnFiltering, -// Row_ColumnFiltering, -// TableOptions_ColumnFiltering, -// TableState_ColumnFiltering, -// Table_ColumnFiltering, -// } from './columnFilteringFeature.types' +import type { + CachedRowModel_Filtered, + ColumnDef_ColumnFiltering, + Column_ColumnFiltering, + CreateRowModel_Filtered, + RowModelFns_ColumnFiltering, + Row_ColumnFiltering, + TableOptions_ColumnFiltering, + TableState_ColumnFiltering, + Table_ColumnFiltering, +} from './columnFilteringFeature.types' interface ColumnFilteringFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // CachedRowModel: CachedRowModel_Filtered - // Column: Column_ColumnFiltering - // ColumnDef: ColumnDef_ColumnFiltering - // CreateRowModels: CreateRowModel_Filtered - // Row: Row_ColumnFiltering - // RowModelFns: RowModelFns_ColumnFiltering - // Table: Table_ColumnFiltering - // TableOptions: TableOptions_ColumnFiltering - // TableState: TableState_ColumnFiltering + CachedRowModel: CachedRowModel_Filtered + Column: Column_ColumnFiltering + ColumnDef: ColumnDef_ColumnFiltering + CreateRowModels: CreateRowModel_Filtered + Row: Row_ColumnFiltering + RowModelFns: RowModelFns_ColumnFiltering + Table: Table_ColumnFiltering + TableOptions: TableOptions_ColumnFiltering + TableState: TableState_ColumnFiltering } export function constructColumnFilteringFeature< diff --git a/packages/table-core/src/features/column-grouping/columnGroupingFeature.ts b/packages/table-core/src/features/column-grouping/columnGroupingFeature.ts index 1d5ae3fd5d..210f4ec5c8 100644 --- a/packages/table-core/src/features/column-grouping/columnGroupingFeature.ts +++ b/packages/table-core/src/features/column-grouping/columnGroupingFeature.ts @@ -18,33 +18,33 @@ import { } from './columnGroupingFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// CachedRowModel_Grouped, -// Cell_ColumnGrouping, -// ColumnDef_ColumnGrouping, -// Column_ColumnGrouping, -// CreateRowModel_Grouped, -// RowModelFns_ColumnGrouping, -// Row_ColumnGrouping, -// TableOptions_ColumnGrouping, -// TableState_ColumnGrouping, -// Table_ColumnGrouping, -// } from './columnGroupingFeature.types' +import type { + CachedRowModel_Grouped, + Cell_ColumnGrouping, + ColumnDef_ColumnGrouping, + Column_ColumnGrouping, + CreateRowModel_Grouped, + RowModelFns_ColumnGrouping, + Row_ColumnGrouping, + TableOptions_ColumnGrouping, + TableState_ColumnGrouping, + Table_ColumnGrouping, +} from './columnGroupingFeature.types' interface ColumnGroupingFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // CachedRowModel: CachedRowModel_Grouped - // Cell: Cell_ColumnGrouping - // Column: Column_ColumnGrouping - // ColumnDef: ColumnDef_ColumnGrouping - // CreateRowModels: CreateRowModel_Grouped - // Row: Row_ColumnGrouping - // RowModelFns: RowModelFns_ColumnGrouping - // Table: Table_ColumnGrouping - // TableOptions: TableOptions_ColumnGrouping - // TableState: TableState_ColumnGrouping + CachedRowModel: CachedRowModel_Grouped + Cell: Cell_ColumnGrouping + Column: Column_ColumnGrouping + ColumnDef: ColumnDef_ColumnGrouping + CreateRowModels: CreateRowModel_Grouped + Row: Row_ColumnGrouping + RowModelFns: RowModelFns_ColumnGrouping + Table: Table_ColumnGrouping + TableOptions: TableOptions_ColumnGrouping + TableState: TableState_ColumnGrouping } export function constructColumnGroupingFeature< diff --git a/packages/table-core/src/features/column-ordering/columnOrderingFeature.ts b/packages/table-core/src/features/column-ordering/columnOrderingFeature.ts index be45385ff0..d5ce0a1673 100644 --- a/packages/table-core/src/features/column-ordering/columnOrderingFeature.ts +++ b/packages/table-core/src/features/column-ordering/columnOrderingFeature.ts @@ -10,21 +10,21 @@ import { } from './columnOrderingFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// Column_ColumnOrdering, -// TableOptions_ColumnOrdering, -// TableState_ColumnOrdering, -// Table_ColumnOrdering, -// } from './columnOrderingFeature.types' +import type { + Column_ColumnOrdering, + TableOptions_ColumnOrdering, + TableState_ColumnOrdering, + Table_ColumnOrdering, +} from './columnOrderingFeature.types' interface ColumnOrderingFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Column: Column_ColumnOrdering - // Table: Table_ColumnOrdering - // TableOptions: TableOptions_ColumnOrdering - // TableState: TableState_ColumnOrdering + Column: Column_ColumnOrdering + Table: Table_ColumnOrdering + TableOptions: TableOptions_ColumnOrdering + TableState: TableState_ColumnOrdering } export function constructColumnOrderingFeature< diff --git a/packages/table-core/src/features/column-pinning/columnPinningFeature.ts b/packages/table-core/src/features/column-pinning/columnPinningFeature.ts index 1f7073b387..b17866287a 100644 --- a/packages/table-core/src/features/column-pinning/columnPinningFeature.ts +++ b/packages/table-core/src/features/column-pinning/columnPinningFeature.ts @@ -33,25 +33,25 @@ import { } from './columnPinningFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// ColumnDef_ColumnPinning, -// Column_ColumnPinning, -// Row_ColumnPinning, -// TableOptions_ColumnPinning, -// TableState_ColumnPinning, -// Table_ColumnPinning, -// } from './columnPinningFeature.types' +import type { + ColumnDef_ColumnPinning, + Column_ColumnPinning, + Row_ColumnPinning, + TableOptions_ColumnPinning, + TableState_ColumnPinning, + Table_ColumnPinning, +} from './columnPinningFeature.types' interface ColumnPinningFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Column: Column_ColumnPinning - // ColumnDef: ColumnDef_ColumnPinning - // Row: Row_ColumnPinning - // Table: Table_ColumnPinning - // TableOptions: TableOptions_ColumnPinning - // TableState: TableState_ColumnPinning + Column: Column_ColumnPinning + ColumnDef: ColumnDef_ColumnPinning + Row: Row_ColumnPinning + Table: Table_ColumnPinning + TableOptions: TableOptions_ColumnPinning + TableState: TableState_ColumnPinning } export function constructColumnPinningFeature< diff --git a/packages/table-core/src/features/column-resizing/columnResizingFeature.ts b/packages/table-core/src/features/column-resizing/columnResizingFeature.ts index 2b813d32f3..2af81dc90c 100644 --- a/packages/table-core/src/features/column-resizing/columnResizingFeature.ts +++ b/packages/table-core/src/features/column-resizing/columnResizingFeature.ts @@ -9,23 +9,23 @@ import { } from './columnResizingFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// Column_ColumnResizing, -// Header_ColumnResizing, -// TableOptions_ColumnResizing, -// TableState_ColumnResizing, -// Table_ColumnResizing, -// } from './columnResizingFeature.types' +import type { + Column_ColumnResizing, + Header_ColumnResizing, + TableOptions_ColumnResizing, + TableState_ColumnResizing, + Table_ColumnResizing, +} from './columnResizingFeature.types' interface ColumnResizingFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Column: Column_ColumnResizing - // Header: Header_ColumnResizing - // Table: Table_ColumnResizing - // TableOptions: TableOptions_ColumnResizing - // TableState: TableState_ColumnResizing + Column: Column_ColumnResizing + Header: Header_ColumnResizing + Table: Table_ColumnResizing + TableOptions: TableOptions_ColumnResizing + TableState: TableState_ColumnResizing } export function constructColumnResizingFeature< diff --git a/packages/table-core/src/features/column-sizing/columnSizingFeature.ts b/packages/table-core/src/features/column-sizing/columnSizingFeature.ts index 9db5a3b074..dda9eb5aad 100644 --- a/packages/table-core/src/features/column-sizing/columnSizingFeature.ts +++ b/packages/table-core/src/features/column-sizing/columnSizingFeature.ts @@ -18,25 +18,25 @@ import { } from './columnSizingFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// ColumnDef_ColumnSizing, -// Column_ColumnSizing, -// Header_ColumnSizing, -// TableOptions_ColumnSizing, -// TableState_ColumnSizing, -// Table_ColumnSizing, -// } from './columnSizingFeature.types' +import type { + ColumnDef_ColumnSizing, + Column_ColumnSizing, + Header_ColumnSizing, + TableOptions_ColumnSizing, + TableState_ColumnSizing, + Table_ColumnSizing, +} from './columnSizingFeature.types' interface ColumnSizingFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // ColumnDef: ColumnDef_ColumnSizing - // Column: Column_ColumnSizing - // Header: Header_ColumnSizing - // Table: Table_ColumnSizing - // TableOptions: TableOptions_ColumnSizing - // TableState: TableState_ColumnSizing + ColumnDef: ColumnDef_ColumnSizing + Column: Column_ColumnSizing + Header: Header_ColumnSizing + Table: Table_ColumnSizing + TableOptions: TableOptions_ColumnSizing + TableState: TableState_ColumnSizing } export function constructColumnSizingFeature< diff --git a/packages/table-core/src/features/column-visibility/columnVisibilityFeature.ts b/packages/table-core/src/features/column-visibility/columnVisibilityFeature.ts index 3369b678c7..1626e683f8 100644 --- a/packages/table-core/src/features/column-visibility/columnVisibilityFeature.ts +++ b/packages/table-core/src/features/column-visibility/columnVisibilityFeature.ts @@ -23,25 +23,25 @@ import { } from './columnVisibilityFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// ColumnDef_ColumnVisibility, -// Column_ColumnVisibility, -// Row_ColumnVisibility, -// TableOptions_ColumnVisibility, -// TableState_ColumnVisibility, -// Table_ColumnVisibility, -// } from './columnVisibilityFeature.types' +import type { + ColumnDef_ColumnVisibility, + Column_ColumnVisibility, + Row_ColumnVisibility, + TableOptions_ColumnVisibility, + TableState_ColumnVisibility, + Table_ColumnVisibility, +} from './columnVisibilityFeature.types' interface ColumnVisibilityFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // ColumnDef: ColumnDef_ColumnVisibility - // Column: Column_ColumnVisibility - // Row: Row_ColumnVisibility - // Table: Table_ColumnVisibility - // TableOptions: TableOptions_ColumnVisibility - // TableState: TableState_ColumnVisibility + ColumnDef: ColumnDef_ColumnVisibility + Column: Column_ColumnVisibility + Row: Row_ColumnVisibility + Table: Table_ColumnVisibility + TableOptions: TableOptions_ColumnVisibility + TableState: TableState_ColumnVisibility } export function constructColumnVisibilityFeature< diff --git a/packages/table-core/src/features/global-filtering/globalFilteringFeature.ts b/packages/table-core/src/features/global-filtering/globalFilteringFeature.ts index c522c81c0d..0d980e9ffd 100644 --- a/packages/table-core/src/features/global-filtering/globalFilteringFeature.ts +++ b/packages/table-core/src/features/global-filtering/globalFilteringFeature.ts @@ -8,23 +8,23 @@ import { } from './globalFilteringFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// ColumnDef_GlobalFiltering, -// Column_GlobalFiltering, -// TableOptions_GlobalFiltering, -// TableState_GlobalFiltering, -// Table_GlobalFiltering, -// } from './globalFilteringFeature.types' +import type { + ColumnDef_GlobalFiltering, + Column_GlobalFiltering, + TableOptions_GlobalFiltering, + TableState_GlobalFiltering, + Table_GlobalFiltering, +} from './globalFilteringFeature.types' interface GlobalFilteringFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Column: Column_GlobalFiltering - // ColumnDef: ColumnDef_GlobalFiltering - // Table: Table_GlobalFiltering - // TableOptions: TableOptions_GlobalFiltering - // TableState: TableState_GlobalFiltering + Column: Column_GlobalFiltering + ColumnDef: ColumnDef_GlobalFiltering + Table: Table_GlobalFiltering + TableOptions: TableOptions_GlobalFiltering + TableState: TableState_GlobalFiltering } export function constructGlobalFilteringFeature< diff --git a/packages/table-core/src/features/row-expanding/rowExpandingFeature.ts b/packages/table-core/src/features/row-expanding/rowExpandingFeature.ts index f965770d71..8bf5fddc16 100644 --- a/packages/table-core/src/features/row-expanding/rowExpandingFeature.ts +++ b/packages/table-core/src/features/row-expanding/rowExpandingFeature.ts @@ -18,25 +18,25 @@ import { } from './rowExpandingFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// CachedRowModel_Expanded, -// CreateRowModel_Expanded, -// Row_RowExpanding, -// TableOptions_RowExpanding, -// TableState_RowExpanding, -// Table_RowExpanding, -// } from './rowExpandingFeature.types' +import type { + CachedRowModel_Expanded, + CreateRowModel_Expanded, + Row_RowExpanding, + TableOptions_RowExpanding, + TableState_RowExpanding, + Table_RowExpanding, +} from './rowExpandingFeature.types' interface RowExpandingFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // CachedRowModel: CachedRowModel_Expanded - // CreateRowModels: CreateRowModel_Expanded - // Row: Row_RowExpanding - // Table: Table_RowExpanding - // TableOptions: TableOptions_RowExpanding - // TableState: TableState_RowExpanding + CachedRowModel: CachedRowModel_Expanded + CreateRowModels: CreateRowModel_Expanded + Row: Row_RowExpanding + Table: Table_RowExpanding + TableOptions: TableOptions_RowExpanding + TableState: TableState_RowExpanding } export function constructRowExpandingFeature< diff --git a/packages/table-core/src/features/row-pagination/rowPaginationFeature.ts b/packages/table-core/src/features/row-pagination/rowPaginationFeature.ts index babf483e7c..b23c865e4c 100644 --- a/packages/table-core/src/features/row-pagination/rowPaginationFeature.ts +++ b/packages/table-core/src/features/row-pagination/rowPaginationFeature.ts @@ -20,23 +20,23 @@ import { } from './rowPaginationFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// CachedRowModel_Paginated, -// CreateRowModel_Paginated, -// TableOptions_RowPagination, -// TableState_RowPagination, -// Table_RowPagination, -// } from './rowPaginationFeature.types' +import type { + CachedRowModel_Paginated, + CreateRowModel_Paginated, + TableOptions_RowPagination, + TableState_RowPagination, + Table_RowPagination, +} from './rowPaginationFeature.types' interface RowPaginationFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // CachedRowModel: CachedRowModel_Paginated - // CreateRowModels: CreateRowModel_Paginated - // Table: Table_RowPagination - // TableOptions: TableOptions_RowPagination - // TableState: TableState_RowPagination + CachedRowModel: CachedRowModel_Paginated + CreateRowModels: CreateRowModel_Paginated + Table: Table_RowPagination + TableOptions: TableOptions_RowPagination + TableState: TableState_RowPagination } export function constructRowPaginationFeature< diff --git a/packages/table-core/src/features/row-pinning/rowPinningFeature.ts b/packages/table-core/src/features/row-pinning/rowPinningFeature.ts index d2e37b265b..1bb4aecc8f 100644 --- a/packages/table-core/src/features/row-pinning/rowPinningFeature.ts +++ b/packages/table-core/src/features/row-pinning/rowPinningFeature.ts @@ -14,21 +14,21 @@ import { } from './rowPinningFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// Row_RowPinning, -// TableOptions_RowPinning, -// TableState_RowPinning, -// Table_RowPinning, -// } from './rowPinningFeature.types' +import type { + Row_RowPinning, + TableOptions_RowPinning, + TableState_RowPinning, + Table_RowPinning, +} from './rowPinningFeature.types' interface RowPinningFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Row: Row_RowPinning - // Table: Table_RowPinning - // TableOptions: TableOptions_RowPinning - // TableState: TableState_RowPinning + Row: Row_RowPinning + Table: Table_RowPinning + TableOptions: TableOptions_RowPinning + TableState: TableState_RowPinning } export function constructRowPinningFeature< diff --git a/packages/table-core/src/features/row-selection/rowSelectionFeature.ts b/packages/table-core/src/features/row-selection/rowSelectionFeature.ts index 07801d6683..ffc550844a 100644 --- a/packages/table-core/src/features/row-selection/rowSelectionFeature.ts +++ b/packages/table-core/src/features/row-selection/rowSelectionFeature.ts @@ -26,21 +26,21 @@ import { } from './rowSelectionFeature.utils' import type { RowData } from '../../types/type-utils' import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// Row_RowSelection, -// TableOptions_RowSelection, -// TableState_RowSelection, -// Table_RowSelection, -// } from './rowSelectionFeature.types' +import type { + Row_RowSelection, + TableOptions_RowSelection, + TableState_RowSelection, + Table_RowSelection, +} from './rowSelectionFeature.types' interface RowSelectionFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // Row: Row_RowSelection - // Table: Table_RowSelection - // TableOptions: TableOptions_RowSelection - // TableState: TableState_RowSelection + Row: Row_RowSelection + Table: Table_RowSelection + TableOptions: TableOptions_RowSelection + TableState: TableState_RowSelection } export function constructRowSelectionFeature< diff --git a/packages/table-core/src/features/row-sorting/rowSortingFeature.ts b/packages/table-core/src/features/row-sorting/rowSortingFeature.ts index d157ed6345..6b5b082ac4 100644 --- a/packages/table-core/src/features/row-sorting/rowSortingFeature.ts +++ b/packages/table-core/src/features/row-sorting/rowSortingFeature.ts @@ -17,35 +17,39 @@ import { table_setSorting, } from './rowSortingFeature.utils' import type { RowData } from '../../types/type-utils' -import type { TableFeature, TableFeatures } from '../../types/TableFeatures' -// import type { -// CachedRowModel_Sorted, -// ColumnDef_RowSorting, -// Column_RowSorting, -// CreateRowModel_Sorted, -// RowModelFns_RowSorting, -// TableOptions_RowSorting, -// TableState_RowSorting, -// Table_RowSorting, -// } from './rowSortingFeature.types' +import type { + GetFeatureData, + TableFeature, + TableFeatures, +} from '../../types/TableFeatures' +import type { + CachedRowModel_Sorted, + ColumnDef_RowSorting, + Column_RowSorting, + CreateRowModel_Sorted, + RowModelFns_RowSorting, + TableOptions_RowSorting, + TableState_RowSorting, + Table_RowSorting, +} from './rowSortingFeature.types' interface RowSortingFeatureConstructors< TFeatures extends TableFeatures, TData extends RowData, > { - // CachedRowModel: CachedRowModel_Sorted - // Column: Column_RowSorting - // ColumnDef: ColumnDef_RowSorting - // CreateRowModels: CreateRowModel_Sorted - // RowModelFns: RowModelFns_RowSorting - // Table: Table_RowSorting - // TableOptions: TableOptions_RowSorting - // TableState: TableState_RowSorting + CachedRowModel: CachedRowModel_Sorted + Column: Column_RowSorting + ColumnDef: ColumnDef_RowSorting + CreateRowModels: CreateRowModel_Sorted + RowModelFns: RowModelFns_RowSorting + Table: Table_RowSorting + TableOptions: TableOptions_RowSorting + TableState: TableState_RowSorting } export function constructRowSortingFeature< TFeatures extends TableFeatures, - TData extends RowData, + TData extends RowData = GetFeatureData, >(): TableFeature> { return { getInitialState(initialState) {