Skip to content

Commit ff728ed

Browse files
authored
Merge pull request #90 from karelhala/update-react-pf
feat(dependencies): update react to v 18
2 parents 1f83117 + 2abdb61 commit ff728ed

File tree

6 files changed

+363
-250
lines changed

6 files changed

+363
-250
lines changed

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
"@babel/core": "7.14.6",
2323
"@lerna/project": "3.21.0",
2424
"@oat-sa/rollup-plugin-wildcard-external": "0.1.0",
25-
"@patternfly/react-core": "4.128.2",
26-
"@patternfly/react-icons": "4.10.11",
27-
"@patternfly/react-table": "4.27.24",
28-
"@patternfly/react-tokens": "4.11.12",
29-
"@redhat-cloud-services/frontend-components": "3.2.8",
25+
"@patternfly/react-core": "4.278.1",
26+
"@patternfly/react-icons": "4.93.7",
27+
"@patternfly/react-table": "4.113.7",
28+
"@patternfly/react-tokens": "4.94.7",
29+
"@redhat-cloud-services/frontend-components": "3.11.7",
3030
"@redhat-cloud-services/frontend-components-notifications": "3.2.2",
3131
"@redhat-cloud-services/frontend-components-utilities": "3.5.0",
32-
"@redhat-cloud-services/rbac-client": "1.0.98",
32+
"@redhat-cloud-services/rbac-client": "^1.0.100",
3333
"@rollup/plugin-commonjs": "19.0.0",
3434
"@rollup/plugin-json": "4.1.0",
3535
"@rollup/plugin-node-resolve": "13.0.0",
@@ -49,7 +49,7 @@
4949
"@types/react-redux": "7.1.16",
5050
"@typescript-eslint/eslint-plugin": "4.27.0",
5151
"@typescript-eslint/parser": "4.27.0",
52-
"axios": "0.21.1",
52+
"axios": "0.27.2",
5353
"axios-mock-adapter": "1.19.0",
5454
"classnames": "2.3.1",
5555
"cross-fetch": "3.1.5",
@@ -76,14 +76,14 @@
7676
"lodash": "4.17.21",
7777
"npm-run-all": "4.1.5",
7878
"prop-types": "15.7.2",
79-
"react": "17.0.2",
80-
"react-content-loader": "6.0.3",
81-
"react-dom": "17.0.2",
79+
"react": "^18.0.0",
80+
"react-content-loader": "6.2.0",
81+
"react-dom": "^18.0.0",
8282
"react-fetching-library": "1.7.6",
83-
"react-redux": "7.2.4",
83+
"react-redux": "7.2.9",
8484
"react-router-dom": "^6.16.0",
85-
"react-test-renderer": "17.0.2",
86-
"react-use": "17.2.4",
85+
"react-test-renderer": "^18.0.0",
86+
"react-use": "17.4.3",
8787
"redux": "4.1.0",
8888
"redux-logger": "3.0.6",
8989
"redux-promise-middleware": "5.1.1",

packages/insights-common-typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"axios": "^0.21.1",
3434
"csx": "^10.0.2",
3535
"formik": "^2.2.9",
36-
"react": "^17.0.2",
36+
"react": "^18.0.0",
3737
"react-fetching-library": "^1.7.6",
3838
"react-router-dom": "^6.16.0",
3939
"react-use": "^17.2.4",

packages/insights-common-typescript/src/components/Formik/Patternfly/Checkbox.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import { useField } from 'formik';
33
import { Checkbox as PFCheckbox, FormGroup, CheckboxProps as PFCheckboxProps } from '@patternfly/react-core';
44

55
import { onChangePFAdapter } from './Common';
6-
import { OuiaComponentProps } from '../../../utils';
76
import { getOuiaProps, withoutOuiaProps } from '../../../utils/Ouia';
87

9-
interface CheckboxProps extends OuiaComponentProps, Omit<PFCheckboxProps, 'onChange' | 'ref'> {
8+
interface CheckboxProps extends Omit<PFCheckboxProps, 'onChange' | 'ref' | 'ouiaId'> {
109
name: string;
1110
isRequired?: boolean;
11+
ouiaId?: string;
1212
}
1313

1414
export const Checkbox: React.FunctionComponent<CheckboxProps> = (props) => {

packages/insights-common-typescript/src/components/Formik/Patternfly/FormText.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import * as React from 'react';
22
import { useField } from 'formik';
33
import { FormGroup, Text, TextVariants, TextProps } from '@patternfly/react-core';
4-
import { getOuiaProps, OuiaComponentProps, withoutOuiaProps } from '../../../utils/Ouia';
4+
import { getOuiaProps, withoutOuiaProps } from '../../../utils/Ouia';
55

6-
interface FormTextProps extends OuiaComponentProps, Omit<TextProps, 'ref'> {
6+
interface FormTextProps extends Omit<TextProps, 'ref' | 'ouiaId'> {
77
id: string;
88
name: string;
99
isRequired?: boolean;
10+
ouiaId?: string;
1011
}
1112

1213
export const FormText: React.FunctionComponent<FormTextProps> = (props) => {

packages/insights-common-typescript/src/components/Formik/Patternfly/FormTextInput.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ import { useField } from 'formik';
33
import { FormGroup, Text, TextInput as PFTextInput, TextInputProps, TextVariants } from '@patternfly/react-core';
44

55
import { onChangePFAdapter } from './Common';
6-
import { OuiaComponentProps, withoutOuiaProps } from '../../../utils';
6+
import { withoutOuiaProps } from '../../../utils';
77
import { getOuiaProps } from '../../../utils/Ouia';
88

9-
interface FormTextInputProps extends OuiaComponentProps, Omit<TextInputProps, 'onChange' | 'innerRef'> {
9+
interface FormTextInputProps extends Omit<TextInputProps, 'onChange' | 'innerRef' | 'ouiaId'> {
1010
id: string;
1111
name: string;
1212
hint?: string;
13+
ouiaId?: string;
1314
}
1415

1516
export const FormTextInput: React.FunctionComponent<FormTextInputProps> = (props) => {

0 commit comments

Comments
 (0)