@mbs-dev/react-editor 1.4.0 → 1.6.0

package/dist/Editor.js

@@ -67,7 +67,14 @@ var getDisplayNameFromPath = function (filename) {
     var _a, _b;
     var clean = (_b = (_a = (filename || '').split('?')[0]) === null || _a === void 0 ? void 0 : _a.split('#')[0]) !== null && _b !== void 0 ? _b : '';
     var last = clean.split('/').pop();
-    return last ? decodeURIComponent(last) : filename;
+    var base = last ? decodeURIComponent(last) : filename;
+    var dotIndex = base.lastIndexOf('.');
+    var noExt = dotIndex > 0 ? base.slice(0, dotIndex) : base;
+    var dashIndex = noExt.lastIndexOf('-');
+    if (dashIndex > 0) {
+        return noExt.slice(0, dashIndex);
+    }
+    return noExt;
 };
 var uploaderConfig = function (apiUrl, imageUrl) { return ({
     imagesExtensions: ['jpg', 'png', 'jpeg', 'gif', 'webp'],
@@ -87,6 +94,7 @@ var uploaderConfig = function (apiUrl, imageUrl) { return ({
         var fn = this.jodit;
         if (((_a = e === null || e === void 0 ? void 0 : e.data) === null || _a === void 0 ? void 0 : _a.files) && e.data.files.length) {
             e.data.files.forEach(function (filename) {
+                var _a, _b, _c;
                 var src = imageUrl ? "".concat(imageUrl, "/").concat(filename) : filename;
                 if (isImageByExtension(filename, _this.imagesExtensions || ['jpg', 'png', 'jpeg', 'gif', 'webp'])) {
                     var tagName = 'img';
@@ -95,6 +103,15 @@ var uploaderConfig = function (apiUrl, imageUrl) { return ({
                     fn.s.insertImage(elm, null, fn.o.imageDefaultWidth);
                 }
                 else {
+                    if ((_a = fn === null || fn === void 0 ? void 0 : fn.s) === null || _a === void 0 ? void 0 : _a.focus)
+                        fn.s.focus();
+                    if ((_b = fn === null || fn === void 0 ? void 0 : fn.s) === null || _b === void 0 ? void 0 : _b.restore) {
+                        try {
+                            fn.s.restore();
+                        }
+                        catch (_d) {
+                        }
+                    }
                     var tagName = 'a';
                     var elm = fn.createInside.element(tagName);
                     elm.setAttribute('href', src);
@@ -102,6 +119,13 @@ var uploaderConfig = function (apiUrl, imageUrl) { return ({
                     elm.setAttribute('rel', 'noopener noreferrer');
                     elm.textContent = getDisplayNameFromPath(filename);
                     fn.s.insertNode(elm);
+                    if ((_c = fn === null || fn === void 0 ? void 0 : fn.s) === null || _c === void 0 ? void 0 : _c.setCursorAfter) {
+                        try {
+                            fn.s.setCursorAfter(elm);
+                        }
+                        catch (_e) {
+                        }
+                    }
                 }
             });
         }
@@ -109,9 +133,7 @@ var uploaderConfig = function (apiUrl, imageUrl) { return ({
     },
     getMessage: function (e) {
         var _a;
-        return ((_a = e === null || e === void 0 ? void 0 : e.data) === null || _a === void 0 ? void 0 : _a.messages) && Array.isArray(e.data.messages)
-            ? e.data.messages.join('')
-            : '';
+        return ((_a = e === null || e === void 0 ? void 0 : e.data) === null || _a === void 0 ? void 0 : _a.messages) && Array.isArray(e.data.messages) ? e.data.messages.join('') : '';
     },
     process: function (resp) {
         var files = [];
@@ -188,9 +210,7 @@ var config = function (_a) {
                     var container = document.createElement('div');
                     container.innerHTML = html || '';
                     var imgs = Array.from(container.getElementsByTagName('img'));
-                    return new Set(imgs
-                        .map(function (img) { return img.getAttribute('src') || ''; })
-                        .filter(function (src) { return !!src; }));
+                    return new Set(imgs.map(function (img) { return img.getAttribute('src') || ''; }).filter(function (src) { return !!src; }));
                 };
                 var prevValue = editor.value || '';
                 var prevSrcs = extractImageSrcs(prevValue);

package/package.json

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

package/src/Editor.tsx

@@ -22,17 +22,26 @@ const isImageByExtension = (filename: string, imageExts: string[]): boolean => {
 const getDisplayNameFromPath = (filename: string): string => {
     const clean = (filename || '').split('?')[0]?.split('#')[0] ?? '';
     const last = clean.split('/').pop();
-    return last ? decodeURIComponent(last) : filename;
+    const base = last ? decodeURIComponent(last) : filename;
+
+    // remove extension
+    const dotIndex = base.lastIndexOf('.');
+    const noExt = dotIndex > 0 ? base.slice(0, dotIndex) : base;
+
+    // remove last "-..." suffix
+    const dashIndex = noExt.lastIndexOf('-');
+    if (dashIndex > 0) {
+        return noExt.slice(0, dashIndex);
+    }
+
+    return noExt;
 };
 
 /**
  * Uploader configuration for Jodit
  * Handles image upload + insertion in the editor
  */
-export const uploaderConfig = (
-    apiUrl?: string,
-    imageUrl?: string
-) => ({
+export const uploaderConfig = (apiUrl?: string, imageUrl?: string) => ({
     imagesExtensions: ['jpg', 'png', 'jpeg', 'gif', 'webp'],
     filesVariableName(t: number): string {
         return 'files[' + t + ']';
@@ -58,13 +67,32 @@ export const uploaderConfig = (
                     elm.setAttribute('src', src);
                     fn.s.insertImage(elm as HTMLImageElement, null, fn.o.imageDefaultWidth);
                 } else {
+                    // ✅ FIX: restore caret/selection before inserting file link
+                    if (fn?.s?.focus) fn.s.focus();
+                    if (fn?.s?.restore) {
+                        try {
+                            fn.s.restore();
+                        } catch {
+                            // ignore
+                        }
+                    }
+
                     const tagName = 'a';
                     const elm = fn.createInside.element(tagName);
                     elm.setAttribute('href', src);
                     elm.setAttribute('target', '_blank');
                     elm.setAttribute('rel', 'noopener noreferrer');
                     elm.textContent = getDisplayNameFromPath(filename);
+
                     fn.s.insertNode(elm);
+
+                    if (fn?.s?.setCursorAfter) {
+                        try {
+                            fn.s.setCursorAfter(elm);
+                        } catch {
+                            // ignore
+                        }
+                    }
                 }
             });
         }
@@ -72,9 +100,7 @@ export const uploaderConfig = (
         return !!e?.success;
     },
     getMessage(e: any): string {
-        return e?.data?.messages && Array.isArray(e.data.messages)
-            ? e.data.messages.join('')
-            : '';
+        return e?.data?.messages && Array.isArray(e.data.messages) ? e.data.messages.join('') : '';
     },
     process(resp: any): { files: any[]; error: string; msg: string } {
         const files: any[] = [];
@@ -108,12 +134,7 @@ type ConfigParams = {
 /**
  * Build Jodit config for ReactEditor
  */
-export const config = ({
-    includeUploader,
-    apiUrl,
-    imageUrl,
-    onDeleteImage,
-}: ConfigParams = {}) => {
+export const config = ({ includeUploader, apiUrl, imageUrl, onDeleteImage }: ConfigParams = {}) => {
     const base: any = {
         readonly: false,
         placeholder: 'Start typing...',
@@ -139,7 +160,7 @@ export const config = ({
             'ol',
             '|',
             'image',
-            'file', // ✅ added
+            'file',
             '|',
             'video',
             '|',
@@ -179,11 +200,7 @@ export const config = ({
                     container.innerHTML = html || '';
                     const imgs = Array.from(container.getElementsByTagName('img')) as HTMLImageElement[];
 
-                    return new Set(
-                        imgs
-                            .map((img) => img.getAttribute('src') || '')
-                            .filter((src) => !!src)
-                    );
+                    return new Set(imgs.map((img) => img.getAttribute('src') || '').filter((src) => !!src));
                 };
 
                 let prevValue: string = editor.value || '';

package/types/Editor.d.ts

@@ -25,5 +25,5 @@ type ConfigParams = {
     imageUrl?: string;
     onDeleteImage?: (imageUrl: string) => void | Promise<void>;
 };
-export declare const config: ({ includeUploader, apiUrl, imageUrl, onDeleteImage, }?: ConfigParams) => any;
+export declare const config: ({ includeUploader, apiUrl, imageUrl, onDeleteImage }?: ConfigParams) => any;
 export default ReactEditor;