fix(no-forward-ref): loose fix

Rel1cx · Jan 23, 2025 · fab6b8e · fab6b8e
1 parent 41ee491
commit fab6b8e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-forward-ref.spec.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-forward-ref.spec.ts
@@ -191,7 +191,7 @@ ruleTester.run(RULE_NAME, rule, {
         interface ComponentProps {
           foo: string;
         }
-        const Component = function Component({ ref, ...props }: ComponentProps & { ref: React.RefObject<HTMLElement> }) {
+        const Component = function Component({ ref, ...props }: ComponentProps & { ref?: React.RefObject<HTMLElement | null> }) {
           return <div ref={ref} />;
         };
       `,
@@ -211,7 +211,7 @@ ruleTester.run(RULE_NAME, rule, {
       errors: [{ messageId: "noForwardRef" }],
       output: /* tsx */ `
         import * as React from 'react'
-        const Component = function Component({ ref, ...props }: { foo: string } & { ref: React.RefObject<HTMLElement> }) {
+        const Component = function Component({ ref, ...props }: { foo: string } & { ref?: React.RefObject<HTMLElement | null> }) {
           return <div ref={ref}>{props.foo}</div>;
         };
       `,
@@ -231,7 +231,7 @@ ruleTester.run(RULE_NAME, rule, {
       errors: [{ messageId: "noForwardRef" }],
       output: /* tsx */ `
         import * as React from 'react'
-        const Component = function Component({ ref, foo }: { foo: string } & { ref: React.RefObject<HTMLElement> }) {
+        const Component = function Component({ ref, foo }: { foo: string } & { ref?: React.RefObject<HTMLElement | null> }) {
           return <div ref={ref}>{foo}</div>;
         };
       `,
@@ -251,7 +251,7 @@ ruleTester.run(RULE_NAME, rule, {
       errors: [{ messageId: "noForwardRef" }],
       output: /* tsx */ `
         import * as React from 'react'
-        const Component = function Component({ ref: r, foo }: { foo: string } & { ref: React.RefObject<HTMLElement> }) {
+        const Component = function Component({ ref: r, foo }: { foo: string } & { ref?: React.RefObject<HTMLElement | null> }) {
           return <div ref={r}>{foo}</div>;
         };
       `,
@@ -271,7 +271,7 @@ ruleTester.run(RULE_NAME, rule, {
       errors: [{ messageId: "noForwardRef" }],
       output: /* tsx */ `
         import * as React from 'react'
-        const Component = function Component({ ref: r, foo, ...rest }: { foo: string, bar: number } & { ref: React.RefObject<HTMLElement> }) {
+        const Component = function Component({ ref: r, foo, ...rest }: { foo: string, bar: number } & { ref?: React.RefObject<HTMLElement | null> }) {
           return <div ref={r}>{foo}</div>;
         };
       `,

diff --git a/packages/plugins/eslint-plugin-react-x/src/rules/no-forward-ref.ts b/packages/plugins/eslint-plugin-react-x/src/rules/no-forward-ref.ts
@@ -131,8 +131,8 @@ function getComponentPropsFixes(
         getText(typeArg1),
         "&",
         "{",
-        `ref:`,
-        `React.RefObject<${getText(typeArg0)}>`,
+        `ref?:`,
+        `React.RefObject<${getText(typeArg0)} | null>`,
         "}",
       ].join(" "),
     ),