Skip to content

Commit 5bcc898

Browse files
ling1726q1b
authored andcommitted
BREAKING: rename types to be more consistent (microsoft#26304)
* BREAKING: rename types to be more consistent * changefile * update md
1 parent 2f8204a commit 5bcc898

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+530
-500
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "BREAKING: table API naming changes",
4+
"packageName": "@fluentui/react-components",
5+
"email": "lingfangao@hotmail.com",
6+
"dependentChangeType": "patch"
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "BREAKING: API naming changes",
4+
"packageName": "@fluentui/react-table",
5+
"email": "lingfangao@hotmail.com",
6+
"dependentChangeType": "patch"
7+
}

packages/react-components/react-components/etc/react-components.unstable.api.md

+31-29
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ import { CardState } from '@fluentui/react-card';
3434
import { CheckboxField_unstable as CheckboxField } from '@fluentui/react-checkbox';
3535
import { checkboxFieldClassNames } from '@fluentui/react-checkbox';
3636
import { CheckboxFieldProps_unstable as CheckboxFieldProps } from '@fluentui/react-checkbox';
37-
import { ColumnDefinition } from '@fluentui/react-table';
38-
import { ColumnId } from '@fluentui/react-table';
3937
import { Combobox } from '@fluentui/react-combobox';
4038
import { comboboxClassNames } from '@fluentui/react-combobox';
4139
import { ComboboxContextValue } from '@fluentui/react-combobox';
@@ -49,8 +47,8 @@ import { ComboboxProps } from '@fluentui/react-combobox';
4947
import { ComboboxProvider } from '@fluentui/react-combobox';
5048
import { ComboboxSlots } from '@fluentui/react-combobox';
5149
import { ComboboxState } from '@fluentui/react-combobox';
52-
import { createColumn } from '@fluentui/react-table';
53-
import { CreateColumnOptions } from '@fluentui/react-table';
50+
import { createTableColumn } from '@fluentui/react-table';
51+
import { CreateTableColumnOptions } from '@fluentui/react-table';
5452
import { DATA_OVERFLOW_ITEM } from '@fluentui/react-overflow';
5553
import { DATA_OVERFLOW_MENU } from '@fluentui/react-overflow';
5654
import { DATA_OVERFLOWING } from '@fluentui/react-overflow';
@@ -177,9 +175,6 @@ import { renderTableRow_unstable } from '@fluentui/react-table';
177175
import { renderTableSelectionCell_unstable } from '@fluentui/react-table';
178176
import { renderToolbar_unstable } from '@fluentui/react-toolbar';
179177
import { renderToolbarGroup_unstable } from '@fluentui/react-toolbar';
180-
import { RowId } from '@fluentui/react-table';
181-
import { RowIdContextProvider } from '@fluentui/react-table';
182-
import { RowState } from '@fluentui/react-table';
183178
import { Select } from '@fluentui/react-select';
184179
import { selectClassNames } from '@fluentui/react-select';
185180
import { SelectField_unstable as SelectField } from '@fluentui/react-select';
@@ -223,9 +218,13 @@ import { TableCellSlots } from '@fluentui/react-table';
223218
import { TableCellState } from '@fluentui/react-table';
224219
import { tableClassName } from '@fluentui/react-table';
225220
import { tableClassNames } from '@fluentui/react-table';
221+
import { TableColumnDefinition } from '@fluentui/react-table';
222+
import { TableColumnId } from '@fluentui/react-table';
226223
import { TableContextProvider } from '@fluentui/react-table';
227224
import { TableContextValue } from '@fluentui/react-table';
228225
import { TableContextValues } from '@fluentui/react-table';
226+
import { TableFeaturePlugin } from '@fluentui/react-table';
227+
import { TableFeaturesState } from '@fluentui/react-table';
229228
import { TableHeader } from '@fluentui/react-table';
230229
import { TableHeaderCell } from '@fluentui/react-table';
231230
import { tableHeaderCellClassName } from '@fluentui/react-table';
@@ -242,6 +241,9 @@ import { TableProps } from '@fluentui/react-table';
242241
import { TableRow } from '@fluentui/react-table';
243242
import { tableRowClassName } from '@fluentui/react-table';
244243
import { tableRowClassNames } from '@fluentui/react-table';
244+
import { TableRowData } from '@fluentui/react-table';
245+
import { TableRowId } from '@fluentui/react-table';
246+
import { TableRowIdContextProvider } from '@fluentui/react-table';
245247
import { TableRowProps } from '@fluentui/react-table';
246248
import { TableRowSlots } from '@fluentui/react-table';
247249
import { TableRowState } from '@fluentui/react-table';
@@ -254,7 +256,6 @@ import { TableSelectionState } from '@fluentui/react-table';
254256
import { TableSlots } from '@fluentui/react-table';
255257
import { TableSortState } from '@fluentui/react-table';
256258
import { TableState } from '@fluentui/react-table';
257-
import { TableStatePlugin } from '@fluentui/react-table';
258259
import { TextareaField_unstable as TextareaField } from '@fluentui/react-textarea';
259260
import { textareaFieldClassNames } from '@fluentui/react-textarea';
260261
import { TextareaFieldProps_unstable as TextareaFieldProps } from '@fluentui/react-textarea';
@@ -329,7 +330,6 @@ import { useOptionStyles_unstable } from '@fluentui/react-combobox';
329330
import { useOverflowMenu } from '@fluentui/react-overflow';
330331
import { useProgressBar_unstable } from '@fluentui/react-progress';
331332
import { useProgressBarStyles_unstable } from '@fluentui/react-progress';
332-
import { useRowIdContext } from '@fluentui/react-table';
333333
import { useSelect_unstable } from '@fluentui/react-select';
334334
import { useSelectStyles_unstable } from '@fluentui/react-select';
335335
import { useTable_unstable } from '@fluentui/react-table';
@@ -343,12 +343,13 @@ import { useTableCellLayoutStyles_unstable } from '@fluentui/react-table';
343343
import { useTableCellStyles_unstable } from '@fluentui/react-table';
344344
import { useTableContext } from '@fluentui/react-table';
345345
import { useTableFeatures } from '@fluentui/react-table';
346+
import { UseTableFeaturesOptions } from '@fluentui/react-table';
346347
import { useTableHeader_unstable } from '@fluentui/react-table';
347348
import { useTableHeaderCell_unstable } from '@fluentui/react-table';
348349
import { useTableHeaderCellStyles_unstable } from '@fluentui/react-table';
349350
import { useTableHeaderStyles_unstable } from '@fluentui/react-table';
350-
import { UseTableOptions } from '@fluentui/react-table';
351351
import { useTableRow_unstable } from '@fluentui/react-table';
352+
import { useTableRowIdContext } from '@fluentui/react-table';
352353
import { useTableRowStyles_unstable } from '@fluentui/react-table';
353354
import { useTableSelection } from '@fluentui/react-table';
354355
import { useTableSelectionCell_unstable } from '@fluentui/react-table';
@@ -428,10 +429,6 @@ export { checkboxFieldClassNames }
428429

