fix: r18 compat

launchdarkly · Dec 6, 2024 · e2e62c9 · e2e62c9
1 parent f2aec70
commit e2e62c9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/packages/drawer/src/Drawer.tsx b/packages/drawer/src/Drawer.tsx
@@ -130,7 +130,7 @@ const DrawerContainer = ({
 					animate="visible"
 					variants={overlay}
 					transition={{ duration: 0.15 }}
-					/* @ts-expect-error framer */
+					/* @ts-ignore framer */
 					role="presentation"
 					className={styles.overlay}
 					onMouseDown={handleOverlayClick}
@@ -140,7 +140,7 @@ const DrawerContainer = ({
 							initial="hidden"
 							animate="visible"
 							variants={slideRight}
-							/* @ts-expect-error framer */
+							/* @ts-ignore framer */
 							role="dialog"
 							aria-labelledby={DRAWER_LABELLED_BY}
 							aria-describedby={DRAWER_LABELLED_BY}

diff --git a/packages/dropdown/__tests__/Dropdown.spec.tsx b/packages/dropdown/__tests__/Dropdown.spec.tsx
@@ -1,4 +1,4 @@
-import type { RefObject } from 'react';
+import type { RefObject } from '@react-types/shared';
 
 import { Menu, MenuItem } from '@launchpad-ui/menu';
 import { useRef } from 'react';

diff --git a/packages/dropdown/package.json b/packages/dropdown/package.json
@@ -44,6 +44,7 @@
 		"react-dom": "^18.0.0 || ^19.0.0"
 	},
 	"devDependencies": {
+		"@react-types/shared": "3.26.0",
 		"react": "19.0.0",
 		"react-dom": "19.0.0"
 	}

diff --git a/packages/modal/src/ModalContainer.tsx b/packages/modal/src/ModalContainer.tsx
@@ -135,7 +135,7 @@ const ModalContainer = ({
 					animate="visible"
 					variants={overlay}
 					transition={{ duration: 0.15 }}
-					/* @ts-expect-error framer */
+					/* @ts-ignore framer */
 					role="presentation"
 					className={styles.overlay}
 					data-test-id="modal-overlay"
@@ -146,7 +146,7 @@ const ModalContainer = ({
 							initial="hidden"
 							animate="visible"
 							variants={isDesktopViewport ? transitions.desktopPop : transitions.mobileSlideUp}
-							/* @ts-expect-error framer */
+							/* @ts-ignore framer */
 							role="dialog"
 							aria-labelledby={MODAL_LABELLED_BY}
 							aria-describedby={MODAL_DESCRIBED_BY}

diff --git a/packages/navigation/src/NavigationContext.ts b/packages/navigation/src/NavigationContext.ts
@@ -1,4 +1,4 @@
-import type { RefObject } from 'react';
+import type { RefObject } from '@react-types/shared';
 
 import { createContext, useContext } from 'react';
 

diff --git a/packages/popover/src/Popover.tsx b/packages/popover/src/Popover.tsx
@@ -147,7 +147,7 @@ const Popover = ({
 		return;
 	}, []);
 	const arrowRef = useRef<HTMLDivElement>(null);
-	const timeoutRef = useRef<ReturnType<typeof setTimeout>>(null);
+	const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 	const optionsRef = useRef<Partial<ComputePositionConfig>>({});
 	const popoverId = useRef(`popover-${useId()}`);
 
@@ -385,7 +385,7 @@ const Popover = ({
 					transition={{ duration: 0.15 }}
 					initial={{ opacity: 0 }}
 					animate={{ opacity: 1 }}
-					/* @ts-expect-error framer */
+					/* @ts-ignore framer */
 					className={cx(
 						styles['Popover-content'],
 						restrictWidth && styles['Popover-content--restrictWidth'],

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml