Skip to content

chore(deps): update to react 18 #31041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OS-jacobbell wants to merge 1 commit into
base: major-9.0
Choose a base branch
from
+83 −124
Open

chore(deps): update to react 18 #31041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 58 additions & 103 deletions packages/react/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions packages/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@
"@ionic/prettier-config": "^2.0.0",
"@rollup/plugin-typescript": "^11.1.5",
"@testing-library/jest-dom": "^5.11.6",
"@testing-library/react": "^12.1.5",
"@testing-library/react-hooks": "^7.0.1",
"@testing-library/react": "~13.4.0",
"@types/jest": "^26.0.15",
"@types/node": "^14.0.14",
"@types/react": "^17.0.79",
"@types/react-dom": "^17.0.25",
"@types/react": "~18.3.28",
"@types/react-dom": "~18.3.7",
"@typescript-eslint/eslint-plugin": "^5.48.2",
"@typescript-eslint/parser": "^5.48.2",
"eslint": "^7.32.0",
Expand All @@ -67,8 +66,8 @@
"jest-environment-jsdom": "^29.7.0",
"np": "^6.4.0",
"prettier": "^2.8.3",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "~18.3.1",
"react-dom": "~18.3.1",
"rimraf": "^3.0.2",
"rollup": "^4.2.0",
"ts-jest": "^29.1.3",
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/IonIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ interface IonIconProps {

type InternalProps = IonIconProps & {
forwardedRef?: React.ForwardedRef<HTMLIonIconElement>;
children: React.ReactNode;
};

class IonIconContainer extends React.PureComponent<InternalProps> {
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/IonPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ interface IonPageProps extends IonicReactProps {}

interface IonPageInternalProps extends IonPageProps {
forwardedRef?: React.ForwardedRef<HTMLDivElement>;
children: React.ReactNode;
}

class IonPageInternal extends React.Component<IonPageInternalProps> {
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/IonRouterOutlet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type Props = LocalJSX.IonRouterOutlet & {

interface InternalProps extends Props {
forwardedRef?: React.ForwardedRef<HTMLIonRouterOutletElement>;
children: React.ReactNode;
}

// eslint-disable-next-line @typescript-eslint/no-empty-interface
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/createControllerComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,6 @@ export const createControllerComponent = <OptionsType extends object, OverlayTyp
}

return React.forwardRef<OverlayType, Props>((props, ref) => {
return <Overlay {...props} forwardedRef={ref} />;
return <Overlay {...(props as Props)} forwardedRef={ref} />;
});
};
2 changes: 1 addition & 1 deletion packages/react/src/components/createOverlayComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,6 @@ export const createOverlayComponent = <OverlayComponent extends object, OverlayT
}

return React.forwardRef<OverlayType, Props>((props, ref) => {
return <Overlay {...props} forwardedRef={ref} />;
return <Overlay {...(props as Props)} forwardedRef={ref} />;
});
};
1 change: 1 addition & 0 deletions packages/react/src/components/navigation/IonNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const IonNavInner = createReactComponent<JSX.IonNav & { delegate: FrameworkDeleg

type IonNavProps = JSX.IonNav & {
forwardedRef?: React.ForwardedRef<HTMLIonNavElement>;
children?: React.ReactNode;
};

// eslint-disable-next-line @typescript-eslint/no-unused-vars
Expand Down
Loading
Loading