Skip to content

fix(column): add phantom of prop for typed slot inference #8485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YevheniiKotyrlo wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −11
Open

fix(column): add phantom of prop for typed slot inference #8485

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 19 additions & 11 deletions packages/primevue/src/column/Column.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import type { PassThroughOptions } from 'primevue/passthrough';
import type { RadioButtonPassThroughOptionType } from 'primevue/radiobutton';
import type { SelectPassThroughOptionType } from 'primevue/select';
import type { VirtualScrollerLoaderOptions } from 'primevue/virtualscroller';
import { VNode } from 'vue';
import { AllowedComponentProps, ComponentCustomProps, VNode, VNodeProps } from 'vue';

export declare type ColumnPassThroughOptionType = ColumnPassThroughAttributes | ((options: ColumnPassThroughMethodOptions) => ColumnPassThroughAttributes | string) | string | null | undefined;

Expand Down Expand Up @@ -640,7 +640,7 @@ export interface ColumnContext {
/**
* Defines valid slots in Column component.
*/
export interface ColumnSlots {
export interface ColumnSlots<T = any> {
/**
* Custom body template for DataTable.
* @param {Object} scope - body slot's params.
Expand All @@ -649,19 +649,19 @@ export interface ColumnSlots {
/**
* Row data.
*/
data: any;
data: T;
/**
* Row node data.
*/
node: any;
node: T;
/**
* Column node.
*/
column: ColumnNode;
/**
* Column field.
*/
field: string | ((item: any) => string) | undefined;
field: string | ((item: T) => string) | undefined;
/**
* Row index.
*/
Expand Down Expand Up @@ -689,11 +689,11 @@ export interface ColumnSlots {
/**
* Row data.
*/
data: any;
data: T;
/**
* Row node data.
*/
node: any;
node: T;
/**
* Column node.
*/
Expand Down Expand Up @@ -749,7 +749,7 @@ export interface ColumnSlots {
/**
* Row data.
*/
data: any;
data: T;
/**
* Column node.
*/
Expand Down Expand Up @@ -884,7 +884,7 @@ export interface ColumnSlots {
/**
* Row data.
*/
data: any;
data: T;
/**
* Column node.
*/
Expand Down Expand Up @@ -1033,13 +1033,21 @@ export declare type ColumnEmits = EmitFn<ColumnEmitsOptions>;
* @group Component
*
*/
declare const Column: DefineComponent<ColumnProps, ColumnSlots, ColumnEmits>;
declare const Column: {
new <T = any>(
props: ColumnProps & { of?: readonly T[] | T[] | null }
): {
$props: ColumnProps & { of?: readonly T[] | T[] | null } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
$slots: ColumnSlots<T>;
$emit: EmitFn<ColumnEmitsOptions>;
};
};

export type ColumnNode = { props: ColumnProps };

declare module 'vue' {
export interface GlobalComponents {
Column: DefineComponent<ColumnProps, ColumnSlots, ColumnEmits>;
Column: typeof Column;
}
}

Expand Down