Merge f85f203 into f260081

textkernel · Jan 3, 2020 · 9b917b9 · 9b917b9
2 parents f260081 + f85f203
commit 9b917b9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/src/components/Buttons/Button/Button.tsx b/src/components/Buttons/Button/Button.tsx
@@ -24,7 +24,7 @@ export interface Props extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement
 
 const { block } = bem('Button', styles);
 
-const Button: React.FC<Props> = React.forwardRef((props, ref?: React.Ref<HTMLButtonElement>) => {
+const Button = React.forwardRef<HTMLButtonElement, Props>((props, ref) => {
     const { children, context, disabled, isBlock, isInline, type, href, size, ...rest } = props;
 
     if (href) {

diff --git a/src/components/Input/Input.tsx b/src/components/Input/Input.tsx
@@ -20,7 +20,7 @@ interface Props extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'size'
 
 const { block } = bem('Input', styles);
 
-const Input: React.FC<Props> = React.forwardRef((props, ref?: React.Ref<HTMLInputElement>) => {
+const Input = React.forwardRef<HTMLInputElement, Props>((props, ref) => {
     const { children, context, disabled, isBlock, size, type, value, ...rest } = props;
     return (
         <input

diff --git a/src/components/SelectedOption/SelectedOption.tsx b/src/components/SelectedOption/SelectedOption.tsx
@@ -15,7 +15,7 @@ interface Props extends React.HTMLAttributes<HTMLElement> {
 
 const { block, elem } = bem('SelectedOption', styles);
 
-const SelectedOption: React.FC<Props> = React.forwardRef((props, ref?: React.Ref<HTMLElement>) => {
+const SelectedOption = React.forwardRef<HTMLElement, Props>((props, ref) => {
     const { As = 'div', children, onDelete, ...rest } = props;
 
     const handleKeyDown = e => {
@@ -28,8 +28,8 @@ const SelectedOption: React.FC<Props> = React.forwardRef((props, ref?: React.Ref
         if (React.isValidElement(children)) {
             return children;
         }
-        return <span {...elem('label')}>{children}</span>
-    }
+        return <span {...elem('label')}>{children}</span>;
+    };
 
     return (
         <As {...rest} ref={ref} {...block(props)}>

diff --git a/src/components/TwoPaneView/LeftPane/LeftPane.tsx b/src/components/TwoPaneView/LeftPane/LeftPane.tsx
@@ -9,8 +9,8 @@ export interface Props extends React.HTMLAttributes<HTMLDivElement> {
 
 const { block } = bem('LeftPane', styles);
 
-const LeftPane: React.FC<Props> = React.forwardRef(
-    (props: Props, ref?: React.Ref<HTMLDivElement>): React.ReactElement => {
+const LeftPane = React.forwardRef<HTMLDivElement, Props>(
+    (props, ref): React.ReactElement => {
         const { children, ...rest } = props;
 
         return (

diff --git a/src/components/WidthRestrictor/BlockWidthRestrictor/BlockWidthRestrictor.tsx b/src/components/WidthRestrictor/BlockWidthRestrictor/BlockWidthRestrictor.tsx
@@ -11,17 +11,15 @@ export interface Props extends React.HTMLAttributes<HTMLElement> {
 
 const { block } = bem('BlockWidthRestrictor', styles);
 
-const BlockWidthRestrictor: React.FC<Props> = React.forwardRef(
-    (props, ref?: React.Ref<HTMLElement>) => {
-        const { children, As = 'div', ...rest } = props;
+const BlockWidthRestrictor = React.forwardRef<HTMLElement, Props>((props, ref?) => {
+    const { children, As = 'div', ...rest } = props;
 
-        return (
-            <As {...rest} ref={ref} {...block(props)}>
-                {children}
-            </As>
-        );
-    }
-);
+    return (
+        <As {...rest} ref={ref} {...block(props)}>
+            {children}
+        </As>
+    );
+});
 
 BlockWidthRestrictor.displayName = 'BlockWidthRestrictor';