Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

chore(web): Lint against null component renders (#16709)

Ben Bachem405938aa1ab2
diff --git a/packages/eslint-plugin/src/index.ts b/packages/eslint-plugin/src/index.ts
index d9b43c87c7..c963a08cf7 100644
--- a/packages/eslint-plugin/src/index.ts
+++ b/packages/eslint-plugin/src/index.ts
@@ -3,6 +3,7 @@ import { default as noArbitraryColors } from "./rules/no-arbitrary-colors.js";
import { default as noAbstractedOverlayTrigger } from "./rules/no-abstracted-overlay-trigger.js";
import { default as noInSourceVitest } from "./rules/no-in-source-vitest.js";
import { default as noMarginOnRootElements } from "./rules/no-margin-on-root-elements.js";
+import { default as noNullRender } from "./rules/no-null-render.js";
import { default as noOverlayZindex } from "./rules/no-overlay-zindex.js";
import { default as noRawFontWeight } from "./rules/no-raw-font-weight.js";
import { default as requireTitleWithTruncate } from "./rules/require-title-with-truncate.js";
@@ -17,6 +18,7 @@ const plugin = {
"no-arbitrary-colors": noArbitraryColors,
"no-in-source-vitest": noInSourceVitest,
"no-margin-on-root-elements": noMarginOnRootElements,
+ "no-null-render": noNullRender,
"no-overlay-zindex": noOverlayZindex,
"no-raw-font-weight": noRawFontWeight,
"no-style-props": noStyleProps,
diff --git a/packages/eslint-plugin/src/react-components.ts b/packages/eslint-plugin/src/react-components.ts
index ba5026f900..db8b6a42eb 100644
--- a/packages/eslint-plugin/src/react-components.ts
+++ b/packages/eslint-plugin/src/react-components.ts
@@ -9,8 +9,19 @@ type RootElementCallbacks = {
onRootElement: (node: TSESTree.JSXElement) => void;
};
+type ResolveReturnExpression = (
+ expression: TSESTree.Expression,
+) => TSESTree.Expression;
+
type ReturnExpressionCallbacks = {
- onReturnExpression: (node: TSESTree.Expression) => void;
+ onReturnExpression?: (
+ node: TSESTree.Expression,
+ resolve?: ResolveReturnExpression,
+ ) => void;
+ onComponentReturns?: (
+ expressions: TSESTree.Expression[],
+ resolve: ResolveReturnExpression,
+ ) => void;
};
const REACT_COMPONENT_TYPES = new Set([
@@ -52,7 +63,12 @@ function expressionReturnsJsxOrNull(
node: TSESTree.Node | null | undefined,
): boolean {
if (!node) return false;
- if (isJsxNode(node) || isNullLiteral(node)) return true;
+ if (
+ isJsxNode(node) ||
+ isNullLiteral(node) ||
+ (node.type === AST_NODE_TYPES.Literal && node.value === false)
+ )
+ return true;
switch (node.type) {
case AST_NODE_TYPES.ConditionalExpression:
@@ -380,37 +396,40 @@ export function createComponentRootElementVisitors(
function visitReturnExpressionsInStatement(
statement: TSESTree.Statement | null | undefined,
- callbacks: ReturnExpressionCallbacks,
+ onReturnExpression: (node: TSESTree.Expression) => void,
): void {
if (!statement) return;
if (statement.type === AST_NODE_TYPES.ReturnStatement) {
- if (statement.argument) callbacks.onReturnExpression(statement.argument);
+ if (statement.argument) onReturnExpression(statement.argument);
return;
}
if (statement.type === AST_NODE_TYPES.BlockStatement) {
for (const child of statement.body) {
- visitReturnExpressionsInStatement(child, callbacks);
+ visitReturnExpressionsInStatement(child, onReturnExpression);
}
return;
}
if (statement.type === AST_NODE_TYPES.IfStatement) {
- visitReturnExpressionsInStatement(statement.consequent, callbacks);
- visitReturnExpressionsInStatement(statement.alternate, callbacks);
+ visitReturnExpressionsInStatement(statement.consequent, onReturnExpression);
+ visitReturnExpressionsInStatement(statement.alternate, onReturnExpression);
return;
}
if (statement.type === AST_NODE_TYPES.SwitchStatement) {
for (const switchCase of statement.cases) {
for (const child of switchCase.consequent) {
- visitReturnExpressionsInStatement(child, callbacks);
+ visitReturnExpressionsInStatement(child, onReturnExpression);
}
}
return;
}
if (statement.type === AST_NODE_TYPES.TryStatement) {
- visitReturnExpressionsInStatement(statement.block, callbacks);
- visitReturnExpressionsInStatement(statement.handler?.body, callbacks);
- visitReturnExpressionsInStatement(statement.finalizer, callbacks);
+ visitReturnExpressionsInStatement(statement.block, onReturnExpression);
+ visitReturnExpressionsInStatement(
+ statement.handler?.body,
+ onReturnExpression,
+ );
+ visitReturnExpressionsInStatement(statement.finalizer, onReturnExpression);
}
}
@@ -452,8 +471,16 @@ export function createComponentReturnExpressionVisitors(
expression: TSESTree.Expression,
initializers: Map<string, TSESTree.Expression>,
) {
- if (expression.type !== AST_NODE_TYPES.Identifier) return expression;
- return initializers.get(expression.name) ?? expression;
+ const seen = new Set<string>();
+ let current: TSESTree.Expression = expression;
+ while (current.type === AST_NODE_TYPES.Identifier) {
+ if (seen.has(current.name)) return current;
+ seen.add(current.name);
+ const init = initializers.get(current.name);
+ if (!init) return current;
+ current = init;
+ }
+ return current;
}
function maybeVisitFunctionComponentReturns(
@@ -470,32 +497,32 @@ export function createComponentReturnExpressionVisitors(
node.expression
) {
if (!expressionReturnsJsxOrNull(node.body)) return;
- callbacks.onReturnExpression(node.body);
+ const resolve = (expression: TSESTree.Expression) => expression;
+ callbacks.onComponentReturns?.([node.body], resolve);
+ callbacks.onReturnExpression?.(node.body, resolve);
return;
}
const initializers = getDirectVariableInitializers(node);
+ const resolve = (expression: TSESTree.Expression) =>
+ resolveDirectVariable(expression, initializers);
const returnExpressions: TSESTree.Expression[] = [];
for (const statement of (node.body as TSESTree.BlockStatement).body) {
if (statement.type === AST_NODE_TYPES.ReturnStatement) {
if (statement.argument) {
- returnExpressions.push(
- resolveDirectVariable(statement.argument, initializers),
- );
+ returnExpressions.push(resolve(statement.argument));
}
continue;
}
- visitReturnExpressionsInStatement(statement, {
- onReturnExpression(expression) {
- returnExpressions.push(
- resolveDirectVariable(expression, initializers),
- );
- },
+ visitReturnExpressionsInStatement(statement, (expression) => {
+ returnExpressions.push(resolve(expression));
});
}
if (!returnExpressions.some(expressionReturnsJsxOrNull)) return;
+ callbacks.onComponentReturns?.(returnExpressions, resolve);
+ if (!callbacks.onReturnExpression) return;
for (const expression of returnExpressions) {
- callbacks.onReturnExpression(expression);
+ callbacks.onReturnExpression(expression, resolve);
}
}
diff --git a/packages/eslint-plugin/src/rules/no-null-render.test.ts b/packages/eslint-plugin/src/rules/no-null-render.test.ts
new file mode 100644
index 0000000000..9c222d7559
--- /dev/null
+++ b/packages/eslint-plugin/src/rules/no-null-render.test.ts
@@ -0,0 +1,553 @@
+import { RuleTester } from "@typescript-eslint/rule-tester";
+import * as typescriptEslintParser from "@typescript-eslint/parser";
+
+import rule from "./no-null-render.js";
+
+const ruleTester = new RuleTester({
+ languageOptions: {
+ parser: typescriptEslintParser,
+ parserOptions: {
+ ecmaFeatures: {
+ jsx: true,
+ },
+ },
+ },
+});
+
+const unexpectedNullishRender = {
+ messageId: "unexpectedNullishRender" as const,
+};
+
+ruleTester.run("no-null-render", rule, {
+ valid: [
+ `function helper() { return null; }`,
+ `const helper = () => null;`,
+ `const helper = () => undefined;`,
+ `function Comp() { return <div />; }`,
+ `const Comp = () => <div />;`,
+ `function Comp() { return <>content</>; }`,
+ `function Comp({ show }: { show: boolean }) {
+ return <div>{show ? <span /> : null}</div>;
+ }`,
+ `function Comp({ show }: { show: boolean }) {
+ return <>{show ? <span /> : null}</>;
+ }`,
+ `function Comp({ show }: { show: boolean }) {
+ return <div>{show && <span />}</div>;
+ }`,
+ `function Comp() {
+ const helper = () => null;
+ return <div>{helper()}</div>;
+ }`,
+ `function Comp({ n }: { n: number }) {
+ if (n) return 1;
+ return <div />;
+ }`,
+ `function Comp() { return; }`,
+ `function notAComponent() { return 1; }`,
+ `const button = () => <div />;`,
+ `export default function () { return <main />; }`,
+ `function Comp({ visible }: { visible: boolean }) {
+ if (visible) return <div />;
+ return <span />;
+ }`,
+ `const Comp = memo(() => <div />);`,
+ `const Comp = forwardRef(() => <div />);`,
+ `const Comp = React.memo(() => <div />);`,
+ `function Comp() { return items.map((item) => null); }`,
+ `function Comp() {
+ const a = b;
+ const b = a;
+ return a;
+ }`,
+ `function Comp({ node }: { node: React.ReactNode }) {
+ if (node) return node;
+ return <div />;
+ }`,
+ `function AdminOnly({ children }: { children: React.ReactNode }) {
+ const canManage = true;
+ if (!canManage) return null;
+ return <>{children}</>;
+ }`,
+ `function ClientPortal({ children }: { children: React.ReactNode }) {
+ const target = document.body;
+ if (!target) return null;
+ return createPortal(children, target);
+ }`,
+ `function Layer({ children, container }: { children: React.ReactNode; container: HTMLElement | null }) {
+ return container ? createPortal(children, container) : null;
+ }`,
+ `function Portal({ children, el }: { children: React.ReactNode; el: HTMLElement }) {
+ return ReactDOM.createPortal(<>{children}</>, el);
+ }`,
+ `function Gate({ children, show }: { children: React.ReactNode; show: boolean }) {
+ return show ? children : null;
+ }`,
+ `function Gate({ children, show }: { children: React.ReactNode; show: boolean }) {
+ return show && children;
+ }`,
+ `function Gate({ children, value }: { children: React.ReactNode; value: React.ReactNode | null }) {
+ return children ?? null;
+ }`,
+ `function Gate({ children, value }: { children: React.ReactNode; value: React.ReactNode | null }) {
+ return children || null;
+ }`,
+ `function Dismiss({ children, show }: { children: (props: { onDismiss: () => void }) => React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return children({ onDismiss: () => undefined });
+ }`,
+ `function Slot(props: { children: React.ReactNode; show: boolean }) {
+ if (!props.show) return null;
+ return props.children;
+ }`,
+ `function Slot(props: { children: React.ReactNode; show: boolean }) {
+ if (!props.show) return null;
+ return props?.children;
+ }`,
+ `function RenderProp({ children, show }: { children: () => React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return children?.();
+ }`,
+ `function Frag({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <React.Fragment>{children}</React.Fragment>;
+ }`,
+ `function Frag({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <Fragment>{/* mount */}{children}</Fragment>;
+ }`,
+ `function Nested({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <><>{children}</></>;
+ }`,
+ `function Alias({ children, show }: { children: React.ReactNode; show: boolean }) {
+ const out = children as React.ReactNode;
+ if (!show) return null;
+ return out;
+ }`,
+ `const Gate = memo(({ children, show }: { children: React.ReactNode; show: boolean }) =>
+ show ? children : null);`,
+ `const Gate = ({ children, show }: { children: React.ReactNode; show: boolean }) =>
+ show ? children : undefined;`,
+ `function SwitchGate({ children, kind }: { children: React.ReactNode; kind: "a" | "b" }) {
+ switch (kind) {
+ case "a":
+ return children;
+ default:
+ return null;
+ }
+ }`,
+ `function TryGate({ children }: { children: React.ReactNode }) {
+ try {
+ return children;
+ } catch {
+ return null;
+ }
+ }`,
+ `function List({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return [children];
+ }`,
+ `function NestedAnd({ children, show, flag }: { children: React.ReactNode; show: boolean; flag: boolean }) {
+ if (!show) return null;
+ return (flag && children) && children;
+ }`,
+ `function NestedCond({ children, show, flag }: { children: React.ReactNode; show: boolean; flag: boolean }) {
+ if (!show) return null;
+ return (flag ? children : null) && children;
+ }`,
+ `function ArrayAnd({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return [children] && children;
+ }`,
+ `function SpreadAnd({ children, show, items }: { children: React.ReactNode; show: boolean; items: React.ReactNode[] }) {
+ if (!show) return null;
+ return [...items] && children;
+ }`,
+ `function PortalAnd({ children, show, el }: { children: React.ReactNode; show: boolean; el: HTMLElement }) {
+ if (!show) return null;
+ return createPortal(children, el) && children;
+ }`,
+ `function FragAnd({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <>{children}</> && children;
+ }`,
+ `function OptionalPortal({ children, el }: { children: React.ReactNode; el: HTMLElement }) {
+ return el ? createPortal?.(children, el) : null;
+ }`,
+ `function WhitespaceFrag({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return (
+ <>
+ {children}
+ </>
+ );
+ }`,
+ `function RenderPropAnd({ children, show }: { children: () => React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return children() && children();
+ }`,
+ ],
+ invalid: [
+ {
+ code: `function Comp() { return <></>; }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `const Comp = () => <React.Fragment></React.Fragment>;`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp() {
+ return (
+ <>
+ {/* intentionally empty */}
+ </>
+ );
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ return show ? <div /> : <React.Fragment />;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp() { return false; }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp() { return null; }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `const Comp = () => null;`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ return show ? <div /> : undefined;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `const Comp = ({ show }: { show: boolean }) =>
+ show ? <div /> : undefined;`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ if (!show) return null;
+ return <div />;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ if (!show) return undefined;
+ return <div />;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ return show ? <div /> : null;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ return show ? null : <div />;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ a, b }: { a: boolean; b: boolean }) {
+ return a ? (b ? <div /> : null) : <span />;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ a, b }: { a: boolean; b: boolean }) {
+ return a ? null : b ? null : <div />;
+ }`,
+ errors: [unexpectedNullishRender, unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ return show && null;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ return show || null;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ value }: { value: string | null }) {
+ return value ?? null;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ return (show && undefined) || <div />;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp() { return null as any; }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp() { return null!; }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp() { return null satisfies null; }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp() { return (null as any)!; }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ filename: "file.ts",
+ code: `function Comp() { return <any>null; }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ filename: "file.ts",
+ code: `const Comp = () => <any>null;`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ const content = show ? <div /> : null;
+ return content;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp() {
+ const nothing = null;
+ const result = nothing;
+ return result;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ const nothing = null;
+ return show ? <div /> : nothing;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ const missing = undefined;
+ const result = missing;
+ return (show && result) || <div />;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp() {
+ const boxed = null as any;
+ return boxed;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `const Comp = memo(() => null);`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `const Comp = React.memo(() => null);`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `const Comp = forwardRef(() => null);`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `const Comp = React.forwardRef(() => null);`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `const Comp = memo(forwardRef(() => null));`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `export default function () { return null; }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `export default () => null;`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp() {
+ try {
+ return <div />;
+ } catch {
+ return null;
+ }
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ kind }: { kind: "a" | "b" }) {
+ switch (kind) {
+ case "a":
+ return <div />;
+ default:
+ return null;
+ }
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <div>{children}</div>;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <Provider>{children}</Provider>;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, container }: { children: React.ReactNode; container: HTMLElement | null }) {
+ return container ? createPortal(<div>{children}</div>, container) : null;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <><span />{children}</>;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <>hello{children}</>;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ show }: { show: boolean }) {
+ if (!show) return null;
+ return <></>;
+ }`,
+ errors: [unexpectedNullishRender, unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <svg:g>{children}</svg:g>;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <Foo.Bar>{children}</Foo.Bar>;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <foo.Fragment>{children}</foo.Fragment>;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ item, show }: { item: { children: React.ReactNode }; show: boolean }) {
+ if (!show) return null;
+ return item.children;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return createPortal();
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show, args }: { children: React.ReactNode; show: boolean; args: unknown[] }) {
+ if (!show) return null;
+ return createPortal(...args);
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return foo(children);
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show, obj }: { children: React.ReactNode; show: boolean; obj: Record<string, Function> }) {
+ if (!show) return null;
+ return obj["createPortal"](children);
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show, rest }: { children: React.ReactNode; show: boolean; rest: React.ReactNode[] }) {
+ if (!show) return null;
+ return [children, ...rest];
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return [, children];
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return <>{...children}</>;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return children && extra;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show }: { children: React.ReactNode; show: boolean }) {
+ if (!show) return null;
+ return props["children"];
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ {
+ code: `function Comp({ children, show, flag }: { children: React.ReactNode; show: boolean; flag: boolean }) {
+ if (!show) return null;
+ return (flag ? extra : children) && children;
+ }`,
+ errors: [unexpectedNullishRender],
+ },
+ ],
+});
diff --git a/packages/eslint-plugin/src/rules/no-null-render.ts b/packages/eslint-plugin/src/rules/no-null-render.ts
new file mode 100644
index 0000000000..885df3b94e
--- /dev/null
+++ b/packages/eslint-plugin/src/rules/no-null-render.ts
@@ -0,0 +1,336 @@
+import { AST_NODE_TYPES, type TSESTree } from "@typescript-eslint/utils";
+
+import { createComponentReturnExpressionVisitors } from "../react-components.js";
+import { createRule } from "../util.js";
+
+type RenderKind = "passthrough" | "presentation" | "other";
+
+type ResolveReturnExpression = (
+ expression: TSESTree.Expression,
+) => TSESTree.Expression;
+
+function isNullLiteral(node: TSESTree.Node): boolean {
+ return node.type === AST_NODE_TYPES.Literal && node.value === null;
+}
+
+function isUndefinedIdentifier(node: TSESTree.Node): boolean {
+ return node.type === AST_NODE_TYPES.Identifier && node.name === "undefined";
+}
+
+function isNullish(node: TSESTree.Node): boolean {
+ return isNullLiteral(node) || isUndefinedIdentifier(node);
+}
+
+function isFalseLiteral(node: TSESTree.Node): boolean {
+ return node.type === AST_NODE_TYPES.Literal && node.value === false;
+}
+
+function unwrapExpression(node: TSESTree.Node): TSESTree.Node {
+ let current = node;
+ while (
+ current.type === AST_NODE_TYPES.TSAsExpression ||
+ current.type === AST_NODE_TYPES.TSNonNullExpression ||
+ current.type === AST_NODE_TYPES.TSSatisfiesExpression ||
+ current.type === AST_NODE_TYPES.TSTypeAssertion ||
+ current.type === AST_NODE_TYPES.ChainExpression
+ ) {
+ current = current.expression;
+ }
+ return current;
+}
+
+function isChildrenExpression(node: TSESTree.Node): boolean {
+ if (node.type === AST_NODE_TYPES.Identifier) {
+ return node.name === "children";
+ }
+ if (node.type !== AST_NODE_TYPES.MemberExpression || node.computed) {
+ return false;
+ }
+ return (
+ node.object.type === AST_NODE_TYPES.Identifier &&
+ node.object.name === "props" &&
+ node.property.type === AST_NODE_TYPES.Identifier &&
+ node.property.name === "children"
+ );
+}
+
+function isChildrenCall(node: TSESTree.CallExpression): boolean {
+ return isChildrenExpression(unwrapExpression(node.callee));
+}
+
+function isCreatePortalCall(node: TSESTree.CallExpression): boolean {
+ const callee = unwrapExpression(node.callee);
+ if (
+ callee.type === AST_NODE_TYPES.Identifier &&
+ callee.name === "createPortal"
+ ) {
+ return true;
+ }
+ return (
+ callee.type === AST_NODE_TYPES.MemberExpression &&
+ !callee.computed &&
+ callee.property.type === AST_NODE_TYPES.Identifier &&
+ callee.property.name === "createPortal"
+ );
+}
+
+function isFragmentElement(node: TSESTree.JSXElement): boolean {
+ const name = node.openingElement.name;
+ if (name.type === AST_NODE_TYPES.JSXIdentifier) {
+ return name.name === "Fragment";
+ }
+ if (name.type !== AST_NODE_TYPES.JSXMemberExpression) {
+ return false;
+ }
+ return (
+ name.object.type === AST_NODE_TYPES.JSXIdentifier &&
+ name.object.name === "React" &&
+ name.property.name === "Fragment"
+ );
+}
+
+function hasOnlyEmptyJsxChildren(children: TSESTree.JSXChild[]): boolean {
+ return children.every((child) => {
+ if (child.type === AST_NODE_TYPES.JSXText) {
+ return child.value.trim() === "";
+ }
+ return (
+ child.type === AST_NODE_TYPES.JSXExpressionContainer &&
+ child.expression.type === AST_NODE_TYPES.JSXEmptyExpression
+ );
+ });
+}
+
+function isEmptyFragment(node: TSESTree.Node): boolean {
+ if (node.type === AST_NODE_TYPES.JSXFragment) {
+ return hasOnlyEmptyJsxChildren(node.children);
+ }
+ return (
+ node.type === AST_NODE_TYPES.JSXElement &&
+ isFragmentElement(node) &&
+ hasOnlyEmptyJsxChildren(node.children)
+ );
+}
+
+function isRenderOutput(
+ node: TSESTree.Expression,
+ resolve: ResolveReturnExpression,
+): boolean {
+ const unwrapped = unwrapExpression(resolve(node));
+
+ if (isNullish(unwrapped) || isChildrenExpression(unwrapped)) return true;
+ if (
+ unwrapped.type === AST_NODE_TYPES.JSXElement ||
+ unwrapped.type === AST_NODE_TYPES.JSXFragment
+ ) {
+ return true;
+ }
+ if (unwrapped.type === AST_NODE_TYPES.CallExpression) {
+ return isCreatePortalCall(unwrapped) || isChildrenCall(unwrapped);
+ }
+ if (unwrapped.type === AST_NODE_TYPES.ConditionalExpression) {
+ return (
+ isRenderOutput(unwrapped.consequent, resolve) ||
+ isRenderOutput(unwrapped.alternate, resolve)
+ );
+ }
+ if (unwrapped.type === AST_NODE_TYPES.LogicalExpression) {
+ return (
+ isRenderOutput(unwrapped.left, resolve) ||
+ isRenderOutput(unwrapped.right, resolve)
+ );
+ }
+ if (unwrapped.type === AST_NODE_TYPES.ArrayExpression) {
+ return unwrapped.elements.some(
+ (element) =>
+ element !== null &&
+ element.type !== AST_NODE_TYPES.SpreadElement &&
+ isRenderOutput(element, resolve),
+ );
+ }
+ return false;
+}
+
+function collectJsxChildren(
+ children: TSESTree.JSXChild[],
+ resolve: ResolveReturnExpression,
+ kinds: Set<RenderKind>,
+): void {
+ for (const child of children) {
+ if (child.type === AST_NODE_TYPES.JSXText) {
+ if (child.value.trim() !== "") kinds.add("other");
+ continue;
+ }
+ if (child.type === AST_NODE_TYPES.JSXExpressionContainer) {
+ if (child.expression.type !== AST_NODE_TYPES.JSXEmptyExpression) {
+ collectRenderKinds(child.expression, resolve, kinds);
+ }
+ continue;
+ }
+ if (
+ child.type === AST_NODE_TYPES.JSXElement ||
+ child.type === AST_NODE_TYPES.JSXFragment
+ ) {
+ collectRenderKinds(child, resolve, kinds);
+ continue;
+ }
+ kinds.add("other");
+ }
+}
+
+function collectRenderKinds(
+ node: TSESTree.Expression,
+ resolve: ResolveReturnExpression,
+ kinds: Set<RenderKind>,
+): void {
+ const unwrapped = unwrapExpression(resolve(node));
+
+ if (isNullish(unwrapped)) return;
+ if (isChildrenExpression(unwrapped)) {
+ kinds.add("passthrough");
+ return;
+ }
+
+ if (unwrapped.type === AST_NODE_TYPES.CallExpression) {
+ if (isChildrenCall(unwrapped)) {
+ kinds.add("passthrough");
+ return;
+ }
+ if (isCreatePortalCall(unwrapped)) {
+ const firstArg = unwrapped.arguments[0];
+ if (!firstArg || firstArg.type === AST_NODE_TYPES.SpreadElement) {
+ kinds.add("other");
+ return;
+ }
+ collectRenderKinds(firstArg, resolve, kinds);
+ return;
+ }
+ kinds.add("other");
+ return;
+ }
+
+ if (unwrapped.type === AST_NODE_TYPES.ConditionalExpression) {
+ collectRenderKinds(unwrapped.consequent, resolve, kinds);
+ collectRenderKinds(unwrapped.alternate, resolve, kinds);
+ return;
+ }
+
+ if (unwrapped.type === AST_NODE_TYPES.LogicalExpression) {
+ if (
+ unwrapped.operator !== "&&" ||
+ isRenderOutput(unwrapped.left, resolve)
+ ) {
+ collectRenderKinds(unwrapped.left, resolve, kinds);
+ }
+ collectRenderKinds(unwrapped.right, resolve, kinds);
+ return;
+ }
+
+ if (unwrapped.type === AST_NODE_TYPES.ArrayExpression) {
+ for (const element of unwrapped.elements) {
+ if (!element || element.type === AST_NODE_TYPES.SpreadElement) {
+ kinds.add("other");
+ continue;
+ }
+ collectRenderKinds(element, resolve, kinds);
+ }
+ return;
+ }
+
+ if (unwrapped.type === AST_NODE_TYPES.JSXFragment) {
+ collectJsxChildren(unwrapped.children, resolve, kinds);
+ return;
+ }
+
+ if (unwrapped.type === AST_NODE_TYPES.JSXElement) {
+ if (isFragmentElement(unwrapped)) {
+ collectJsxChildren(unwrapped.children, resolve, kinds);
+ return;
+ }
+ kinds.add("presentation");
+ return;
+ }
+
+ kinds.add("other");
+}
+
+function isHeadlessPassthrough(
+ expressions: TSESTree.Expression[],
+ resolve: ResolveReturnExpression,
+): boolean {
+ const kinds = new Set<RenderKind>();
+ for (const expression of expressions) {
+ collectRenderKinds(expression, resolve, kinds);
+ }
+ return (
+ kinds.has("passthrough") &&
+ !kinds.has("presentation") &&
+ !kinds.has("other")
+ );
+}
+
+function visitEmptyRender(
+ node: TSESTree.Expression,
+ onEmptyRender: (emptyNode: TSESTree.Node) => void,
+ resolve: ResolveReturnExpression,
+): void {
+ const unwrapped = unwrapExpression(resolve(node));
+
+ if (
+ isNullish(unwrapped) ||
+ isFalseLiteral(unwrapped) ||
+ isEmptyFragment(unwrapped)
+ ) {
+ onEmptyRender(unwrapped);
+ return;
+ }
+
+ if (unwrapped.type === AST_NODE_TYPES.ConditionalExpression) {
+ visitEmptyRender(unwrapped.consequent, onEmptyRender, resolve);
+ visitEmptyRender(unwrapped.alternate, onEmptyRender, resolve);
+ return;
+ }
+
+ if (unwrapped.type === AST_NODE_TYPES.LogicalExpression) {
+ visitEmptyRender(unwrapped.left, onEmptyRender, resolve);
+ visitEmptyRender(unwrapped.right, onEmptyRender, resolve);
+ }
+}
+
+const rule = createRule({
+ name: "no-null-render",
+ meta: {
+ type: "problem",
+ docs: {
+ description:
+ "Disallow React components that render nothing, except headless children/portal passthroughs.",
+ },
+ schema: [],
+ messages: {
+ unexpectedNullishRender:
+ "Do not render nothing from a component. Handle the condition in the parent, or extract a hook/HOC so this component always renders. Headless gates and portals that only pass through children may render nothing.",
+ },
+ },
+ defaultOptions: [],
+ create(context) {
+ return createComponentReturnExpressionVisitors({
+ onComponentReturns(expressions, resolve) {
+ if (isHeadlessPassthrough(expressions, resolve)) return;
+ for (const expression of expressions) {
+ visitEmptyRender(
+ expression,
+ (emptyNode) => {
+ context.report({
+ node: emptyNode,
+ messageId: "unexpectedNullishRender",
+ });
+ },
+ resolve,
+ );
+ }
+ },
+ });
+ },
+});
+
+export default rule;
diff --git a/web/eslint.config.mjs b/web/eslint.config.mjs
index b571fc4073..abc455b89c 100644
--- a/web/eslint.config.mjs
+++ b/web/eslint.config.mjs
@@ -140,6 +140,39 @@ export default [
},
},
+ // Components should always render. Returning null/undefined hides the
+ // condition that owns visibility and makes composition unpredictable — the
+ // parent should branch, or the logic should live in a hook/HOC. Headless
+ // children/portal passthroughs (gates, createPortal wrappers) may return
+ // null; anything that owns markup may not. Existing violations use a
+ // file-level eslint-disable; do not add new ones.
+ {
+ name: "langfuse/web/no-null-render",
+ files: ["src/**/*.{ts,tsx}"],
+ ignores: [
+ "src/__tests__/**",
+ "src/__e2e__/**",
+ "src/**/*.clienttest.{ts,tsx}",
+ "src/**/*.servertest.{ts,tsx}",
+ "src/**/*.stories.{ts,tsx}",
+ "src/components/layouts/**",
+ ],
+ rules: {
+ "@repo/no-null-render": "error",
+ },
+ },
+
+ // Next.js pages are the route composition root: the router, not a parent
+ // component, owns whether they mount. Returning null for auth, missing
+ // params, or SSR is a page-level concern, so this rule does not apply.
+ {
+ name: "langfuse/web/no-null-render-pages",
+ files: ["src/pages/**/*.{ts,tsx}"],
+ rules: {
+ "@repo/no-null-render": "off",
+ },
+ },
+
// Component APIs should expose explicit variants instead of className, style,
// or prefixed variants such as badgeClassName. New file-level overrides are
// only acceptable for headless components that do not apply any internal
diff --git a/web/src/components/BatchExportTableButton.tsx b/web/src/components/BatchExportTableButton.tsx
index 629098c5aa..b1c8c80f27 100644
--- a/web/src/components/BatchExportTableButton.tsx
+++ b/web/src/components/BatchExportTableButton.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-abstracted-overlay-trigger */
+/* eslint-disable @repo/no-abstracted-overlay-trigger, @repo/no-null-render */
import {
DropdownMenu,
DropdownMenuContent,
diff --git a/web/src/components/ChatMessages/ChatMessageComponent.tsx b/web/src/components/ChatMessages/ChatMessageComponent.tsx
index 7891025065..4911a255cf 100644
--- a/web/src/components/ChatMessages/ChatMessageComponent.tsx
+++ b/web/src/components/ChatMessages/ChatMessageComponent.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import capitalize from "lodash/capitalize";
import { GripVertical, MinusCircleIcon } from "lucide-react";
import {
diff --git a/web/src/components/JSONSchemaEditor.tsx b/web/src/components/JSONSchemaEditor.tsx
index 99bc43b9ee..59c1be6861 100644
--- a/web/src/components/JSONSchemaEditor.tsx
+++ b/web/src/components/JSONSchemaEditor.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import React from "react";
import { ArrowUpRight } from "lucide-react";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/components/ModelParameters/index.tsx b/web/src/components/ModelParameters/index.tsx
index 6f5d4385db..515d07c05a 100644
--- a/web/src/components/ModelParameters/index.tsx
+++ b/web/src/components/ModelParameters/index.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useState, useEffect, useRef, useCallback } from "react";
import { Button } from "@/src/components/ui/button";
import { Input } from "@/src/components/ui/input";
diff --git a/web/src/components/ScoreBadge/ScoreBadge.tsx b/web/src/components/ScoreBadge/ScoreBadge.tsx
index 8bb6371884..fcc6799ab9 100644
--- a/web/src/components/ScoreBadge/ScoreBadge.tsx
+++ b/web/src/components/ScoreBadge/ScoreBadge.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-margin-on-root-elements */
+/* eslint-disable @repo/no-margin-on-root-elements, @repo/no-null-render */
import { type LastUserScore, type ScoreDomain } from "@langfuse/shared";
import {
BracesIcon,
diff --git a/web/src/components/TruncatedLabels.tsx b/web/src/components/TruncatedLabels.tsx
index 71d795aca2..d11b27a686 100644
--- a/web/src/components/TruncatedLabels.tsx
+++ b/web/src/components/TruncatedLabels.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import React from "react";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/components/nav/in-app-ai-agent-button.tsx b/web/src/components/nav/in-app-ai-agent-button.tsx
index df1422737d..9ebfa9dd98 100644
--- a/web/src/components/nav/in-app-ai-agent-button.tsx
+++ b/web/src/components/nav/in-app-ai-agent-button.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useCallback, useEffect } from "react";
import { BotMessageSquare } from "lucide-react";
diff --git a/web/src/components/nav/topbar-account.tsx b/web/src/components/nav/topbar-account.tsx
index 91a325b3ab..6a9f10b7cd 100644
--- a/web/src/components/nav/topbar-account.tsx
+++ b/web/src/components/nav/topbar-account.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props, @repo/no-abstracted-overlay-trigger */
+/* eslint-disable @repo/no-style-props, @repo/no-abstracted-overlay-trigger, @repo/no-null-render */
"use client";
import Link from "next/link";
diff --git a/web/src/components/nav/topbar-brand.tsx b/web/src/components/nav/topbar-brand.tsx
index ba3ee8f48f..ba2830e6fe 100644
--- a/web/src/components/nav/topbar-brand.tsx
+++ b/web/src/components/nav/topbar-brand.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { cn } from "@/src/utils/tailwind";
import Link from "next/link";
import { env } from "@/src/env.mjs";
diff --git a/web/src/components/session/SessionObservationIO.tsx b/web/src/components/session/SessionObservationIO.tsx
index 75c24e7623..4c17e13e4b 100644
--- a/web/src/components/session/SessionObservationIO.tsx
+++ b/web/src/components/session/SessionObservationIO.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import React from "react";
import { Download, ExternalLinkIcon, Loader2 } from "lucide-react";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/components/session/index.tsx b/web/src/components/session/index.tsx
index 35d5bc37d5..095756ba4e 100644
--- a/web/src/components/session/index.tsx
+++ b/web/src/components/session/index.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { cn } from "@/src/utils/tailwind";
import { GroupedScoreBadges } from "@/src/components/grouped-score-badge";
import { ErrorPage } from "@/src/components/error-page";
diff --git a/web/src/components/table/filtered-run-pills.tsx b/web/src/components/table/filtered-run-pills.tsx
index 138a89bb53..0f9ee49b1e 100644
--- a/web/src/components/table/filtered-run-pills.tsx
+++ b/web/src/components/table/filtered-run-pills.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { Badge } from "@/src/components/ui/badge";
import {
HoverCard,
diff --git a/web/src/components/table/peek.tsx b/web/src/components/table/peek.tsx
index 90cf33dbe4..a86fc8d4c4 100644
--- a/web/src/components/table/peek.tsx
+++ b/web/src/components/table/peek.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import * as SheetPrimitive from "@radix-ui/react-dialog";
import { Sheet, SheetPortal } from "@/src/components/ui/sheet";
import { Drawer, DrawerContent, DrawerTitle } from "@/src/components/ui/drawer";
diff --git a/web/src/components/table/use-cases/observations.tsx b/web/src/components/table/use-cases/observations.tsx
index 9638de733f..1735d59634 100644
--- a/web/src/components/table/use-cases/observations.tsx
+++ b/web/src/components/table/use-cases/observations.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { api } from "@/src/utils/api";
import { DataTable } from "@/src/components/table/data-table";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
diff --git a/web/src/components/ui/LangfuseMediaView.tsx b/web/src/components/ui/LangfuseMediaView.tsx
index a2d7e341dc..7f962d6515 100644
--- a/web/src/components/ui/LangfuseMediaView.tsx
+++ b/web/src/components/ui/LangfuseMediaView.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { api } from "@/src/utils/api";
import { cn } from "@/src/utils/tailwind";
import { useState } from "react";
diff --git a/web/src/components/ui/calendar.tsx b/web/src/components/ui/calendar.tsx
index 29c46c6b20..709ef32cb3 100644
--- a/web/src/components/ui/calendar.tsx
+++ b/web/src/components/ui/calendar.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
"use client";
import * as React from "react";
diff --git a/web/src/components/ui/chart.tsx b/web/src/components/ui/chart.tsx
index fba19ceb49..0a056d6097 100644
--- a/web/src/components/ui/chart.tsx
+++ b/web/src/components/ui/chart.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
"use client";
import * as React from "react";
diff --git a/web/src/components/ui/form.tsx b/web/src/components/ui/form.tsx
index b49436347e..564500e6f4 100644
--- a/web/src/components/ui/form.tsx
+++ b/web/src/components/ui/form.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import * as React from "react";
import type * as LabelPrimitive from "@radix-ui/react-label";
import { Slot } from "@radix-ui/react-slot";
diff --git a/web/src/components/ui/side-panel.tsx b/web/src/components/ui/side-panel.tsx
index fbe4734459..d0327d6a9c 100644
--- a/web/src/components/ui/side-panel.tsx
+++ b/web/src/components/ui/side-panel.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props, @repo/no-abstracted-overlay-trigger */
+/* eslint-disable @repo/no-style-props, @repo/no-abstracted-overlay-trigger, @repo/no-null-render */
import { default as React, useState, useCallback, type ReactNode } from "react";
import { Button } from "@/src/components/ui/button";
import { ChevronLeft, ChevronRight } from "lucide-react";
diff --git a/web/src/ee/features/billing/components/BillingDiscountCodeButton.tsx b/web/src/ee/features/billing/components/BillingDiscountCodeButton.tsx
index 0ac7d3f437..d7265a5dd9 100644
--- a/web/src/ee/features/billing/components/BillingDiscountCodeButton.tsx
+++ b/web/src/ee/features/billing/components/BillingDiscountCodeButton.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-abstracted-overlay-trigger */
+/* eslint-disable @repo/no-abstracted-overlay-trigger, @repo/no-null-render */
import { useState } from "react";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/ee/features/billing/components/BillingDiscountView.tsx b/web/src/ee/features/billing/components/BillingDiscountView.tsx
index dbc773a998..4dc6524c93 100644
--- a/web/src/ee/features/billing/components/BillingDiscountView.tsx
+++ b/web/src/ee/features/billing/components/BillingDiscountView.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { api } from "@/src/utils/api";
import { Badge } from "@/src/components/ui/badge";
import { useBillingInformation } from "@/src/ee/features/billing/components/useBillingInformation";
diff --git a/web/src/ee/features/billing/components/BillingInvoiceTable.tsx b/web/src/ee/features/billing/components/BillingInvoiceTable.tsx
index d415806b6d..fde0b7d0a3 100644
--- a/web/src/ee/features/billing/components/BillingInvoiceTable.tsx
+++ b/web/src/ee/features/billing/components/BillingInvoiceTable.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { DataTable } from "@/src/components/table/data-table";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
import { type LangfuseColumnDef } from "@/src/components/table/types";
diff --git a/web/src/ee/features/billing/components/BillingScheduleNotification.tsx b/web/src/ee/features/billing/components/BillingScheduleNotification.tsx
index 8b7cfe4701..4ed075be00 100644
--- a/web/src/ee/features/billing/components/BillingScheduleNotification.tsx
+++ b/web/src/ee/features/billing/components/BillingScheduleNotification.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
// Langfuse Cloud only
import { InfoIcon } from "lucide-react";
diff --git a/web/src/ee/features/billing/components/BillingSettings.tsx b/web/src/ee/features/billing/components/BillingSettings.tsx
index b7ff8d9a86..ce79b398f9 100644
--- a/web/src/ee/features/billing/components/BillingSettings.tsx
+++ b/web/src/ee/features/billing/components/BillingSettings.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
// Langfuse Cloud only
import { useHasOrganizationAccess } from "@/src/features/rbac";
diff --git a/web/src/ee/features/billing/components/BillingUsageChart.tsx b/web/src/ee/features/billing/components/BillingUsageChart.tsx
index c8fdc7ccb9..4d08f5b7ef 100644
--- a/web/src/ee/features/billing/components/BillingUsageChart.tsx
+++ b/web/src/ee/features/billing/components/BillingUsageChart.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
// Langfuse Cloud only
import { api } from "@/src/utils/api";
diff --git a/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsSection.tsx b/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsSection.tsx
index 2d92379cab..6fa9422c03 100644
--- a/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsSection.tsx
+++ b/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsSection.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useState } from "react";
import { Button } from "@/src/components/ui/button";
import { Plus } from "lucide-react";
diff --git a/web/src/ee/features/billing/components/StripeCancellationButton.tsx b/web/src/ee/features/billing/components/StripeCancellationButton.tsx
index 2dbf95007f..c28ddf030b 100644
--- a/web/src/ee/features/billing/components/StripeCancellationButton.tsx
+++ b/web/src/ee/features/billing/components/StripeCancellationButton.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props, @repo/no-abstracted-overlay-trigger */
+/* eslint-disable @repo/no-style-props, @repo/no-abstracted-overlay-trigger, @repo/no-null-render */
import { Button } from "@/src/components/ui/button";
import {
Dialog,
diff --git a/web/src/ee/features/billing/components/StripeCustomerPortalButton.tsx b/web/src/ee/features/billing/components/StripeCustomerPortalButton.tsx
index 2be27d478c..37dc9b19dd 100644
--- a/web/src/ee/features/billing/components/StripeCustomerPortalButton.tsx
+++ b/web/src/ee/features/billing/components/StripeCustomerPortalButton.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { Button } from "@/src/components/ui/button";
import { useHasOrganizationAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
diff --git a/web/src/ee/features/billing/components/StripeKeepPlanButton.tsx b/web/src/ee/features/billing/components/StripeKeepPlanButton.tsx
index 69d5f3e5af..d9ae564feb 100644
--- a/web/src/ee/features/billing/components/StripeKeepPlanButton.tsx
+++ b/web/src/ee/features/billing/components/StripeKeepPlanButton.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-abstracted-overlay-trigger */
+/* eslint-disable @repo/no-abstracted-overlay-trigger, @repo/no-null-render */
import { useState } from "react";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/ee/features/billing/components/StripeSwitchPlanButton.tsx b/web/src/ee/features/billing/components/StripeSwitchPlanButton.tsx
index fd81148567..8613be6d68 100644
--- a/web/src/ee/features/billing/components/StripeSwitchPlanButton.tsx
+++ b/web/src/ee/features/billing/components/StripeSwitchPlanButton.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-abstracted-overlay-trigger */
+/* eslint-disable @repo/no-abstracted-overlay-trigger, @repo/no-null-render */
import { useState } from "react";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemCountBadge.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemCountBadge.tsx
index 681aed491b..83e342dfaf 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueueItemCountBadge.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemCountBadge.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { cn } from "@/src/utils/tailwind";
type AnnotationQueueItemCountBadgeProps = {
diff --git a/web/src/features/auth/components/AuthCloudPrivacyNotice.tsx b/web/src/features/auth/components/AuthCloudPrivacyNotice.tsx
index 507580e926..dbb18acb42 100644
--- a/web/src/features/auth/components/AuthCloudPrivacyNotice.tsx
+++ b/web/src/features/auth/components/AuthCloudPrivacyNotice.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { env } from "@/src/env.mjs";
export const CloudPrivacyNotice = ({ action }: { action: string }) =>
diff --git a/web/src/features/auth/components/AuthCloudRegionSwitch.tsx b/web/src/features/auth/components/AuthCloudRegionSwitch.tsx
index b9248df91d..565677976d 100644
--- a/web/src/features/auth/components/AuthCloudRegionSwitch.tsx
+++ b/web/src/features/auth/components/AuthCloudRegionSwitch.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { env } from "@/src/env.mjs";
import { CloudRegionPicker } from "@/src/features/auth/components/CloudRegionPicker";
import { getAvailableCloudRegionOptions } from "@/src/features/organizations/cloudRegions";
diff --git a/web/src/features/automations/components/AutomationFailureBanner.tsx b/web/src/features/automations/components/AutomationFailureBanner.tsx
index 0d5095dc43..4e8bab3f3c 100644
--- a/web/src/features/automations/components/AutomationFailureBanner.tsx
+++ b/web/src/features/automations/components/AutomationFailureBanner.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import React from "react";
import { AlertTriangle, X } from "lucide-react";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/blobstorage-integration/components/GzipCompressionField.tsx b/web/src/features/blobstorage-integration/components/GzipCompressionField.tsx
index 46a776bc3a..44d04a0cc5 100644
--- a/web/src/features/blobstorage-integration/components/GzipCompressionField.tsx
+++ b/web/src/features/blobstorage-integration/components/GzipCompressionField.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useWatch } from "react-hook-form";
import {
FormControl,
diff --git a/web/src/features/chart-view/components/AddToDashboardButton.tsx b/web/src/features/chart-view/components/AddToDashboardButton.tsx
index f31a48a28b..e4037d02c9 100644
--- a/web/src/features/chart-view/components/AddToDashboardButton.tsx
+++ b/web/src/features/chart-view/components/AddToDashboardButton.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import React, { useCallback, useState } from "react";
import { useRouter } from "next/router";
import { LayoutDashboard } from "lucide-react";
diff --git a/web/src/features/cloud-status-notification/components/CloudStatusMenu.tsx b/web/src/features/cloud-status-notification/components/CloudStatusMenu.tsx
index 2e0a42d792..e053c87fdb 100644
--- a/web/src/features/cloud-status-notification/components/CloudStatusMenu.tsx
+++ b/web/src/features/cloud-status-notification/components/CloudStatusMenu.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { api } from "@/src/utils/api";
import Link from "next/link";
import { SidebarMenuButton } from "@/src/components/ui/sidebar";
diff --git a/web/src/features/command-k-menu/CommandMenu.tsx b/web/src/features/command-k-menu/CommandMenu.tsx
index 23e5d5a114..64bc0577d8 100644
--- a/web/src/features/command-k-menu/CommandMenu.tsx
+++ b/web/src/features/command-k-menu/CommandMenu.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import {
CommandDialog,
CommandEmpty,
diff --git a/web/src/features/comments/CommentCountIcon.tsx b/web/src/features/comments/CommentCountIcon.tsx
index f07c44fe1d..3b98396716 100644
--- a/web/src/features/comments/CommentCountIcon.tsx
+++ b/web/src/features/comments/CommentCountIcon.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
// LFE-7628: general comment counts use the square speech bubble, matching the
// CommentDrawerController, to stay distinct from per-score comment indicators.
import { MessageSquareMore } from "lucide-react";
diff --git a/web/src/features/comments/CommentList.tsx b/web/src/features/comments/CommentList.tsx
index a8ece03e63..ff7d10970f 100644
--- a/web/src/features/comments/CommentList.tsx
+++ b/web/src/features/comments/CommentList.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { Avatar } from "@/src/components/design-system/Avatar/Avatar";
import { Button } from "@/src/components/ui/button";
import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";
diff --git a/web/src/features/comments/ReactionBar.tsx b/web/src/features/comments/ReactionBar.tsx
index 969faf1a5b..6d7ac0f868 100644
--- a/web/src/features/comments/ReactionBar.tsx
+++ b/web/src/features/comments/ReactionBar.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { Button } from "@/src/components/ui/button";
import {
HoverCard,
diff --git a/web/src/features/comments/components/InlineCommentBubble.tsx b/web/src/features/comments/components/InlineCommentBubble.tsx
index e3a8bf5fef..7e23f3d08d 100644
--- a/web/src/features/comments/components/InlineCommentBubble.tsx
+++ b/web/src/features/comments/components/InlineCommentBubble.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* InlineCommentBubble - floating button shown when text is selected in JSON view
*
diff --git a/web/src/features/dashboard/components/cards/ChevronButton.tsx b/web/src/features/dashboard/components/cards/ChevronButton.tsx
index e45d4b4536..8e70048b38 100644
--- a/web/src/features/dashboard/components/cards/ChevronButton.tsx
+++ b/web/src/features/dashboard/components/cards/ChevronButton.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { ChevronDown, ChevronUp } from "lucide-react";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/datasets/components/DatasetItemFieldSchemaErrors.tsx b/web/src/features/datasets/components/DatasetItemFieldSchemaErrors.tsx
index 1a771fc9e5..49983a1d42 100644
--- a/web/src/features/datasets/components/DatasetItemFieldSchemaErrors.tsx
+++ b/web/src/features/datasets/components/DatasetItemFieldSchemaErrors.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { AlertCircle } from "lucide-react";
type DatasetError = {
diff --git a/web/src/features/datasets/components/DatasetItemMediaAttachments.tsx b/web/src/features/datasets/components/DatasetItemMediaAttachments.tsx
index 3d5837c5c7..2f7d92dcd9 100644
--- a/web/src/features/datasets/components/DatasetItemMediaAttachments.tsx
+++ b/web/src/features/datasets/components/DatasetItemMediaAttachments.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { type RefObject, useRef, useState } from "react";
import type { EditorView, ReactCodeMirrorRef } from "@uiw/react-codemirror";
import { type Extension } from "@codemirror/state";
diff --git a/web/src/features/datasets/components/DatasetsTable.tsx b/web/src/features/datasets/components/DatasetsTable.tsx
index 04cc54b059..0a5d50d351 100644
--- a/web/src/features/datasets/components/DatasetsTable.tsx
+++ b/web/src/features/datasets/components/DatasetsTable.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { IconOnlyButton } from "@/src/components/IconOnlyButton";
import { DataTable } from "@/src/components/table/data-table";
import { type LangfuseColumnDef } from "@/src/components/table/types";
diff --git a/web/src/features/datasets/components/NewDatasetItemForm.tsx b/web/src/features/datasets/components/NewDatasetItemForm.tsx
index ad0a21f826..66acee2aa4 100644
--- a/web/src/features/datasets/components/NewDatasetItemForm.tsx
+++ b/web/src/features/datasets/components/NewDatasetItemForm.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { Button } from "@/src/components/ui/button";
import * as z from "zod";
import { safeRandomUUID } from "@/src/utils/safe-random-uuid";
diff --git a/web/src/features/evals/components/code-eval-test-run-card.tsx b/web/src/features/evals/components/code-eval-test-run-card.tsx
index 6e9efae3ed..38b4db4c7d 100644
--- a/web/src/features/evals/components/code-eval-test-run-card.tsx
+++ b/web/src/features/evals/components/code-eval-test-run-card.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { CodeMirrorEditor } from "@/src/components/editor";
import { TablePeekViewTraceDetail } from "@/src/components/table/peek/peek-trace-detail";
import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavigation";
diff --git a/web/src/features/evals/components/eval-template-type-selector.tsx b/web/src/features/evals/components/eval-template-type-selector.tsx
index 7c2abc7a65..aae3f52ef1 100644
--- a/web/src/features/evals/components/eval-template-type-selector.tsx
+++ b/web/src/features/evals/components/eval-template-type-selector.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useRef } from "react";
import { type UseFormReturn } from "react-hook-form";
import { type z } from "zod";
diff --git a/web/src/features/evals/components/eval-version-callout.tsx b/web/src/features/evals/components/eval-version-callout.tsx
index 04bbdb09e1..7dc766ee61 100644
--- a/web/src/features/evals/components/eval-version-callout.tsx
+++ b/web/src/features/evals/components/eval-version-callout.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { Alert } from "@/src/components/design-system/Alert/Alert";
import { AlertTriangle } from "lucide-react";
import { type EvalCapabilities } from "@/src/features/evals/hooks/useEvalCapabilities";
diff --git a/web/src/features/evals/components/evaluator-detail.tsx b/web/src/features/evals/components/evaluator-detail.tsx
index 03be4c5ebe..f3d0ae727f 100644
--- a/web/src/features/evals/components/evaluator-detail.tsx
+++ b/web/src/features/evals/components/evaluator-detail.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import * as React from "react";
import { api } from "@/src/utils/api";
import { useRouter } from "next/router";
diff --git a/web/src/features/evals/components/evaluator-form.tsx b/web/src/features/evals/components/evaluator-form.tsx
index 4903a4fd11..dde3233eb0 100644
--- a/web/src/features/evals/components/evaluator-form.tsx
+++ b/web/src/features/evals/components/evaluator-form.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { type EvalTemplate, type EvalTargetObject } from "@langfuse/shared";
import { InnerEvaluatorForm } from "@/src/features/evals/components/inner-evaluator-form";
import { type PartialConfig } from "@/src/features/evals/types";
diff --git a/web/src/features/evals/components/evaluator-paused-callout.tsx b/web/src/features/evals/components/evaluator-paused-callout.tsx
index 840b24d23e..2b9bfa3f4e 100644
--- a/web/src/features/evals/components/evaluator-paused-callout.tsx
+++ b/web/src/features/evals/components/evaluator-paused-callout.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { Button } from "@/src/components/ui/button";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
diff --git a/web/src/features/evals/components/evaluator-selector.tsx b/web/src/features/evals/components/evaluator-selector.tsx
index 7a29d840e8..f3d41cbe90 100644
--- a/web/src/features/evals/components/evaluator-selector.tsx
+++ b/web/src/features/evals/components/evaluator-selector.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import {
EvalTemplateSourceCodeLanguage,
EvalTemplateType,
diff --git a/web/src/features/evals/components/template-form.tsx b/web/src/features/evals/components/template-form.tsx
index 07d5a9e928..e75f162cdf 100644
--- a/web/src/features/evals/components/template-form.tsx
+++ b/web/src/features/evals/components/template-form.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useState } from "react";
import Link from "next/link";
import { useFieldArray, useForm } from "react-hook-form";
diff --git a/web/src/features/evals/pages/new-template.tsx b/web/src/features/evals/pages/new-template.tsx
index bce6bb6bc1..dbfb2a8ab3 100644
--- a/web/src/features/evals/pages/new-template.tsx
+++ b/web/src/features/evals/pages/new-template.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import Page from "@/src/components/layouts/page";
import { EvalTemplateForm } from "@/src/features/evals/components/template-form";
import { useHasProjectAccess } from "@/src/features/rbac";
diff --git a/web/src/features/evals/pages/templates.tsx b/web/src/features/evals/pages/templates.tsx
index cb86e70030..76199b7b8f 100644
--- a/web/src/features/evals/pages/templates.tsx
+++ b/web/src/features/evals/pages/templates.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import Page from "@/src/components/layouts/page";
import { useRouter } from "next/router";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/evals/v2/components/EvaluatorTestPanel/components/TestSection/components/TestResultActions/TestResultActions.tsx b/web/src/features/evals/v2/components/EvaluatorTestPanel/components/TestSection/components/TestResultActions/TestResultActions.tsx
index 76655dadb2..60e17328bc 100644
--- a/web/src/features/evals/v2/components/EvaluatorTestPanel/components/TestSection/components/TestResultActions/TestResultActions.tsx
+++ b/web/src/features/evals/v2/components/EvaluatorTestPanel/components/TestSection/components/TestResultActions/TestResultActions.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { DropdownMenuTrigger } from "@/src/components/ui/dropdown-menu";
import {
TestResultTraceActions,
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorSavedDialogContainer/EvaluatorSavedDialogContainer.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorSavedDialogContainer/EvaluatorSavedDialogContainer.tsx
index ff5a364aea..70f4ad4c11 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorSavedDialogContainer/EvaluatorSavedDialogContainer.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorSavedDialogContainer/EvaluatorSavedDialogContainer.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import {
EvalTemplateType,
EvalTargetObject,
diff --git a/web/src/features/evals/v2/components/OverviewSelectionBar/OverviewSelectionBar.tsx b/web/src/features/evals/v2/components/OverviewSelectionBar/OverviewSelectionBar.tsx
index f37830d017..547f897da4 100644
--- a/web/src/features/evals/v2/components/OverviewSelectionBar/OverviewSelectionBar.tsx
+++ b/web/src/features/evals/v2/components/OverviewSelectionBar/OverviewSelectionBar.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { X } from "lucide-react";
import { Button } from "@/src/components/ui/button";
import { Layer } from "@/src/components/ui/layer";
diff --git a/web/src/features/evals/v2/components/Rules/EditRuleDialog/EditRuleDialog.tsx b/web/src/features/evals/v2/components/Rules/EditRuleDialog/EditRuleDialog.tsx
index 8b86b186c3..9a70f6a9d6 100644
--- a/web/src/features/evals/v2/components/Rules/EditRuleDialog/EditRuleDialog.tsx
+++ b/web/src/features/evals/v2/components/Rules/EditRuleDialog/EditRuleDialog.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useEffect, useState } from "react";
import { useRouter } from "next/router";
import { useDebounce } from "@/src/hooks/useDebounce";
diff --git a/web/src/features/events/components/CategoryPresetChips.tsx b/web/src/features/events/components/CategoryPresetChips.tsx
index 136084683a..1ff5617006 100644
--- a/web/src/features/events/components/CategoryPresetChips.tsx
+++ b/web/src/features/events/components/CategoryPresetChips.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useMemo, useRef } from "react";
import {
Check,
diff --git a/web/src/features/events/components/MobileFiltersSheet.tsx b/web/src/features/events/components/MobileFiltersSheet.tsx
index f51f28570f..a5a04e7149 100644
--- a/web/src/features/events/components/MobileFiltersSheet.tsx
+++ b/web/src/features/events/components/MobileFiltersSheet.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-abstracted-overlay-trigger */
+/* eslint-disable @repo/no-abstracted-overlay-trigger, @repo/no-null-render */
"use client";
import { type ReactNode } from "react";
diff --git a/web/src/features/events/components/V4SidebarToggle.tsx b/web/src/features/events/components/V4SidebarToggle.tsx
index 85628124c7..358872aa69 100644
--- a/web/src/features/events/components/V4SidebarToggle.tsx
+++ b/web/src/features/events/components/V4SidebarToggle.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { Switch } from "@/src/components/design-system/Switch/Switch";
import { Label } from "@/src/components/ui/label";
import { SidebarMenuButton } from "@/src/components/ui/sidebar";
diff --git a/web/src/features/experiments/components/CreateExperimentsForm.tsx b/web/src/features/experiments/components/CreateExperimentsForm.tsx
index a543183aa8..f0cf13ac3e 100644
--- a/web/src/features/experiments/components/CreateExperimentsForm.tsx
+++ b/web/src/features/experiments/components/CreateExperimentsForm.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import React, { useState } from "react";
import { Button } from "@/src/components/ui/button";
import { CheckIcon, ChevronDown, Code2, Cog, Wand2 } from "lucide-react";
diff --git a/web/src/features/experiments/components/ExperimentMetadataSection.tsx b/web/src/features/experiments/components/ExperimentMetadataSection.tsx
index 112a6fa718..ffe27b771a 100644
--- a/web/src/features/experiments/components/ExperimentMetadataSection.tsx
+++ b/web/src/features/experiments/components/ExperimentMetadataSection.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { PrettyJsonView } from "@/src/components/ui/PrettyJsonView";
import {
Collapsible,
diff --git a/web/src/features/experiments/components/MultiStepExperimentForm.tsx b/web/src/features/experiments/components/MultiStepExperimentForm.tsx
index 634de19711..00c9fa35e4 100644
--- a/web/src/features/experiments/components/MultiStepExperimentForm.tsx
+++ b/web/src/features/experiments/components/MultiStepExperimentForm.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useHasProjectAccess } from "@/src/features/rbac";
import React, { useEffect, useRef, useState } from "react";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx b/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
index 137b6cb0a6..c8ee3f9019 100644
--- a/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
+++ b/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import React from "react";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
diff --git a/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx b/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx
index 1980073ed9..d2df232ceb 100644
--- a/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx
+++ b/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import React, { useState } from "react";
import { useForm, useFieldArray } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
diff --git a/web/src/features/experiments/components/table/ExperimentFilterPills.tsx b/web/src/features/experiments/components/table/ExperimentFilterPills.tsx
index 0c93681f4c..aca7565b49 100644
--- a/web/src/features/experiments/components/table/ExperimentFilterPills.tsx
+++ b/web/src/features/experiments/components/table/ExperimentFilterPills.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { Badge } from "@/src/components/ui/badge";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/features/experiments/components/table/ExperimentsTable.tsx b/web/src/features/experiments/components/table/ExperimentsTable.tsx
index 4f1c68e645..608aa9a107 100644
--- a/web/src/features/experiments/components/table/ExperimentsTable.tsx
+++ b/web/src/features/experiments/components/table/ExperimentsTable.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { MAX_SELECTED_EXPERIMENTS } from "@/src/features/experiments/constants/comparison";
import { DataTable } from "@/src/components/table/data-table";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
diff --git a/web/src/features/in-app-agent/components/InAppAgentActivityCards.tsx b/web/src/features/in-app-agent/components/InAppAgentActivityCards.tsx
index 8fc845d24c..0218f007f1 100644
--- a/web/src/features/in-app-agent/components/InAppAgentActivityCards.tsx
+++ b/web/src/features/in-app-agent/components/InAppAgentActivityCards.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { BotMessageSquare, X } from "lucide-react";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/in-app-agent/components/InAppAgentToolResultPayload.tsx b/web/src/features/in-app-agent/components/InAppAgentToolResultPayload.tsx
index 885b1441e9..5a376ff59d 100644
--- a/web/src/features/in-app-agent/components/InAppAgentToolResultPayload.tsx
+++ b/web/src/features/in-app-agent/components/InAppAgentToolResultPayload.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
"use client";
import { InAppAgentToolPayload } from "./InAppAgentToolPayload";
diff --git a/web/src/features/in-app-agent/components/InAppAgentWidgetComposer.tsx b/web/src/features/in-app-agent/components/InAppAgentWidgetComposer.tsx
index 6fd9f12210..86b08ee4ca 100644
--- a/web/src/features/in-app-agent/components/InAppAgentWidgetComposer.tsx
+++ b/web/src/features/in-app-agent/components/InAppAgentWidgetComposer.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { type KeyboardEvent, type SyntheticEvent, useState } from "react";
import { SendHorizontal, Sparkles } from "lucide-react";
diff --git a/web/src/features/in-app-agent/components/InAppAgentWindowHost.tsx b/web/src/features/in-app-agent/components/InAppAgentWindowHost.tsx
index 0ea0783a02..6c613ca11e 100644
--- a/web/src/features/in-app-agent/components/InAppAgentWindowHost.tsx
+++ b/web/src/features/in-app-agent/components/InAppAgentWindowHost.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
"use client";
import { useLayoutEffect, useRef } from "react";
diff --git a/web/src/features/in-app-agent/components/InAppAgentWindowShell.tsx b/web/src/features/in-app-agent/components/InAppAgentWindowShell.tsx
index 774e04297c..e3be801ea4 100644
--- a/web/src/features/in-app-agent/components/InAppAgentWindowShell.tsx
+++ b/web/src/features/in-app-agent/components/InAppAgentWindowShell.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
"use client";
import {
diff --git a/web/src/features/models/components/PriceBreakdownTooltip.tsx b/web/src/features/models/components/PriceBreakdownTooltip.tsx
index f13e0b31e8..c572e3801f 100644
--- a/web/src/features/models/components/PriceBreakdownTooltip.tsx
+++ b/web/src/features/models/components/PriceBreakdownTooltip.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import Decimal from "decimal.js";
import { InfoIcon } from "lucide-react";
import { useMemo, useState } from "react";
diff --git a/web/src/features/models/components/ProvidedModelNameCell.tsx b/web/src/features/models/components/ProvidedModelNameCell.tsx
index 167eee6102..49052cc87c 100644
--- a/web/src/features/models/components/ProvidedModelNameCell.tsx
+++ b/web/src/features/models/components/ProvidedModelNameCell.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { PlusCircle } from "lucide-react";
import { IdTableCell } from "@/src/components/design-system/table/components/IdTableCell/IdTableCell";
import { UpsertModelFormDialog } from "@/src/features/models/components/UpsertModelFormDialog/UpsertModelFormDialog";
diff --git a/web/src/features/navigate-detail-pages/DetailPageNav.tsx b/web/src/features/navigate-detail-pages/DetailPageNav.tsx
index 5e63fe3efd..de151ffedc 100644
--- a/web/src/features/navigate-detail-pages/DetailPageNav.tsx
+++ b/web/src/features/navigate-detail-pages/DetailPageNav.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { Button, type ButtonProps } from "@/src/components/ui/button";
import { InputCommandShortcut } from "@/src/components/ui/input-command";
import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";
diff --git a/web/src/features/notifications/components/ProjectNotificationChannels.tsx b/web/src/features/notifications/components/ProjectNotificationChannels.tsx
index d4cad4730f..2c164a6f3b 100644
--- a/web/src/features/notifications/components/ProjectNotificationChannels.tsx
+++ b/web/src/features/notifications/components/ProjectNotificationChannels.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import Header from "@/src/components/layouts/header";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/features/organizations/components/ProjectOverview.tsx b/web/src/features/organizations/components/ProjectOverview.tsx
index 7d1ab6e099..e4148f4b0c 100644
--- a/web/src/features/organizations/components/ProjectOverview.tsx
+++ b/web/src/features/organizations/components/ProjectOverview.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import {
BookOpen,
LockIcon,
diff --git a/web/src/features/payment-banner/PaymentBanner.tsx b/web/src/features/payment-banner/PaymentBanner.tsx
index af98109f0a..61de3f1ef2 100644
--- a/web/src/features/payment-banner/PaymentBanner.tsx
+++ b/web/src/features/payment-banner/PaymentBanner.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useMemo, useRef } from "react";
import { useSession } from "next-auth/react";
import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
diff --git a/web/src/features/playground/page/components/MultiWindowPlayground.tsx b/web/src/features/playground/page/components/MultiWindowPlayground.tsx
index f7b08ddf26..6947c30332 100644
--- a/web/src/features/playground/page/components/MultiWindowPlayground.tsx
+++ b/web/src/features/playground/page/components/MultiWindowPlayground.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import React, { useMemo, useCallback, useRef, useEffect } from "react";
import { PlaygroundProvider, usePlaygroundContext } from "../context";
import { SaveToPromptButton } from "./SaveToPromptButton";
diff --git a/web/src/features/preview-deployment-banner/PreviewDeploymentBanner.tsx b/web/src/features/preview-deployment-banner/PreviewDeploymentBanner.tsx
index e4c80919d5..bc91605211 100644
--- a/web/src/features/preview-deployment-banner/PreviewDeploymentBanner.tsx
+++ b/web/src/features/preview-deployment-banner/PreviewDeploymentBanner.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useRef } from "react";
import { formatDistanceToNow } from "date-fns";
import {
diff --git a/web/src/features/prompts/components/NewPromptForm/PromptChatMessages.tsx b/web/src/features/prompts/components/NewPromptForm/PromptChatMessages.tsx
index 1b64ebe70d..ed83a28444 100644
--- a/web/src/features/prompts/components/NewPromptForm/PromptChatMessages.tsx
+++ b/web/src/features/prompts/components/NewPromptForm/PromptChatMessages.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useEffect, useState, useCallback, useRef } from "react";
import { v4 as uuidv4 } from "uuid";
import { PlusIcon } from "lucide-react";
diff --git a/web/src/features/prompts/components/PromptVariableListPreview.tsx b/web/src/features/prompts/components/PromptVariableListPreview.tsx
index bfaa5923a0..3c26c687e4 100644
--- a/web/src/features/prompts/components/PromptVariableListPreview.tsx
+++ b/web/src/features/prompts/components/PromptVariableListPreview.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { Badge } from "@/src/components/ui/badge";
export const PromptVariableListPreview = ({
diff --git a/web/src/features/public-api/components/ApiKeyList.tsx b/web/src/features/public-api/components/ApiKeyList.tsx
index 860469aa93..47597adfad 100644
--- a/web/src/features/public-api/components/ApiKeyList.tsx
+++ b/web/src/features/public-api/components/ApiKeyList.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import Header from "@/src/components/layouts/header";
import { Button } from "@/src/components/ui/button";
import { Card } from "@/src/components/ui/card";
diff --git a/web/src/features/public-api/components/CreateApiKeyButton.tsx b/web/src/features/public-api/components/CreateApiKeyButton.tsx
index cece50d0cb..0a1112fc10 100644
--- a/web/src/features/public-api/components/CreateApiKeyButton.tsx
+++ b/web/src/features/public-api/components/CreateApiKeyButton.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import {
useHasProjectAccess,
useHasOrganizationAccess,
diff --git a/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx b/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx
index 6f4a856d7c..5eec803557 100644
--- a/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx
+++ b/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-abstracted-overlay-trigger */
+/* eslint-disable @repo/no-abstracted-overlay-trigger, @repo/no-null-render */
import { PlusIcon } from "lucide-react";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/features/public-api/components/LLMApiKeyList.tsx b/web/src/features/public-api/components/LLMApiKeyList.tsx
index 30e0303128..7dbc705ccf 100644
--- a/web/src/features/public-api/components/LLMApiKeyList.tsx
+++ b/web/src/features/public-api/components/LLMApiKeyList.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useHasProjectAccess } from "@/src/features/rbac";
import { TrashIcon } from "lucide-react";
import { useState } from "react";
diff --git a/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx b/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx
index b2f100784b..864c9ca961 100644
--- a/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx
+++ b/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-abstracted-overlay-trigger */
+/* eslint-disable @repo/no-abstracted-overlay-trigger, @repo/no-null-render */
import { useState } from "react";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/features/rbac/components/MembershipInvitesPage.tsx b/web/src/features/rbac/components/MembershipInvitesPage.tsx
index 62c6d2b56c..a46da0c60a 100644
--- a/web/src/features/rbac/components/MembershipInvitesPage.tsx
+++ b/web/src/features/rbac/components/MembershipInvitesPage.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { DataTable } from "@/src/components/table/data-table";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
import { type LangfuseColumnDef } from "@/src/components/table/types";
diff --git a/web/src/features/score-analytics/components/ScoreAnalyticsNoticeBanner.tsx b/web/src/features/score-analytics/components/ScoreAnalyticsNoticeBanner.tsx
index e008cae2c9..3484493531 100644
--- a/web/src/features/score-analytics/components/ScoreAnalyticsNoticeBanner.tsx
+++ b/web/src/features/score-analytics/components/ScoreAnalyticsNoticeBanner.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { Clock, Info } from "lucide-react";
import { useScoreAnalytics } from "./ScoreAnalyticsProvider";
import { useState, useEffect } from "react";
diff --git a/web/src/features/score-analytics/components/charts/ScoreChartLegendContent.tsx b/web/src/features/score-analytics/components/charts/ScoreChartLegendContent.tsx
index 195c197e8e..bbae57851f 100644
--- a/web/src/features/score-analytics/components/charts/ScoreChartLegendContent.tsx
+++ b/web/src/features/score-analytics/components/charts/ScoreChartLegendContent.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import React, { useState, useRef, useLayoutEffect, useMemo } from "react";
import type { DefaultLegendContentProps, LegendPayload } from "recharts";
import { MoreVertical } from "lucide-react";
diff --git a/web/src/features/score-analytics/lib/ScoreChartTooltip.tsx b/web/src/features/score-analytics/lib/ScoreChartTooltip.tsx
index 1b613e84ea..82305d7cd5 100644
--- a/web/src/features/score-analytics/lib/ScoreChartTooltip.tsx
+++ b/web/src/features/score-analytics/lib/ScoreChartTooltip.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import {
type IntervalConfig,
type TimeRange,
diff --git a/web/src/features/score-configs/components/ScoreConfigDetails.tsx b/web/src/features/score-configs/components/ScoreConfigDetails.tsx
index dbbc7df321..d6ff1d70f3 100644
--- a/web/src/features/score-configs/components/ScoreConfigDetails.tsx
+++ b/web/src/features/score-configs/components/ScoreConfigDetails.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { isNumericDataType } from "@/src/features/scores/lib/helpers";
import { isPresent, type ScoreConfigDomain } from "@langfuse/shared";
import React from "react";
diff --git a/web/src/features/score-configs/components/ScoreConfigSettings.tsx b/web/src/features/score-configs/components/ScoreConfigSettings.tsx
index 1f43580dd1..f785571f10 100644
--- a/web/src/features/score-configs/components/ScoreConfigSettings.tsx
+++ b/web/src/features/score-configs/components/ScoreConfigSettings.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import React from "react";
import Header from "@/src/components/layouts/header";
import { useHasProjectAccess } from "@/src/features/rbac";
diff --git a/web/src/features/setup/components/SetupTracingButton.tsx b/web/src/features/setup/components/SetupTracingButton.tsx
index cc4383ca1c..052bcc25ce 100644
--- a/web/src/features/setup/components/SetupTracingButton.tsx
+++ b/web/src/features/setup/components/SetupTracingButton.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { Button } from "@/src/components/ui/button";
import Link from "next/link";
import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
diff --git a/web/src/features/support-chat/SupportDrawer.tsx b/web/src/features/support-chat/SupportDrawer.tsx
index 0dfa584d85..7c5a6d1e6c 100644
--- a/web/src/features/support-chat/SupportDrawer.tsx
+++ b/web/src/features/support-chat/SupportDrawer.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { useSupportDrawer } from "@/src/features/support-chat/SupportDrawerProvider";
import { useState } from "react";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/tag/components/TagCreateItem.tsx b/web/src/features/tag/components/TagCreateItem.tsx
index 3bd34120f6..e0ddc94dfd 100644
--- a/web/src/features/tag/components/TagCreateItem.tsx
+++ b/web/src/features/tag/components/TagCreateItem.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import React from "react";
import { CommandItem } from "cmdk";
diff --git a/web/src/features/traces/components/AdvancedJsonViewer/components/MediaButtonGroup.tsx b/web/src/features/traces/components/AdvancedJsonViewer/components/MediaButtonGroup.tsx
index 6cdb8c62ca..ac4ada1a4c 100644
--- a/web/src/features/traces/components/AdvancedJsonViewer/components/MediaButtonGroup.tsx
+++ b/web/src/features/traces/components/AdvancedJsonViewer/components/MediaButtonGroup.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useMemo, useState, useRef } from "react";
import { type MediaReturnType } from "@/src/features/media/validation";
import { File, Image as ImageIcon, Volume2, Video } from "lucide-react";
diff --git a/web/src/features/traces/components/BreakdownTooltip.tsx b/web/src/features/traces/components/BreakdownTooltip.tsx
index 18b1234a48..05b4e2e1e6 100644
--- a/web/src/features/traces/components/BreakdownTooltip.tsx
+++ b/web/src/features/traces/components/BreakdownTooltip.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import {
Tooltip,
TooltipContent,
diff --git a/web/src/features/traces/components/IOPreview/components/ChatMessage.tsx b/web/src/features/traces/components/IOPreview/components/ChatMessage.tsx
index 04741ecd97..2eb1472006 100644
--- a/web/src/features/traces/components/IOPreview/components/ChatMessage.tsx
+++ b/web/src/features/traces/components/IOPreview/components/ChatMessage.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useState } from "react";
import { Button } from "@/src/components/ui/button";
import { PrettyJsonView } from "@/src/components/ui/PrettyJsonView";
diff --git a/web/src/features/traces/components/IOPreview/components/SectionMedia.tsx b/web/src/features/traces/components/IOPreview/components/SectionMedia.tsx
index 2a54253389..46abbf5fb4 100644
--- a/web/src/features/traces/components/IOPreview/components/SectionMedia.tsx
+++ b/web/src/features/traces/components/IOPreview/components/SectionMedia.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { LangfuseMediaView } from "@/src/components/ui/LangfuseMediaView";
import { type MediaReturnType } from "@/src/features/media/validation";
diff --git a/web/src/features/traces/components/IOPreview/components/SectionToolDefinitions.tsx b/web/src/features/traces/components/IOPreview/components/SectionToolDefinitions.tsx
index f09d457155..6027ec65f7 100644
--- a/web/src/features/traces/components/IOPreview/components/SectionToolDefinitions.tsx
+++ b/web/src/features/traces/components/IOPreview/components/SectionToolDefinitions.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import {
ToolCallDefinitionCard,
type ToolDefinition,
diff --git a/web/src/features/traces/components/IOPreview/components/ToolCallDefinitionCard.tsx b/web/src/features/traces/components/IOPreview/components/ToolCallDefinitionCard.tsx
index c1b7375b89..6277620380 100644
--- a/web/src/features/traces/components/IOPreview/components/ToolCallDefinitionCard.tsx
+++ b/web/src/features/traces/components/IOPreview/components/ToolCallDefinitionCard.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { ChevronRight, ChevronDown, Wrench } from "lucide-react";
import { Badge } from "@/src/components/ui/badge";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/features/traces/components/ObservationDetailView/components/ModelBadge.tsx b/web/src/features/traces/components/ObservationDetailView/components/ModelBadge.tsx
index f4a681d1cd..7b8d5ff39f 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ModelBadge.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ModelBadge.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* Model badge for ObservationDetailView
* Handles linked models (with external link) and unlinked models (with create form)
diff --git a/web/src/features/traces/components/ObservationDetailView/components/ModelParametersBadges.tsx b/web/src/features/traces/components/ObservationDetailView/components/ModelParametersBadges.tsx
index 3bab884868..62ca02c5f8 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ModelParametersBadges.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ModelParametersBadges.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* Model parameters badges for ObservationDetailView
* Renders dynamic badges for each model parameter with truncation
diff --git a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/components/EvaluatorBadge/EvaluatorBadge.tsx b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/components/EvaluatorBadge/EvaluatorBadge.tsx
index 2fb5187a94..9dd69ab98b 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/components/EvaluatorBadge/EvaluatorBadge.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/components/EvaluatorBadge/EvaluatorBadge.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { LangfuseInternalTraceEnvironment } from "@langfuse/shared";
import { ExternalLinkIcon } from "lucide-react";
import Link from "next/link";
diff --git a/web/src/features/traces/components/ObservationMetadataBadgesSimple/ObservationMetadataBadgesSimple.tsx b/web/src/features/traces/components/ObservationMetadataBadgesSimple/ObservationMetadataBadgesSimple.tsx
index 22b5ebc45c..f96134334f 100644
--- a/web/src/features/traces/components/ObservationMetadataBadgesSimple/ObservationMetadataBadgesSimple.tsx
+++ b/web/src/features/traces/components/ObservationMetadataBadgesSimple/ObservationMetadataBadgesSimple.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* Simple metadata badges for ObservationDetailView
* Each badge handles its own null checks and returns null when data is unavailable
diff --git a/web/src/features/traces/components/ObservationMetadataBadgesTooltip.tsx b/web/src/features/traces/components/ObservationMetadataBadgesTooltip.tsx
index ba8dacf0df..6f5c5dd460 100644
--- a/web/src/features/traces/components/ObservationMetadataBadgesTooltip.tsx
+++ b/web/src/features/traces/components/ObservationMetadataBadgesTooltip.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* Tooltip-based metadata badges for ObservationDetailView
* These badges use BreakdownTooltip to show detailed cost/usage information
diff --git a/web/src/features/traces/components/PlaybackControls.tsx b/web/src/features/traces/components/PlaybackControls.tsx
index f2c23cdb95..054b0e41a8 100644
--- a/web/src/features/traces/components/PlaybackControls.tsx
+++ b/web/src/features/traces/components/PlaybackControls.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* PlaybackControls - transport for the trace playhead, in the navigation
* header. The play/pause button is wrapped in a circular progress ring that
diff --git a/web/src/features/traces/components/PromptBadge.tsx b/web/src/features/traces/components/PromptBadge.tsx
index 8bbf3bd851..a1a7c8e15f 100644
--- a/web/src/features/traces/components/PromptBadge.tsx
+++ b/web/src/features/traces/components/PromptBadge.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import Link from "next/link";
import { ExternalLinkIcon } from "lucide-react";
import { Badge } from "@/src/components/design-system/Badge/Badge";
diff --git a/web/src/features/traces/components/ToolCallInvocationsView.tsx b/web/src/features/traces/components/ToolCallInvocationsView.tsx
index 5bfde03f1f..3955fc2aa1 100644
--- a/web/src/features/traces/components/ToolCallInvocationsView.tsx
+++ b/web/src/features/traces/components/ToolCallInvocationsView.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { Wrench } from "lucide-react";
import { cn } from "@/src/utils/tailwind";
import { PrettyJsonView } from "@/src/components/ui/PrettyJsonView";
diff --git a/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx b/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx
index db514eba66..6d0854a5d6 100644
--- a/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx
+++ b/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* TraceGraphView wrapper
*
diff --git a/web/src/features/traces/components/TraceLogView/LogViewTreeIndent.tsx b/web/src/features/traces/components/TraceLogView/LogViewTreeIndent.tsx
index eac3b4876b..4c94bf390a 100644
--- a/web/src/features/traces/components/TraceLogView/LogViewTreeIndent.tsx
+++ b/web/src/features/traces/components/TraceLogView/LogViewTreeIndent.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* LogViewTreeIndent - Tree indentation lines for log view rows.
*
diff --git a/web/src/features/traces/components/TraceMetadataBadges.tsx b/web/src/features/traces/components/TraceMetadataBadges.tsx
index d234a1d7f7..e4b0da8548 100644
--- a/web/src/features/traces/components/TraceMetadataBadges.tsx
+++ b/web/src/features/traces/components/TraceMetadataBadges.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* TraceMetadataBadges - Extracted badge components for trace metadata
*
diff --git a/web/src/features/traces/components/TracePanelNavigationLayoutDesktop/components/TracePanelNavigationHiddenNotice.tsx b/web/src/features/traces/components/TracePanelNavigationLayoutDesktop/components/TracePanelNavigationHiddenNotice.tsx
index 2abb44867b..2f8f3c1366 100644
--- a/web/src/features/traces/components/TracePanelNavigationLayoutDesktop/components/TracePanelNavigationHiddenNotice.tsx
+++ b/web/src/features/traces/components/TracePanelNavigationLayoutDesktop/components/TracePanelNavigationHiddenNotice.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* HiddenObservationsNotice - Shows notification when observations are filtered by minimum level
*
diff --git a/web/src/features/traces/components/TraceTimelineDense/TimelineDense.tsx b/web/src/features/traces/components/TraceTimelineDense/TimelineDense.tsx
index 97da08e83a..5226ef86f2 100644
--- a/web/src/features/traces/components/TraceTimelineDense/TimelineDense.tsx
+++ b/web/src/features/traces/components/TraceTimelineDense/TimelineDense.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* The Timeline. `TraceTimelineCompact` measures a box and renders this inside it,
* and the trace panel's Timeline view IS this — for everyone, on every device,
diff --git a/web/src/features/traces/components/TraceTimelineDense/TimelineRowMetrics.tsx b/web/src/features/traces/components/TraceTimelineDense/TimelineRowMetrics.tsx
index e2db9ead23..b156b1b7e0 100644
--- a/web/src/features/traces/components/TraceTimelineDense/TimelineRowMetrics.tsx
+++ b/web/src/features/traces/components/TraceTimelineDense/TimelineRowMetrics.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* The metrics beside a bar: how long it took, what it cost, whether anyone
* commented on it, and how it scored.
diff --git a/web/src/features/traces/components/TraceTruncationNotice.tsx b/web/src/features/traces/components/TraceTruncationNotice.tsx
index 1cc587cbb5..4567ea85be 100644
--- a/web/src/features/traces/components/TraceTruncationNotice.tsx
+++ b/web/src/features/traces/components/TraceTruncationNotice.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
/**
* Inline notice above the tree/timeline/search list when the trace has more
* observations than the detail view loads.
diff --git a/web/src/features/v4-migration/V4MigrationBanner.tsx b/web/src/features/v4-migration/V4MigrationBanner.tsx
index 7567cb977c..03270ea782 100644
--- a/web/src/features/v4-migration/V4MigrationBanner.tsx
+++ b/web/src/features/v4-migration/V4MigrationBanner.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import Link from "next/link";
import { useSession } from "next-auth/react";
import { Zap } from "lucide-react";
diff --git a/web/src/features/v4-migration/V4MigrationContent.tsx b/web/src/features/v4-migration/V4MigrationContent.tsx
index eea8fc8a6c..5a5fb03fe9 100644
--- a/web/src/features/v4-migration/V4MigrationContent.tsx
+++ b/web/src/features/v4-migration/V4MigrationContent.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { type ReactNode, useEffect, useRef, useState } from "react";
import { useRouter } from "next/router";
import Link from "next/link";
diff --git a/web/src/features/v4-migration/V4MigrationDelayBadge.tsx b/web/src/features/v4-migration/V4MigrationDelayBadge.tsx
index 8a7642440b..d680ceff29 100644
--- a/web/src/features/v4-migration/V4MigrationDelayBadge.tsx
+++ b/web/src/features/v4-migration/V4MigrationDelayBadge.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useEffect, useRef, useState } from "react";
import { useRouter } from "next/router";
import {
diff --git a/web/src/features/v4-migration/V4MigrationNavItem.tsx b/web/src/features/v4-migration/V4MigrationNavItem.tsx
index 0676705820..65e85c7193 100644
--- a/web/src/features/v4-migration/V4MigrationNavItem.tsx
+++ b/web/src/features/v4-migration/V4MigrationNavItem.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { ChevronRight } from "lucide-react";
import { SidebarMenuButton, useSidebar } from "@/src/components/ui/sidebar";
import { useV4UpgradeUiEnabled } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";
diff --git a/web/src/features/v4-migration/V4MigrationPanel.tsx b/web/src/features/v4-migration/V4MigrationPanel.tsx
index 60b8e561c2..de94571918 100644
--- a/web/src/features/v4-migration/V4MigrationPanel.tsx
+++ b/web/src/features/v4-migration/V4MigrationPanel.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { X } from "lucide-react";
import { Button } from "@/src/components/ui/button";
import { useV4MigrationPanel } from "@/src/features/v4-migration/V4MigrationPanelProvider";
diff --git a/web/src/features/v4-migration/V4MigrationProjectChip.tsx b/web/src/features/v4-migration/V4MigrationProjectChip.tsx
index 966c306755..fa237c9429 100644
--- a/web/src/features/v4-migration/V4MigrationProjectChip.tsx
+++ b/web/src/features/v4-migration/V4MigrationProjectChip.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { type V4MigrationTargetProject } from "@/src/features/v4-migration/V4MigrationPanelProvider";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
diff --git a/web/src/features/v4-migration/V4MigrationStatusPage.tsx b/web/src/features/v4-migration/V4MigrationStatusPage.tsx
index 2d3e0a3822..236715ce63 100644
--- a/web/src/features/v4-migration/V4MigrationStatusPage.tsx
+++ b/web/src/features/v4-migration/V4MigrationStatusPage.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useState, type ReactNode } from "react";
import Link from "next/link";
import { useRouter } from "next/router";
diff --git a/web/src/features/version-update/VersionUpdateBanner.tsx b/web/src/features/version-update/VersionUpdateBanner.tsx
index da10fc2eeb..1f88fe5521 100644
--- a/web/src/features/version-update/VersionUpdateBanner.tsx
+++ b/web/src/features/version-update/VersionUpdateBanner.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useEffect } from "react";
import { Layer } from "@/src/components/ui/layer";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
diff --git a/web/src/features/web-callouts/components/WebCalloutMenuItem.tsx b/web/src/features/web-callouts/components/WebCalloutMenuItem.tsx
index bbbd4c9644..87673651eb 100644
--- a/web/src/features/web-callouts/components/WebCalloutMenuItem.tsx
+++ b/web/src/features/web-callouts/components/WebCalloutMenuItem.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { Webhook } from "lucide-react";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/widgets/chart-library/BigNumber.tsx b/web/src/features/widgets/chart-library/BigNumber.tsx
index d34878bfe4..afd4831743 100644
--- a/web/src/features/widgets/chart-library/BigNumber.tsx
+++ b/web/src/features/widgets/chart-library/BigNumber.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import React, { useEffect, useRef, useState, useMemo } from "react";
import { cn } from "@/src/utils/tailwind";
import { type ChartProps } from "@/src/features/widgets/chart-library/chart-props";
diff --git a/web/src/features/widgets/chart-library/ChartLoadingState.tsx b/web/src/features/widgets/chart-library/ChartLoadingState.tsx
index cb3f129882..d7f4bfbf53 100644
--- a/web/src/features/widgets/chart-library/ChartLoadingState.tsx
+++ b/web/src/features/widgets/chart-library/ChartLoadingState.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/no-style-props */
+/* eslint-disable @repo/no-style-props, @repo/no-null-render */
import { useEffect, useState } from "react";
import { cn } from "@/src/utils/tailwind";
import { SLOW_QUERY_HINT_TEXT } from "@langfuse/shared";
diff --git a/web/src/features/widgets/chart-library/NearestSeriesProbe.tsx b/web/src/features/widgets/chart-library/NearestSeriesProbe.tsx
index 356f0c29b8..671d7d143b 100644
--- a/web/src/features/widgets/chart-library/NearestSeriesProbe.tsx
+++ b/web/src/features/widgets/chart-library/NearestSeriesProbe.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import { useEffect, useMemo, useRef } from "react";
import {
useActiveTooltipCoordinate,
diff --git a/web/src/features/widgets/chart-library/TimeAxisTick.tsx b/web/src/features/widgets/chart-library/TimeAxisTick.tsx
index f0b21ab994..7bded27777 100644
--- a/web/src/features/widgets/chart-library/TimeAxisTick.tsx
+++ b/web/src/features/widgets/chart-library/TimeAxisTick.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import type { ReactNode } from "react";
import type { XAxisTickContentProps } from "recharts";
diff --git a/web/src/features/widgets/chart-library/TimeSeriesLegend.tsx b/web/src/features/widgets/chart-library/TimeSeriesLegend.tsx
index 888ada551f..2b2575da8b 100644
--- a/web/src/features/widgets/chart-library/TimeSeriesLegend.tsx
+++ b/web/src/features/widgets/chart-library/TimeSeriesLegend.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @repo/no-null-render */
import React, { useEffect, useMemo, useRef, useState } from "react";
import { type ChartConfig } from "@/src/components/ui/chart";
import {