stream-chat-react-native-core 9.6.1-beta.1 → 9.6.1-beta.3

package/lib/typescript/contexts/messageInputContext/MessageInputContext.d.ts

@@ -80,6 +80,14 @@ export type InputMessageInputContextValue = {
         localMessage: LocalMessage;
         options?: UpdateMessageOptions;
     }) => ReturnType<StreamChat['updateMessage']>;
+    /**
+     * Controls what happens when the attach button is pressed while the attachment picker is open.
+     * When true (default), the message input is focused, toggling from the picker to the keyboard.
+     * When false, the attachment picker is closed without focusing the input.
+     * @type boolean
+     * @default true
+     */
+    focusInputOnPickerClose: boolean;
     /** When false, CameraSelectorIcon will be hidden */
     hasCameraPicker: boolean;
     /** When false, CommandsButton will be hidden */

package/lib/typescript/contexts/messageInputContext/MessageInputContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageInputContext.d.ts","sourceRoot":"","sources":["../../../../src/contexts/messageInputContext/MessageInputContext.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MessageInputContext.d.ts","sourceRoot":"","sources":["../../../../src/contexts/messageInputContext/MessageInputContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EACZ,iBAAiB,EACjB,GAAG,EAMJ,MAAM,OAAO,CAAC;AACf,OAAO,EAAkB,SAAS,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGzE,OAAO,EACL,YAAY,EAEZ,kBAAkB,EAClB,UAAU,EACV,OAAO,IAAI,aAAa,EACxB,oBAAoB,EACpB,eAAe,EAChB,MAAM,aAAa,CAAC;AAgBrB,OAAO,EAA6B,UAAU,EAAkB,MAAM,cAAc,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAazC,MAAM,MAAM,wBAAwB,GAAG;IACrC,qBAAqB,EAAE,MAAM,IAAI,CAAC;IAClC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IACjD,oBAAoB,EAAE,MAAM,IAAI,CAAC;IACjC;;OAEG;IACH,kCAAkC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC;;OAEG;IACH,cAAc,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC;IAC7C;;OAEG;IACH,kBAAkB,EAAE,CAClB,SAAS,CAAC,EAAE,UAAU,KACnB,OAAO,CAAC;QAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC,CAAC;IAC9E,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,mBAAmB,EAAE,MAAM,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;IACxD,oBAAoB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,oBAAoB,EAAE,CAAC,cAAc,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,kBAAkB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG;IACpC,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C;;;OAGG;IACH,yBAAyB,EAAE,MAAM,CAAC;IAClC;;;OAGG;IACH,iCAAiC,EAAE,MAAM,CAAC;IAC1C;;;;OAIG;IACH,4BAA4B,EAAE,OAAO,CAAC;IACtC;;;OAGG;IACH,kCAAkC,EAAE,MAAM,CAAC;IAC3C;;OAEG;IACH,qBAAqB,EAAE,OAAO,CAAC;IAC/B;;;;OAIG;IACH,iCAAiC,EAAE,MAAM,CAAC;IAC1C;;;;;OAKG;IACH,4BAA4B,EAAE,MAAM,CAAC;IAErC,WAAW,EAAE,CAAC,MAAM,EAAE;QACpB,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,CAAC,EAAE,oBAAoB,CAAC;KAChC,KAAK,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC;IAE9C;;;;;;OAMG;IACH,uBAAuB,EAAE,OAAO,CAAC;IAEjC,oDAAoD;IACpD,eAAe,EAAE,OAAO,CAAC;IAEzB,gDAAgD;IAChD,WAAW,EAAE,OAAO,CAAC;IACrB,kDAAkD;IAClD,aAAa,EAAE,OAAO,CAAC;IACvB,mDAAmD;IACnD,cAAc,EAAE,OAAO,CAAC;IAExB,WAAW,EAAE,CAAC,MAAM,EAAE;QACpB,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,EAAE,aAAa,CAAC;QACvB,OAAO,CAAC,EAAE,kBAAkB,CAAC;KAC9B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,cAAc,CAAC;IAC1C,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAC3C,uBAAuB,CAAC,EAAE,MAAM,IAAI,CAAC;IACrC;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,eAAe,CAAC;IAEtC;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,IAAI,CAAC;IAErC;;;;OAIG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B,sBAAsB,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,IAAI,CAAC,wBAAwB,EAAE,aAAa,CAAC,KAAK,IAAI,CAAC;IAClG;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,KAAK,IAAI,CAAC;IAC9C,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,uBAAuB,EAAE,uBAAuB,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,wBAAwB,GAC7D,IAAI,CAAC,6BAA6B,EAAE,aAAa,CAAC,CAAC;AAErD,eAAO,MAAM,mBAAmB,yCAE/B,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,sBAGlC,iBAAiB,CAAC;IACnB,KAAK,EAAE,6BAA6B,CAAC;CACtC,CAAC,sBAyWD,CAAC;AAEF,eAAO,MAAM,sBAAsB,gCAUlC,CAAC"}

