Skip to content

TRY: Block Editor: Separate server-side mediaUpload key to fix nested provider loop #76137

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

Closed
adamsilverstein wants to merge 5 commits into from
Closed

TRY: Block Editor: Separate server-side mediaUpload key to fix nested provider loop #76137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb0282d
Block Editor: Separate server-side mediaUpload key
adamsilverstein Mar 4, 2026
6cf585a
Fix Prettier formatting in useMediaUploadSettings
adamsilverstein Mar 4, 2026
ec67964
Fix linting issue
andrewserong Mar 5, 2026
dbb11a8
Merge branch 'trunk' into fix/separate-server-media-upload-key
adamsilverstein Apr 23, 2026
b27b564
Merge remote-tracking branch 'origin/fix/separate-server-media-upload…
adamsilverstein Apr 23, 2026
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
7 changes: 7 additions & 0 deletions packages/block-editor/src/components/provider/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,16 @@ export const ExperimentalBlockEditorProvider = withRegistryProvider(
: heicMediaUpload;
const interceptor = uploadFn.bind( null, registry, _settings );
interceptor.__isMediaUploadInterceptor = true;
// Preserve the original server-side function. If _settings already
// has __unstableMediaUploadServer (from a parent provider), reuse it;
// otherwise use _settings.mediaUpload (the real function at root level).
const serverMediaUpload =
_settings.__unstableMediaUploadServer ||
_settings.mediaUpload;
return {
..._settings,
mediaUpload: interceptor,
__unstableMediaUploadServer: serverMediaUpload,
};
}
return _settings;
Expand Down
3 changes: 2 additions & 1 deletion packages/block-editor/src/components/provider/use-media-upload-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import { useMemo } from '@wordpress/element';
function useMediaUploadSettings( settings = {} ) {
return useMemo(
() => ( {
mediaUpload: settings.mediaUpload,
mediaUpload:
settings.__unstableMediaUploadServer || settings.mediaUpload,
mediaSideload: settings.mediaSideload,
mediaFinalize: settings.mediaFinalize,
maxUploadFileSize: settings.maxUploadFileSize,
Expand Down
Loading