Skip to content
This repository was archived by the owner on Dec 30, 2025. It is now read-only.

Commit 1fe82ac

Browse files
fix(grid-core): - Generate .d.ts files for grid and scheduler core packages (#3667)
* Generate .d.ts for grid and scheduler core packages * Add missing api changes * trying api changes again * Fix lint * Remove forgotten skiplibcheck * Bring back yarn.lock from master and add WA for some strange TS error
1 parent 2b97503 commit 1fe82ac

File tree

13 files changed

+74
-33
lines changed

13 files changed

+74
-33
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"yarn": ">=1.22.0"
9191
},
9292
"resolutions": {
93-
"@types/react": "16.9.35",
94-
"@types/react-test-renderer": "^16.9.3"
93+
"@types/react": "^17.0.30",
94+
"@types/react-test-renderer": "^17.0.9"
9595
}
9696
}

packages/dx-grid-core/merge-dts.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { fileURLToPath } from 'url';
2+
import { dirname } from 'path';
3+
4+
import buildDefinitions from '../../scripts/merge-dts.js';
5+
6+
buildDefinitions(dirname(fileURLToPath(import.meta.url)));

packages/dx-grid-core/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"main": "dist/dx-grid-core.umd.cjs",
4141
"module": "dist/dx-grid-core.es.js",
4242
"types": "dist/dx-grid-core.d.ts",
43+
"typings": "dist/dx-grid-core.d.ts",
4344
"globalName": "DevExpress.DXGridCore",
4445
"files": [
4546
"dist"
@@ -50,6 +51,7 @@
5051
"test:coverage": "jest --coverage",
5152
"build": "rollup -c rollup.config.js",
5253
"build:watch": "rollup -c rollup.config.js -w",
54+
"dts": "tsc -p tsconfig.dts.json && node ./merge-dts.js",
5355
"lint": "tslint -p tsconfig.lint.json",
5456
"lint:fix": "yarn lint -- --fix"
5557
},

packages/dx-grid-core/src/plugins/table-band-header/test-utils.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ export const generateChains = (
3434
.sort((a, b) => a - b)
3535
.filter(p => p < columns.length);
3636

37-
const chain = [];
37+
const chain: {
38+
bandTitle: string[],
39+
columns: typeof columns,
40+
start: number,
41+
}[] = [];
3842
for (let i = 0; i < indexes.length - 1; i += 2) {
3943
const start = indexes[i];
4044
const end = indexes[i + 1];
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"extends": "./tsconfig.json",
3+
"compilerOptions": {
4+
"declaration": true,
5+
"declarationDir": "./dist/dts",
6+
"emitDeclarationOnly": true,
7+
}
8+
}

packages/dx-grid-core/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"outDir": "./dist",
55
"downlevelIteration": true,
6-
"noImplicitAny": true,
6+
"noImplicitAny": false,
77
},
88
"include": [
99
"./src"

packages/dx-react-grid/api/dx-react-grid.api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,9 +1558,9 @@ export class TableSummaryRowBase extends React_2.PureComponent<TableSummaryRowPr
15581558
// (undocumented)
15591559
static GROUP_ROW_TYPE: symbol;
15601560
// (undocumented)
1561-
render(): JSX.Element;
1561+
render(): React_2.JSX.Element;
15621562
// (undocumented)
1563-
renderContent(column: any, columnSummaries: any): JSX.Element;
1563+
renderContent(column: any, columnSummaries: any): React_2.JSX.Element;
15641564
// (undocumented)
15651565
static TOTAL_ROW_TYPE: symbol;
15661566
// (undocumented)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { fileURLToPath } from 'url';
2+
import { dirname } from 'path';
3+
4+
import buildDefinitions from '../../scripts/merge-dts.js';
5+
6+
buildDefinitions(dirname(fileURLToPath(import.meta.url)));

packages/dx-scheduler-core/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,16 @@
4242
"files": [
4343
"dist"
4444
],
45+
"types": "dist/dx-scheduler-core.d.ts",
46+
"typings": "dist/dx-scheduler-core.d.ts",
4547
"scripts": {
4648
"test": "jest",
4749
"test:pacific": "TZ=US/Pacific jest",
4850
"test:watch": "jest --watch",
4951
"test:coverage": "jest --coverage",
5052
"build": "rollup -c rollup.config.js",
5153
"build:watch": "rollup -c rollup.config.js -w",
54+
"dts": "tsc -p tsconfig.dts.json && node ./merge-dts.js",
5255
"lint": "tslint -p tsconfig.lint.json",
5356
"lint:fix": "yarn lint -- --fix"
5457
},

packages/dx-scheduler-core/src/utils.ts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,17 @@ export const getAppointmentStyle: PureComputed<
8989
> = ({
9090
top, left,
9191
width, height,
92-
}) => ({
93-
height,
94-
width: `${width}%`,
95-
transform: `translateY(${top}px)`,
96-
msTransform: `translateY(${top}px)`,
97-
left: `${left}%`,
98-
position: 'absolute',
99-
});
92+
}) => {
93+
const transform = `translateY(${top}px)` as any;
94+
return ({
95+
height,
96+
width: `${width}%`,
97+
transform,
98+
msTransform: transform,
99+
left: `${left}%`,
100+
position: 'absolute',
101+
});
102+
};
100103

101104
const expandRecurrenceAppointment = (
102105
appointment: AppointmentMoment, leftBound: Date, rightBound: Date,

0 commit comments

Comments
 (0)