Skip to content

Commit

Permalink
Remove media collection bridge functions (#59547)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fluiddot
fluiddot authored Mar 4, 2024
1 parent 531328c commit 4ec760f
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 302 deletions.
12 changes: 0 additions & 12 deletions ...c/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ public static MediaType getEnum(String value) {

void mediaUploadSync(MediaSelectedCallback mediaSelectedCallback);

void mediaSaveSync(MediaSelectedCallback mediaSelectedCallback);

void requestImageFailedRetryDialog(int mediaId);

void requestImageUploadCancelDialog(int mediaId);
Expand Down Expand Up @@ -159,16 +157,6 @@ void gutenbergDidRequestUnsupportedBlockFallback(ReplaceUnsupportedBlockCallback

void onShowXpostSuggestions(Consumer<String> onResult);

void requestMediaFilesEditorLoad(ReadableArray mediaFiles, String blockId);

void requestMediaFilesFailedRetryDialog(ReadableArray mediaFiles);

void requestMediaFilesUploadCancelDialog(ReadableArray mediaFiles);

void requestMediaFilesSaveCancelDialog(ReadableArray mediaFiles);

void mediaFilesBlockReplaceSync(ReadableArray mediaFiles, String blockId);

void setFocalPointPickerTooltipShown(boolean tooltipShown);

void requestFocalPointPickerTooltipShown(FocalPointPickerTooltipShownCallback focalPointPickerTooltipShownCallback);
Expand Down
30 changes: 0 additions & 30 deletions ...a/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,6 @@ public void mediaUploadSync() {
mGutenbergBridgeJS2Parent.mediaUploadSync(getNewMediaSelectedCallback(false,null));
}

@ReactMethod
public void mediaSaveSync() {
mGutenbergBridgeJS2Parent.mediaSaveSync(getNewMediaSelectedCallback(true,null));
}

@ReactMethod
public void requestImageFailedRetryDialog(final int mediaId) {
mGutenbergBridgeJS2Parent.requestImageFailedRetryDialog(mediaId);
Expand Down Expand Up @@ -308,31 +303,6 @@ public void requestMediaEditor(String mediaUrl, final Callback onUploadMediaSele
mGutenbergBridgeJS2Parent.requestMediaEditor(getNewMediaSelectedCallback(false, onUploadMediaSelected), mediaUrl);
}

@ReactMethod
public void requestMediaFilesEditorLoad(ReadableArray mediaFiles, String blockId) {
mGutenbergBridgeJS2Parent.requestMediaFilesEditorLoad(mediaFiles, blockId);
}

@ReactMethod
public void requestMediaFilesFailedRetryDialog(ReadableArray mediaFiles) {
mGutenbergBridgeJS2Parent.requestMediaFilesFailedRetryDialog(mediaFiles);
}

@ReactMethod
public void requestMediaFilesUploadCancelDialog(ReadableArray mediaFiles) {
mGutenbergBridgeJS2Parent.requestMediaFilesUploadCancelDialog(mediaFiles);
}

@ReactMethod
public void requestMediaFilesSaveCancelDialog(ReadableArray mediaFiles) {
mGutenbergBridgeJS2Parent.requestMediaFilesSaveCancelDialog(mediaFiles);
}

@ReactMethod
public void mediaFilesBlockReplaceSync(ReadableArray mediaFiles, String blockId) {
mGutenbergBridgeJS2Parent.mediaFilesBlockReplaceSync(mediaFiles, blockId);
}

@ReactMethod
public void editorDidEmitLog(String message, int logLevel) {
mGutenbergBridgeJS2Parent.editorDidEmitLog(message, GutenbergBridgeJS2Parent.LogLevel.valueOf(logLevel));
Expand Down
58 changes: 0 additions & 58 deletions ...act-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ public class WPAndroidGlueCode {

private OnMediaLibraryButtonListener mOnMediaLibraryButtonListener;
private OnReattachMediaUploadQueryListener mOnReattachMediaUploadQueryListener;
private OnReattachMediaSavingQueryListener mOnReattachMediaSavingQueryListener;
private OnSetFeaturedImageListener mOnSetFeaturedImageListener;
private OnEditorMountListener mOnEditorMountListener;
private OnEditorAutosaveListener mOnEditorAutosaveListener;
Expand All @@ -102,7 +101,6 @@ public class WPAndroidGlueCode {
private OnGutenbergDidRequestEmbedFullscreenPreviewListener mOnGutenbergDidRequestEmbedFullscreenPreviewListener;
private OnGutenbergDidSendButtonPressedActionListener mOnGutenbergDidSendButtonPressedActionListener;
private ReplaceUnsupportedBlockCallback mReplaceUnsupportedBlockCallback;
private OnMediaFilesCollectionBasedBlockEditorListener mOnMediaFilesCollectionBasedBlockEditorListener;
private OnFocalPointPickerTooltipShownEventListener mOnFocalPointPickerTooltipShownListener;
private OnGutenbergDidRequestPreviewListener mOnGutenbergDidRequestPreviewListener;
private OnBlockTypeImpressionsEventListener mOnBlockTypeImpressionsEventListener;
Expand Down Expand Up @@ -177,14 +175,6 @@ public interface OnMediaLibraryButtonListener {
void onOtherMediaButtonClicked(String mediaSource, boolean allowMultipleSelection);
}

public interface OnMediaFilesCollectionBasedBlockEditorListener {
void onRequestMediaFilesEditorLoad(ArrayList<Object> mediaFiles, String blockId);
void onCancelUploadForMediaCollection(ArrayList<Object> mediaFiles);
void onRetryUploadForMediaCollection(ArrayList<Object> mediaFiles);
void onCancelSaveForMediaCollection(ArrayList<Object> mediaFiles);
void onMediaFilesBlockReplaceSync(ArrayList<Object> mediaFiles, String blockId);
}

public interface OnImageFullscreenPreviewListener {
void onImageFullscreenPreviewClicked(String mediaUrl);
}
Expand All @@ -193,10 +183,6 @@ public interface OnReattachMediaUploadQueryListener {
void onQueryCurrentProgressForUploadingMedia();
}

public interface OnReattachMediaSavingQueryListener {
void onQueryCurrentProgressForSavingMedia();
}

public interface OnSetFeaturedImageListener {
void onSetFeaturedImageButtonClicked(int mediaId);
}
Expand Down Expand Up @@ -363,12 +349,6 @@ public void mediaUploadSync(MediaSelectedCallback mediaSelectedCallback) {
mOnReattachMediaUploadQueryListener.onQueryCurrentProgressForUploadingMedia();
}

@Override
public void mediaSaveSync(MediaSelectedCallback mediaSelectedCallback) {
mMediaSelectedCallback = mediaSelectedCallback;
mOnReattachMediaSavingQueryListener.onQueryCurrentProgressForSavingMedia();
}

@Override
public void requestImageFailedRetryDialog(int mediaId) {
mOnMediaLibraryButtonListener.onRetryUploadForMediaClicked(mediaId);
Expand Down Expand Up @@ -512,40 +492,6 @@ public void onShowUserSuggestions(Consumer<String> onResult) {
mShowSuggestionsUtil.showXpostSuggestions(onResult);
}

@Override
public void requestMediaFilesEditorLoad(ReadableArray mediaFiles, String blockId) {
mOnMediaFilesCollectionBasedBlockEditorListener
.onRequestMediaFilesEditorLoad(mediaFiles.toArrayList(), blockId);
}

@Override
public void requestMediaFilesFailedRetryDialog(ReadableArray mediaFiles) {
mOnMediaFilesCollectionBasedBlockEditorListener.onRetryUploadForMediaCollection(
mediaFiles.toArrayList()
);
}

@Override
public void requestMediaFilesUploadCancelDialog(ReadableArray mediaFiles) {
mOnMediaFilesCollectionBasedBlockEditorListener.onCancelUploadForMediaCollection(
mediaFiles.toArrayList()
);
}

@Override
public void requestMediaFilesSaveCancelDialog(ReadableArray mediaFiles) {
mOnMediaFilesCollectionBasedBlockEditorListener.onCancelSaveForMediaCollection(
mediaFiles.toArrayList()
);
}

@Override
public void mediaFilesBlockReplaceSync(ReadableArray mediaFiles, String blockId) {
mOnMediaFilesCollectionBasedBlockEditorListener.onMediaFilesBlockReplaceSync(
mediaFiles.toArrayList(), blockId
);
}

@Override
public void setFocalPointPickerTooltipShown(boolean showTooltip) {
mOnFocalPointPickerTooltipShownListener.onSetFocalPointPickerTooltipShown(showTooltip);
Expand Down Expand Up @@ -693,7 +639,6 @@ public void onCreateView(Context initContext,
public void attachToContainer(ViewGroup viewGroup,
OnMediaLibraryButtonListener onMediaLibraryButtonListener,
OnReattachMediaUploadQueryListener onReattachMediaUploadQueryListener,
OnReattachMediaSavingQueryListener onReattachMediaSavingQueryListener,
OnSetFeaturedImageListener onSetFeaturedImageListener,
OnEditorMountListener onEditorMountListener,
OnEditorAutosaveListener onEditorAutosaveListener,
Expand All @@ -705,7 +650,6 @@ public void attachToContainer(ViewGroup viewGroup,
OnGutenbergDidRequestEmbedFullscreenPreviewListener onGutenbergDidRequestEmbedFullscreenPreviewListener,
OnGutenbergDidSendButtonPressedActionListener onGutenbergDidSendButtonPressedActionListener,
ShowSuggestionsUtil showSuggestionsUtil,
OnMediaFilesCollectionBasedBlockEditorListener onMediaFilesCollectionBasedBlockEditorListener,
OnFocalPointPickerTooltipShownEventListener onFocalPointPickerTooltipListener,
OnGutenbergDidRequestPreviewListener onGutenbergDidRequestPreviewListener,
OnBlockTypeImpressionsEventListener onBlockTypeImpressionsEventListener,
Expand All @@ -721,7 +665,6 @@ public void attachToContainer(ViewGroup viewGroup,

mOnMediaLibraryButtonListener = onMediaLibraryButtonListener;
mOnReattachMediaUploadQueryListener = onReattachMediaUploadQueryListener;
mOnReattachMediaSavingQueryListener = onReattachMediaSavingQueryListener;
mOnSetFeaturedImageListener = onSetFeaturedImageListener;
mOnEditorMountListener = onEditorMountListener;
mOnEditorAutosaveListener = onEditorAutosaveListener;
Expand All @@ -732,7 +675,6 @@ public void attachToContainer(ViewGroup viewGroup,
mOnGutenbergDidRequestEmbedFullscreenPreviewListener = onGutenbergDidRequestEmbedFullscreenPreviewListener;
mOnGutenbergDidSendButtonPressedActionListener = onGutenbergDidSendButtonPressedActionListener;
mShowSuggestionsUtil = showSuggestionsUtil;
mOnMediaFilesCollectionBasedBlockEditorListener = onMediaFilesCollectionBasedBlockEditorListener;
mOnFocalPointPickerTooltipShownListener = onFocalPointPickerTooltipListener;
mOnGutenbergDidRequestPreviewListener = onGutenbergDidRequestPreviewListener;
mOnBlockTypeImpressionsEventListener = onBlockTypeImpressionsEventListener;
Expand Down
83 changes: 0 additions & 83 deletions packages/react-native-bridge/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,16 +262,6 @@ export function mediaUploadSync() {
return RNReactNativeGutenbergBridge.mediaUploadSync();
}

/**
* Request to start listening to save events when in-progress saves are in place
*
* For example, when media is being saved and the user re-enters the editor
*
*/
export function mediaSaveSync() {
return RNReactNativeGutenbergBridge.mediaSaveSync();
}

export function requestImageFailedRetryDialog( mediaId ) {
return RNReactNativeGutenbergBridge.requestImageFailedRetryDialog(
mediaId
Expand Down Expand Up @@ -352,79 +342,6 @@ export function showXpostSuggestions() {
return RNReactNativeGutenbergBridge.showXpostSuggestions();
}

/**
* Request the host app to show the block for editing its mediaFiles collection
*
* For example, a mediaFiles collection editor can make special handling of visualization
* in this regard.
*
* @param {Array<Map>} mediaFiles the mediaFiles attribute of the block, containing data about each media item.
* @param {string} blockClientId the clientId of the block.
*/
export function requestMediaFilesEditorLoad( mediaFiles, blockClientId ) {
RNReactNativeGutenbergBridge.requestMediaFilesEditorLoad(
mediaFiles,
blockClientId
);
}

/**
* Request the host app to show a retry dialog for mediaFiles arrays which contained items that failed
* to upload
*
* For example, tapping on a failed-media overlay would trigger this request and a "Retry?" dialog
* would be presented to the user
*
* @param {Array<Map>} mediaFiles the mediaFiles attribute of the block, containing data about each media item
*/
export function requestMediaFilesFailedRetryDialog( mediaFiles ) {
RNReactNativeGutenbergBridge.requestMediaFilesFailedRetryDialog(
mediaFiles
);
}

/**
* Request the host app to show a cancel dialog for mediaFiles arrays currently being uploaded
*
* For example, tapping on a block containing mediaFiles that are currently being uplaoded would trigger this request
* and a "Cancel upload?" dialog would be presented to the user.
*
* @param {Array<Map>} mediaFiles the mediaFiles attribute of the block, containing data about each media item
*/
export function requestMediaFilesUploadCancelDialog( mediaFiles ) {
RNReactNativeGutenbergBridge.requestMediaFilesUploadCancelDialog(
mediaFiles
);
}

/**
* Request the host app to show a cancel dialog for mediaFiles arrays currently undergoing a save operation
*
* Save operations on mediaFiles collection could be lengthy so for example, tapping on a mediaFiles-type block
* currently being saved would trigger this request and a "Cancel save?" dialog would be presented to the user
*
* @param {Array<Map>} mediaFiles the mediaFiles attribute of the block, containing data about each media item.
*/
export function requestMediaFilesSaveCancelDialog( mediaFiles ) {
RNReactNativeGutenbergBridge.requestMediaFilesSaveCancelDialog(
mediaFiles
);
}

/**
* Request the host app to listen to mediaFiles collection based block replacement signals
* in case such an event was enqueued
*
* @param {Array<Map>} mediaFiles the mediaFiles attribute of the block, containing data about each media item.
* @param {string} blockClientId the clientId of the block.
*/
export function mediaFilesBlockReplaceSync( mediaFiles, blockClientId ) {
RNReactNativeGutenbergBridge.mediaFilesBlockReplaceSync(
mediaFiles,
blockClientId
);
}

export function requestFocalPointPickerTooltipShown( callback ) {
return RNReactNativeGutenbergBridge.requestFocalPointPickerTooltipShown(
callback
Expand Down
23 changes: 0 additions & 23 deletions packages/react-native-bridge/ios/GutenbergBridgeDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,20 +249,6 @@ public protocol GutenbergBridgeDelegate: AnyObject {

func gutenbergDidSendButtonPressedAction(_ buttonType: Gutenberg.ActionButtonType)

// Media Collection

/// Tells the delegate that a media collection block requested to reconnect with media save coordinator.
///
func gutenbergDidRequestMediaSaveSync()

func gutenbergDidRequestMediaFilesEditorLoad(_ mediaFiles: [[String: Any]], blockId: String)

func gutenbergDidRequestMediaFilesFailedRetryDialog(_ mediaFiles: [[String: Any]])

func gutenbergDidRequestMediaFilesUploadCancelDialog(_ mediaFiles: [[String: Any]])

func gutenbergDidRequestMediaFilesSaveCancelDialog(_ mediaFiles: [[String: Any]])

func gutenbergDidRequestPreview()

/// Tells the delegate that the editor requested the block type impression counts
Expand Down Expand Up @@ -294,13 +280,4 @@ public extension GutenbergBridgeDelegate {
func gutenbergDidLayout() { }
func gutenbergDidRequestUnsupportedBlockFallback(for block: Block) { }
func gutenbergDidSendButtonPressedAction(_ buttonType: Gutenberg.ActionButtonType) { }

// Media Collection

func gutenbergDidRequestMediaSaveSync() {}
func gutenbergDidRequestMediaFilesEditorLoad(_ mediaFiles: [[String: Any]], blockId: String) { }
func gutenbergDidRequestMediaFilesFailedRetryDialog(_ mediaFiles: [[String: Any]]) { }
func gutenbergDidRequestMediaFilesUploadCancelDialog(_ mediaFiles: [[String: Any]]) { }
func gutenbergDidRequestMediaFilesSaveCancelDialog(_ mediaFiles: [[String: Any]]) { }
func gutenbergDidRequestMediaFilesBlockReplaceSync(_ mediaFiles: [[String: Any]], clientId: String) {}
}
7 changes: 0 additions & 7 deletions packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,9 @@ @interface RCT_EXTERN_MODULE(RNReactNativeGutenbergBridge, NSObject)
RCT_EXTERN_METHOD(requestUnsupportedBlockFallback:(NSString *)content blockId:(NSString *)blockId blockName:(NSString *)blockName blockTitle:(NSString *)blockTitle)
RCT_EXTERN_METHOD(showUserSuggestions:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)rejecter)
RCT_EXTERN_METHOD(showXpostSuggestions:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)rejecter)
RCT_EXTERN_METHOD(requestMediaFilesEditorLoad:(NSArray<NSDictionary *> *)mediaFiles blockId:(NSString *)blockId)
RCT_EXTERN_METHOD(requestMediaFilesFailedRetryDialog:(NSArray<NSDictionary *> *)mediaFiles)
RCT_EXTERN_METHOD(requestMediaFilesUploadCancelDialog:(NSArray<NSDictionary *> *)mediaFiles)
RCT_EXTERN_METHOD(requestMediaFilesSaveCancelDialog:(NSArray<NSDictionary *> *)mediaFiles)
RCT_EXTERN_METHOD(onCancelUploadForMediaCollection:(NSArray<NSDictionary *> *)mediaFiles)
RCT_EXTERN_METHOD(requestFocalPointPickerTooltipShown:(RCTResponseSenderBlock)callback)
RCT_EXTERN_METHOD(setFocalPointPickerTooltipShown:(BOOL)tooltipShown)
RCT_EXTERN_METHOD(actionButtonPressed:(NSString *)buttonType)
RCT_EXTERN_METHOD(mediaSaveSync)
RCT_EXTERN_METHOD(mediaFilesBlockReplaceSync:(NSArray<NSDictionary *> *)mediaFiles clientId:(NSString *)clientId)
RCT_EXTERN_METHOD(requestPreview)
RCT_EXTERN_METHOD(requestBlockTypeImpressions:(RCTResponseSenderBlock)callback)
RCT_EXTERN_METHOD(setBlockTypeImpressions:(NSDictionary *)impressions)
Expand Down
Loading

0 comments on commit 4ec760f

Please sign in to comment.