react-native-gifted-chat 2.7.3 → 2.8.1

package/src/Bubble/index.tsx

@@ -1,11 +1,11 @@
-import React from 'react'
+import React, { useCallback } from 'react'
 import {
   Text,
   TouchableWithoutFeedback,
   View,
 } from 'react-native'
 
-import { GiftedChatContext } from '../GiftedChatContext'
+import { useChatContext } from '../GiftedChatContext'
 import { QuickReplies } from '../QuickReplies'
 import { MessageText } from '../MessageText'
 import { MessageImage } from '../MessageImage'
@@ -22,25 +22,39 @@ import styles from './styles'
 
 export * from './types'
 
-export default class Bubble<
-  TMessage extends IMessage = IMessage,
-> extends React.Component<BubbleProps<TMessage>> {
-  static contextType = GiftedChatContext
-
-  onPress = () => {
-    if (this.props.onPress)
-      this.props.onPress(this.context, this.props.currentMessage)
-  }
-
-  onLongPress = () => {
+const Bubble: React.FC<BubbleProps<IMessage>> = (props: BubbleProps<IMessage>) => {
+  const {
+    currentMessage,
+    nextMessage,
+    position,
+    containerToNextStyle,
+    previousMessage,
+    containerToPreviousStyle,
+    onQuickReply,
+    renderQuickReplySend,
+    quickReplyStyle,
+    quickReplyTextStyle,
+    quickReplyContainerStyle,
+    containerStyle,
+    wrapperStyle,
+    bottomContainerStyle,
+  } = props
+
+  const context = useChatContext()
+
+  const onPress = useCallback(() => {
+    if (props.onPress)
+      props.onPress(context, currentMessage)
+  }, [context, props, currentMessage])
+
+  const onLongPress = useCallback(() => {
     const {
-      currentMessage,
       onLongPress,
       optionTitles,
-    } = this.props
+    } = props
 
     if (onLongPress) {
-      onLongPress(this.context, currentMessage)
+      onLongPress(context, currentMessage)
       return
     }
 
@@ -51,7 +65,7 @@ export default class Bubble<
     const cancelButtonIndex = options.length - 1
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ;(this.context as any).actionSheet().showActionSheetWithOptions(
+    ;(context as any).actionSheet().showActionSheetWithOptions(
       {
         options,
         cancelButtonIndex,
@@ -60,11 +74,13 @@ export default class Bubble<
         console.log('onLongPress', { buttonIndex })
       }
     )
-  }
+  }, [
+    currentMessage,
+    context,
+    props,
+  ])
 
-  styledBubbleToNext () {
-    const { currentMessage, nextMessage, position, containerToNextStyle } =
-      this.props
+  const styledBubbleToNext = useCallback(() => {
     if (
       currentMessage &&
       nextMessage &&
@@ -78,15 +94,14 @@ export default class Bubble<
       ]
 
     return null
-  }
-
-  styledBubbleToPrevious () {
-    const {
-      currentMessage,
-      previousMessage,
-      position,
-      containerToPreviousStyle,
-    } = this.props
+  }, [
+    currentMessage,
+    nextMessage,
+    position,
+    containerToNextStyle,
+  ])
+
+  const styledBubbleToPrevious = useCallback(() => {
     if (
       currentMessage &&
       previousMessage &&
@@ -100,19 +115,14 @@ export default class Bubble<
       ]
 
     return null
-  }
-
-  renderQuickReplies () {
-    const {
-      currentMessage,
-      onQuickReply,
-      nextMessage,
-      renderQuickReplySend,
-      quickReplyStyle,
-      quickReplyTextStyle,
-      quickReplyContainerStyle,
-    } = this.props
-
+  }, [
+    currentMessage,
+    previousMessage,
+    position,
+    containerToPreviousStyle,
+  ])
+
+  const renderQuickReplies = useCallback(() => {
     if (currentMessage?.quickReplies) {
       const {
         /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -120,10 +130,10 @@ export default class Bubble<
         wrapperStyle,
         /* eslint-enable @typescript-eslint/no-unused-vars */
         ...quickReplyProps
-      } = this.props
+      } = props
 
-      if (this.props.renderQuickReplies)
-        return this.props.renderQuickReplies(quickReplyProps)
+      if (props.renderQuickReplies)
+        return props.renderQuickReplies(quickReplyProps)
 
       return (
         <QuickReplies
@@ -139,10 +149,19 @@ export default class Bubble<
     }
 
     return null
-  }
-
-  renderMessageText () {
-    if (this.props.currentMessage?.text) {
+  }, [
+    currentMessage,
+    onQuickReply,
+    renderQuickReplySend,
+    quickReplyStyle,
+    quickReplyTextStyle,
+    quickReplyContainerStyle,
+    nextMessage,
+    props,
+  ])
+
+  const renderMessageText = useCallback(() => {
+    if (currentMessage?.text) {
       const {
         /* eslint-disable @typescript-eslint/no-unused-vars */
         containerStyle,
@@ -150,35 +169,36 @@ export default class Bubble<
         optionTitles,
         /* eslint-enable @typescript-eslint/no-unused-vars */
         ...messageTextProps
-      } = this.props
-      if (this.props.renderMessageText)
-        return this.props.renderMessageText(messageTextProps)
+      } = props
+
+      if (props.renderMessageText)
+        return props.renderMessageText(messageTextProps)
 
       return <MessageText {...messageTextProps} />
     }
     return null
-  }
+  }, [props, currentMessage])
 
-  renderMessageImage () {
-    if (this.props.currentMessage?.image) {
+  const renderMessageImage = useCallback(() => {
+    if (currentMessage?.image) {
       const {
         /* eslint-disable @typescript-eslint/no-unused-vars */
         containerStyle,
         wrapperStyle,
         /* eslint-enable @typescript-eslint/no-unused-vars */
         ...messageImageProps
-      } = this.props
+      } = props
 
-      if (this.props.renderMessageImage)
-        return this.props.renderMessageImage(messageImageProps)
+      if (props.renderMessageImage)
+        return props.renderMessageImage(messageImageProps)
 
       return <MessageImage {...messageImageProps} />
     }
     return null
-  }
+  }, [props, currentMessage])
 
-  renderMessageVideo () {
-    if (!this.props.currentMessage?.video)
+  const renderMessageVideo = useCallback(() => {
+    if (!currentMessage?.video)
       return null
 
     const {
@@ -187,16 +207,16 @@ export default class Bubble<
       wrapperStyle,
       /* eslint-enable @typescript-eslint/no-unused-vars */
       ...messageVideoProps
-    } = this.props
+    } = props
 
-    if (this.props.renderMessageVideo)
-      return this.props.renderMessageVideo(messageVideoProps)
+    if (props.renderMessageVideo)
+      return props.renderMessageVideo(messageVideoProps)
 
     return <MessageVideo />
-  }
+  }, [props, currentMessage])
 
-  renderMessageAudio () {
-    if (!this.props.currentMessage?.audio)
+  const renderMessageAudio = useCallback(() => {
+    if (!currentMessage?.audio)
       return null
 
     const {
@@ -205,20 +225,19 @@ export default class Bubble<
       wrapperStyle,
       /* eslint-enable @typescript-eslint/no-unused-vars */
       ...messageAudioProps
-    } = this.props
+    } = props
 
-    if (this.props.renderMessageAudio)
-      return this.props.renderMessageAudio(messageAudioProps)
+    if (props.renderMessageAudio)
+      return props.renderMessageAudio(messageAudioProps)
 
     return <MessageAudio />
-  }
+  }, [props, currentMessage])
 
