stream-chat-react-native-core 5.34.0-beta.3 → 5.34.1-beta.1

package/src/components/MessageInput/components/InputGiphySearch.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 
-import type { ChannelContextValue } from '../../../contexts/channelContext/ChannelContext';
 import {
   MessageInputContextValue,
   useMessageInputContext,
@@ -34,23 +33,38 @@ const styles = StyleSheet.create({
   },
 });
 
-export type InputGiphySearchPropsWithContext<
+export type InputGiphySearchProps<
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  MessageInputContextValue<StreamChatGenerics>,
-  'additionalTextInputProps' | 'cooldownEndsAt' | 'setGiphyActive' | 'setShowMoreOptions'
-> &
-  Pick<ChannelContextValue<StreamChatGenerics>, 'disabled'>;
+> = Partial<
+  Pick<
+    MessageInputContextValue<StreamChatGenerics>,
+    'additionalTextInputProps' | 'cooldownEndsAt' | 'setGiphyActive' | 'setShowMoreOptions'
+  >
+> & {
+  disabled: boolean;
+};
 
-export const InputGiphySearchWithContext = <
+export const InputGiphySearch = <
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >({
-  additionalTextInputProps,
-  cooldownEndsAt,
+  additionalTextInputProps: propAdditionalTextInputProps,
+  cooldownEndsAt: propCooldownEndsAt,
   disabled,
-  setGiphyActive,
-  setShowMoreOptions,
-}: InputGiphySearchPropsWithContext<StreamChatGenerics>) => {
+  setGiphyActive: propSetGiphyActive,
+  setShowMoreOptions: propSetShowMoreOptions,
+}: InputGiphySearchProps<StreamChatGenerics>) => {
+  const {
+    additionalTextInputProps: contextAdditionalTextInputProps,
+    cooldownEndsAt: contextCooldownEndsAt,
+    setGiphyActive: contextSetGiphyActive,
+    setShowMoreOptions: contextSetShowMoreOptions,
+  } = useMessageInputContext<StreamChatGenerics>();
+
+  const additionalTextInputProps = propAdditionalTextInputProps || contextAdditionalTextInputProps;
+  const cooldownEndsAt = propCooldownEndsAt || contextCooldownEndsAt;
+  const setGiphyActive = propSetGiphyActive || contextSetGiphyActive;
+  const setShowMoreOptions = propSetShowMoreOptions || contextSetShowMoreOptions;
+
   const { seconds: cooldownRemainingSeconds } = useCountdown(cooldownEndsAt);
 
   const {
@@ -88,42 +102,4 @@ export const InputGiphySearchWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: InputGiphySearchPropsWithContext<StreamChatGenerics>,
-  nextProps: InputGiphySearchPropsWithContext<StreamChatGenerics>,
-) => {
-  const { disabled: prevDisabled } = prevProps;
-  const { disabled: nextDisabled } = nextProps;
-
-  const disabledEqual = prevDisabled === nextDisabled;
-  if (!disabledEqual) return false;
-
-  return true;
-};
-
-const MemoizedInputGiphySearch = React.memo(
-  InputGiphySearchWithContext,
-  areEqual,
-) as typeof InputGiphySearchWithContext;
-
-export type InputGiphySearchProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<InputGiphySearchPropsWithContext<StreamChatGenerics>>;
-
-export const InputGiphySearch = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: InputGiphySearchProps<StreamChatGenerics>,
-) => {
-  const { additionalTextInputProps, cooldownEndsAt, setGiphyActive, setShowMoreOptions } =
-    useMessageInputContext<StreamChatGenerics>();
-
-  return (
-    <MemoizedInputGiphySearch
-      {...{ additionalTextInputProps, cooldownEndsAt, setGiphyActive, setShowMoreOptions }}
-      {...props}
-    />
-  );
-};
-
 InputGiphySearch.displayName = 'InputGiphySearch{messageInput}';

