react-native-gifted-chat 0.16.3 → 1.0.0-beta-1

package/lib/Composer.js

@@ -1,9 +1,10 @@
 import PropTypes from 'prop-types';
-import React from 'react';
-import { Platform, StyleSheet, TextInput } from 'react-native';
+import React, { useRef } from 'react';
+import { Platform, StyleSheet, TextInput, } from 'react-native';
 import { MIN_COMPOSER_HEIGHT, DEFAULT_PLACEHOLDER } from './Constant';
 import Color from './Color';
 import { StylePropType } from './utils';
+import { useCallbackOne } from 'use-memo-one';
 const styles = StyleSheet.create({
     textInput: {
         flex: 1,
@@ -28,44 +29,37 @@ const styles = StyleSheet.create({
         }),
     },
 });
-export default class Composer extends React.Component {
-    constructor() {
-        super(...arguments);
-        this.contentSize = undefined;
-        this.onContentSizeChange = (e) => {
-            const { contentSize } = e.nativeEvent;
-            // Support earlier versions of React Native on Android.
-            if (!contentSize) {
-                return;
-            }
-            if (!this.contentSize ||
-                (this.contentSize &&
-                    (this.contentSize.width !== contentSize.width ||
-                        this.contentSize.height !== contentSize.height))) {
-                this.contentSize = contentSize;
-                this.props.onInputSizeChanged(this.contentSize);
-            }
-        };
-        this.onChangeText = (text) => {
-            this.props.onTextChanged(text);
-        };
-    }
-    render() {
-        return (<TextInput testID={this.props.placeholder} accessible accessibilityLabel={this.props.placeholder} placeholder={this.props.placeholder} placeholderTextColor={this.props.placeholderTextColor} multiline={this.props.multiline} editable={!this.props.disableComposer} onChange={this.onContentSizeChange} onContentSizeChange={this.onContentSizeChange} onChangeText={this.onChangeText} style={[
-            styles.textInput,
-            this.props.textInputStyle,
-            {
-                height: this.props.composerHeight,
-                ...Platform.select({
-                    web: {
-                        outlineWidth: 0,
-                        outlineColor: 'transparent',
-                        outlineOffset: 0,
-                    },
-                }),
-            },
-        ]} autoFocus={this.props.textInputAutoFocus} value={this.props.text} enablesReturnKeyAutomatically underlineColorAndroid='transparent' keyboardAppearance={this.props.keyboardAppearance} {...this.props.textInputProps}/>);
-    }
+export function Composer(props) {
+    const { placeholder, onTextChanged, text } = props;
+    const layoutRef = useRef();
+    const handleOnLayout = useCallbackOne((e) => {
+        const { layout } = e.nativeEvent;
+        // Support earlier versions of React Native on Android.
+        if (!layout) {
+            return;
+        }
+        if (!layoutRef ||
+            (layoutRef.current &&
+                (layoutRef.current.width !== layoutRef.current.width ||
+                    layoutRef.current.height !== layoutRef.current.height))) {
+            layoutRef.current = layout;
+            props.onInputSizeChanged(layout);
+        }
+    }, [props.onInputSizeChanged]);
+    return (<TextInput testID={placeholder} accessible accessibilityLabel={placeholder} placeholder={placeholder} placeholderTextColor={props.placeholderTextColor} multiline={props.multiline} editable={!props.disableComposer} onLayout={handleOnLayout} onChangeText={onTextChanged} style={[
+        styles.textInput,
+        props.textInputStyle,
+        {
+            height: props.composerHeight,
+            ...Platform.select({
+                web: {
+                    outlineWidth: 0,
+                    outlineColor: 'transparent',
+                    outlineOffset: 0,
+                },
+            }),
+        },
+    ]} autoFocus={props.textInputAutoFocus} value={text} enablesReturnKeyAutomatically underlineColorAndroid='transparent' keyboardAppearance={props.keyboardAppearance} {...props.textInputProps}/>);
 }
 Composer.defaultProps = {
     composerHeight: MIN_COMPOSER_HEIGHT,

package/lib/Composer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Composer.js","sourceRoot":"","sources":["../src/Composer.tsx"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAkB,MAAM,cAAc,CAAA;AAC9E,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AACrE,OAAO,KAAK,MAAM,SAAS,CAAA;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,EAAE;QACd,GAAG,QAAQ,CAAC,MAAM,CAAC;YACjB,GAAG,EAAE;gBACH,UAAU,EAAE,CAAC;gBACb,WAAW,EAAE,CAAC;aACf;SACF,CAAC;QACF,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC;YACzB,GAAG,EAAE,CAAC;YACN,OAAO,EAAE,CAAC;YACV,GAAG,EAAE,CAAC;SACP,CAAC;QACF,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC;YAC5B,GAAG,EAAE,CAAC;YACN,OAAO,EAAE,CAAC;YACV,GAAG,EAAE,CAAC;SACP,CAAC;KACH;CACF,CAAC,CAAA;AAiBF,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK,CAAC,SAAwB;IAApE;;QA+BE,gBAAW,GAAuC,SAAS,CAAA;QAE3D,wBAAmB,GAAG,CAAC,CAAM,EAAE,EAAE;YAC/B,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC,WAAW,CAAA;YAErC,uDAAuD;YACvD,IAAI,CAAC,WAAW,EAAE;gBAChB,OAAM;aACP;YAED,IACE,CAAC,IAAI,CAAC,WAAW;gBACjB,CAAC,IAAI,CAAC,WAAW;oBACf,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,KAAK,WAAW,CAAC,KAAK;wBAC3C,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC,CAAC,EACpD;gBACA,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;gBAC9B,IAAI,CAAC,KAAK,CAAC,kBAAmB,CAAC,IAAI,CAAC,WAAY,CAAC,CAAA;aAClD;QACH,CAAC,CAAA;QAED,iBAAY,GAAG,CAAC,IAAY,EAAE,EAAE;YAC9B,IAAI,CAAC,KAAK,CAAC,aAAc,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC,CAAA;IAsCH,CAAC;IApCC,MAAM;QACJ,OAAO,CACL,CAAC,SAAS,CACR,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAC/B,UAAU,CACV,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAC3C,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CACpC,oBAAoB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CACtD,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAChC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CACtC,QAAQ,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CACnC,mBAAmB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAC9C,YAAY,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAChC,KAAK,CAAC,CAAC;YACL,MAAM,CAAC,SAAS;YAChB,IAAI,CAAC,KAAK,CAAC,cAAc;YACzB;gBACE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc;gBACjC,GAAG,QAAQ,CAAC,MAAM,CAAC;oBACjB,GAAG,EAAE;wBACH,YAAY,EAAE,CAAC;wBACf,YAAY,EAAE,aAAa;wBAC3B,aAAa,EAAE,CAAC;qBACjB;iBACF,CAAC;aACH;SACF,CAAC,CACF,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CACzC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CACvB,6BAA6B,CAC7B,qBAAqB,CAAC,aAAa,CACnC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAClD,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAC9B,CACH,CAAA;IACH,CAAC;;AA1FM,qBAAY,GAAG;IACpB,cAAc,EAAE,mBAAmB;IACnC,IAAI,EAAE,EAAE;IACR,oBAAoB,EAAE,KAAK,CAAC,YAAY;IACxC,WAAW,EAAE,mBAAmB;IAChC,cAAc,EAAE,IAAI;IACpB,SAAS,EAAE,IAAI;IACf,eAAe,EAAE,KAAK;IACtB,cAAc,EAAE,EAAE;IAClB,kBAAkB,EAAE,KAAK;IACzB,kBAAkB,EAAE,SAAS;IAC7B,aAAa,EAAE,GAAG,EAAE,GAAE,CAAC;IACvB,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC7B,CAAA;AAEM,kBAAS,GAAG;IACjB,cAAc,EAAE,SAAS,CAAC,MAAM;IAChC,IAAI,EAAE,SAAS,CAAC,MAAM;IACtB,WAAW,EAAE,SAAS,CAAC,MAAM;IAC7B,oBAAoB,EAAE,SAAS,CAAC,MAAM;IACtC,cAAc,EAAE,SAAS,CAAC,MAAM;IAChC,aAAa,EAAE,SAAS,CAAC,IAAI;IAC7B,kBAAkB,EAAE,SAAS,CAAC,IAAI;IAClC,SAAS,EAAE,SAAS,CAAC,IAAI;IACzB,eAAe,EAAE,SAAS,CAAC,IAAI;IAC/B,cAAc,EAAE,aAAa;IAC7B,kBAAkB,EAAE,SAAS,CAAC,IAAI;IAClC,kBAAkB,EAAE,SAAS,CAAC,MAAM;CACrC,CAAA"}
+{"version":3,"file":"Composer.js","sourceRoot":"","sources":["../src/Composer.tsx"],"names":[],"mappings":"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"}

package/lib/Day.d.ts

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-import { StyleProp, ViewStyle, TextStyle } from 'react-native';
+import { StyleProp, ViewStyle, TextStyle, TextProps } from 'react-native';
 import { IMessage } from './Models';
 export interface DayProps<TMessage extends IMessage> {
     currentMessage?: TMessage;
@@ -9,14 +8,13 @@ export interface DayProps<TMessage extends IMessage> {
     containerStyle?: StyleProp<ViewStyle>;
     wrapperStyle?: StyleProp<ViewStyle>;
     textStyle?: StyleProp<TextStyle>;
+    textProps?: TextProps;
     dateFormat?: string;
     inverted?: boolean;
 }
-export default class Day<TMessage extends IMessage = IMessage> extends PureComponent<DayProps<TMessage>> {
-    static contextTypes: {
-        getLocale: PropTypes.Requireable<(...args: any[]) => any>;
-    };
-    static defaultProps: {
+export declare const Day: {
+    <TMessage extends IMessage = IMessage>({ dateFormat, currentMessage, previousMessage, containerStyle, wrapperStyle, textStyle, }: DayProps<TMessage>): JSX.Element | null;
+    defaultProps: {
         currentMessage: {
             createdAt: null;
         };
@@ -27,7 +25,7 @@ export default class Day<TMessage extends IMessage = IMessage> extends PureCompo
         textStyle: {};
         dateFormat: string;
     };
-    static propTypes: {
+    propTypes: {
         currentMessage: PropTypes.Requireable<object>;
         previousMessage: PropTypes.Requireable<object>;
         nextMessage: PropTypes.Requireable<object>;
@@ -37,5 +35,4 @@ export default class Day<TMessage extends IMessage = IMessage> extends PureCompo
         textStyle: PropTypes.Requireable<number | boolean | object>;
         dateFormat: PropTypes.Requireable<string>;
     };
-    render(): JSX.Element | null;
-}
+};

package/lib/Day.js

@@ -1,10 +1,11 @@
+import * as React from 'react';
 import PropTypes from 'prop-types';
-import React, { PureComponent } from 'react';
 import { StyleSheet, Text, View, } from 'react-native';
 import dayjs from 'dayjs';
 import Color from './Color';
 import { StylePropType, isSameDay } from './utils';
 import { DATE_FORMAT } from './Constant';
+import { useChatContext } from './GiftedChatContext';
 const styles = StyleSheet.create({
     container: {
         alignItems: 'center',
@@ -19,25 +20,20 @@ const styles = StyleSheet.create({
         fontWeight: '600',
     },
 });
-export default class Day extends PureComponent {
-    render() {
-        const { dateFormat, currentMessage, previousMessage, containerStyle, wrapperStyle, textStyle, } = this.props;
-        if (currentMessage && !isSameDay(currentMessage, previousMessage)) {
-            return (<View style={[styles.container, containerStyle]}>
-          <View style={wrapperStyle}>
-            <Text style={[styles.text, textStyle]}>
-              {dayjs(currentMessage.createdAt)
-                .locale(this.context.getLocale())
-                .format(dateFormat)}
-            </Text>
-          </View>
-        </View>);
-        }
-        return null;
+export const Day = ({ dateFormat, currentMessage, previousMessage, containerStyle, wrapperStyle, textStyle, }) => {
+    const { getLocale } = useChatContext();
+    if (currentMessage && !isSameDay(currentMessage, previousMessage)) {
+        return (<View style={[styles.container, containerStyle]}>
+        <View style={wrapperStyle}>
+          <Text style={[styles.text, textStyle]}>
+            {dayjs(currentMessage.createdAt)
+            .locale(getLocale())
+            .format(dateFormat)}
+          </Text>
+        </View>
+      </View>);
     }
-}
-Day.contextTypes = {
-    getLocale: PropTypes.func,
+    return null;
 };
 Day.defaultProps = {
     currentMessage: {

package/lib/Day.js.map

@@ -1 +1 @@
-{"version":3,"file":"Day.js","sourceRoot":"","sources":["../src/Day.tsx"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAC5C,OAAO,EACL,UAAU,EACV,IAAI,EACJ,IAAI,GAIL,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,MAAM,SAAS,CAAA;AAE3B,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAGxC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;QACxB,SAAS,EAAE,CAAC;QACZ,YAAY,EAAE,EAAE;KACjB;IACD,IAAI,EAAE;QACJ,eAAe,EAAE,KAAK,CAAC,qBAAqB;QAC5C,KAAK,EAAE,KAAK,CAAC,YAAY;QACzB,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,KAAK;KAClB;CACF,CAAC,CAAA;AAaF,MAAM,CAAC,OAAO,OAAO,GAEnB,SAAQ,aAAiC;IA4BzC,MAAM;QACJ,MAAM,EACJ,UAAU,EACV,cAAc,EACd,eAAe,EACf,cAAc,EACd,YAAY,EACZ,SAAS,GACV,GAAG,IAAI,CAAC,KAAK,CAAA;QAEd,IAAI,cAAc,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,eAAgB,CAAC,EAAE;YAClE,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAC9C;UAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CACxB;YAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CACpC;cAAA,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC;iBAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;iBAChC,MAAM,CAAC,UAAU,CAAC,CACvB;YAAA,EAAE,IAAI,CACR;UAAA,EAAE,IAAI,CACR;QAAA,EAAE,IAAI,CAAC,CACR,CAAA;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;;AAnDM,gBAAY,GAAG;IACpB,SAAS,EAAE,SAAS,CAAC,IAAI;CAC1B,CAAA;AAEM,gBAAY,GAAG;IACpB,cAAc,EAAE;QACd,SAAS,EAAE,IAAI;KAChB;IACD,eAAe,EAAE,EAAE;IACnB,WAAW,EAAE,EAAE;IACf,cAAc,EAAE,EAAE;IAClB,YAAY,EAAE,EAAE;IAChB,SAAS,EAAE,EAAE;IACb,UAAU,EAAE,WAAW;CACxB,CAAA;AAEM,aAAS,GAAG;IACjB,cAAc,EAAE,SAAS,CAAC,MAAM;IAChC,eAAe,EAAE,SAAS,CAAC,MAAM;IACjC,WAAW,EAAE,SAAS,CAAC,MAAM;IAC7B,QAAQ,EAAE,SAAS,CAAC,IAAI;IACxB,cAAc,EAAE,aAAa;IAC7B,YAAY,EAAE,aAAa;IAC3B,SAAS,EAAE,aAAa;IACxB,UAAU,EAAE,SAAS,CAAC,MAAM;CAC7B,CAAA"}
+{"version":3,"file":"Day.js","sourceRoot":"","sources":["../src/Day.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,EACL,UAAU,EACV,IAAI,EACJ,IAAI,GAKL,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,MAAM,SAAS,CAAA;AAC3B,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;QACxB,SAAS,EAAE,CAAC;QACZ,YAAY,EAAE,EAAE;KACjB;IACD,IAAI,EAAE;QACJ,eAAe,EAAE,KAAK,CAAC,qBAAqB;QAC5C,KAAK,EAAE,KAAK,CAAC,YAAY;QACzB,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,KAAK;KAClB;CACF,CAAC,CAAA;AAcF,MAAM,CAAC,MAAM,GAAG,GAAG,CAAuC,EACxD,UAAU,EACV,cAAc,EACd,eAAe,EACf,cAAc,EACd,YAAY,EACZ,SAAS,GACU,EAAE,EAAE;IACvB,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,EAAE,CAAA;IACtC,IAAI,cAAc,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,eAAgB,CAAC,EAAE;QAClE,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAC9C;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CACxB;UAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CACpC;YAAA,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC;aAC7B,MAAM,CAAC,SAAS,EAAE,CAAC;aACnB,MAAM,CAAC,UAAU,CAAC,CACvB;UAAA,EAAE,IAAI,CACR;QAAA,EAAE,IAAI,CACR;MAAA,EAAE,IAAI,CAAC,CACR,CAAA;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,GAAG,CAAC,YAAY,GAAG;IACjB,cAAc,EAAE;QACd,SAAS,EAAE,IAAI;KAChB;IACD,eAAe,EAAE,EAAE;IACnB,WAAW,EAAE,EAAE;IACf,cAAc,EAAE,EAAE;IAClB,YAAY,EAAE,EAAE;IAChB,SAAS,EAAE,EAAE;IACb,UAAU,EAAE,WAAW;CACxB,CAAA;AAED,GAAG,CAAC,SAAS,GAAG;IACd,cAAc,EAAE,SAAS,CAAC,MAAM;IAChC,eAAe,EAAE,SAAS,CAAC,MAAM;IACjC,WAAW,EAAE,SAAS,CAAC,MAAM;IAC7B,QAAQ,EAAE,SAAS,CAAC,IAAI;IACxB,cAAc,EAAE,aAAa;IAC7B,YAAY,EAAE,aAAa;IAC3B,SAAS,EAAE,aAAa;IACxB,UAAU,EAAE,SAAS,CAAC,MAAM;CAC7B,CAAA"}

package/lib/GiftedAvatar.js

@@ -92,10 +92,10 @@ export default class GiftedAvatar extends React.Component {
                 styles.avatarStyle,
                 styles.avatarTransparent,
                 this.props.avatarStyle,
-            ]} accessibilityTraits='image'/>);
+            ]} accessibilityRole='image'/>);
         }
         if (this.props.user.avatar) {
-            return (<TouchableOpacity disabled={!this.props.onPress} onPress={this.props.onPress} onLongPress={this.props.onLongPress} accessibilityTraits='image'>
+            return (<TouchableOpacity disabled={!this.props.onPress} onPress={this.props.onPress} onLongPress={this.props.onLongPress} accessibilityRole='image'>
           {this.renderAvatar()}
         </TouchableOpacity>);
         }
@@ -104,7 +104,7 @@ export default class GiftedAvatar extends React.Component {
             styles.avatarStyle,
             { backgroundColor: this.avatarColor },
             this.props.avatarStyle,
-        ]} accessibilityTraits='image'>
+        ]} accessibilityRole='image'>
         {this.renderInitials()}
       </TouchableOpacity>);
     }

package/lib/GiftedAvatar.js.map

@@ -1 +1 @@
-{"version":3,"file":"GiftedAvatar.js","sourceRoot":"","sources":["../src/GiftedAvatar.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"GiftedAvatar.js","sourceRoot":"","sources":["../src/GiftedAvatar.tsx"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EACL,KAAK,EACL,IAAI,EACJ,gBAAgB,EAChB,IAAI,EACJ,UAAU,GAIX,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,MAAM,SAAS,CAAA;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAEvC,MAAM,EACJ,MAAM,EACN,OAAO,EACP,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,YAAY,GACb,GAAG,KAAK,CAAA;AAET,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,WAAW,EAAE;QACX,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;QACpB,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,EAAE;QACV,YAAY,EAAE,EAAE;KACjB;IACD,iBAAiB,EAAE;QACjB,eAAe,EAAE,KAAK,CAAC,qBAAqB;KAC7C;IACD,SAAS,EAAE;QACT,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,QAAQ,EAAE,EAAE;QACZ,eAAe,EAAE,KAAK,CAAC,qBAAqB;QAC5C,UAAU,EAAE,KAAK;KAClB;CACF,CAAC,CAAA;AAUF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAK,CAAC,SAA4B;IAA5E;;QAoBE,eAAU,GAAY,SAAS,CAAA;QAC/B,gBAAW,GAAY,SAAS,CAAA;QAiEhC,kBAAa,GAAG,GAAG,EAAE;YACnB,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACxC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;gBACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;aAC1B;QACH,CAAC,CAAA;QAED,sBAAiB,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;IAkD9B,CAAC;IAxHC,cAAc;QACZ,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;QAChE,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC9C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,IAAI,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;SACzC;aAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,IAAI,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;SAC7D;aAAM;YACL,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;SACrB;QAED,IAAI,QAAQ,GAAG,CAAC,CAAA;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YAC3C,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;SACnC;QAED,+DAA+D;QAC/D,wCAAwC;QACxC,MAAM,MAAM,GAAG;YACb,MAAM;YACN,OAAO;YACP,UAAU;YACV,QAAQ;YACR,QAAQ;YACR,SAAS;YACT,YAAY;SACb,CAAA;QAED,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;IACrD,CAAC;IAED,YAAY;QACV,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAC3B,IAAI,IAAI,EAAE;YACR,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE;gBACrC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAA;aACjE;iBAAM,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE;gBAC1C,OAAO,CACL,CAAC,KAAK,CACJ,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAC7B,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,EACpD,CACH,CAAA;aACF;iBAAM,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE;gBAC1C,OAAO,CACL,CAAC,KAAK,CACJ,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CACpB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,EACpD,CACH,CAAA;aACF;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,cAAc;QACZ,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CACpD;QAAA,CAAC,IAAI,CAAC,UAAU,CAClB;MAAA,EAAE,IAAI,CAAC,CACR,CAAA;IACH,CAAC;IAWD,MAAM;QACJ,IACE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;YAChB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAClD;YACA,qBAAqB;YACrB,OAAO,CACL,CAAC,IAAI,CACH,KAAK,CAAC,CAAC;gBACL,MAAM,CAAC,WAAW;gBAClB,MAAM,CAAC,iBAAiB;gBACxB,IAAI,CAAC,KAAK,CAAC,WAAW;aACvB,CAAC,CACF,iBAAiB,CAAC,OAAO,EACzB,CACH,CAAA;SACF;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE;YAC1B,OAAO,CACL,CAAC,gBAAgB,CACf,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAC9B,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAC5B,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CACpC,iBAAiB,CAAC,OAAO,CAEzB;UAAA,CAAC,IAAI,CAAC,YAAY,EAAE,CACtB;QAAA,EAAE,gBAAgB,CAAC,CACpB,CAAA;SACF;QAED,IAAI,CAAC,cAAc,EAAE,CAAA;QAErB,OAAO,CACL,CAAC,gBAAgB,CACf,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAC9B,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAC5B,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CACpC,KAAK,CAAC,CAAC;YACL,MAAM,CAAC,WAAW;YAClB,EAAE,eAAe,EAAE,IAAI,CAAC,WAAW,EAAE;YACrC,IAAI,CAAC,KAAK,CAAC,WAAW;SACvB,CAAC,CACF,iBAAiB,CAAC,OAAO,CAEzB;QAAA,CAAC,IAAI,CAAC,cAAc,EAAE,CACxB;MAAA,EAAE,gBAAgB,CAAC,CACpB,CAAA;IACH,CAAC;;AA7IM,yBAAY,GAAG;IACpB,IAAI,EAAE;QACJ,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;KACb;IACD,OAAO,EAAE,SAAS;IAClB,WAAW,EAAE,SAAS;IACtB,WAAW,EAAE,EAAE;IACf,SAAS,EAAE,EAAE;CACd,CAAA;AAEM,sBAAS,GAAG;IACjB,IAAI,EAAE,SAAS,CAAC,MAAM;IACtB,OAAO,EAAE,SAAS,CAAC,IAAI;IACvB,WAAW,EAAE,SAAS,CAAC,IAAI;IAC3B,WAAW,EAAE,aAAa;IAC1B,SAAS,EAAE,aAAa;CACzB,CAAA"}

package/lib/GiftedChat.d.ts

@@ -1,25 +1,25 @@
 import PropTypes from 'prop-types';
 import React, { RefObject } from 'react';
-import { Animated, StyleProp, ViewStyle, FlatList, TextStyle } from 'react-native';
+import { Animated, StyleProp, ViewStyle, FlatList, TextStyle, LayoutChangeEvent } from 'react-native';
 import { ActionSheetOptions } from '@expo/react-native-action-sheet';
 import * as utils from './utils';
-import Actions from './Actions';
-import Avatar from './Avatar';
+import { Actions, ActionsProps } from './Actions';
+import { Avatar, AvatarProps } from './Avatar';
 import Bubble from './Bubble';
-import SystemMessage from './SystemMessage';
-import MessageImage from './MessageImage';
-import MessageText from './MessageText';
-import Composer from './Composer';
-import Day from './Day';
-import InputToolbar from './InputToolbar';
-import LoadEarlier from './LoadEarlier';
+import { SystemMessage, SystemMessageProps } from './SystemMessage';
+import { MessageImage, MessageImageProps } from './MessageImage';
+import { MessageText, MessageTextProps } from './MessageText';
+import { Composer, ComposerProps } from './Composer';
+import { Day, DayProps } from './Day';
+import { InputToolbar, InputToolbarProps } from './InputToolbar';
+import { LoadEarlier, LoadEarlierProps } from './LoadEarlier';
 import Message from './Message';
 import MessageContainer from './MessageContainer';
-import Send from './Send';
-import Time from './Time';
+import { Send, SendProps } from './Send';
+import { Time, TimeProps } from './Time';
+import { QuickRepliesProps } from './QuickReplies';
 import GiftedAvatar from './GiftedAvatar';
-import { IMessage, User, Reply, LeftRightStyle } from './Models';
-import QuickReplies from './QuickReplies';
+import { IMessage, User, Reply, LeftRightStyle, MessageVideoProps, MessageAudioProps } from './Models';
 export interface GiftedChatProps<TMessage extends IMessage = IMessage> {
     messages?: TMessage[];
     isTyping?: boolean;
@@ -74,30 +74,32 @@ export interface GiftedChatProps<TMessage extends IMessage = IMessage> {
     onSend?(messages: TMessage[]): void;
     onLoadEarlier?(): void;
     renderLoading?(): React.ReactNode;
-    renderLoadEarlier?(props: LoadEarlier['props']): React.ReactNode;
-    renderAvatar?(props: Avatar<TMessage>['props']): React.ReactNode;
+    renderLoadEarlier?(props: LoadEarlierProps): React.ReactNode;
+    renderAvatar?(props: AvatarProps<TMessage>): React.ReactNode | null;
     renderBubble?(props: Bubble<TMessage>['props']): React.ReactNode;
-    renderSystemMessage?(props: SystemMessage<TMessage>['props']): React.ReactNode;
+    renderSystemMessage?(props: SystemMessageProps<TMessage>): React.ReactNode;
     onLongPress?(context: any, message: any): void;
     renderMessage?(message: Message<TMessage>['props']): React.ReactNode;
-    renderMessageText?(messageText: MessageText<TMessage>['props']): React.ReactNode;
-    renderMessageImage?(props: MessageImage<TMessage>['props']): React.ReactNode;
+    renderMessageText?(messageText: MessageTextProps<TMessage>): React.ReactNode;
+    renderMessageImage?(props: MessageImageProps<TMessage>): React.ReactNode;
+    renderMessageVideo?(props: MessageVideoProps<TMessage>): React.ReactNode;
+    renderMessageAudio?(props: MessageAudioProps<TMessage>): React.ReactNode;
     renderCustomView?(props: Bubble<TMessage>['props']): React.ReactNode;
-    renderDay?(props: Day<TMessage>['props']): React.ReactNode;
-    renderTime?(props: Time<TMessage>['props']): React.ReactNode;
+    renderDay?(props: DayProps<TMessage>): React.ReactNode;
+    renderTime?(props: TimeProps<TMessage>): React.ReactNode;
     renderFooter?(): React.ReactNode;
     renderChatEmpty?(): React.ReactNode;
     renderChatFooter?(): React.ReactNode;
-    renderInputToolbar?(props: InputToolbar['props']): React.ReactNode;
-    renderComposer?(props: Composer['props']): React.ReactNode;
-    renderActions?(props: Actions['props']): React.ReactNode;
-    renderSend?(props: Send['props']): React.ReactNode;
-    renderAccessory?(props: InputToolbar['props']): React.ReactNode;
+    renderInputToolbar?(props: InputToolbarProps<TMessage>): React.ReactNode;
+    renderComposer?(props: ComposerProps): React.ReactNode;
+    renderActions?(props: ActionsProps): React.ReactNode;
+    renderSend?(props: SendProps<TMessage>): React.ReactNode;
+    renderAccessory?(props: InputToolbarProps<TMessage>): React.ReactNode;
     onPressActionButton?(): void;
     onInputTextChanged?(text: string): void;
     parsePatterns?(linkStyle: TextStyle): any;
     onQuickReply?(replies: Reply[]): void;
-    renderQuickReplies?(quickReplies: QuickReplies['props']): React.ReactNode;
+    renderQuickReplies?(quickReplies: QuickRepliesProps): React.ReactNode;
     renderQuickReplySend?(): React.ReactNode;
     scrollToBottomComponent?(): React.ReactNode;
     shouldUpdateMessage?(props: Message<TMessage>['props'], nextProps: Message<TMessage>['props']): boolean;
@@ -111,10 +113,6 @@ export interface GiftedChatState<TMessage extends IMessage = IMessage> {
     messages?: TMessage[];
 }
 declare class GiftedChat<TMessage extends IMessage = IMessage> extends React.Component<GiftedChatProps<TMessage>, GiftedChatState> {
-    static childContextTypes: {
-        actionSheet: PropTypes.Requireable<(...args: any[]) => any>;
-        getLocale: PropTypes.Requireable<(...args: any[]) => any>;
-    };
     static defaultProps: {
         messages: never[];
         messagesContainerStyle: undefined;
@@ -145,6 +143,8 @@ declare class GiftedChat<TMessage extends IMessage = IMessage> extends React.Com
         renderMessage: null;
         renderMessageText: null;
         renderMessageImage: null;
+        renderMessageVideo: null;
+        renderMessageAudio: null;
         imageProps: {};
         videoProps: {};
         audioProps: {};
@@ -165,7 +165,7 @@ declare class GiftedChat<TMessage extends IMessage = IMessage> extends React.Com
         renderAccessory: null;
         isKeyboardInternallyHandled: boolean;
         onPressActionButton: null;
-        bottomOffset: number;
+        bottomOffset: null;
         minInputToolbarHeight: number;
         keyboardShouldPersistTaps: string;
         onInputTextChanged: null;
@@ -252,6 +252,7 @@ declare class GiftedChat<TMessage extends IMessage = IMessage> extends React.Com
     invertibleScrollViewProps: any;
     _actionSheetRef: any;
     _messageContainerRef?: RefObject<FlatList<IMessage>>;
+    _isTextInputWasFocused: boolean;
     textInput?: any;
     state: {
         isInitialized: boolean;
@@ -262,10 +263,6 @@ declare class GiftedChat<TMessage extends IMessage = IMessage> extends React.Com
         messages: undefined;
     };
     constructor(props: GiftedChatProps<TMessage>);
-    getChildContext(): {
-        actionSheet: () => any;
-        getLocale: () => string;
-    };
     componentDidMount(): void;
     componentWillUnmount(): void;
     componentDidUpdate(prevProps?: GiftedChatProps<TMessage>): void;
@@ -298,7 +295,19 @@ declare class GiftedChat<TMessage extends IMessage = IMessage> extends React.Com
      * Returns the height, based on current window size, taking the keyboard into account.
      */
     getMessagesContainerHeightWithKeyboard(composerHeight?: number | undefined): number;
-    safeAreaSupport: (bottomOffset: number) => number;
+    safeAreaSupport: (bottomOffset?: number | undefined) => number;
+    /**
+     * Store text input focus status when keyboard hide to retrieve
+     * it after wards if needed.
+     * `onKeyboardWillHide` may be called twice in sequence so we
+     * make a guard condition (eg. showing image picker)
+     */
+    handleTextInputFocusWhenKeyboardHide(): void;
+    /**
+     * Refocus the text input only if it was focused before showing keyboard.
+     * This is needed in some cases (eg. showing image picker).
+     */
+    handleTextInputFocusWhenKeyboardShow(): void;
     onKeyboardWillShow: (e: any) => void;
     onKeyboardWillHide: (_e: any) => void;
     onKeyboardDidShow: (e: any) => void;
@@ -314,7 +323,7 @@ declare class GiftedChat<TMessage extends IMessage = IMessage> extends React.Com
     onInputTextChanged: (text: string) => void;
     notifyInputTextReset(): void;
     onInitialLayoutViewLayout: (e: any) => void;
-    onMainViewLayout: (e: any) => void;
+    onMainViewLayout: (e: LayoutChangeEvent) => void;
     renderInputToolbar(): {} | null | undefined;
     renderChatFooter(): {} | null | undefined;
     renderLoading(): {} | null | undefined;

package/lib/GiftedChat.js

@@ -7,20 +7,21 @@ import { getBottomSpace } from 'react-native-iphone-x-helper';
 import dayjs from 'dayjs';
 import localizedFormat from 'dayjs/plugin/localizedFormat';
 import * as utils from './utils';
-import Actions from './Actions';
-import Avatar from './Avatar';
+import { Actions } from './Actions';
+import { Avatar } from './Avatar';
 import Bubble from './Bubble';
-import SystemMessage from './SystemMessage';
-import MessageImage from './MessageImage';
-import MessageText from './MessageText';
-import Composer from './Composer';
-import Day from './Day';
-import InputToolbar from './InputToolbar';
-import LoadEarlier from './LoadEarlier';
+import { SystemMessage } from './SystemMessage';
+import { MessageImage } from './MessageImage';
+import { MessageText } from './MessageText';
+import { Composer } from './Composer';
+import { Day } from './Day';
+import { InputToolbar } from './InputToolbar';
+import { LoadEarlier } from './LoadEarlier';
 import Message from './Message';
 import MessageContainer from './MessageContainer';
-import Send from './Send';
-import Time from './Time';
+import { Send } from './Send';
+import { GiftedChatContext } from './GiftedChatContext';
+import { Time } from './Time';
 import GiftedAvatar from './GiftedAvatar';
 import { MIN_COMPOSER_HEIGHT, MAX_COMPOSER_HEIGHT, DEFAULT_PLACEHOLDER, TIME_FORMAT, DATE_FORMAT, } from './Constant';
 dayjs.extend(localizedFormat);
@@ -36,6 +37,7 @@ class GiftedChat extends React.Component {
         this.invertibleScrollViewProps = undefined;
         this._actionSheetRef = undefined;
         this._messageContainerRef = React.createRef();
+        this._isTextInputWasFocused = false;
         this.state = {
             isInitialized: false,
             composerHeight: this.props.minComposerHeight,
@@ -46,13 +48,10 @@ class GiftedChat extends React.Component {
         };
         this.getLocale = () => this._locale;
         this.safeAreaSupport = (bottomOffset) => {
-            return bottomOffset === this._bottomOffset
-                ? this.getBottomOffset()
-                    ? this.getBottomOffset()
-                    : getBottomSpace()
-                : bottomOffset;
+            return bottomOffset != null ? bottomOffset : getBottomSpace();
         };
         this.onKeyboardWillShow = (e) => {
+            this.handleTextInputFocusWhenKeyboardShow();
             if (this.props.isKeyboardInternallyHandled) {
                 this.setIsTypingDisabled(true);
                 this.setKeyboardHeight(e.endCoordinates ? e.endCoordinates.height : e.end.height);
@@ -64,6 +63,7 @@ class GiftedChat extends React.Component {
             }
         };
         this.onKeyboardWillHide = (_e) => {
+            this.handleTextInputFocusWhenKeyboardHide();
             if (this.props.isKeyboardInternallyHandled) {
                 this.setIsTypingDisabled(true);
                 this.setKeyboardHeight(0);
@@ -151,7 +151,7 @@ class GiftedChat extends React.Component {
             });
         };
         this.onMainViewLayout = (e) => {
-            // fix an issue when keyboard is dismissing during the initialization
+            // TODO: fix an issue when keyboard is dismissing during the initialization
             const { layout } = e.nativeEvent;
             if (this.getMaxHeight() !== layout.height ||
                 this.getIsFirstLayout() === true) {
@@ -191,12 +191,6 @@ class GiftedChat extends React.Component {
             ? currentMessages.concat(messages)
             : messages.concat(currentMessages);
     }
-    getChildContext() {
-        return {
-            actionSheet: this.props.actionSheet || (() => this._actionSheetRef.getContext()),
-            getLocale: this.getLocale,
-        };
-    }
     componentDidMount() {
         const { messages, text } = this.props;
         this.setIsMounted(true);
@@ -318,6 +312,31 @@ class GiftedChat extends React.Component {
             this.getKeyboardHeight() +
             this.getBottomOffset());
     }
+    /**
+     * Store text input focus status when keyboard hide to retrieve
+     * it after wards if needed.
+     * `onKeyboardWillHide` may be called twice in sequence so we
+     * make a guard condition (eg. showing image picker)
+     */
+    handleTextInputFocusWhenKeyboardHide() {
+        var _a;
+        if (!this._isTextInputWasFocused) {
+            this._isTextInputWasFocused = ((_a = this.textInput) === null || _a === void 0 ? void 0 : _a.isFocused()) || false;
+        }
+    }
+    /**
+     * Refocus the text input only if it was focused before showing keyboard.
+     * This is needed in some cases (eg. showing image picker).
+     */
+    handleTextInputFocusWhenKeyboardShow() {
+        if (this.textInput &&
+            this._isTextInputWasFocused &&
+            !this.textInput.isFocused()) {
+            this.textInput.focus();
+        }
+        // Reset the indicator since the keyboard is shown
+        this._isTextInputWasFocused = false;
+    }
     scrollToBottom(animated = true) {
         if (this._messageContainerRef && this._messageContainerRef.current) {
             const { inverted } = this.props;
@@ -403,24 +422,27 @@ class GiftedChat extends React.Component {
         if (this.state.isInitialized === true) {
             const { wrapInSafeArea } = this.props;
             const Wrapper = wrapInSafeArea ? SafeAreaView : View;
-            return (<Wrapper style={styles.safeArea}>
-          <ActionSheetProvider ref={(component) => (this._actionSheetRef = component)}>
-            <View style={styles.container} onLayout={this.onMainViewLayout}>
-              {this.renderMessages()}
-              {this.renderInputToolbar()}
-            </View>
-          </ActionSheetProvider>
-        </Wrapper>);
+            const actionSheet = this.props.actionSheet || (() => this._actionSheetRef.getContext());
+            const { getLocale } = this;
+            return (<GiftedChatContext.Provider value={{
+                actionSheet,
+                getLocale,
+            }}>
+          <Wrapper style={styles.safeArea}>
+            <ActionSheetProvider ref={(component) => (this._actionSheetRef = component)}>
+              <View style={styles.container} onLayout={this.onMainViewLayout}>
+                {this.renderMessages()}
+                {this.renderInputToolbar()}
+              </View>
+            </ActionSheetProvider>
+          </Wrapper>
+        </GiftedChatContext.Provider>);
         }
         return (<View style={styles.container} onLayout={this.onInitialLayoutViewLayout}>
         {this.renderLoading()}
       </View>);
     }
 }
-GiftedChat.childContextTypes = {
-    actionSheet: PropTypes.func,
-    getLocale: PropTypes.func,
-};
 GiftedChat.defaultProps = {
     messages: [],
     messagesContainerStyle: undefined,
@@ -451,6 +473,8 @@ GiftedChat.defaultProps = {
     renderMessage: null,
     renderMessageText: null,
     renderMessageImage: null,
+    renderMessageVideo: null,
+    renderMessageAudio: null,
     imageProps: {},
     videoProps: {},
     audioProps: {},
@@ -471,7 +495,7 @@ GiftedChat.defaultProps = {
     renderAccessory: null,
     isKeyboardInternallyHandled: true,
     onPressActionButton: null,
-    bottomOffset: 0,
+    bottomOffset: null,
     minInputToolbarHeight: 44,
     keyboardShouldPersistTaps: Platform.select({
         ios: 'never',
@@ -559,5 +583,6 @@ const styles = StyleSheet.create({
         flex: 1,
     },
 });
+export * from './Models';
 export { GiftedChat, Actions, Avatar, Bubble, SystemMessage, MessageImage, MessageText, Composer, Day, InputToolbar, LoadEarlier, Message, MessageContainer, Send, Time, GiftedAvatar, utils, };
 //# sourceMappingURL=GiftedChat.js.map

package/lib/GiftedChat.js.flow

@@ -10,6 +10,10 @@ import SystemMessage from './SystemMessage'
 import type { SystemMessageProps } from './SystemMessage'
 import MessageImage from './MessageImage'
 import type { MessageImageProps } from './MessageImage'
+import MessageVideo from './MessageVideo'
+import type { MessageVideoProps } from './MessageVideo'
+import MessageAudio from './MessageAudio'
+import type { MessageAudioProps } from './MessageAudio'
 import MessageText from './MessageText'
 import type { MessageTextProps } from './MessageText'
 import Composer from './Composer'
@@ -96,6 +100,8 @@ export type GiftedChatProps<TMessage: IMessage = IMessage> = $ReadOnly<{|
   renderMessage?: (MessageProps<TMessage>) => React.Node,
   renderMessageText?: (MessageTextProps<TMessage>) => React.Node,
   renderMessageImage?: (MessageImageProps<TMessage>) => React.Node,
+  renderMessageVideo?: (MessageVideoProps<TMessage>) => React.Node,
+  renderMessageAudio?: (MessageAudioProps<TMessage>) => React.Node,
   renderCustomView?: (BubbleProps<TMessage>) => React.Node,
   renderDay?: (DayProps<TMessage>) => React.Node,
   renderTime?: (TimeProps<TMessage>) => React.Node,
@@ -140,6 +146,8 @@ export {
   Bubble,
   SystemMessage,
   MessageImage,
+  MessageVideo,
+  MessageAudio,
   MessageText,
   Composer,
   Day,