-  renderTicks () {
+  const renderTicks = useCallback(() => {
     const {
-      currentMessage,
       renderTicks,
       user,
-    } = this.props
+    } = props
 
     if (renderTicks && currentMessage)
       return renderTicks(currentMessage)
@@ -237,17 +256,17 @@ export default class Bubble<
       return (
         <View style={styles.content.tickView}>
           {!!currentMessage.sent && (
-            <Text style={[styles.content.tick, this.props.tickStyle]}>
+            <Text style={[styles.content.tick, props.tickStyle]}>
               {'✓'}
             </Text>
           )}
           {!!currentMessage.received && (
-            <Text style={[styles.content.tick, this.props.tickStyle]}>
+            <Text style={[styles.content.tick, props.tickStyle]}>
               {'✓'}
             </Text>
           )}
           {!!currentMessage.pending && (
-            <Text style={[styles.content.tick, this.props.tickStyle]}>
+            <Text style={[styles.content.tick, props.tickStyle]}>
               {'🕓'}
             </Text>
           )}
@@ -255,10 +274,13 @@ export default class Bubble<
       )
 
     return null
-  }
+  }, [
+    props,
+    currentMessage,
+  ])
 
-  renderTime () {
-    if (this.props.currentMessage?.createdAt) {
+  const renderTime = useCallback(() => {
+    if (currentMessage?.createdAt) {
       const {
         /* eslint-disable @typescript-eslint/no-unused-vars */
         containerStyle,
@@ -266,24 +288,23 @@ export default class Bubble<
         textStyle,
         /* eslint-enable @typescript-eslint/no-unused-vars */
         ...timeProps
-      } = this.props
+      } = props
 
-      if (this.props.renderTime)
-        return this.props.renderTime(timeProps)
+      if (props.renderTime)
+        return props.renderTime(timeProps)
 
       return <Time {...timeProps} />
     }
     return null
-  }
+  }, [props, currentMessage])
 
