diff --git a/packages/devextreme/build/gulp/transpile.js b/packages/devextreme/build/gulp/transpile.js index c864e0bc2abd..2b15dbb03603 100644 --- a/packages/devextreme/build/gulp/transpile.js +++ b/packages/devextreme/build/gulp/transpile.js @@ -44,7 +44,7 @@ const esmTranspileSrc = src.concat([ '!**/*.json' ]); -const srcTsPattern = 'js/__internal/**/*.ts'; +const srcTsPattern = 'js/__internal/**/*.{ts,tsx}'; const srcTsIgnorePatterns = [ '**/__tests__/**/*' ]; @@ -66,7 +66,7 @@ const generatedTs = [ const bundlesSrc = ['js/bundles/**/*.js']; const TS_OUTPUT_BASE_DIR = 'artifacts/dist_ts'; -const TS_OUTPUT_SRC = [`${TS_OUTPUT_BASE_DIR}/__internal/**/*.js`]; +const TS_OUTPUT_SRC = [`${TS_OUTPUT_BASE_DIR}/__internal/**/*.{js,jsx}`]; const TS_COMPILER_CONFIG = { baseAbsPath: path.resolve(__dirname, '../..'), relativePath: { diff --git a/packages/devextreme/js/__internal/scheduler/r1/components/base/cell.ts b/packages/devextreme/js/__internal/scheduler/r1/components/base/cell.tsx similarity index 84% rename from packages/devextreme/js/__internal/scheduler/r1/components/base/cell.ts rename to packages/devextreme/js/__internal/scheduler/r1/components/base/cell.tsx index 04fb4cbcd42a..2d42544b75e3 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/components/base/cell.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/components/base/cell.tsx @@ -1,7 +1,5 @@ import { BaseInfernoComponent } from '@devextreme/runtime/inferno'; import type { PropsWithChildren, PropsWithClassName } from '@ts/core/r1/index'; -import type { VNode } from 'inferno'; -import { createVNode } from 'inferno'; import { renderUtils } from '../../utils/index'; import type { ContentTemplateProps } from '../types'; @@ -36,7 +34,7 @@ export const CellBaseDefaultProps: CellBaseProps = { }, }; export class CellBase extends BaseInfernoComponent { - render(): VNode { + render(): JSX.Element { const { className, isFirstGroupCell, @@ -45,12 +43,17 @@ export class CellBase extends BaseInfernoComponent { ariaLabel, } = this.props; - const classNames = renderUtils + const classes = renderUtils .getGroupCellClasses(isFirstGroupCell, isLastGroupCell, className); - return createVNode(1, 'td', classNames, children, 0, { - 'aria-label': ariaLabel, - }); + return ( + + {children} + + ); } } diff --git a/packages/devextreme/js/__internal/tsconfig.json b/packages/devextreme/js/__internal/tsconfig.json index ae22d9e96519..49b58613e356 100644 --- a/packages/devextreme/js/__internal/tsconfig.json +++ b/packages/devextreme/js/__internal/tsconfig.json @@ -3,6 +3,7 @@ "outDir": "../../artifacts/dist_ts", "module": "es6", "target": "ES2017", + "jsx": "preserve", "baseUrl": "../", "skipLibCheck": true, "allowJs": true,