Merge branch 'master' into feature/async-image-upload

Author: Dan Carbonell

docs/cookbook.md

@@ -1326,11 +1326,14 @@ For setup regarding push notifications, first of all make sure you have followed
 
 ### Requirements
 
-- User must be a member of channel, if he expects a push notification for a message on that channel.
+- User must be a member of channel if they expect a push notification for a message on that channel.
 
 - We only send a push notification, when user is **NOT** connected to chat, or in other words, if user does **NOT** have any active WS (websocket) connection. WS connection is established when you do
 
-  `await client.setUser({ id: 'user_id' })`.
+  ```js
+  await client.setUser({ id: 'user_id' })	
+  await client.addDevice(token.token, token.os === 'ios' ? 'apn' : 'firebase')	
+  ```
 
 ### Caveats
 

src/components/Attachment.js

@@ -48,28 +48,28 @@ export const Attachment = withMessageContentContext(
         additionalTouchableProps: PropTypes.object,
         /**
          * Custom UI component to display enriched url preview.
-         * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
+         * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
          */
         UrlPreview: PropTypes.oneOfType([
           PropTypes.node,
           PropTypes.elementType,
         ]),
         /**
          * Custom UI component to display Giphy image.
-         * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
+         * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
          */
         Giphy: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
         /**
          * Custom UI component to display group of File type attachments or multiple file attachments (in single message).
-         * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachmentGroup.js
+         * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachmentGroup.js
          */
         FileAttachmentGroup: PropTypes.oneOfType([
           PropTypes.node,
           PropTypes.elementType,
         ]),
         /**
          * Custom UI component to display File type attachment.
-         * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachment.js
+         * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachment.js
          */
         FileAttachment: PropTypes.oneOfType([
           PropTypes.node,
@@ -85,12 +85,12 @@ export const Attachment = withMessageContentContext(
         ]),
         /**
          * Custom UI component to display image attachments.
-         * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Gallery.js
+         * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Gallery.js
          */
         Gallery: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
         /**
          * Custom UI component to display generic media type e.g. giphy, url preview etc
-         * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
+         * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
          */
         Card: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
         /**
@@ -116,7 +116,7 @@ export const Attachment = withMessageContentContext(
         ]),
         /**
          * Custom UI component to display attachment actions. e.g., send, shuffle, cancel in case of giphy
-         * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/AttachmentActions.js
+         * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/AttachmentActions.js
          */
         AttachmentActions: PropTypes.oneOfType([
           PropTypes.node,

src/components/ChannelInner.js

@@ -140,7 +140,7 @@ class ChannelInner extends PureComponent {
   getInitialStateFromProps(props) {
     return {
       error: false,
-      // Loading the intial content of the channel
+      // Loading the initial content of the channel
       loading: true,
       // Loading more messages
       loadingMore: false,
@@ -155,7 +155,6 @@ class ChannelInner extends PureComponent {
       threadMessages: [],
       threadLoadingMore: false,
       threadHasMore: true,
-      kavEnabled: true,
       /** We save the events in state so that we can display event message
        * next to the message after which it was received, in MessageList.
        *
@@ -651,8 +650,6 @@ class ChannelInner extends PureComponent {
       this.props.disableIfFrozenChannel,
   });
 
-  renderComponent = () => this.props.children;
-
   renderLoading = () => {
     const Indicator = this.props.LoadingIndicator;
     return <Indicator listType="message" />;
@@ -665,7 +662,7 @@ class ChannelInner extends PureComponent {
 
   render() {
     let core;
-    const { KeyboardCompatibleView, t } = this.props;
+    const { children, KeyboardCompatibleView, t } = this.props;
     if (this.state.error) {
       this.props.logger(
         'Channel component',
@@ -693,14 +690,7 @@ class ChannelInner extends PureComponent {
           enabled={!this.props.disableKeyboardCompatibleView}
         >
           <ChannelContext.Provider value={this.getContext()}>
-            <SuggestionsProvider
-              handleKeyboardAvoidingViewEnabled={(trueOrFalse) => {
-                if (this._unmounted) return;
-                this.setState({ kavEnabled: trueOrFalse });
-              }}
-            >
-              {this.renderComponent()}
-            </SuggestionsProvider>
+            <SuggestionsProvider>{children}</SuggestionsProvider>
           </ChannelContext.Provider>
         </KeyboardCompatibleView>
       );

src/components/Chat.js

@@ -165,7 +165,6 @@ export const Chat = themed(
       this._unmounted = true;
       this.props.client.off('connection.recovered');
       this.props.client.off('connection.changed');
-      this.props.client.off(this.handleEvent);
       this.unsubscribeNetInfo && this.unsubscribeNetInfo();
     }
 

src/components/MessageInput.js

@@ -918,7 +918,7 @@ class MessageInput extends PureComponent {
                   break;
                 default:
               }
-            }, 10);
+            }, 201); // 201ms to fire after the animation is complete https://github.com/beefe/react-native-actionsheet/blob/master/lib/ActionSheetCustom.js#L78
           }}
           styles={this.props.actionSheetStyles}
         />

src/components/MessageSimple/MessageContent.js

@@ -298,25 +298,25 @@ class MessageContent extends React.PureComponent {
     MessageText: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
     /**
      * Custom UI component to display enriched url preview.
-     * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
+     * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
      */
     UrlPreview: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
     /**
      * Custom UI component to display Giphy image.
-     * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
+     * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
      */
     Giphy: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
     /**
      * Custom UI component to display group of File type attachments or multiple file attachments (in single message).
-     * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachmentGroup.js
+     * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachmentGroup.js
      */
     FileAttachmentGroup: PropTypes.oneOfType([
       PropTypes.node,
       PropTypes.elementType,
     ]),
     /**
      * Custom UI component to display File type attachment.
-     * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachment.js
+     * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachment.js
      */
     FileAttachment: PropTypes.oneOfType([
       PropTypes.node,
@@ -332,12 +332,12 @@ class MessageContent extends React.PureComponent {
     ]),
     /**
      * Custom UI component to display image attachments.
-     * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Gallery.js
+     * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Gallery.js
      */
     Gallery: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
     /**
      * Custom UI component to display generic media type e.g. giphy, url preview etc
-     * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
+     * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
      */
     Card: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
     /**
@@ -357,7 +357,7 @@ class MessageContent extends React.PureComponent {
     CardFooter: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
     /**
      * Custom UI component to display attachment actions. e.g., send, shuffle, cancel in case of giphy
-     * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/AttachmentActions.js
+     * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/AttachmentActions.js
      */
     AttachmentActions: PropTypes.oneOfType([
       PropTypes.node,

src/components/MessageSimple/index.js

@@ -77,25 +77,25 @@ export const MessageSimple = themed(
       MessageText: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
       /**
        * Custom UI component to display enriched url preview.
-       * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
+       * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
        */
       UrlPreview: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
       /**
        * Custom UI component to display Giphy image.
-       * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
+       * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
        */
       Giphy: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
       /**
        * Custom UI component to display group of File type attachments or multiple file attachments (in single message).
-       * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachmentGroup.js
+       * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachmentGroup.js
        */
       FileAttachmentGroup: PropTypes.oneOfType([
         PropTypes.node,
         PropTypes.elementType,
       ]),
       /**
        * Custom UI component to display File type attachment.
-       * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachment.js
+       * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/FileAttachment.js
        */
       FileAttachment: PropTypes.oneOfType([
         PropTypes.node,
@@ -111,12 +111,12 @@ export const MessageSimple = themed(
       ]),
       /**
        * Custom UI component to display image attachments.
-       * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Gallery.js
+       * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Gallery.js
        */
       Gallery: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
       /**
        * Custom UI component to display generic media type e.g. giphy, url preview etc
-       * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
+       * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/Card.js
        */
       Card: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
       /**
@@ -136,7 +136,7 @@ export const MessageSimple = themed(
       CardFooter: PropTypes.oneOfType([PropTypes.node, PropTypes.elementType]),
       /**
        * Custom UI component to display attachment actions. e.g., send, shuffle, cancel in case of giphy
-       * Deaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/AttachmentActions.js
+       * Defaults to https://github.com/GetStream/stream-chat-react-native/blob/master/src/components/AttachmentActions.js
        */
       AttachmentActions: PropTypes.oneOfType([
         PropTypes.node,

types/index.d.ts

@@ -1,7 +1,7 @@
 // TypeScript Version: 2.8
 
 import * as React from 'react';
-import { Text, GestureResponderEvent, FlatList } from 'react-native';
+import { FlatList, GestureResponderEvent } from 'react-native';
 import * as Client from 'stream-chat';
 import * as SeamlessImmutable from 'seamless-immutable';
 import * as i18next from 'i18next';
@@ -100,7 +100,6 @@ export interface ChannelContextValue {
   threadMessages?: Client.MessageResponse[];
   threadLoadingMore?: boolean;
   threadHasMore?: boolean;
-  kavEnabled?: boolean;
 
   sendMessage?(message: Client.Message): void;
   /** The function to update a message, handled by the Channel component */