package/src/components/MessageInput/components/InputReplyStateHeader.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 
-import type { ChannelContextValue } from '../../../contexts/channelContext/ChannelContext';
 import {
   MessageInputContextValue,
   useMessageInputContext,
@@ -25,19 +24,21 @@ const styles = StyleSheet.create({
   },
 });
 
-export type InputReplyStateHeaderPropsWithContext<
+export type InputReplyStateHeaderProps<
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<MessageInputContextValue<StreamChatGenerics>, 'clearQuotedMessageState' | 'resetInput'> &
-  Pick<ChannelContextValue<StreamChatGenerics>, 'disabled'>;
+> = Partial<
+  Pick<MessageInputContextValue<StreamChatGenerics>, 'clearQuotedMessageState' | 'resetInput'>
+>;
 
-export const InputReplyStateHeaderWithContext = <
+export const InputReplyStateHeader = <
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >({
-  clearQuotedMessageState,
-  disabled,
-  resetInput,
-}: InputReplyStateHeaderPropsWithContext<StreamChatGenerics>) => {
+  clearQuotedMessageState: propClearQuotedMessageState,
+  resetInput: propResetInput,
+}: InputReplyStateHeaderProps<StreamChatGenerics>) => {
   const { t } = useTranslationContext();
+  const { clearQuotedMessageState: contextClearQuotedMessageState, resetInput: contextResetInput } =
+    useMessageInputContext();
   const {
     theme: {
       colors: { black, grey, grey_gainsboro },
@@ -47,6 +48,9 @@ export const InputReplyStateHeaderWithContext = <
     },
   } = useTheme();
 
+  const clearQuotedMessageState = propClearQuotedMessageState || contextClearQuotedMessageState;
+  const resetInput = propResetInput || contextResetInput;
+
   return (
     <View style={[styles.replyBoxHeader, editingBoxHeader]}>
       <CurveLineLeftUp pathFill={grey_gainsboro} />
@@ -54,10 +58,13 @@ export const InputReplyStateHeaderWithContext = <
         {t<string>('Reply to Message')}
       </Text>
       <TouchableOpacity
-        disabled={disabled}
         onPress={() => {
-          resetInput();
-          clearQuotedMessageState();
+          if (resetInput) {
+            resetInput();
+          }
+          if (clearQuotedMessageState) {
+            clearQuotedMessageState();
+          }
         }}
         testID='close-button'
       >
@@ -67,36 +74,4 @@ export const InputReplyStateHeaderWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: InputReplyStateHeaderPropsWithContext<StreamChatGenerics>,
-  nextProps: InputReplyStateHeaderPropsWithContext<StreamChatGenerics>,
-) => {
-  const { disabled: prevDisabled } = prevProps;
-  const { disabled: nextDisabled } = nextProps;
-
-  const disabledEqual = prevDisabled === nextDisabled;
-  if (!disabledEqual) return false;
-
-  return true;
-};
-
-const MemoizedInputReplyStateHeader = React.memo(
-  InputReplyStateHeaderWithContext,
-  areEqual,
-) as typeof InputReplyStateHeaderWithContext;
-
-export type InputReplyStateHeaderProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<InputReplyStateHeaderPropsWithContext<StreamChatGenerics>>;
-
-export const InputReplyStateHeader = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: InputReplyStateHeaderProps<StreamChatGenerics>,
-) => {
-  const { clearQuotedMessageState, resetInput } = useMessageInputContext<StreamChatGenerics>();
-
-  return <MemoizedInputReplyStateHeader {...{ clearQuotedMessageState, resetInput }} {...props} />;
-};
-
 InputReplyStateHeader.displayName = 'ReplyStateHeader{messageInput}';

package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap

@@ -1682,7 +1682,7 @@ exports[`Thread should match thread snapshot 1`] = `
                 {
                   "busy": undefined,
                   "checked": undefined,
-                  "disabled": false,
+                  "disabled": undefined,
                   "expanded": undefined,
                   "selected": undefined,
                 }
@@ -1778,7 +1778,7 @@ exports[`Thread should match thread snapshot 1`] = `
                 {
                   "busy": undefined,
                   "checked": undefined,
-                  "disabled": false,
+                  "disabled": undefined,
                   "expanded": undefined,
                   "selected": undefined,
                 }

