mirror of
https://github.com/carbon-design-system/carbon-components-svelte.git
synced 2025-09-16 02:41:05 +00:00
Tweaks to DataTable generics (#1968)
Adjust DataTable types. - Make key in `cell` slot prop less strict to prevent type errors in markup. - Resolve property path names up to one level deep for header keys.
This commit is contained in:
parent
140e8ff468
commit
e49369ef02
7 changed files with 79 additions and 27 deletions
11
types/DataTable/DataTable.svelte.d.ts
vendored
11
types/DataTable/DataTable.svelte.d.ts
vendored
|
@ -1,14 +1,15 @@
|
|||
import type { SvelteComponentTyped } from "svelte";
|
||||
import type { SvelteHTMLElements } from "svelte/elements";
|
||||
|
||||
export type DataTableKey<Row = DataTableRow> = Exclude<keyof Row, "id">;
|
||||
export type DataTableKey<Row = DataTableRow> =
|
||||
import("./DataTableTypes.d.ts").PropertyPath<Row>;
|
||||
|
||||
export type DataTableValue = any;
|
||||
|
||||
export interface DataTableEmptyHeader<Row = DataTableRow> {
|
||||
key: DataTableKey<Row>;
|
||||
empty: boolean;
|
||||
display?: (item: DataTableValue, row: Row) => DataTableValue;
|
||||
display?: (item: Value, row: Row) => DataTableValue;
|
||||
sort?: false | ((a: DataTableValue, b: DataTableValue) => number);
|
||||
columnMenu?: boolean;
|
||||
width?: string;
|
||||
|
@ -18,7 +19,7 @@ export interface DataTableEmptyHeader<Row = DataTableRow> {
|
|||
export interface DataTableNonEmptyHeader<Row = DataTableRow> {
|
||||
key: DataTableKey<Row>;
|
||||
value: DataTableValue;
|
||||
display?: (item: DataTableValue, row: Row) => DataTableValue;
|
||||
display?: (item: Value, row: Row) => DataTableValue;
|
||||
sort?: false | ((a: DataTableValue, b: DataTableValue) => number);
|
||||
columnMenu?: boolean;
|
||||
width?: string;
|
||||
|
@ -37,9 +38,9 @@ export interface DataTableRow {
|
|||
export type DataTableRowId = any;
|
||||
|
||||
export interface DataTableCell<Row = DataTableRow> {
|
||||
key: DataTableKey<Row>;
|
||||
key: DataTableKey<Row> | (string & {});
|
||||
value: DataTableValue;
|
||||
display?: (item: DataTableValue, row: DataTableRow) => DataTableValue;
|
||||
display?: (item: Value, row: DataTableRow) => DataTableValue;
|
||||
}
|
||||
|
||||
type $RestProps = SvelteHTMLElements["div"];
|
||||
|
|
17
types/DataTable/DataTableTypes.d.ts
vendored
Normal file
17
types/DataTable/DataTableTypes.d.ts
vendored
Normal file
|
@ -0,0 +1,17 @@
|
|||
type PathDepth = [never, 0, 1, 2, ...0[]];
|
||||
|
||||
type Join<K, P> = K extends string | number
|
||||
? P extends string | number
|
||||
? `${K}${"" extends P ? "" : "."}${P}`
|
||||
: never
|
||||
: never;
|
||||
|
||||
export type PropertyPath<T, D extends number = 10> = [D] extends [never]
|
||||
? never
|
||||
: T extends object
|
||||
? {
|
||||
[K in keyof T]-?: K extends string | number
|
||||
? `${K}` | Join<K, PropertyPath<T[K], PathDepth[D]>>
|
||||
: never;
|
||||
}[keyof T]
|
||||
: "";
|
Loading…
Add table
Add a link
Reference in a new issue