@mbs-dev/react-editor 1.12.0 → 1.13.1

package/dist/Editor.js

@@ -89,33 +89,10 @@ var uploaderConfig = function (apiUrl, imageUrl, selectionRef) { return ({
         return formdata;
     },
     isSuccess: function (e) {
-        var _a, _b;
-        var err = (_a = (typeof (e === null || e === void 0 ? void 0 : e.error) === 'number' ? e.error : undefined)) !== null && _a !== void 0 ? _a : (typeof ((_b = e === null || e === void 0 ? void 0 : e.data) === null || _b === void 0 ? void 0 : _b.error) === 'number' ? e.data.error : undefined);
-        if ((e === null || e === void 0 ? void 0 : e.success) === true)
-            return true;
-        if (typeof err === 'number')
-            return err === 0;
-        return false;
-    },
-    getMessage: function (e) {
-        var _a, _b;
-        var msg = (_a = e === null || e === void 0 ? void 0 : e.msg) !== null && _a !== void 0 ? _a : (_b = e === null || e === void 0 ? void 0 : e.data) === null || _b === void 0 ? void 0 : _b.msg;
-        return typeof msg === 'string' ? msg : '';
-    },
-    process: function (resp) {
-        var payload = (resp === null || resp === void 0 ? void 0 : resp.data) ? resp.data : resp;
-        var files = Array.isArray(payload === null || payload === void 0 ? void 0 : payload.files) ? payload.files : [];
-        var error = payload === null || payload === void 0 ? void 0 : payload.error;
-        var msg = payload === null || payload === void 0 ? void 0 : payload.msg;
-        return {
-            files: files,
-            error: typeof error === 'number' ? String(error) : (error !== null && error !== void 0 ? error : ''),
-            msg: typeof msg === 'string' ? msg : '',
-        };
-    },
-    defaultHandlerSuccess: function (data) {
         var _this = this;
+        var _a;
         var fn = this.jodit;
+        var data = ((_a = e === null || e === void 0 ? void 0 : e.data) !== null && _a !== void 0 ? _a : e);
         var restoreToLastCaret = function () {
             var _a, _b;
             var saved = selectionRef === null || selectionRef === void 0 ? void 0 : selectionRef.current;
@@ -148,51 +125,61 @@ var uploaderConfig = function (apiUrl, imageUrl, selectionRef) { return ({
                 selectionRef.current = null;
             }
         };
-        var list = (Array.isArray(data === null || data === void 0 ? void 0 : data.files) ? data.files : [])
-            .map(function (item) {
-            var _a;
-            if (typeof item === 'string')
-                return { file: item };
-            if (item && typeof item === 'object') {
-                return {
-                    file: String((_a = item.file) !== null && _a !== void 0 ? _a : ''),
-                    origineFileName: typeof item.origineFileName === 'string' ? item.origineFileName : undefined,
-                };
-            }
-            return { file: '' };
-        })
-            .filter(function (x) { return !!x.file; });
-        if (!list.length)
-            return;
-        list.forEach(function (_a) {
-            var _b;
-            var file = _a.file, origineFileName = _a.origineFileName;
-            var src = imageUrl ? "".concat(imageUrl, "/").concat(file) : file;
-            restoreToLastCaret();
-            if (isImageByExtension(file, _this.imagesExtensions || ['jpg', 'png', 'jpeg', 'gif', 'webp'])) {
-                var tagName_1 = 'img';
-                var elm_1 = fn.createInside.element(tagName_1);
-                elm_1.setAttribute('src', src);
-                fn.s.insertImage(elm_1, null, fn.o.imageDefaultWidth);
-                refreshSavedRange();
-                return;
-            }
-            var tagName = 'a';
-            var elm = fn.createInside.element(tagName);
-            elm.setAttribute('href', src);
-            elm.setAttribute('target', '_blank');
-            elm.setAttribute('rel', 'noopener noreferrer');
-            elm.textContent = origineFileName || getDisplayNameFromPath(file);
-            fn.s.insertNode(elm);
-            if ((_b = fn === null || fn === void 0 ? void 0 : fn.s) === null || _b === void 0 ? void 0 : _b.setCursorAfter) {
-                try {
-                    fn.s.setCursorAfter(elm);
+        if ((data === null || data === void 0 ? void 0 : data.files) && data.files.length) {
+            data.files.forEach(function (filename, idx) {
+                var _a;
+                var src = imageUrl ? "".concat(imageUrl, "/").concat(filename) : filename;
+                restoreToLastCaret();
+                if (isImageByExtension(filename, _this.imagesExtensions || ['jpg', 'png', 'jpeg', 'gif', 'webp'])) {
+                    var tagName = 'img';
+                    var elm = fn.createInside.element(tagName);
+                    elm.setAttribute('src', src);
+                    fn.s.insertImage(elm, null, fn.o.imageDefaultWidth);
+                    refreshSavedRange();
                 }
-                catch (_c) {
+                else {
+                    var tagName = 'a';
+                    var elm = fn.createInside.element(tagName);
+                    elm.setAttribute('href', src);
+                    elm.setAttribute('target', '_blank');
+                    elm.setAttribute('rel', 'noopener noreferrer');
+                    elm.textContent =
+                        ((data === null || data === void 0 ? void 0 : data.origineFileName) && data.origineFileName[idx]) ||
+                            getDisplayNameFromPath(filename);
+                    fn.s.insertNode(elm);
+                    if ((_a = fn === null || fn === void 0 ? void 0 : fn.s) === null || _a === void 0 ? void 0 : _a.setCursorAfter) {
+                        try {
+                            fn.s.setCursorAfter(elm);
+                        }
+                        catch (_b) {
+                        }
+                    }
+                    refreshSavedRange();
                 }
-            }
-            refreshSavedRange();
-        });
+            });
+        }
+        if (typeof (data === null || data === void 0 ? void 0 : data.error) !== 'undefined') {
+            return Number(data.error) === 0;
+        }
+        return !!(e === null || e === void 0 ? void 0 : e.success);
+    },
+    getMessage: function (e) {
+        var _a, _b;
+        var data = ((_a = e === null || e === void 0 ? void 0 : e.data) !== null && _a !== void 0 ? _a : e);
+        if (typeof (data === null || data === void 0 ? void 0 : data.msg) === 'string')
+            return data.msg;
+        return ((_b = e === null || e === void 0 ? void 0 : e.data) === null || _b === void 0 ? void 0 : _b.messages) && Array.isArray(e.data.messages)
+            ? e.data.messages.join('')
+            : '';
+    },
+    process: function (resp) {
+        var _a, _b, _c, _d;
+        return {
+            files: (_a = resp === null || resp === void 0 ? void 0 : resp.data) === null || _a === void 0 ? void 0 : _a.files,
+            origineFileName: (_b = resp === null || resp === void 0 ? void 0 : resp.data) === null || _b === void 0 ? void 0 : _b.origineFileName,
+            error: (_c = resp === null || resp === void 0 ? void 0 : resp.data) === null || _c === void 0 ? void 0 : _c.error,
+            msg: (_d = resp === null || resp === void 0 ? void 0 : resp.data) === null || _d === void 0 ? void 0 : _d.msg,
+        };
     },
     error: function (e) {
         this.j.e.fire('errorMessage', e.message, 'error', 4000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mbs-dev/react-editor",
-  "version": "1.12.0",
+  "version": "1.13.1",
   "description": "react editor",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

package/src/Editor.tsx

@@ -56,36 +56,14 @@ export const uploaderConfig = (apiUrl?: string, imageUrl?: string, selectionRef?
         return formdata;
     },
     isSuccess(this: any, e: any): boolean {
-        const err =
-            (typeof e?.error === 'number' ? e.error : undefined) ??
-            (typeof e?.data?.error === 'number' ? e.data.error : undefined);
-
-        if (e?.success === true) return true;
-        if (typeof err === 'number') return err === 0;
-
-        return false;
-    },
-    getMessage(e: any): string {
-        const msg = e?.msg ?? e?.data?.msg;
-        return typeof msg === 'string' ? msg : '';
-    },
-    process(resp: any): { files: any[]; error: string; msg: string } {
-        const payload = resp?.data ? resp.data : resp;
-
-        const files = Array.isArray(payload?.files) ? payload.files : [];
-        const error = payload?.error;
-        const msg = payload?.msg;
+        const fn = this.jodit;
 
-        return {
-            files,
-            error: typeof error === 'number' ? String(error) : (error ?? ''),
-            msg: typeof msg === 'string' ? msg : '',
+        const data = (e?.data ?? e) as {
+            files?: string[];
+            origineFileName?: string[];
+            error?: number;
+            msg?: string;
         };
-    },
-
-    // ✅ FIX: handle insertion here to avoid default handler inserting "undefined[object Object]"
-    defaultHandlerSuccess(this: any, data: any): void {
-        const fn = this.jodit;
 
         const restoreToLastCaret = () => {
             const saved = selectionRef?.current;
@@ -99,6 +77,7 @@ export const uploaderConfig = (apiUrl?: string, imageUrl?: string, selectionRef?
                 }
             }
 
+            // fallback: jodit internal save/restore
             if (fn?.s?.focus) fn.s.focus();
             if (fn?.s?.restore) {
                 try {
@@ -120,59 +99,69 @@ export const uploaderConfig = (apiUrl?: string, imageUrl?: string, selectionRef?
             }
         };
 
-        const list: Array<{ file: string; origineFileName?: string }> = (Array.isArray(data?.files) ? data.files : [])
-            .map((item: any) => {
-                if (typeof item === 'string') return { file: item };
-                if (item && typeof item === 'object') {
-                    return {
-                        file: String(item.file ?? ''),
-                        origineFileName: typeof item.origineFileName === 'string' ? item.origineFileName : undefined,
-                    };
-                }
-                return { file: '' };
-            })
-            .filter((x: { file: any; }) => !!x.file);
-
-        if (!list.length) return;
-
-        list.forEach(({ file, origineFileName }) => {
-            const src = imageUrl ? `${imageUrl}/${file}` : file;
-
-            // ✅ Restore caret BEFORE inserting anything (image or file)
-            restoreToLastCaret();
-
-            // ✅ If it's an image => insert <img> (no filename display)
-            if (isImageByExtension(file, this.imagesExtensions || ['jpg', 'png', 'jpeg', 'gif', 'webp'])) {
-                const tagName = 'img';
-                const elm = fn.createInside.element(tagName);
-                elm.setAttribute('src', src);
-                fn.s.insertImage(elm as HTMLImageElement, null, fn.o.imageDefaultWidth);
-                refreshSavedRange();
-                return;
-            }
-
-            // ✅ Otherwise insert <a> and display origineFileName (files only)
-            const tagName = 'a';
-            const elm = fn.createInside.element(tagName);
-            elm.setAttribute('href', src);
-            elm.setAttribute('target', '_blank');
-            elm.setAttribute('rel', 'noopener noreferrer');
-            elm.textContent = origineFileName || getDisplayNameFromPath(file);
-
-            fn.s.insertNode(elm);
+        if (data?.files && data.files.length) {
+            data.files.forEach((filename: string, idx: number) => {
+                const src = imageUrl ? `${imageUrl}/${filename}` : filename;
+
+                // ✅ Restore caret BEFORE inserting anything (image or file)
+                restoreToLastCaret();
+
+                // ✅ If it's an image => insert <img>, otherwise insert <a href="...">
+                if (isImageByExtension(filename, this.imagesExtensions || ['jpg', 'png', 'jpeg', 'gif', 'webp'])) {
+                    const tagName = 'img';
+                    const elm = fn.createInside.element(tagName);
+                    elm.setAttribute('src', src);
+                    fn.s.insertImage(elm as HTMLImageElement, null, fn.o.imageDefaultWidth);
+                    refreshSavedRange();
+                } else {
+                    const tagName = 'a';
+                    const elm = fn.createInside.element(tagName);
+                    elm.setAttribute('href', src);
+                    elm.setAttribute('target', '_blank');
+                    elm.setAttribute('rel', 'noopener noreferrer');
+
+                    // ✅ Display origineFileName for files (not images)
+                    elm.textContent =
+                        (data?.origineFileName && data.origineFileName[idx]) ||
+                        getDisplayNameFromPath(filename);
+
+                    fn.s.insertNode(elm);
+
+                    if (fn?.s?.setCursorAfter) {
+                        try {
+                            fn.s.setCursorAfter(elm);
+                        } catch {
+                            // ignore
+                        }
+                    }
 
-            if (fn?.s?.setCursorAfter) {
-                try {
-                    fn.s.setCursorAfter(elm);
-                } catch {
-                    // ignore
+                    refreshSavedRange();
                 }
-            }
+            });
+        }
+
+        if (typeof data?.error !== 'undefined') {
+            return Number(data.error) === 0;
+        }
 
-            refreshSavedRange();
-        });
+        return !!e?.success;
     },
+    getMessage(e: any): string {
+        const data = (e?.data ?? e) as { msg?: string; messages?: unknown };
+        if (typeof data?.msg === 'string') return data.msg;
 
+        return e?.data?.messages && Array.isArray(e.data.messages)
+            ? e.data.messages.join('')
+            : '';
+    },
+    process(resp: any): any {
+        return {
+            files: resp?.data?.files,
+            origineFileName: resp?.data?.origineFileName,
+            error: resp?.data?.error,
+            msg: resp?.data?.msg,
+        };
+    },
     error(this: any, e: Error): void {
         this.j.e.fire('errorMessage', e.message, 'error', 4000);
     },

package/types/Editor.d.ts

@@ -14,12 +14,7 @@ export declare const uploaderConfig: (apiUrl?: string, imageUrl?: string, select
     prepareData(formdata: FormData): FormData;
     isSuccess(this: any, e: any): boolean;
     getMessage(e: any): string;
-    process(resp: any): {
-        files: any[];
-        error: string;
-        msg: string;
-    };
-    defaultHandlerSuccess(this: any, data: any): void;
+    process(resp: any): any;
     error(this: any, e: Error): void;
     defaultHandlerError(this: any, e: any): void;
 };