package/src/contexts/messageContext/MessageContext.tsx

@@ -110,7 +110,7 @@ export type MessageContextValue<
   preventPress?: boolean;
   /** Whether or not the avatar show show next to Message */
   showAvatar?: boolean;
-} & Pick<ChannelContextValue<StreamChatGenerics>, 'channel' | 'disabled' | 'members'>;
+} & Pick<ChannelContextValue<StreamChatGenerics>, 'channel' | 'members'>;
 
 export const MessageContext = React.createContext(
   DEFAULT_BASE_CONTEXT_VALUE as MessageContextValue,

package/src/contexts/messageInputContext/MessageInputContext.tsx

@@ -219,7 +219,7 @@ export type LocalMessageInputContext<
 
 export type InputMessageInputContextValue<
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ChannelContextValue<StreamChatGenerics>, 'disabled'> & {
+> = {
   /**
    * Controls how many pixels to the top side the user has to scroll in order to lock the recording view and allow the user to lift their finger from the screen without stopping the recording.
    */
@@ -241,7 +241,7 @@ export type InputMessageInputContextValue<
    *
    * Defaults to and accepts same props as: [AttachButton](https://getstream.io/chat/docs/sdk/reactnative/ui-components/attach-button/)
    */
-  AttachButton: React.ComponentType<AttachButtonProps<StreamChatGenerics>>;
+  AttachButton: React.ComponentType<AttachButtonProps>;
   /**
    * Custom UI component for audio attachment upload preview.
    *
@@ -329,7 +329,7 @@ export type InputMessageInputContextValue<
    *
    * Defaults to and accepts same props as: [MoreOptionsButton](https://getstream.io/chat/docs/sdk/reactnative/ui-components/more-options-button/)
    */
-  MoreOptionsButton: React.ComponentType<MoreOptionsButtonProps<StreamChatGenerics>>;
+  MoreOptionsButton: React.ComponentType<MoreOptionsButtonProps>;
   /** Limit on the number of lines in the text input before scrolling */
   numberOfLines: number;
   quotedMessage: boolean | MessageType<StreamChatGenerics>;

package/src/contexts/messageInputContext/hooks/useCreateMessageInputContext.ts

@@ -31,7 +31,6 @@ export const useCreateMessageInputContext = <
   compressImageQuality,
   cooldownEndsAt,
   CooldownTimer,
-  disabled,
   doDocUploadRequest,
   doImageUploadRequest,
   editing,
@@ -151,7 +150,6 @@ export const useCreateMessageInputContext = <
       compressImageQuality,
       cooldownEndsAt,
       CooldownTimer,
-      disabled,
       doDocUploadRequest,
       doImageUploadRequest,
       editing,
@@ -231,7 +229,6 @@ export const useCreateMessageInputContext = <
       asyncIdsLength,
       asyncUploadsValue,
       cooldownEndsAt,
-      disabled,
       editingdep,
       fileUploadsValue,
       giphyActive,

package/src/utils/utils.ts

@@ -607,6 +607,7 @@ export const stringifyMessage = <
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >({
   deleted_at,
+  i18n,
   latest_reactions,
   reaction_groups,
   readBy,
@@ -630,7 +631,7 @@ export const stringifyMessage = <
           )
           .join()
       : ''
-  }${type}${deleted_at}${text}${readBy}${reply_count}${status}${updated_at}`;
+  }${type}${deleted_at}${text}${readBy}${reply_count}${status}${updated_at}${JSON.stringify(i18n)}`;
 
 /**
  * Reduces a list of messages to strings that are used in useEffect & useMemo

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.34.0-beta.3"
+  "version": "5.34.1-beta.1"
 }