429430
export { CheckboxFieldProps }
430431

431-
export { ColumnDefinition }
432-
433-
export { ColumnId }
434-
435432
export { Combobox }
436433

437434
export { comboboxClassNames }
@@ -458,9 +455,9 @@ export { ComboboxSlots }
458455

459456
export { ComboboxState }
460457

461-
export { createColumn }
458+
export { createTableColumn }
462459

463-
export { CreateColumnOptions }
460+
export { CreateTableColumnOptions }
464461

465462
export { DATA_OVERFLOW_ITEM }
466463

@@ -714,12 +711,6 @@ export { renderToolbar_unstable }
714711

715712
export { renderToolbarGroup_unstable }
716713

717-
export { RowId }
718-
719-
export { RowIdContextProvider }
720-
721-
export { RowState }
722-
723714
export { Select }
724715

725716
export { selectClassNames }
@@ -806,12 +797,20 @@ export { tableClassName }
806797

807798
export { tableClassNames }
808799

800+
export { TableColumnDefinition }
801+
802+
export { TableColumnId }
803+
809804
export { TableContextProvider }
810805

811806
export { TableContextValue }
812807

813808
export { TableContextValues }
814809

810+
export { TableFeaturePlugin }
811+
812+
export { TableFeaturesState }
813+
815814
export { TableHeader }
816815

817816
export { TableHeaderCell }
@@ -844,6 +843,12 @@ export { tableRowClassName }
844843

845844
export { tableRowClassNames }
846845

846+
export { TableRowData }
847+
848+
export { TableRowId }
849+
850+
export { TableRowIdContextProvider }
851+
847852
export { TableRowProps }
848853

849854
export { TableRowSlots }
@@ -866,11 +871,8 @@ export { TableSlots }
866871

867872
export { TableSortState }
868873

869-
export { TableState as HeadlessTableState }
870874
export { TableState }
871875

872-
export { TableStatePlugin }
873-
874876
export { TextareaField }
875877

876878
export { textareaFieldClassNames }
@@ -1019,8 +1021,6 @@ export { useProgressBar_unstable }
10191021

10201022
export { useProgressBarStyles_unstable }
10211023

1022-
export { useRowIdContext }
1023-
10241024
export { useSelect_unstable }
10251025

10261026
export { useSelectStyles_unstable }
@@ -1047,6 +1047,8 @@ export { useTableContext }
10471047

10481048
export { useTableFeatures }
10491049

1050+
export { UseTableFeaturesOptions }
1051+
10501052
export { useTableHeader_unstable }
10511053