package/lib/typescript/contexts/messageInputContext/hooks/useCreateMessageInputContext.d.ts

@@ -1,4 +1,4 @@
 import type { ThreadContextValue } from '../../threadContext/ThreadContext';
 import type { MessageInputContextValue } from '../MessageInputContext';
-export declare const useCreateMessageInputContext: ({ additionalTextInputProps, allowSendBeforeAttachmentsUpload, asyncMessagesLockDistance, asyncMessagesMinimumPressDuration, asyncMessagesSlideToCancelDistance, audioRecordingSendOnComplete, attachmentPickerBottomSheetHeight, attachmentSelectionBarHeight, audioRecordingEnabled, closeAttachmentPicker, closePollCreationDialog, compressImageQuality, createPollOptionGap, editMessage, handleAttachButtonPress, hasCameraPicker, hasCommands, hasFilePicker, hasImagePicker, inputBoxRef, messageInputFloating, messageInputHeightStore, openAttachmentPicker, openPollCreationDialog, pickAndUploadImageFromNativePicker, pickFile, sendMessage, setInputBoxRef, setInputRef, showPollCreationDialog, takeAndUploadImage, uploadNewFile, audioRecorderManager, startVoiceRecording, deleteVoiceRecording, uploadVoiceRecording, stopVoiceRecording, thread, }: MessageInputContextValue & Pick<ThreadContextValue, "thread">) => MessageInputContextValue;
+export declare const useCreateMessageInputContext: ({ additionalTextInputProps, allowSendBeforeAttachmentsUpload, asyncMessagesLockDistance, asyncMessagesMinimumPressDuration, asyncMessagesSlideToCancelDistance, audioRecordingSendOnComplete, attachmentPickerBottomSheetHeight, attachmentSelectionBarHeight, audioRecordingEnabled, closeAttachmentPicker, closePollCreationDialog, compressImageQuality, createPollOptionGap, editMessage, focusInputOnPickerClose, handleAttachButtonPress, hasCameraPicker, hasCommands, hasFilePicker, hasImagePicker, inputBoxRef, messageInputFloating, messageInputHeightStore, openAttachmentPicker, openPollCreationDialog, pickAndUploadImageFromNativePicker, pickFile, sendMessage, setInputBoxRef, setInputRef, showPollCreationDialog, takeAndUploadImage, uploadNewFile, audioRecorderManager, startVoiceRecording, deleteVoiceRecording, uploadVoiceRecording, stopVoiceRecording, thread, }: MessageInputContextValue & Pick<ThreadContextValue, "thread">) => MessageInputContextValue;
 //# sourceMappingURL=useCreateMessageInputContext.d.ts.map

