Skip to content

draft: merge images and video to "gallery" tab #5644

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

draft: merge images and video to "gallery" tab #5644

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee8ecab
draft: merge images and video to "gallery" tab
Simon-Laux Oct 30, 2025
442026e
Fix lint
Simon-Laux Oct 30, 2025
cb09300
Fix the issue that videos were not shown
Simon-Laux Oct 30, 2025
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
26 changes: 11 additions & 15 deletions packages/frontend/src/components/Gallery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import { useTranslationWritingDirection } from '../hooks/useTranslationFunction'

const log = getLogger('renderer/Gallery')

type MediaTabKey = 'webxdc_apps' | 'images' | 'video' | 'audio' | 'files'
type MediaTabKey = 'webxdc_apps' | 'gallery' | 'audio' | 'files'

type GalleryElement = (
props: GalleryAttachmentElementProps & {
Expand All @@ -54,13 +54,13 @@ const MediaTabs: Readonly<{
values: ['Webxdc'],
element: WebxdcAttachment,
},
images: {
values: ['Gif', 'Image'],
element: ImageAttachment,
},
video: {
values: ['Video'],
element: VideoAttachment,
gallery: {
values: ['Gif', 'Image', 'Video'],
element: props =>
props.loadResult.kind === 'message' &&
props.loadResult.viewType === 'Video'
? VideoAttachment(props)
: ImageAttachment(props),
},
audio: {
values: ['Audio', 'Voice'],
Expand Down Expand Up @@ -203,7 +203,7 @@ export default class Gallery extends Component<
if (this.props.chatId !== prevProps.chatId) {
// reset
this.reset()
this.onSelect('images')
this.onSelect('webxdc_apps')
}
}

Expand All @@ -218,7 +218,7 @@ export default class Gallery extends Component<
this.setState({ loading: true })

BackendRemote.rpc
.getChatMedia(accountId, chatId, msgTypes[0], msgTypes[1], null)
.getChatMedia(accountId, chatId, msgTypes[0], msgTypes[1], msgTypes[2])
.then(async media_ids => {
const mediaLoadResult =
tab !== 'files'
Expand Down Expand Up @@ -247,14 +247,10 @@ export default class Gallery extends Component<
const allMedia = this.props.chatId === 'all'
const tx = window.static_translate // static because dynamic isn't too important here
switch (tab) {
case 'images':
case 'gallery':
return allMedia
? tx('tab_all_media_empty_hint')
: tx('tab_image_empty_hint')
case 'video':
return allMedia
? tx('tab_all_media_empty_hint')
: tx('tab_video_empty_hint')
case 'audio':
return allMedia
? tx('tab_all_media_empty_hint')
Expand Down