Skip to content

Revert "VideoPress: fix replace video from toolbar issues (#28432)" #28447

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

Merged
dhasilva merged 3 commits into from
Jan 18, 2023
Merged

Revert "VideoPress: fix replace video from toolbar issues (#28432)" #28447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db42a45
Revert "VideoPress: fix replace video from toolbar issues (#28432)"
dhasilva Jan 18, 2023
9a08f6f
Merge remote-tracking branch 'origin/trunk' into revert-28432-update/…
dhasilva Jan 18, 2023
e5fb248
fix version
dhasilva Jan 18, 2023
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: 0 additions & 4 deletions ...ts/packages/videopress/changelog/update-videopress-fix-replace-when-uploading-video-issue
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion projects/packages/videopress/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-videopress",
"version": "0.10.5-alpha",
"version": "0.10.4",
"description": "VideoPress package",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/videopress/#readme",
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion projects/packages/videopress/src/class-package-version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* The Package_Version class.
*/
class Package_Version {
const PACKAGE_VERSION = '0.10.5-alpha';
const PACKAGE_VERSION = '0.10.4';

const PACKAGE_SLUG = 'videopress';

Expand Down
3 changes: 2 additions & 1 deletion .../src/client/block-editor/blocks/video/components/videopress-uploader/uploader-progress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ const usePosterAndTitleUpdate = ( { setAttributes, videoData, onDone } ) => {

Promise.allSettled( updates ).then( () => {
setIsFinishingUpdate( false );
onDone( videoData );
setAttributes( videoData );
onDone();
} );
};

Expand Down
18 changes: 3 additions & 15 deletions projects/packages/videopress/src/client/block-editor/blocks/video/edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,19 +390,11 @@ export default function VideoPressEdit( {

// Render uploading block view
if ( isUploadingFile ) {
const handleDoneUpload = newVideoData => {
const handleDoneUpload = () => {
setIsUploadingFile( false );
if ( isReplacingFile.isReplacing ) {
const newBlockAttributes = {
...attributes,
...newVideoData,
};

// Delete attributes that are not needed.
delete newBlockAttributes.poster;

setIsReplacingFile( { isReplacing: false, prevAttrs: {} } );
replaceBlock( clientId, createBlock( 'videopress/video', newBlockAttributes ) );
replaceBlock( clientId, createBlock( 'videopress/video', { ...attributes } ) );
}
};

Expand Down Expand Up @@ -506,12 +498,8 @@ export default function VideoPressEdit( {
setFileToUpload( media );
} }
onSelectVideoFromLibrary={ media => {
// Depending on the endpoint, `videopress_guid` can be an array or a string.
const mediaGuid = Array.isArray( media.videopress_guid )
? media.videopress_guid[ 0 ]
: media.videopress_guid;
const mediaGuid = media.videopress_guid?.[ 0 ] ?? media.videopress_guid;
if ( ! mediaGuid ) {
debug( 'No media guid provided' );
return;
}

Expand Down