remove @react-aria/utils

components/Blocks/TextBlock/index.tsx

···
-import { useRef, useEffect, useState } from "react";
+import { useRef, useEffect, useState, useLayoutEffect } from "react";
 import { elementId } from "src/utils/elementId";
 import { baseKeymap } from "prosemirror-commands";
 import { keymap } from "prosemirror-keymap";
···
 import { addBlueskyPostBlock, addLinkBlock } from "src/utils/addLinkBlock";
 import { BlockCommandBar } from "components/Blocks/BlockCommandBar";
 import { useEditorStates } from "src/state/useEditorState";
-import { isIOS, useLayoutEffect } from "@react-aria/utils";
 import { useEntitySetContext } from "components/EntitySetProvider";
 import { useHandlePaste } from "./useHandlePaste";
 import { highlightSelectionPlugin } from "./plugins";
···
 import { AddTiny } from "components/Icons/AddTiny";
 import { BlockDocPageSmall } from "components/Icons/BlockDocPageSmall";
 import { BlockImageSmall } from "components/Icons/BlockImageSmall";
+import { isIOS } from "src/utils/isDevice";
 
 const HeadingStyle = {
   1: "text-xl font-bold",

components/HelpPopover.tsx

···
 "use client";
-import { isMac } from "@react-aria/utils";
 import { ShortcutKey } from "./Layout";
 import { Media } from "./Media";
 import { Popover } from "./Popover";
···
 import { useState } from "react";
 import { ActionButton } from "components/ActionBar/ActionButton";
 import { HelpSmall } from "./Icons/HelpSmall";
+import { isMac } from "src/utils/isDevice";
 
 export const HelpPopover = (props: { noShortcuts?: boolean }) => {
   let entity_set = useEntitySetContext();

components/Input.tsx

···
 "use client";
-import { isIOS } from "@react-aria/utils";
 import { useCallback, useEffect, useRef, type JSX } from "react";
 import { onMouseDown } from "src/utils/iosInputMouseDown";
+import { isIOS } from "src/utils/isDevice";
 
 export function Input(
   props: React.DetailedHTMLProps<

components/Toolbar/HighlightToolbar.tsx

···
 import { rangeHasMark } from "src/utils/prosemirror/rangeHasMark";
 
 import { Separator, ShortcutKey } from "components/Layout";
-import { isMac } from "@react-aria/utils";
 import { ToolbarButton } from ".";
 import { NestedCardThemeProvider } from "components/ThemeManager/ThemeProvider";
 import { Props } from "components/Icons/Props";
···
 import { ArrowRightTiny } from "components/Icons/ArrowRightTiny";
 import { PaintSmall } from "components/Icons/PaintSmall";
 import { Color } from "react-aria-components";
+import { isMac } from "src/utils/isDevice";
 
 export const HighlightButton = (props: {
   lastUsedHighlight: string;

components/Toolbar/TextToolbar.tsx

···
-import { isMac } from "@react-aria/utils";
 import { Separator, ShortcutKey } from "components/Layout";
 import { metaKey } from "src/utils/metaKey";
 import { LinkButton } from "./InlineLinkToolbar";
···
 import { TextAlignmentButton } from "./TextAlignmentToolbar";
 import { LockBlockButton } from "./LockBlockButton";
 import { Props } from "components/Icons/Props";
+import { isMac } from "src/utils/isDevice";
 
 export const TextToolbar = (props: {
   lastUsedHighlight: string;

components/ViewportSizeLayout.tsx

···
 "use client";
-import { isIOS, useViewportSize } from "@react-aria/utils";
 import { useEffect, useState } from "react";
+import { isIOS } from "src/utils/isDevice";
 
 export function ViewportSizeLayout(props: { children: React.ReactNode }) {
   let viewheight = useViewportSize().height;
···
     height: visualViewport?.height || window?.innerHeight,
   };
 }
+
+export function useViewportSize(): {
+  width: number;
+  height: number;
+} {
+  let [size, setSize] = useState(() => getViewportSize());
+
+  useEffect(() => {
+    // Use visualViewport api to track available height even on iOS virtual keyboard opening
+    let onResize = () => {
+      setSize((size) => {
+        let newSize = getViewportSize();
+        if (newSize.width === size.width && newSize.height === size.height) {
+          return size;
+        }
+        return newSize;
+      });
+    };
+
+    if (!visualViewport) {
+      window.addEventListener("resize", onResize);
+    } else {
+      visualViewport.addEventListener("resize", onResize);
+    }
+
+    return () => {
+      if (!visualViewport) {
+        window.removeEventListener("resize", onResize);
+      } else {
+        visualViewport.removeEventListener("resize", onResize);
+      }
+    };
+  }, []);
+
+  return size;
+}

package-lock.json

···
         "@atproto/xrpc": "^0.6.9",
         "@mdx-js/loader": "^3.1.0",
         "@mdx-js/react": "^3.1.0",
+        "@next/bundle-analyzer": "^15.3.2",
         "@next/mdx": "15.3.2",
         "@radix-ui/react-dropdown-menu": "^2.1.14",
         "@radix-ui/react-popover": "^1.1.13",
         "@radix-ui/react-slider": "^1.3.4",
         "@radix-ui/react-tooltip": "^1.2.6",
-        "@react-aria/utils": "^3.24.1",
         "@react-spring/web": "^10.0.0-beta.0",
         "@rocicorp/undo": "^0.2.1",
         "@supabase/ssr": "^0.3.0",
···
         "@tiptap/core": "^2.11.5",
         "@types/mdx": "^2.0.13",
         "@vercel/analytics": "^1.3.1",
-        "@vercel/kv": "^1.0.1",
         "@vercel/sdk": "^1.3.1",
         "babel-plugin-react-compiler": "^19.1.0-rc.1",
         "base64-js": "^1.5.1",
···
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@date-fns/tz/-/tz-1.2.0.tgz",
       "integrity": "sha512-LBrd7MiJZ9McsOgxqWX7AaxrDjcFVjWH/tIKJd7pnR7McaslGYOP1QmmiBXdJH/H/yLCT+rcQ7FaPBUxRGUtrg=="
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
     },
     "node_modules/@emnapi/runtime": {
       "version": "1.4.3",
···
         "react": ">=16"
       }
     },
+    "node_modules/@next/bundle-analyzer": {
+      "version": "15.3.2",
+      "resolved": "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-15.3.2.tgz",
+      "integrity": "sha512-zY5O1PNKNxWEjaFX8gKzm77z2oL0cnj+m5aiqNBgay9LPLCDO13Cf+FJONeNq/nJjeXptwHFT9EMmTecF9U4Iw==",
+      "license": "MIT",
+      "dependencies": {
+        "webpack-bundle-analyzer": "4.10.1"
+      }
+    },
     "node_modules/@next/env": {
       "version": "15.3.2",
       "resolved": "https://registry.npmjs.org/@next/env/-/env-15.3.2.tgz",
···
       "engines": {
         "node": ">=14"
       }
+    },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.29",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
+      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
+      "license": "MIT"
     },
     "node_modules/@radix-ui/number": {
       "version": "1.1.1",
···
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
       "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
     },
-    "node_modules/@upstash/redis": {
-      "version": "1.25.1",
-      "resolved": "https://registry.npmjs.org/@upstash/redis/-/redis-1.25.1.tgz",
-      "integrity": "sha512-ACj0GhJ4qrQyBshwFgPod6XufVEfKX2wcaihsEvSdLYnY+m+pa13kGt1RXm/yTHKf4TQi/Dy2A8z/y6WUEOmlg==",
-      "dependencies": {
-        "crypto-js": "^4.2.0"
-      }
-    },
     "node_modules/@vercel/analytics": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@vercel/analytics/-/analytics-1.3.1.tgz",
···
         "react": {
           "optional": true
         }
-      }
-    },
-    "node_modules/@vercel/kv": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@vercel/kv/-/kv-1.0.1.tgz",
-      "integrity": "sha512-uTKddsqVYS2GRAM/QMNNXCTuw9N742mLoGRXoNDcyECaxEXvIHG0dEY+ZnYISV4Vz534VwJO+64fd9XeSggSKw==",
-      "dependencies": {
-        "@upstash/redis": "1.25.1"
-      },
-      "engines": {
-        "node": ">=14.6"
       }
     },
     "node_modules/@vercel/sdk": {
···
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
       "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
-      "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
···
         "node": ">= 8"
       }
     },
