Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/SampleApp/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3584,7 +3584,7 @@ SPEC CHECKSUMS:
op-sqlite: a7e46cfdaebeef219fd0e939332967af9fe6d406
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f
RCTDeprecation: 300c5eb91114d4339b0bb39505d0f4824d7299b7
RCTRequired: e0446b01093475b7082fbeee5d1ef4ad1fe20ac4
RCTTypeSafety: cb974efcdc6695deedf7bf1eb942f2a0603a063f
Expand Down
3 changes: 2 additions & 1 deletion package/src/components/Channel/Channel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ import { AttachmentUploadProgressIndicator as AttachmentUploadProgressIndicatorD
import { AudioAttachmentUploadPreview as AudioAttachmentUploadPreviewDefault } from '../MessageInput/components/AttachmentPreview/AudioAttachmentUploadPreview';
import { FileAttachmentUploadPreview as FileAttachmentUploadPreviewDefault } from '../MessageInput/components/AttachmentPreview/FileAttachmentUploadPreview';
import { ImageAttachmentUploadPreview as ImageAttachmentUploadPreviewDefault } from '../MessageInput/components/AttachmentPreview/ImageAttachmentUploadPreview';
import { VideoAttachmentUploadPreview as VideoAttachmentUploadPreviewDefault } from '../MessageInput/components/AttachmentPreview/VideoAttachmentUploadPreview';
import { AudioRecorder as AudioRecorderDefault } from '../MessageInput/components/AudioRecorder/AudioRecorder';
import { AudioRecordingButton as AudioRecordingButtonDefault } from '../MessageInput/components/AudioRecorder/AudioRecordingButton';
import { AudioRecordingInProgress as AudioRecordingInProgressDefault } from '../MessageInput/components/AudioRecorder/AudioRecordingInProgress';
Expand Down Expand Up @@ -758,7 +759,7 @@ const ChannelWithContext = (props: PropsWithChildren<ChannelPropsWithContext>) =
UnreadMessagesNotification = UnreadMessagesNotificationDefault,
AttachmentUploadProgressIndicator = AttachmentUploadProgressIndicatorDefault,
UrlPreview = CardDefault,
VideoAttachmentUploadPreview = FileAttachmentUploadPreviewDefault,
VideoAttachmentUploadPreview = VideoAttachmentUploadPreviewDefault,
VideoThumbnail = VideoThumbnailDefault,
isOnline,
maximumMessageLimit,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import React, { useMemo } from 'react';

import { StyleSheet, Text, View } from 'react-native';

import { LocalImageAttachment, LocalVideoAttachment } from 'stream-chat';

import { FileAttachmentUploadPreview } from './FileAttachmentUploadPreview';
import { ImageAttachmentUploadPreview } from './ImageAttachmentUploadPreview';

import { useTheme } from '../../../../contexts/themeContext/ThemeContext';
import { Recorder } from '../../../../icons';
import { primitives } from '../../../../theme';
import { UploadAttachmentPreviewProps } from '../../../../types/types';
import { formatMsToMinSec } from '../../../../utils/utils';

export type VideoAttachmentUploadPreviewProps<CustomLocalMetadata = Record<string, unknown>> =
UploadAttachmentPreviewProps<LocalVideoAttachment<CustomLocalMetadata>>;

export const VideoAttachmentUploadPreview = ({
attachment,
handleRetry,
removeAttachments,
}: VideoAttachmentUploadPreviewProps) => {
const styles = useStyles();

const durationLabel = useMemo(
() => (attachment.duration ? formatMsToMinSec(attachment.duration) : undefined),
[attachment.duration],
);

return attachment.localMetadata.previewUri ? (
<>
<ImageAttachmentUploadPreview
attachment={attachment as unknown as LocalImageAttachment}
handleRetry={handleRetry}
removeAttachments={removeAttachments}
/>
{durationLabel ? (
<View style={styles.durationContainer}>
<Recorder height={12} width={12} pathFill={styles.durationText.color} />
<Text style={styles.durationText}>{durationLabel}</Text>
</View>
) : null}
</>
) : (
<FileAttachmentUploadPreview
attachment={attachment}
handleRetry={handleRetry}
removeAttachments={removeAttachments}
/>
);
};

const useStyles = () => {
const {
theme: {
semantics,
messageInput: {
videoAttachmentUploadPreview: { durationContainer, durationText },
},
},
} = useTheme();

const { badgeBgInverse, badgeText } = semantics;

return useMemo(
() =>
StyleSheet.create({
durationContainer: {
position: 'absolute',
left: 8,
bottom: 8,
borderRadius: primitives.radiusMax,
backgroundColor: badgeBgInverse,
paddingVertical: primitives.spacingXxs,
paddingHorizontal: primitives.spacingXs,
flexDirection: 'row',
alignItems: 'center',
...durationContainer,
},
durationText: {
fontSize: primitives.typographyFontSizeXxs,
fontWeight: primitives.typographyFontWeightBold,
color: badgeText,
marginLeft: primitives.spacingXxs,
...durationText,
},
}),
[badgeBgInverse, badgeText, durationContainer, durationText],
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import type { AttachmentUploadProgressIndicatorProps } from '../../components/Me
import { AudioAttachmentUploadPreviewProps } from '../../components/MessageInput/components/AttachmentPreview/AudioAttachmentUploadPreview';
import { FileAttachmentUploadPreviewProps } from '../../components/MessageInput/components/AttachmentPreview/FileAttachmentUploadPreview';
import { ImageAttachmentUploadPreviewProps } from '../../components/MessageInput/components/AttachmentPreview/ImageAttachmentUploadPreview';
import { VideoAttachmentUploadPreviewProps } from '../../components/MessageInput/components/AttachmentPreview/VideoAttachmentUploadPreview';
import type { AudioRecorderProps } from '../../components/MessageInput/components/AudioRecorder/AudioRecorder';
import type { AudioRecordingButtonProps } from '../../components/MessageInput/components/AudioRecorder/AudioRecordingButton';
import type { AudioRecordingInProgressProps } from '../../components/MessageInput/components/AudioRecorder/AudioRecordingInProgress';
Expand Down Expand Up @@ -251,7 +252,7 @@ export type InputMessageInputContextValue = {
AudioAttachmentUploadPreview: React.ComponentType<AudioAttachmentUploadPreviewProps>;
ImageAttachmentUploadPreview: React.ComponentType<ImageAttachmentUploadPreviewProps>;
FileAttachmentUploadPreview: React.ComponentType<FileAttachmentUploadPreviewProps>;
VideoAttachmentUploadPreview: React.ComponentType<FileAttachmentUploadPreviewProps>;
VideoAttachmentUploadPreview: React.ComponentType<VideoAttachmentUploadPreviewProps>;

/**
* Custom UI component to display the remaining cooldown a user will have to wait before
Expand Down
16 changes: 6 additions & 10 deletions package/src/contexts/themeContext/utils/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -411,10 +411,8 @@ export type Theme = {
overlay: ViewStyle;
};
videoAttachmentUploadPreview: {
recorderIconContainer: ViewStyle;
recorderIcon: IconProps;
itemContainer: ViewStyle;
upload: ImageStyle;
durationContainer: ViewStyle;
durationText: TextStyle;
};
wrapper: ViewStyle;
linkPreviewList: {
Expand Down Expand Up @@ -1160,6 +1158,10 @@ export const defaultTheme: Theme = {
upload: {},
wrapper: {},
},
videoAttachmentUploadPreview: {
durationContainer: {},
durationText: {},
},
inputBox: {},
inputBoxContainer: {},
inputBoxWrapper: {},
Expand Down Expand Up @@ -1222,12 +1224,6 @@ export const defaultTheme: Theme = {
indicatorColor: '',
overlay: {},
},
videoAttachmentUploadPreview: {
itemContainer: {},
recorderIcon: {},
recorderIconContainer: {},
upload: {},
},
wrapper: {},
linkPreviewList: {
linkContainer: {},
Expand Down
11 changes: 11 additions & 0 deletions package/src/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,17 @@ export const getDurationLabelFromDuration = (duration: number) => {
return durationLabel;
};

export const formatMsToMinSec = (ms: number) => {
const totalSeconds = Math.max(0, Math.floor(ms / 1000));
const minutes = Math.floor(totalSeconds / 60);
const seconds = totalSeconds % 60;

const mm = minutes; // no padding for minutes
const ss = String(seconds).padStart(2, '0');

return `${mm}m ${ss}s`.replace(/^0m\s/, '');
};

/**
* Utility to escape special characters in a string.
* @param text
Expand Down