Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Prevent focus-ring clipping in AnimatedHeight (#2503)

Julius Marminge0576820755fe
diff --git a/apps/web/src/components/AnimatedHeight.tsx b/apps/web/src/components/AnimatedHeight.tsx
index dd404c49d..d0e21b390 100644
--- a/apps/web/src/components/AnimatedHeight.tsx
+++ b/apps/web/src/components/AnimatedHeight.tsx
@@ -1,10 +1,25 @@
"use client";
-import { type ReactNode, useLayoutEffect, useRef, useState } from "react";
+import { type ReactNode, useEffect, useLayoutEffect, useRef, useState } from "react";
+
+const HEIGHT_TRANSITION_FALLBACK_MS = 250;
export function AnimatedHeight({ children }: { readonly children: ReactNode }) {
const contentRef = useRef<HTMLDivElement>(null);
- const [height, setHeight] = useState<number | null>(null);
+ const [heightState, setHeightState] = useState<{
+ readonly height: number | null;
+ readonly isClipping: boolean;
+ }>({ height: null, isClipping: false });
+
+ useEffect(() => {
+ if (!heightState.isClipping) return;
+ const timeoutId = window.setTimeout(() => {
+ setHeightState((currentState) =>
+ currentState.isClipping ? { ...currentState, isClipping: false } : currentState,
+ );
+ }, HEIGHT_TRANSITION_FALLBACK_MS);
+ return () => window.clearTimeout(timeoutId);
+ }, [heightState.height, heightState.isClipping]);
useLayoutEffect(() => {
const element = contentRef.current;
@@ -14,7 +29,13 @@ export function AnimatedHeight({ children }: { readonly children: ReactNode }) {
const updateHeight = () => {
const nextHeight = Math.ceil(element.scrollHeight || element.getBoundingClientRect().height);
- setHeight((currentHeight) => (currentHeight === nextHeight ? currentHeight : nextHeight));
+ setHeightState((currentState) => {
+ if (currentState.height === nextHeight) return currentState;
+ return {
+ height: nextHeight,
+ isClipping: currentState.height !== null,
+ };
+ });
};
const cancelPendingFrames = () => {
if (firstFrameId !== null) {
@@ -50,8 +71,19 @@ export function AnimatedHeight({ children }: { readonly children: ReactNode }) {
return (
<div
- className="overflow-hidden transition-[height] duration-200 ease-out motion-reduce:transition-none"
- style={height === null ? undefined : { height }}
+ data-slot="animated-height"
+ className="transition-[height] duration-200 ease-out motion-reduce:transition-none"
+ style={
+ heightState.height === null
+ ? undefined
+ : { height: heightState.height, overflow: heightState.isClipping ? "hidden" : "visible" }
+ }
+ onTransitionEnd={(event) => {
+ if (event.target !== event.currentTarget || event.propertyName !== "height") return;
+ setHeightState((currentState) =>
+ currentState.isClipping ? { ...currentState, isClipping: false } : currentState,
+ );
+ }}
>
<div ref={contentRef}>{children}</div>
</div>