-    "node_modules/crypto-js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
-    },
     "node_modules/cssesc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
···
       "engines": {
         "node": ">= 0.4"
       }
+    },
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "license": "MIT"
     },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
···
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
     },
+    "node_modules/gzip-size": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+      "license": "MIT",
+      "dependencies": {
+        "duplexer": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/hanji": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/hanji/-/hanji-0.0.5.tgz",
···
       "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz",
       "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==",
       "dev": true
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "license": "MIT"
     },
     "node_modules/html-void-elements": {
       "version": "3.0.0",
···
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/is-promise": {
···
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/mrmime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
+      "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
···
       "dev": true,
       "dependencies": {
         "wrappy": "1"
+      }
+    },
+    "node_modules/opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+      "license": "(WTFPL OR MIT)",
+      "bin": {
+        "opener": "bin/opener-bin.js"
       }
     },
     "node_modules/optionator": {
···
         "is-arrayish": "^0.3.1"
       }
     },
+    "node_modules/sirv": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
+      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@polka/url": "^1.0.0-next.24",
+        "mrmime": "^2.0.0",
+        "totalist": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
···
       "license": "MIT",
       "engines": {
         "node": ">=0.6"
+      }
+    },
+    "node_modules/totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/tr46": {
···
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.1.tgz",
+      "integrity": "sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@discoveryjs/json-ext": "0.5.7",
+        "acorn": "^8.0.4",
+        "acorn-walk": "^8.0.0",
+        "commander": "^7.2.0",
+        "debounce": "^1.2.1",
+        "escape-string-regexp": "^4.0.0",
+        "gzip-size": "^6.0.0",
+        "html-escaper": "^2.0.2",
+        "is-plain-object": "^5.0.0",
+        "opener": "^1.5.2",
+        "picocolors": "^1.0.0",
+        "sirv": "^2.0.3",
+        "ws": "^7.3.1"
+      },
+      "bin": {
+        "webpack-bundle-analyzer": "lib/bin/analyzer.js"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/whatwg-url": {

package.json

···
   "main": "index.js",
   "scripts": {
     "dev": "next dev",
+    "generate-db-types": "supabase gen types --local > supabase/database.types.ts && drizzle-kit introspect && rm -rf ./drizzle/*.sql ./drizzle/meta",
     "lexgen": "tsx ./lexicons/build.ts && lex gen-api ./lexicons/api ./lexicons/pub/leaflet/* ./lexicons/pub/leaflet/*/* ./lexicons/com/atproto/*/* --yes",
     "wrangler-dev": "wrangler dev",
     "start-appview-dev": "tsx --env-file='./.env.local' --watch appview/index.ts",
···
     "@atproto/xrpc": "^0.6.9",
     "@mdx-js/loader": "^3.1.0",
     "@mdx-js/react": "^3.1.0",
+    "@next/bundle-analyzer": "^15.3.2",
     "@next/mdx": "15.3.2",
     "@radix-ui/react-dropdown-menu": "^2.1.14",
     "@radix-ui/react-popover": "^1.1.13",
     "@radix-ui/react-slider": "^1.3.4",
     "@radix-ui/react-tooltip": "^1.2.6",
-    "@react-aria/utils": "^3.24.1",
     "@react-spring/web": "^10.0.0-beta.0",
     "@rocicorp/undo": "^0.2.1",
     "@supabase/ssr": "^0.3.0",
···
     "@tiptap/core": "^2.11.5",
     "@types/mdx": "^2.0.13",
     "@vercel/analytics": "^1.3.1",
-    "@vercel/kv": "^1.0.1",
     "@vercel/sdk": "^1.3.1",
     "babel-plugin-react-compiler": "^19.1.0-rc.1",
     "base64-js": "^1.5.1",

src/shortcuts.ts

···
-import { isIOS, isMac } from "@react-aria/utils";
 import { useUIState } from "./useUIState";
 import { Replicache } from "replicache";
 import { ReplicacheMutators } from "./replicache";
+import { isMac } from "./utils/isDevice";
 
 type Shortcut = {
   metaKey?: boolean;

src/utils/iosInputMouseDown.ts

···
-import { isIOS } from "@react-aria/utils";
+import { isIOS } from "./isDevice";
 
 export function onMouseDown(e: React.MouseEvent<HTMLInputElement>) {
   if (!isIOS()) return;

src/utils/isDevice.ts

···
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+function testUserAgent(re: RegExp) {
+  if (typeof window === "undefined" || window.navigator == null) {
+    return false;
+  }
+  return (
+    //@ts-ignore
+    window.navigator["userAgentData"]?.brands.some(
+      (brand: { brand: string; version: string }) => re.test(brand.brand),
+    ) || re.test(window.navigator.userAgent)
+  );
+}
+
+function testPlatform(re: RegExp) {
+  return typeof window !== "undefined" && window.navigator != null
+    ? re.test(
+        //@ts-ignore
+        window.navigator["userAgentData"]?.platform ||
+          window.navigator.platform,
+      )
+    : false;
+}
+
+function cached(fn: () => boolean) {
+  if (process.env.NODE_ENV === "test") {
+    return fn;
+  }
+
+  let res: boolean | null = null;
+  return () => {
+    if (res == null) {
+      res = fn();
+    }
+    return res;
+  };
+}
+
+export const isMac = cached(function () {
+  return testPlatform(/^Mac/i);
+});
+
+export const isIPhone = cached(function () {
+  return testPlatform(/^iPhone/i);
+});
+
+export const isIPad = cached(function () {
+  return (
+    testPlatform(/^iPad/i) ||
+    // iPadOS 13 lies and says it's a Mac, but we can distinguish by detecting touch support.
+    (isMac() && navigator.maxTouchPoints > 1)
+  );
+});
+
+export const isIOS = cached(function () {
+  return isIPhone() || isIPad();
+});
+
+export const isAppleDevice = cached(function () {
+  return isMac() || isIOS();
+});
+
+export const isWebKit = cached(function () {
+  return testUserAgent(/AppleWebKit/i) && !isChrome();
+});
+
+export const isChrome = cached(function () {
+  return testUserAgent(/Chrome/i);
+});
+
+export const isAndroid = cached(function () {
+  return testUserAgent(/Android/i);
+});
+
+export const isFirefox = cached(function () {
+  return testUserAgent(/Firefox/i);
+});