-  renderUsername () {
+  const renderUsername = useCallback(() => {
     const {
-      currentMessage,
       user,
       renderUsername,
-    } = this.props
+    } = props
 
-    if (this.props.renderUsernameOnMessage && currentMessage) {
+    if (props.renderUsernameOnMessage && currentMessage) {
       if (user && currentMessage.user._id === user._id)
         return null
 
@@ -294,7 +315,7 @@ export default class Bubble<
         <View style={styles.content.usernameView}>
           <Text
             style={
-              [styles.content.username, this.props.usernameStyle]
+              [styles.content.username, props.usernameStyle]
             }
           >
             {'~ '}
@@ -305,75 +326,78 @@ export default class Bubble<
     }
 
     return null
-  }
+  }, [
+    currentMessage,
+    props,
+  ])
 
-  renderCustomView () {
-    if (this.props.renderCustomView)
-      return this.props.renderCustomView(this.props)
+  const renderCustomView = useCallback(() => {
+    if (props.renderCustomView)
+      return props.renderCustomView(props)
 
     return null
-  }
+  }, [props])
 
-  renderBubbleContent () {
+  const renderBubbleContent = useCallback(() => {
     return (
       <View>
-        {!this.props.isCustomViewBottom && this.renderCustomView()}
-        {this.renderMessageImage()}
-        {this.renderMessageVideo()}
-        {this.renderMessageAudio()}
-        {this.renderMessageText()}
-        {this.props.isCustomViewBottom && this.renderCustomView()}
+        {!props.isCustomViewBottom && renderCustomView()}
+        {renderMessageImage()}
+        {renderMessageVideo()}
+        {renderMessageAudio()}
+        {renderMessageText()}
+        {props.isCustomViewBottom && renderCustomView()}
       </View>
     )
-  }
-
-  render () {
-    const {
-      position,
-      containerStyle,
-      wrapperStyle,
-      bottomContainerStyle,
-    } = this.props
-
-    return (
+  }, [
+    renderCustomView,
+    renderMessageImage,
+    renderMessageVideo,
+    renderMessageAudio,
+    renderMessageText,
+    props.isCustomViewBottom,
+  ])
+
+  return (
+    <View
+      style={[
+        stylesCommon.fill,
+        styles[position].container,
+        containerStyle && containerStyle[position],
+      ]}
+    >
       <View
         style={[
-          stylesCommon.fill,
-          styles[position].container,
-          containerStyle && containerStyle[position],
+          styles[position].wrapper,
+          styledBubbleToNext(),
+          styledBubbleToPrevious(),
+          wrapperStyle && wrapperStyle[position],
         ]}
       >
-        <View
-          style={[
-            styles[position].wrapper,
-            this.styledBubbleToNext(),
-            this.styledBubbleToPrevious(),
-            wrapperStyle && wrapperStyle[position],
-          ]}
+        <TouchableWithoutFeedback
+          onPress={onPress}
+          onLongPress={onLongPress}
+          accessibilityRole='text'
+          {...props.touchableProps}
         >
-          <TouchableWithoutFeedback
-            onPress={this.onPress}
-            onLongPress={this.onLongPress}
-            accessibilityRole='text'
-            {...this.props.touchableProps}
-          >
-            <View>
-              {this.renderBubbleContent()}
-              <View
-                style={[
-                  styles[position].bottom,
-                  bottomContainerStyle && bottomContainerStyle[position],
-                ]}
-              >
-                {this.renderUsername()}
-                {this.renderTime()}
-                {this.renderTicks()}
-              </View>
+          <View>
+            {renderBubbleContent()}
+            <View
+              style={[
+                styles[position].bottom,
+                bottomContainerStyle && bottomContainerStyle[position],
+              ]}
+            >
+              {renderUsername()}
+              {renderTime()}
+              {renderTicks()}
             </View>
-          </TouchableWithoutFeedback>
-        </View>
-        {this.renderQuickReplies()}
+          </View>
+        </TouchableWithoutFeedback>
       </View>
-    )
-  }
+      {renderQuickReplies()}
+    </View>
+  )
 }
