Skip to content

Commit d959797

Browse files
committed
chore(deps): update to react 18
1 parent 1886864 commit d959797

18 files changed

+83
-124
lines changed

packages/react/package-lock.json

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

packages/react/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@
5353
"@ionic/prettier-config": "^2.0.0",
5454
"@rollup/plugin-typescript": "^11.1.5",
5555
"@testing-library/jest-dom": "^5.11.6",
56-
"@testing-library/react": "^12.1.5",
57-
"@testing-library/react-hooks": "^7.0.1",
56+
"@testing-library/react": "~13.4.0",
5857
"@types/jest": "^26.0.15",
5958
"@types/node": "^14.0.14",
60-
"@types/react": "^17.0.79",
61-
"@types/react-dom": "^17.0.25",
59+
"@types/react": "~18.3.28",
60+
"@types/react-dom": "~18.3.7",
6261
"@typescript-eslint/eslint-plugin": "^5.48.2",
6362
"@typescript-eslint/parser": "^5.48.2",
6463
"eslint": "^7.32.0",
@@ -67,8 +66,8 @@
6766
"jest-environment-jsdom": "^29.7.0",
6867
"np": "^6.4.0",
6968
"prettier": "^2.8.3",
70-
"react": "^17.0.2",
71-
"react-dom": "^17.0.2",
69+
"react": "~18.3.1",
70+
"react-dom": "~18.3.1",
7271
"rimraf": "^3.0.2",
7372
"rollup": "^4.2.0",
7473
"ts-jest": "^29.1.3",

packages/react/src/components/IonIcon.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ interface IonIconProps {
2121

2222
type InternalProps = IonIconProps & {
2323
forwardedRef?: React.ForwardedRef<HTMLIonIconElement>;
24+
children: React.ReactNode;
2425
};
2526

2627
class IonIconContainer extends React.PureComponent<InternalProps> {

packages/react/src/components/IonPage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ interface IonPageProps extends IonicReactProps {}
1111

1212
interface IonPageInternalProps extends IonPageProps {
1313
forwardedRef?: React.ForwardedRef<HTMLDivElement>;
14+
children: React.ReactNode;
1415
}
1516

1617
class IonPageInternal extends React.Component<IonPageInternalProps> {

packages/react/src/components/IonRouterOutlet.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ type Props = LocalJSX.IonRouterOutlet & {
1616

1717
interface InternalProps extends Props {
1818
forwardedRef?: React.ForwardedRef<HTMLIonRouterOutletElement>;
19+
children: React.ReactNode;
1920
}
2021

2122
// eslint-disable-next-line @typescript-eslint/no-empty-interface

packages/react/src/components/createControllerComponent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,6 @@ export const createControllerComponent = <OptionsType extends object, OverlayTyp
122122
}
123123

124124
return React.forwardRef<OverlayType, Props>((props, ref) => {
125-
return <Overlay {...props} forwardedRef={ref} />;
125+
return <Overlay {...(props as Props)} forwardedRef={ref} />;
126126
});
127127
};

packages/react/src/components/createOverlayComponent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,6 @@ export const createOverlayComponent = <OverlayComponent extends object, OverlayT
139139
}
140140

141141
return React.forwardRef<OverlayType, Props>((props, ref) => {
142-
return <Overlay {...props} forwardedRef={ref} />;
142+
return <Overlay {...(props as Props)} forwardedRef={ref} />;
143143
});
144144
};

packages/react/src/components/navigation/IonNav.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const IonNavInner = createReactComponent<JSX.IonNav & { delegate: FrameworkDeleg
1515

1616
type IonNavProps = JSX.IonNav & {
1717
forwardedRef?: React.ForwardedRef<HTMLIonNavElement>;
18+
children?: React.ReactNode;
1819
};
1920

2021
// eslint-disable-next-line @typescript-eslint/no-unused-vars

0 commit comments

Comments
 (0)