Skip to content

Commit 97fe139

Browse files
authored
Fix generic components generation (#641)
* Generate generic params defaults for a component's class * Forward generic params to the instance property
1 parent 1bee78d commit 97fe139

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

packages/devextreme-react-generator/src/component-generator.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ interface ICLASS_NAMEOptions<T1 = any, T2 = any> extends Properties<T1, T2>, IHt
8989
dataSource?: Properties<T1, T2>["dataSource"];
9090
}
9191
92-
class CLASS_NAME<T1, T2> extends BaseComponent<ICLASS_NAMEOptions<T1, T2>> {
92+
class CLASS_NAME<T1 = any, T2 = any> extends BaseComponent<ICLASS_NAMEOptions<T1, T2>> {
9393
94-
public get instance(): dxCLASS_NAME {
94+
public get instance(): dxCLASS_NAME<T1, T2> {
9595
return this._instance;
9696
}
9797

packages/devextreme-react-generator/src/component-generator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,9 @@ const renderComponent: (model: {
351351
useRequestAnimationFrameFlag?: boolean;
352352
typeParams: string[] | undefined;
353353
}) => string = createTempate(
354-
`class <#= it.className #>${TYPE_PARAMS} extends BaseComponent<<#= it.optionsName #>${TYPE_PARAMS}> {
354+
`class <#= it.className #>${TYPE_PARAMS_WITH_DEFAULTS} extends BaseComponent<<#= it.optionsName #>${TYPE_PARAMS}> {
355355
356-
public get instance(): <#= it.widgetName #> {
356+
public get instance(): <#= it.widgetName #>${TYPE_PARAMS} {
357357
return this._instance;
358358
}
359359

0 commit comments

Comments
 (0)