+
+export default Bubble

package/src/Day/index.tsx

@@ -1,4 +1,4 @@
-import * as React from 'react'
+import React, { useMemo } from 'react'
 import {
   Text,
   View,
@@ -29,7 +29,7 @@ export function Day ({
 }: DayProps) {
   const { getLocale } = useChatContext()
 
-  const dateStr = React.useMemo(() => {
+  const dateStr = useMemo(() => {
     if (createdAt == null)
       return null
 

package/src/GiftedChat/index.tsx

@@ -56,7 +56,7 @@ import styles from './styles'
 dayjs.extend(localizedFormat)
 
 function GiftedChat<TMessage extends IMessage = IMessage> (
-  props: GiftedChatProps
+  props: GiftedChatProps<TMessage>
 ) {
   const {
     messages = [],
@@ -94,9 +94,9 @@ function GiftedChat<TMessage extends IMessage = IMessage> (
   const actionSheetRef = useRef<ActionSheetProviderRef>(null)
 
   const messageContainerRef = useMemo(
-    () => props.messageContainerRef || createRef<AnimatedList>(),
+    () => props.messageContainerRef || createRef<AnimatedList<TMessage>>(),
     [props.messageContainerRef]
-  )
+  ) as RefObject<AnimatedList<TMessage>>
 
   const textInputRef = useMemo(
     () => props.textInputRef || createRef<TextInput>(),
@@ -205,9 +205,9 @@ function GiftedChat<TMessage extends IMessage = IMessage> (
 
     const { messagesContainerStyle, ...messagesContainerProps } = props
 
-    const fragment = (
+    return (
       <View style={[stylesCommon.fill, messagesContainerStyle]}>
-        <MessageContainer
+        <MessageContainer<TMessage>
           {...messagesContainerProps}
           invertibleScrollViewProps={{
             inverted,
@@ -220,8 +220,6 @@ function GiftedChat<TMessage extends IMessage = IMessage> (
         {renderChatFooter?.()}
       </View>
     )
-
-    return fragment
   }, [
     isInitialized,
     isTyping,
@@ -449,10 +447,10 @@ function GiftedChat<TMessage extends IMessage = IMessage> (
   )
 }
 
-function GiftedChatWrapper (props: GiftedChatProps) {
+function GiftedChatWrapper<TMessage extends IMessage = IMessage> (props: GiftedChatProps<TMessage>) {
   return (
     <KeyboardProvider>
-      <GiftedChat {...props} />
+      <GiftedChat<TMessage> {...props} />
     </KeyboardProvider>
   )
 }

package/src/GiftedChat/types.ts

@@ -30,12 +30,12 @@ import { QuickRepliesProps } from '../QuickReplies'
 import { SendProps } from '../Send'
 import { SystemMessageProps } from '../SystemMessage'
 import { TimeProps } from '../Time'
-import MessageContainer, { AnimatedList, ListViewProps } from '../MessageContainer'
-import Bubble from '../Bubble'
+import { AnimatedList, ListViewProps, MessageContainerProps } from '../MessageContainer'
+import { BubbleProps } from '../Bubble'
 
-export interface GiftedChatProps<TMessage extends IMessage = IMessage> extends Partial<Omit<typeof MessageContainer<TMessage>, 'isScrollToBottomEnabled'>> {
+export interface GiftedChatProps<TMessage extends IMessage> extends Partial<MessageContainerProps<TMessage>> {
   /* Message container ref */
-  messageContainerRef?: RefObject<AnimatedList>
+  messageContainerRef?: RefObject<AnimatedList<TMessage>>
   /* text input ref */
   textInputRef?: RefObject<TextInput>
   /* Messages to display */
@@ -144,7 +144,7 @@ export interface GiftedChatProps<TMessage extends IMessage = IMessage> extends P
   /* Custom message avatar; set to null to not render any avatar for the message */
   renderAvatar?: null | ((props: AvatarProps<TMessage>) => React.ReactNode)
   /* Custom message bubble */
-  renderBubble?(props: Bubble<TMessage>['props']): React.ReactNode
+  renderBubble?(props: BubbleProps<TMessage>): React.ReactNode
   /* Custom system message */
   renderSystemMessage?(props: SystemMessageProps<TMessage>): React.ReactNode
   /* Callback when a message bubble is pressed; default is to do nothing */
@@ -165,13 +165,13 @@ export interface GiftedChatProps<TMessage extends IMessage = IMessage> extends P
   /* Custom message video */
   renderMessageAudio?(props: MessageAudioProps<TMessage>): React.ReactNode
   /* Custom view inside the bubble */
-  renderCustomView?(props: Bubble<TMessage>['props']): React.ReactNode
+  renderCustomView?(props: BubbleProps<TMessage>): React.ReactNode
   /* Custom day above a message */
   renderDay?(props: DayProps): React.ReactNode
   /* Custom time inside a message */
   renderTime?(props: TimeProps<TMessage>): React.ReactNode
   /* Custom footer component on the ListView, e.g. 'User is typing...' */
-  renderFooter?(): React.ReactNode
+  renderFooter?(props: MessageContainerProps<TMessage>): React.ReactNode
   /* Custom component to render in the ListView when messages are empty */
   renderChatEmpty?(): React.ReactNode
   /* Custom component to render below the MessageContainer (separate from the ListView) */

package/src/GiftedChatContext.ts

@@ -1,4 +1,4 @@
-import * as React from 'react'
+import { createContext, useContext } from 'react'
 import {
   ActionSheetOptions,
 } from '@expo/react-native-action-sheet'
@@ -13,11 +13,11 @@ export interface IGiftedChatContext {
   getLocale(): string
 }
 
-export const GiftedChatContext = React.createContext<IGiftedChatContext>({
+export const GiftedChatContext = createContext<IGiftedChatContext>({
   getLocale: () => 'en',
   actionSheet: () => ({
     showActionSheetWithOptions: () => {},
   }),
 })
 
-export const useChatContext = () => React.useContext(GiftedChatContext)
+export const useChatContext = () => useContext(GiftedChatContext)

package/src/InputToolbar.tsx

@@ -40,6 +40,7 @@ export function InputToolbar<TMessage extends IMessage = IMessage> (
 
   const actionsFragment = useMemo(() => {
     const props = {
+      onPressActionButton,
       options,
       optionTintColor,
       icon,

package/src/Message/index.tsx

@@ -114,22 +114,16 @@ let Message: React.FC<MessageProps<IMessage>> = (props: MessageProps<IMessage>)
 }
 
 Message = memo(Message, (props, nextProps) => {
-  const next = nextProps.currentMessage!
-  const current = props.currentMessage!
-  const { previousMessage, nextMessage } = props
-  const nextPropsMessage = nextProps.nextMessage
-  const nextPropsPreviousMessage = nextProps.previousMessage
-
-  let shouldUpdate =
-    props.shouldUpdateMessage?.(props, nextProps) || false
-
-  shouldUpdate =
-    shouldUpdate ||
-    !isEqual(current, next) ||
-    !isEqual(previousMessage, nextPropsPreviousMessage) ||
-    !isEqual(nextMessage, nextPropsMessage)
-
-  return shouldUpdate
+  const shouldUpdate =
+    props.shouldUpdateMessage?.(props, nextProps) ||
+    !isEqual(props.currentMessage!, nextProps.currentMessage!) ||
+    !isEqual(props.previousMessage, nextProps.previousMessage) ||
+    !isEqual(props.nextMessage, nextProps.nextMessage)
+
+  if (shouldUpdate)
+    return false
+
+  return true
 })
 
 export default Message