Fix types

Author: jaclarke

shared/studio/components/extendedViewers/index.tsx

@@ -13,7 +13,7 @@ export {ExtendedViewerContext};
 const PostgisViewer = lazy(() => import("./postgisViewer"));
 const HexViewer = lazy(() => import("./hexViewer"));
 
-type Renderer = (props: {data: any}) => JSX.Element | null;
+type Renderer = (props: {data: any}) => React.ReactNode;
 
 export const extendedViewerRenderers: {
   [key: string]: Renderer;

web/package.json

@@ -36,6 +36,8 @@
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
     "@types/jest": "^27.0.1",
+    "@types/react": "^18.3.1",
+    "@types/react-dom": "^18.3.1",
     "@types/selenium-webdriver": "^4.1.27",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "eslint": "^9.13.0",

web/src/components/databasePage/index.tsx

@@ -10,6 +10,7 @@ import {HeaderTab} from "@edgedb/studio/components/headerNav";
 import {
   HeaderNav,
   HeaderNavCol,
+  HeaderNavColProps,
 } from "@edgedb/studio/components/headerNav/elements";
 import {HeaderDatabaseIcon} from "@edgedb/studio/icons";
 
@@ -92,7 +93,7 @@ function HeaderNavMenu({
       setDropdownOpen={setDropdownOpen}
     >
       <HeaderNavCol<{to: string}>
-        Link={Link}
+        Link={Link as HeaderNavColProps<{to: string}>["Link"]}
         closeDropdown={() => setDropdownOpen(false)}
         itemGroups={[
           {

yarn.lock

@@ -2895,12 +2895,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:*":
-  version: 17.0.14
-  resolution: "@types/react-dom@npm:17.0.14"
-  dependencies:
-    "@types/react": "*"
-  checksum: b54cd0ef573236b3d87fe7493e6d1c36d8b4ca37a3b46364272a5c91ac178e3296b68ea1aeb299ce68f12ad663c5720ee890d0539b14881c6754bdcbdb0befa0
+"@types/react-dom@npm:*, @types/react-dom@npm:^18.3.1":
+  version: 18.3.5
+  resolution: "@types/react-dom@npm:18.3.5"
+  peerDependencies:
+    "@types/react": ^18.0.0
+  checksum: 95c757684f71e761515c5a11299e5feec550c72bb52975487f360e6f0d359b26454c26eaf2ce45dd22748205aa9b2c2fe0abe7005ebcbd233a7615283ac39a7d
   languageName: node
   linkType: hard
 
@@ -2922,21 +2922,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*":
-  version: 17.0.41
-  resolution: "@types/react@npm:17.0.41"
+"@types/react@npm:*, @types/react@npm:^18.3.1":
+  version: 18.3.18
+  resolution: "@types/react@npm:18.3.18"
   dependencies:
     "@types/prop-types": "*"
-    "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: 1b086ec0ea5d666f05e19e0724e41278d27a2ca29a2cd71b9d9ab3fe27dba233806eb728d744e092c9fe9637ac738d8c5a05983cde84d215342949b47ecba2ef
-  languageName: node
-  linkType: hard
-
-"@types/scheduler@npm:*":
-  version: 0.16.2
-  resolution: "@types/scheduler@npm:0.16.2"
-  checksum: b6b4dcfeae6deba2e06a70941860fb1435730576d3689225a421280b7742318d1548b3d22c1f66ab68e414f346a9542f29240bc955b6332c5b11e561077583bc
+  checksum: 5933597bc9f53e282f0438f0bb76d0f0fab60faabe760ea806e05ffe6f5c61b9b4d363e1a03a8fea47c510d493c6cf926cdeeba9f7074fa97b61940c350245e7
   languageName: node
   linkType: hard
 
@@ -8746,6 +8738,8 @@ __metadata:
     "@testing-library/react": ^12.0.0
     "@testing-library/user-event": ^13.2.1
     "@types/jest": ^27.0.1
+    "@types/react": ^18.3.1
+    "@types/react-dom": ^18.3.1
     "@types/selenium-webdriver": ^4.1.27
     "@vitejs/plugin-react-swc": ^3.5.0
     edgedb: 1.6.0-canary.20250120T111308