Merge pull request #1299 from rylwl/feature/custom-upload-function

feat: Add customUploadFunction option to uploader for custom file upload

Author: xdan

src/modules/uploader/helpers/send.ts

@@ -21,8 +21,16 @@ export function send(
 ): Promise<IUploaderAnswer> {
 	const requestData = buildData(uploader, data);
 
-	const sendData = (
-		request: FormData | IDictionary<string> | string
+	const showProgress = (progress:number)=>{
+		uploader.j.progressbar.show().progress(progress);
+		if (progress >= 100) {
+			uploader.j.progressbar.hide();
+		}
+	}
+
+	let sendData = (
+		request: FormData | IDictionary<string> | string,
+		showProgress:(progress:number)=>void
 	): Promise<any> => {
 		const ajax = new Ajax<IUploaderAnswer>({
 			xhr: (): XMLHttpRequest => {
@@ -32,29 +40,21 @@ export function send(
 					(uploader.j.ow as any).FormData !== undefined &&
 					xhr.upload
 				) {
-					uploader.j.progressbar.show().progress(10);
-
+					showProgress(10);
 					xhr.upload.addEventListener(
 						'progress',
 						evt => {
 							if (evt.lengthComputable) {
 								let percentComplete = evt.loaded / evt.total;
 
 								percentComplete *= 100;
-
-								uploader.j.progressbar
-									.show()
-									.progress(percentComplete);
-
-								if (percentComplete >= 100) {
-									uploader.j.progressbar.hide();
-								}
+								showProgress(percentComplete)
 							}
 						},
 						false
 					);
 				} else {
-					uploader.j.progressbar.hide();
+					showProgress(100)
 				}
 
 				return xhr;
@@ -98,11 +98,15 @@ export function send(
 			});
 	};
 
+	if (isFunction(uploader.o.customUploadFunction)) {
+		sendData = uploader.o.customUploadFunction
+	}
+
 	if (isPromise(requestData)) {
-		return requestData.then(sendData).catch(error => {
+		return requestData.then((data)=>sendData(data, showProgress)).catch(error => {
 			uploader.o.error.call(uploader, error);
 		});
 	}
 
-	return sendData(requestData);
+	return sendData(requestData,showProgress);
 }

src/modules/widget/file-selector/file-selector.ts

@@ -57,7 +57,7 @@ export const FileSelectorWidget = (
 	if (
 		callbacks.upload &&
 		editor.o.uploader &&
-		(editor.o.uploader.url || editor.o.uploader.insertImageAsBase64URI)
+		(editor.o.uploader.url || editor.o.uploader.insertImageAsBase64URI || editor.o.uploader.customUploadFunction)
 	) {
 		const dragBox = editor.c.fromHTML(
 			'<div class="jodit-drag-and-drop__file-box">' +

src/types/uploader.d.ts

@@ -121,6 +121,21 @@ export interface IUploaderOptions<T> {
 	defaultHandlerError: HandlerError;
 
 	contentType: (this: T, requestData: any) => string | false;
+
+	/**
+	 * This method can be used to replace the function of uploading files
+	 * ```javascript
+	 * Jodit.make('#editor', {
+	 * 	uploader: {
+	 * 		customUploadFunction: (requestData, showProgress) => fetch(requestData).then((res)=>{
+	 *			showProgress(100)
+	 *			return res.json()
+	 *		})
+	 * 	}
+	 * });
+	 * ```
+	 */
+	customUploadFunction?: (requestData: any, showProgress:(progress:number) => void ) => Promise<IUploaderAnswer>;
 }
 
 export interface IUploader extends IViewComponent {