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

File: Remove unnecessary synchronization effect #57585

Merged
merged 1 commit into from
Jan 6, 2024
Merged

File: Remove unnecessary synchronization effect #57585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 14 additions & 21 deletions packages/block-library/src/file/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ function ClipboardToolbarButton( { text, disabled } ) {
function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
const {
id,
fileId,
fileName,
href,
textLinkHref,
Expand All @@ -85,8 +84,7 @@ function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
);

const { createErrorNotice } = useDispatch( noticesStore );
const { toggleSelection, __unstableMarkNextChangeAsNotPersistent } =
useDispatch( blockEditorStore );
const { toggleSelection } = useDispatch( blockEditorStore );

useEffect( () => {
// Upload a file drag-and-dropped into the editor.
Expand All @@ -109,26 +107,21 @@ function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
}
}, [] );

useEffect( () => {
if ( ! fileId && href ) {
// Add a unique fileId to each file block.
__unstableMarkNextChangeAsNotPersistent();
setAttributes( { fileId: `wp-block-file--media-${ clientId }` } );
}
}, [ href, fileId, clientId ] );

function onSelectFile( newMedia ) {
if ( newMedia && newMedia.url ) {
const isPdf = newMedia.url.endsWith( '.pdf' );
setAttributes( {
href: newMedia.url,
fileName: newMedia.title,
textLinkHref: newMedia.url,
id: newMedia.id,
displayPreview: isPdf ? true : undefined,
previewHeight: isPdf ? 600 : undefined,
} );
if ( ! newMedia || ! newMedia.url ) {
return;
}

const isPdf = newMedia.url.endsWith( '.pdf' );
setAttributes( {
href: newMedia.url,
fileName: newMedia.title,
textLinkHref: newMedia.url,
id: newMedia.id,
displayPreview: isPdf ? true : undefined,
previewHeight: isPdf ? 600 : undefined,
fileId: `wp-block-file--media-${ clientId }`,
} );
}

function onUploadError( message ) {
Expand Down
Loading