Skip to content

Commit 5262167

Browse files
Bump devextreme-internal-tools to 18.0.0 (#31222)
Co-authored-by: ilyakhd <[email protected]>
1 parent 2348b35 commit 5262167

File tree

5 files changed

+379
-334
lines changed

5 files changed

+379
-334
lines changed

packages/devextreme-metadata/common/index.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import {
22
AddMutation,
3-
ArrayDataType,
43
DataType,
5-
MemberRefDataType,
4+
DataTypes,
65
Mutation,
76
RemoveMutation,
87
} from 'devextreme-internal-tools/metadata';
@@ -37,13 +36,13 @@ export function replaceTypes({ uid, types }: { uid: string; types: DataType[] })
3736
}
3837

3938
export const types = {
40-
array(...itemTypes: ArrayDataType['itemTypes']): ArrayDataType {
39+
array(...itemTypes: DataTypes.Array['itemTypes']): DataTypes.Array {
4140
return { kind: 'array', itemTypes };
4241
},
4342

44-
memberRef(uid: string): MemberRefDataType {
45-
return { kind: 'memberRef', uid };
43+
uidRef(uid: string): DataTypes.UidRef {
44+
return { kind: 'uidRef', uid };
4645
},
4746

48-
object: { kind: 'object' } as any,
47+
object: { kind: 'object' } as DataTypes.Object,
4948
};

packages/devextreme-metadata/make-aspnet-metadata.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ AspNet.makeMetadata({
4343
}),
4444
addMember({
4545
uid: 'ui/popover:dxPopoverOptions.toolbarItems',
46-
types: [types.array(types.memberRef('ui/popover:ToolbarItem'))],
46+
types: [types.array(types.uidRef('ui/popover:ToolbarItem'))],
4747
}),
4848
removeMembers(/ui\/scheduler:ToolbarItem\.options/),
4949
],

packages/devextreme/ts/dx.all.d.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7340,11 +7340,9 @@ declare module DevExpress.data {
73407340
/**
73417341
* [descr:PivotGridDataSource.on(events)]
73427342
*/
7343-
on(
7344-
events: {
7345-
[key in DevExpress.data.PivotGridDataSource.EventName]?: Function;
7346-
}
7347-
): this;
7343+
on(events: {
7344+
[key in DevExpress.data.PivotGridDataSource.EventName]?: Function;
7345+
}): this;
73487346
/**
73497347
* [descr:PivotGridDataSource.reload()]
73507348
*/

0 commit comments

Comments
 (0)