improve forwardRef

mebtte · Nov 22, 2023 · 18ebc5d · 18ebc5d
1 parent 17e4d33
commit 18ebc5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/apps/pwa/src/components/input.tsx b/apps/pwa/src/components/input.tsx
@@ -1,10 +1,4 @@
-import {
-  ForwardedRef,
-  forwardRef,
-  InputHTMLAttributes,
-  useImperativeHandle,
-  useRef,
-} from 'react';
+import { ForwardedRef, forwardRef, InputHTMLAttributes } from 'react';
 import styled from 'styled-components';
 import { ComponentSize } from '../constants/style';
 import { CSSVariable } from '../global_style';
@@ -43,11 +37,7 @@ function Wrapper(
   { disabled = false, ...props }: Props,
   ref: ForwardedRef<HTMLInputElement>,
 ) {
-  const inputRef = useRef<HTMLInputElement>(null);
-
-  useImperativeHandle(ref, () => inputRef.current!);
-
-  return <Input {...props} disabled={disabled} ref={inputRef} />;
+  return <Input {...props} disabled={disabled} ref={ref} />;
 }
 
 export default forwardRef<HTMLInputElement, Props>(Wrapper);
diff --git a/apps/pwa/src/components/textarea.tsx b/apps/pwa/src/components/textarea.tsx
@@ -1,10 +1,4 @@
-import {
-  ForwardedRef,
-  forwardRef,
-  TextareaHTMLAttributes,
-  useImperativeHandle,
-  useRef,
-} from 'react';
+import { ForwardedRef, forwardRef, TextareaHTMLAttributes } from 'react';
 import styled from 'styled-components';
 import { CSSVariable } from '../global_style';
 
@@ -41,9 +35,7 @@ function Wrapper(
   { disabled = false, ...props }: Props,
   ref: ForwardedRef<HTMLTextAreaElement>,
 ) {
-  const textareaRef = useRef<HTMLTextAreaElement>(null);
-  useImperativeHandle(ref, () => textareaRef.current!);
-  return <Textarea {...props} disabled={disabled} ref={textareaRef} />;
+  return <Textarea {...props} disabled={disabled} ref={ref} />;
 }
 
 export default forwardRef<HTMLTextAreaElement, Props>(Wrapper);