package/lib/typescript/contexts/messageInputContext/hooks/useCreateMessageInputContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCreateMessageInputContext.d.ts","sourceRoot":"","sources":["../../../../../src/contexts/messageInputContext/hooks/useCreateMessageInputContext.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAEvE,eAAO,MAAM,4BAA4B,GAAI,u0BAuC1C,wBAAwB,GAAG,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,6BAgD/D,CAAC"}
+{"version":3,"file":"useCreateMessageInputContext.d.ts","sourceRoot":"","sources":["../../../../../src/contexts/messageInputContext/hooks/useCreateMessageInputContext.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAEvE,eAAO,MAAM,4BAA4B,GAAI,g2BAwC1C,wBAAwB,GAAG,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,6BAiD/D,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "9.6.1-beta.1",
+  "version": "9.6.1-beta.3",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/Attachment/__tests__/buildGallery.test.ts

@@ -1,6 +1,9 @@
 import type { Attachment } from 'stream-chat';
 
-import { generateImageAttachment } from '../../../mock-builders/generator/attachment';
+import {
+  generateImageAttachment,
+  generateVideoAttachment,
+} from '../../../mock-builders/generator/attachment';
 import { buildGallery } from '../utils/buildGallery/buildGallery';
 
 describe('buildGallery', () => {
@@ -126,4 +129,35 @@ describe('buildGallery', () => {
     expect(t2.url.includes('&w=*')).toBe(true);
     expect(t2.url.includes('&resize=*')).toBe(true);
   });
+
+  it('resizes the thumb_url of a video attachment', () => {
+    const video = generateVideoAttachment({
+      image_url:
+        'https://us-east.stream-io-cdn.com/23kn4k2j3n4k2n3k4n23?sig=34k23n4k23nk423&oh=2532&ow=1170&s=v',
+      thumb_url:
+        'https://us-east.stream-io-cdn.com/23kn4k2j3n4k2n3k4n23?sig=34k23n4k23nk423&oh=2532&ow=1170&s=v',
+    });
+
+    const { thumbnailGrid } = buildGallery({
+      images: [video],
+      sizeConfig: defaultSizeConfig,
+    });
+
+    const thumbnail = thumbnailGrid[0][0];
+    expect(thumbnail.thumb_url?.includes('&h=')).toBe(true);
+    expect(thumbnail.thumb_url?.includes('&w=')).toBe(true);
+    expect(thumbnail.thumb_url?.includes('&resize=clip')).toBe(true);
+  });
+
+  it('leaves a non-resizable thumb_url untouched', () => {
+    const thumbUrl = 'https://not-a-stream-cdn.example.com/thumb.jpg';
+    const video = generateVideoAttachment({ thumb_url: thumbUrl });
+
+    const { thumbnailGrid } = buildGallery({
+      images: [video],
+      sizeConfig: defaultSizeConfig,
+    });
+
+    expect(thumbnailGrid[0][0].thumb_url).toBe(thumbUrl);
+  });
 });

package/src/components/Attachment/utils/buildGallery/buildThumbnail.ts

@@ -42,7 +42,15 @@ export function buildThumbnail({
     resizeMode: resizeMode
       ? resizeMode
       : ((image.original_height && image.original_width ? 'contain' : 'cover') as ImageResizeMode),
-    thumb_url: image.thumb_url,
+    thumb_url:
+      image.thumb_url && shouldResize
+        ? getResizedImageUrl({
+            height,
+            resizableCDNHosts,
+            url: image.thumb_url,
+            width,
+          })
+        : image.thumb_url,
     type: image.type,
     url: shouldResize
       ? getResizedImageUrl({

package/src/components/Channel/Channel.tsx

@@ -218,6 +218,7 @@ export type ChannelPropsWithContext = Pick<ChannelContextValue, 'channel'> &
       | 'compressImageQuality'
       | 'createPollOptionGap'
       | 'doFileUploadRequest'
+      | 'focusInputOnPickerClose'
       | 'handleAttachButtonPress'
       | 'hasCameraPicker'
       | 'hasCommands'
@@ -423,6 +424,7 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
     enableSwipeToReply = true,
     enforceUniqueReaction = false,
     FlatList = NativeHandlers.FlatList,
+    focusInputOnPickerClose = true,
     forceAlignMessages,
     getMessageGroupStyle,
     handleAttachButtonPress,
@@ -1651,6 +1653,7 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
     createPollOptionGap,
     doFileUploadRequest,
     editMessage,
+    focusInputOnPickerClose,
     handleAttachButtonPress,
     hasCameraPicker,
     hasCommands: hasCommands ?? !!clientChannelConfig?.commands?.length,

package/src/components/Channel/hooks/useCreateInputMessageInputContext.ts

@@ -17,6 +17,7 @@ export const useCreateInputMessageInputContext = ({
   createPollOptionGap,
   doFileUploadRequest,
   editMessage,
+  focusInputOnPickerClose,
   handleAttachButtonPress,
   hasCameraPicker,
   hasCommands,
@@ -49,6 +50,7 @@ export const useCreateInputMessageInputContext = ({
       createPollOptionGap,
       doFileUploadRequest,
       editMessage,
+      focusInputOnPickerClose,
       handleAttachButtonPress,
       hasCameraPicker,
       hasCommands,

package/src/components/MessageInput/__tests__/AttachButton.test.tsx

@@ -180,4 +180,35 @@ describe('AttachButton', () => {
       expect(queryByTestId('attachment-picker-list')).toBeTruthy();
     });
   });
+
+  it('should close the attachment picker on second press when focusInputOnPickerClose is false', async () => {
+    jest.spyOn(NativeHandler, 'isImageMediaLibraryAvailable').mockImplementation(() => true);
+
+    const channelProps = { channel, focusInputOnPickerClose: false };
+    const props = {};
+
+    renderComponent({ channelProps, client, props });
+
+    const { queryByTestId } = screen;
+
+    await waitFor(() => {
+      expect(queryByTestId('attach-button')).toBeTruthy();
+    });
+
+    act(() => {
+      fireEvent.press(screen.getByTestId('attach-button'));
+    });
+
+    await waitFor(() => {
+      expect(queryByTestId('attachment-picker-list')).toBeTruthy();
+    });
+
+    act(() => {
+      fireEvent.press(screen.getByTestId('attach-button'));
+    });
+
+    await waitFor(() => {
+      expect(queryByTestId('attachment-picker-list')).toBeNull();
+    });
+  });
 });

package/src/components/MessageInput/components/InputButtons/AttachButton.tsx

@@ -92,13 +92,23 @@ export type AttachButtonProps = Partial<AttachButtonPropsWithContext>;
  */
 export const AttachButton = (props: AttachButtonProps) => {
   const { disableAttachmentPicker } = useAttachmentPickerContext();
-  const { inputBoxRef, handleAttachButtonPress, openAttachmentPicker } = useMessageInputContext();
+  const {
+    closeAttachmentPicker,
+    focusInputOnPickerClose,
+    handleAttachButtonPress,
+    inputBoxRef,
+    openAttachmentPicker,
+  } = useMessageInputContext();
   const { attachmentPickerStore } = useAttachmentPickerContext();
   const { selectedPicker } = useAttachmentPickerState();
 
   const toggleAttachmentPicker = useStableCallback(() => {
     if (attachmentPickerStore.state.getLatestValue().selectedPicker) {
-      inputBoxRef.current?.focus();
+      if (focusInputOnPickerClose) {
+        inputBoxRef.current?.focus();
+      } else {
+        closeAttachmentPicker();
+      }
     } else {
       openAttachmentPicker();
     }

package/src/contexts/messageInputContext/MessageInputContext.tsx

@@ -128,6 +128,15 @@ export type InputMessageInputContextValue = {
     options?: UpdateMessageOptions;
   }) => ReturnType<StreamChat['updateMessage']>;
 
+  /**
+   * Controls what happens when the attach button is pressed while the attachment picker is open.
+   * When true (default), the message input is focused, toggling from the picker to the keyboard.
+   * When false, the attachment picker is closed without focusing the input.
+   * @type boolean
+   * @default true
+   */
+  focusInputOnPickerClose: boolean;
+
   /** When false, CameraSelectorIcon will be hidden */
   hasCameraPicker: boolean;
 

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

@@ -18,6 +18,7 @@ export const useCreateMessageInputContext = ({
   compressImageQuality,
   createPollOptionGap,
   editMessage,
+  focusInputOnPickerClose,
   handleAttachButtonPress,
   hasCameraPicker,
   hasCommands,
@@ -61,6 +62,7 @@ export const useCreateMessageInputContext = ({
       compressImageQuality,
       createPollOptionGap,
       editMessage,
+      focusInputOnPickerClose,
       handleAttachButtonPress,
       hasCameraPicker,
       hasCommands,

package/src/version.json

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