[core] break(Portal): stop using legacy context in React 18 (#6680)

palantir · Jan 30, 2024 · a1fc694 · a1fc694 · adidahiya · Jan 30, 2024
1 parent def9459
commit a1fc694
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/core/src/common/utils/reactUtils.ts b/packages/core/src/common/utils/reactUtils.ts
@@ -123,3 +123,7 @@ export function isElementOfType<P = {}>(
         element.type.displayName === ComponentType.displayName
     );
 }
+
+export function isReact18(): boolean {
+    return React.version.startsWith("18");
+}
diff --git a/packages/core/src/components/portal/portal.tsx b/packages/core/src/components/portal/portal.tsx
@@ -20,6 +20,7 @@ import * as ReactDOM from "react-dom";
 import { Classes, DISPLAYNAME_PREFIX, type Props } from "../../common";
 import type { ValidationMap } from "../../common/context";
 import * as Errors from "../../common/errors";
+import { isReact18 } from "../../common/utils/reactUtils";
 import { PortalContext } from "../../context/portal/portalProvider";
 
 export interface PortalProps extends Props {
@@ -155,8 +156,11 @@ export function Portal(
 }
 
 Portal.displayName = `${DISPLAYNAME_PREFIX}.Portal`;
-// eslint-disable-next-line deprecation/deprecation
-Portal.contextTypes = PORTAL_LEGACY_CONTEXT_TYPES;
+// only use legacy context in React 16 or 17
+if (!isReact18()) {
+    // eslint-disable-next-line deprecation/deprecation
+    Portal.contextTypes = PORTAL_LEGACY_CONTEXT_TYPES;
+}
 
 function maybeRemoveClass(classList: DOMTokenList, className?: string) {
     if (className != null && className !== "") {