Skip to content
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

Story block: Add more media options to choose from in the editor #19628

Merged
merged 6 commits into from
May 6, 2021
Merged

Story block: Add more media options to choose from in the editor #19628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42cfc56
[not verified] Show External media options on the story block as well
Tug Apr 22, 2021
f027ecb
Add changelog entry
Tug Apr 28, 2021
08794be
Add Comment: prefix to the changelog entry so it's ignored by the rel…
Tug Apr 30, 2021
414cb2d
Fix MediaPlaceholder regression when using hook: ids are given instea…
Tug Apr 30, 2021
8fb1720
Merge remote-tracking branch 'origin/master' into story-block/add/mor…
jeherve May 6, 2021
54b1b1b
Merge remote-tracking branch 'origin/master' into story-block/add/mor…
Tug May 6, 2021
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
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/story-block-add-more-media-options
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: other

Comment: Story block: Add more media options to choose from in the editor
17 changes: 13 additions & 4 deletions projects/plugins/jetpack/extensions/blocks/story/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import './editor.scss';

const ALLOWED_MEDIA_TYPES = [ 'image', 'video' ];

export const pickRelevantMediaFiles = ( media, sizeSlug = 'large' ) => {
export const pickRelevantMediaFiles = media => {
const mediaProps = pick( media, [
'alt',
'title',
Expand All @@ -37,8 +37,8 @@ export const pickRelevantMediaFiles = ( media, sizeSlug = 'large' ) => {
'height',
] );
mediaProps.url =
get( media, [ 'sizes', sizeSlug, 'url' ] ) ||
get( media, [ 'media_details', 'sizes', sizeSlug, 'source_url' ] ) ||
get( media, [ 'sizes', 'large', 'url' ] ) ||
get( media, [ 'media_details', 'sizes', 'large', 'source_url' ] ) ||
get( media, [ 'media_details', 'videopress', 'original' ] ) ||
get( media, [ 'media_details', 'original', 'url' ] ) ||
media.url;
Expand All @@ -63,7 +63,16 @@ export default withNotices( function StoryEdit( {
const lockName = 'storyBlockLock';

const onSelectMedia = newMediaFiles => {
const allMedia = newMediaFiles.map( file => pickRelevantMediaFiles( file ) );
const allMedia = newMediaFiles
.map( newMedia => {
// MediaPlaceholder passes only the media ids as value to MediaUpload, so we're only getting those back
if ( ! isNaN( newMedia ) ) {
const existingMedia = mediaFiles.find( mediaFile => mediaFile.id === newMedia );
return existingMedia || { id: newMedia };
}
return newMedia;
} )
.map( pickRelevantMediaFiles );
const uploadedMedias = allMedia.filter( media => ! isBlobURL( media.url ) );
// prevent saving blob urls in mediaFiles block attribute
if ( allMedia.length !== uploadedMedias.length ) {
Expand Down
1 change: 1 addition & 0 deletions projects/plugins/jetpack/extensions/shared/external-media/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ if ( isCurrentUserConnected() && 'function' === typeof useBlockEditContext ) {
'core/media-text',
'jetpack/image-compare',
'jetpack/slideshow',
'jetpack/story',
'jetpack/tiled-gallery',
];

Expand Down