10521054
export { useTableHeaderCell_unstable }
@@ -1055,10 +1057,10 @@ export { useTableHeaderCellStyles_unstable }
10551057

10561058
export { useTableHeaderStyles_unstable }
10571059

1058-
export { UseTableOptions }
1059-
10601060
export { useTableRow_unstable }
10611061

1062+
export { useTableRowIdContext }
1063+
10621064
export { useTableRowStyles_unstable }
10631065

10641066
export { useTableSelection }

packages/react-components/react-components/src/unstable/index.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export {
237237
useTableFeatures,
238238
useTableSelection,
239239
useTableSort,
240-
createColumn,
240+
createTableColumn,
241241
DataGridCell,
242242
dataGridCellClassNames,
243243
useDataGridCellStyles_unstable,
@@ -273,8 +273,8 @@ export {
273273
useDataGridSelectionCell_unstable,
274274
renderDataGridSelectionCell_unstable,
275275
dataGridSelectionCellClassNames,
276-
RowIdContextProvider,
277-
useRowIdContext,
276+
TableRowIdContextProvider,
277+
useTableRowIdContext,
278278
} from '@fluentui/react-table';
279279

280280
export type {
@@ -308,16 +308,16 @@ export type {
308308
TableCellLayoutProps,
309309
TableCellLayoutState,
310310
TableCellLayoutSlots,
311-
UseTableOptions,
312-
TableState as HeadlessTableState,
311+
UseTableFeaturesOptions,
312+
TableFeaturesState,
313313
TableSelectionState,
314314
TableSortState,
315-
TableStatePlugin,
316-
RowState,
317-
RowId,
318-
ColumnDefinition,
319-
ColumnId,
320-
CreateColumnOptions,
315+
TableFeaturePlugin,
316+
TableRowData,
317+
TableRowId,
318+
TableColumnDefinition,
319+
TableColumnId,
320+
CreateTableColumnOptions,
321321
DataGridHeaderCellProps,
322322
DataGridHeaderCellSlots,
323323
DataGridHeaderCellState,

packages/react-components/react-data-grid-react-window/etc/react-data-grid-react-window.api.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { DataGridBodySlots as DataGridBodySlots_2 } from '@fluentui/react-c
1111
import type { DataGridBodyState as DataGridBodyState_2 } from '@fluentui/react-components/unstable';
1212
import type { ForwardRefComponent } from '@fluentui/react-components';
1313
import * as React_2 from 'react';
14-
import type { RowState } from '@fluentui/react-components/unstable';
14+
import type { TableRowData } from '@fluentui/react-components/unstable';
1515

1616
// @public
1717
export const DataGridBody: ForwardRefComponent<DataGridBodyProps>;

packages/react-components/react-data-grid-react-window/src/components/DataGridBody/DataGridBody.types.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import type {
3-
RowState,
3+
TableRowData,
44
DataGridBodyProps as DataGridBodyPropsBase,
55
DataGridBodySlots as DataGridBodySlotsBase,
66
DataGridBodyState as DataGridBodyStateBase,
@@ -11,7 +11,7 @@ export type DataGridBodySlots = DataGridBodySlotsBase;
1111
// Use any here since we can't know the user types
1212
// The user is responsible for narrowing the type downstream
1313
// eslint-disable-next-line @typescript-eslint/no-explicit-any
14-
export type RowRenderFunction = (row: RowState<any>, style: React.CSSProperties) => React.ReactNode;
14+
export type RowRenderFunction = (row: TableRowData<any>, style: React.CSSProperties) => React.ReactNode;
1515

1616
/**
1717
* DataGridBody Props

packages/react-components/react-data-grid-react-window/src/components/DataGridBody/renderDataGridBody.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import type { DataGridBodyState, DataGridBodySlots } from './DataGridBody.types';
33
import { FixedSizeList as List, ListChildComponentProps } from 'react-window';
44
import { getSlots } from '@fluentui/react-components';
5-
import { RowState, RowIdContextProvider } from '@fluentui/react-components/unstable';
5+
import { TableRowData, TableRowIdContextProvider } from '@fluentui/react-components/unstable';
66

77
/**
88
* Render the final JSX of DataGridVirtualizedBody
@@ -20,8 +20,8 @@ export const renderDataGridBody_unstable = (state: DataGridBodyState) => {
2020
itemCount={state.rows.length}
2121
>
2222
{({ data, index, style }: ListChildComponentProps) => {
23-
const row: RowState<unknown> = data[index];
24-
return <RowIdContextProvider value={row.rowId}>{state.renderRow(row, style)}</RowIdContextProvider>;
23+
const row: TableRowData<unknown> = data[index];
24+
return <TableRowIdContextProvider value={row.rowId}>{state.renderRow(row, style)}</TableRowIdContextProvider>;
2525
}}
2626
</List>
2727
</slots.root>

0 commit comments

Comments
 (0)