Resolve React warnings

withspectrum · Dec 19, 2018 · 460fa50 · 460fa50
1 parent 359e601
commit 460fa50
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/components/chatInput/style.js b/src/components/chatInput/style.js
@@ -1,4 +1,5 @@
 // @flow
+import React from 'react';
 import theme from 'shared/theme';
 import styled, { css } from 'styled-components';
 import Textarea from 'react-textarea-autosize';
@@ -97,7 +98,9 @@ export const InputWrapper = styled.div`
   }
 `;
 
-export const Input = styled(Textarea).attrs({
+export const Input = styled(({ hasAttachment, networkDisabled, ...rest }) => (
+  <Textarea {...rest} />
+)).attrs({
   spellCheck: true,
   autoCapitalize: 'sentences',
   autoComplete: 'on',

diff --git a/src/views/thread/components/threadDetail.js b/src/views/thread/components/threadDetail.js
@@ -57,6 +57,7 @@ type Props = {
   dispatch: Dispatch<Object>,
   currentUser: ?Object,
   toggleEdit: Function,
+  innerRef?: any,
 };
 
 class ThreadDetailPure extends React.Component<Props, State> {
@@ -341,7 +342,7 @@ class ThreadDetailPure extends React.Component<Props, State> {
       : null;
 
     return (
-      <ThreadWrapper>
+      <ThreadWrapper innerRef={this.props.innerRef}>
         <ThreadContent isEditing={isEditing}>
           {/* $FlowFixMe */}
           <ErrorBoundary fallbackComponent={null}>

diff --git a/src/views/thread/container.js b/src/views/thread/container.js
@@ -388,7 +388,7 @@ class ThreadContainer extends React.Component<Props, State> {
           toggleEdit={this.toggleEdit}
           thread={thread}
           slider={slider}
-          ref={c => (this.threadDetailElem = c)}
+          innerRef={c => (this.threadDetailElem = c)}
         />
       </React.Fragment>
     );