Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect types for <GiftedChat /> component #2576

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix incorrect types for <GiftedChat /> component #2576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/GiftedChat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import { GiftedChatContext } from './GiftedChatContext'
import { InputToolbar, InputToolbarProps } from './InputToolbar'
import { LoadEarlier, LoadEarlierProps } from './LoadEarlier'
import Message from './Message'
import MessageContainer from './MessageContainer'
import MessageContainer, { MessageContainerProps } from './MessageContainer'
import { MessageImage, MessageImageProps } from './MessageImage'
import { MessageText, MessageTextProps } from './MessageText'
import {
Expand Down Expand Up @@ -66,9 +66,9 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'

dayjs.extend(localizedFormat)

export interface GiftedChatProps<TMessage extends IMessage = IMessage> extends Partial<Omit<MessageContainer<TMessage>, 'scrollToBottom'>> {
export interface GiftedChatProps<TMessage extends IMessage = IMessage> extends Partial<MessageContainerProps<TMessage>> {
/* Message container ref */
messageContainerRef?: React.RefObject<FlatList<IMessage>>
messageContainerRef?: React.RefObject<FlatList<TMessage>>
/* text input ref */
textInputRef?: React.RefObject<TextInput>
/* Messages to display */
Expand Down Expand Up @@ -204,7 +204,7 @@ export interface GiftedChatProps<TMessage extends IMessage = IMessage> extends P
/* 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) */
Expand Down Expand Up @@ -239,7 +239,7 @@ export interface GiftedChatProps<TMessage extends IMessage = IMessage> extends P
}

function GiftedChat<TMessage extends IMessage = IMessage> (
props: GiftedChatProps
props: GiftedChatProps<TMessage>
) {
const {
messages = [],
Expand Down Expand Up @@ -273,7 +273,7 @@ function GiftedChat<TMessage extends IMessage = IMessage> (
const actionSheetRef = useRef<ActionSheetProviderRef>(null)

const messageContainerRef = useMemo(
() => props.messageContainerRef || createRef<FlatList<IMessage>>(),
() => props.messageContainerRef || createRef<FlatList<TMessage>>(),
[props.messageContainerRef]
)

Expand Down Expand Up @@ -387,7 +387,7 @@ function GiftedChat<TMessage extends IMessage = IMessage> (

const fragment = (
<View style={[styles.fill, messagesContainerStyle]}>
<MessageContainer
<MessageContainer<TMessage>
{...messagesContainerProps}
invertibleScrollViewProps={{
inverted,
Expand Down
Loading