Skip to content

Commit 937c98e

Browse files
authored
Merge pull request #1553 from data-driven-forms/migrate-mui
Migrate mui package to TS
2 parents 5faf82d + 36b60b6 commit 937c98e

119 files changed

Lines changed: 1826 additions & 3445 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"arguments": true
2323
},
2424
"plugins": ["react", "jest"],
25-
"extends": ["react-app", "eslint:recommended", "plugin:react/recommended", "plugin:prettier/recommended", "prettier"],
25+
"extends": ["eslint-config-react-app", "eslint:recommended", "plugin:react/recommended", "plugin:prettier/recommended", "prettier"],
2626
"env": {
2727
"es6": true,
2828
"browser": true,

package-lock.json

Lines changed: 477 additions & 259 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"start-demo": "nx run @data-driven-forms/react-renderer-demo:start",
2121
"lint": "npm run lint:js && npm run lint:typescript",
2222
"lint:js": "npx eslint ./packages/*/src --ext .js",
23-
"lint:typescript": "eslint packages/react-form-renderer/src/**/* packages/react-form-renderer/demo/**/* packages/pf4-component-mapper/src/**/* packages/pf4-component-mapper/demo/**/* --ext .ts,.tsx,.js,.jsx",
23+
"lint:typescript": "eslint packages/react-form-renderer/src/**/* packages/react-form-renderer/demo/**/* packages/pf4-component-mapper/src/**/* packages/pf4-component-mapper/demo/**/* packages/mui-component-mapper/src/**/* packages/mui-component-mapper/demo/**/* --ext .ts,.tsx,.js,.jsx",
2424
"generate-template": "node ./scripts/generate-mapper.js",
2525
"clean-build": "node ./scripts/clean-build.js",
2626
"prebuild": "node ./scripts/clean-build.js"
@@ -60,7 +60,6 @@
6060
"@types/react-dom": "^19.1.3",
6161
"@typescript-eslint/eslint-plugin": "^8.54.0",
6262
"@typescript-eslint/parser": "^8.54.0",
63-
"@babel/eslint-parser": "^7.28.6",
6463
"babel-jest": "^29.7.0",
6564
"babel-loader": "^8.4.1",
6665
"babel-plugin-transform-imports": "^2.0.0",

packages/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"devDependencies": {},
2222
"dependencies": {
23-
"@data-driven-forms/react-form-renderer": "^4.1.8",
23+
"@data-driven-forms/react-form-renderer": "^4.1.10",
2424
"clsx": "^1.0.4",
2525
"lodash": "^4.17.23"
2626
},

packages/common/src/form-template/form-template.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { useFormApi, FormSpy, AnyObject } from '@data-driven-forms/react-form-re
55
interface FormTemplateRenderProps extends AnyObject {
66
formFields: React.ReactNode[];
77
schema: {
8-
title?: string;
9-
description?: string;
8+
title?: React.ReactNode;
9+
description?: React.ReactNode;
1010
label?: string;
1111
};
1212
}

packages/common/src/select/select.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ export interface SelectProps<T = OptionValue> {
3737
menuPortalTarget?: Element;
3838
showMoreLabel?: string;
3939
showLessLabel?: string;
40+
// Allow any additional props to be passed through to SelectComponent
41+
// Different mappers may need different props for their SelectComponent implementations
42+
[key: string]: any;
4043
}
4144

4245
const Select = <T extends OptionValue = OptionValue>({

packages/common/src/wizard/enter-handler.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { KeyboardEvent } from 'react';
12
import selectNext, { NextStep } from './select-next';
23
import { AnyObject } from '@data-driven-forms/react-form-renderer';
34

packages/common/src/wizard/wizard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useReducer, useEffect } from 'react';
1+
import React, { useReducer, useEffect, KeyboardEventHandler, KeyboardEvent } from 'react';
22
import { useFormApi, WizardContext, AnyObject, Field } from '@data-driven-forms/react-form-renderer';
33

44
import get from 'lodash/get';
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"extends": ["../../.eslintrc.json"],
3+
"ignorePatterns": ["**/*.html", "**/*.css", "**/*.scss"],
4+
"overrides": [
5+
{
6+
"files": ["**/*.ts", "**/*.tsx"],
7+
"parser": "@typescript-eslint/parser",
8+
"parserOptions": {
9+
"ecmaVersion": 2020,
10+
"sourceType": "module",
11+
"ecmaFeatures": {
12+
"jsx": true
13+
},
14+
"project": ["packages/mui-component-mapper/tsconfig.json", "packages/mui-component-mapper/tsconfig.demo.json"]
15+
},
16+
"rules": {
17+
"@typescript-eslint/no-unused-vars": "error",
18+
"no-unused-vars": "off",
19+
"@typescript-eslint/no-use-before-define": ["error", { "functions": false }],
20+
"no-use-before-define": "off",
21+
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx", ".ts", ".tsx"] }],
22+
"react/prop-types": "off",
23+
"react/no-unused-prop-types": "off"
24+
}
25+
}
26+
]
27+
}

packages/mui-component-mapper/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,16 @@ vendor
8888
!README.md
8989
!tsconfig.json
9090
!tsconfig.spec.json
91+
!tsconfig.demo.json
92+
!tsconfig.cjs.json
93+
!tsconfig.esm.json
9194
!jest.config.ts
9295
!generate-typings.js
9396
!rollup.config.js
9497
!generate-componen-examples.js
9598
!firebae.json
9699
!firebaseFunctions.js
97100
!scripts/
101+
!.eslintrc.json
98102

99103
.DS_STORE

0 commit comments

Comments
 (0)