tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Bundle being used with incorrect prop types by using type-dependent key (#38721)

Browse Source
This commit is contained in:
Claire 2026-04-16 20:05:04 +02:00 committed by GitHub
parent fc1ba93cdc
commit 0e6180a5af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/components/media_attachments.jsx
View File

@ -65,7 +65,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
const description = audio.getIn(['translation', 'description']) || audio.get('description'); const description = audio.getIn(['translation', 'description']) || audio.get('description');
return ( return (
<Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} > <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} key='audio'>
{Component => ( {Component => (
<Component <Component
src={audio.get('url')} src={audio.get('url')}
@ -87,7 +87,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
const description = video.getIn(['translation', 'description']) || video.get('description'); const description = video.getIn(['translation', 'description']) || video.get('description');
return ( return (
<Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} > <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} key='video'>
{Component => ( {Component => (
<Component <Component
preview={video.get('preview_url')} preview={video.get('preview_url')}
@ -108,7 +108,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
); );
} else { } else {
return ( return (
<Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} > <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} key='gallery'>
{Component => ( {Component => (
<Component <Component
media={mediaAttachments} media={mediaAttachments}

6
app/javascript/mastodon/components/status.jsx
View File

@ -477,7 +477,7 @@ class Status extends ImmutablePureComponent {
if (['image', 'gifv', 'unknown'].includes(status.getIn(['media_attachments', 0, 'type'])) || status.get('media_attachments').size > 1) { if (['image', 'gifv', 'unknown'].includes(status.getIn(['media_attachments', 0, 'type'])) || status.get('media_attachments').size > 1) {
media = ( media = (
<Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}> <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} key='gallery'>
{Component => ( {Component => (
<Component <Component
media={status.get('media_attachments')} media={status.get('media_attachments')}
@ -499,7 +499,7 @@ class Status extends ImmutablePureComponent {
const description = attachment.getIn(['translation', 'description']) || attachment.get('description'); const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
media = ( media = (
<Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} > <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} key='audio'>
{Component => ( {Component => (
<Component <Component
src={attachment.get('url')} src={attachment.get('url')}
@ -525,7 +525,7 @@ class Status extends ImmutablePureComponent {
const description = attachment.getIn(['translation', 'description']) || attachment.get('description'); const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
media = ( media = (
<Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} > <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} key='video'>
{Component => ( {Component => (
<Component <Component
preview={attachment.get('preview_url')} preview={attachment.get('preview_url')}