@sequent-org/moodboard 1.4.14 → 1.4.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequent-org/moodboard",
-  "version": "1.4.14",
+  "version": "1.4.15",
   "type": "module",
   "description": "Interactive moodboard",
   "main": "./src/index.js",

package/src/core/keyboard/KeyboardClipboardImagePaste.js

@@ -40,49 +40,6 @@ export class KeyboardClipboardImagePaste {
         }
     }
 
-    async handleFileUpload(file, fileName) {
-        try {
-            if (!(this.core && this.core.fileUploadService)) {
-                alert('Сервис загрузки файлов недоступен. Файл не добавлен.');
-                return;
-            }
-
-            const uploadResult = await this.core.fileUploadService.uploadFile(file, fileName);
-            const world = this.core?.pixi?.worldLayer || this.core?.pixi?.app?.stage;
-            const view = this.core?.pixi?.app?.view;
-            const s = world?.scale?.x || 1;
-            const hasCursor = Number.isFinite(this.core?._cursor?.x) && Number.isFinite(this.core?._cursor?.y);
-
-            const screenX = hasCursor ? this.core._cursor.x : (view?.clientWidth || 0) / 2;
-            const screenY = hasCursor ? this.core._cursor.y : (view?.clientHeight || 0) / 2;
-            const worldX = (screenX - (world?.x || 0)) / s;
-            const worldY = (screenY - (world?.y || 0)) / s;
-
-            const width = 120;
-            const height = 140;
-            this.eventBus.emit(Events.UI.ToolbarAction, {
-                type: 'file',
-                id: 'file',
-                position: {
-                    x: Math.round(worldX - width / 2),
-                    y: Math.round(worldY - height / 2)
-                },
-                properties: {
-                    fileName: uploadResult.name,
-                    fileSize: uploadResult.size,
-                    mimeType: uploadResult.mimeType,
-                    formattedSize: uploadResult.formattedSize,
-                    src: uploadResult.src,
-                    width,
-                    height
-                }
-            });
-        } catch (error) {
-            console.error('Ошибка загрузки файла:', error);
-            alert('Ошибка загрузки файла на сервер. Файл не добавлен.');
-        }
-    }
-
     createPasteHandler() {
         return async (e) => {
             try {
@@ -102,21 +59,6 @@ export class KeyboardClipboardImagePaste {
                 }
                 if (handled) return;
 
-                // Windows/desktop clipboard providers may expose pasted files as items
-                // with generic type like "Files" and empty clipboardData.files.
-                for (const item of items) {
-                    if (!item || typeof item.getAsFile !== 'function') continue;
-                    const fileFromItem = item.getAsFile();
-                    if (!fileFromItem) continue;
-                    e.preventDefault();
-                    if (fileFromItem.type && fileFromItem.type.startsWith('image/')) {
-                        await this.handleImageFileUpload(fileFromItem, fileFromItem.name || 'clipboard-image.png');
-                    } else {
-                        await this.handleFileUpload(fileFromItem, fileFromItem.name || 'clipboard-file');
-                    }
-                    return;
-                }
-
                 const files = cd.files ? Array.from(cd.files) : [];
                 const imgFile = files.find(f => f.type && f.type.startsWith('image/'));
                 if (imgFile) {
@@ -124,12 +66,6 @@ export class KeyboardClipboardImagePaste {
                     await this.handleImageFileUpload(imgFile, imgFile.name || 'clipboard-image.png');
                     return;
                 }
-                const plainFile = files.find(f => !(f.type && f.type.startsWith('image/')));
-                if (plainFile) {
-                    e.preventDefault();
-                    await this.handleFileUpload(plainFile, plainFile.name || 'clipboard-file');
-                    return;
-                }
 
                 const html = cd.getData && cd.getData('text/html');
                 if (html && html.includes('<img')) {

package/src/ui/toolbar/ToolbarPopupsController.js

@@ -470,10 +470,11 @@ export class ToolbarPopupsController {
                             const target = 64;
                             const targetW = target;
                             const targetH = target;
+                            const placementSrc = this.resolveEmojiPlacementSrc(cat, emojiCode, url);
                             this.toolbar.eventBus.emit(Events.Keyboard.ToolSelect, { tool: 'place' });
                             this.toolbar.eventBus.emit(Events.Place.Set, {
                                 type: 'image',
-                                properties: { src: url, width: targetW, height: targetH, isEmojiIcon: true },
+                                properties: { src: placementSrc, width: targetW, height: targetH, isEmojiIcon: true },
                                 size: { width: targetW, height: targetH },
                                 placeOnMouseUp: true
                             });
@@ -508,11 +509,12 @@ export class ToolbarPopupsController {
                     const target = 64;
                     const targetW = target;
                     const targetH = target;
+                    const placementSrc = this.resolveEmojiPlacementSrc(cat, emojiCode, url);
 
                     this.toolbar.eventBus.emit(Events.Place.Set, {
                         type: 'image',
                         properties: {
-                            src: url,
+                            src: placementSrc,
                             width: targetW,
                             height: targetH,
                             isEmojiIcon: true,
@@ -533,6 +535,24 @@ export class ToolbarPopupsController {
         this.toolbar.container.appendChild(this.toolbar.emojiPopupEl);
     }
 
+    resolveEmojiPlacementSrc(category, emojiCode, fallbackUrl) {
+        const basePath = this.getEmojiBasePath();
+        if (!emojiCode || !basePath) {
+            return fallbackUrl;
+        }
+
+        const normalizeBase = basePath.endsWith('/') ? basePath : `${basePath}/`;
+        const encodedCategory = encodeURIComponent(category || 'Разное');
+        const encodedEmojiCode = encodeURIComponent(emojiCode);
+        const relativePath = `${encodedCategory}/${encodedEmojiCode}.png`;
+
+        try {
+            return new URL(relativePath, normalizeBase).href;
+        } catch (_) {
+            return `${normalizeBase}${relativePath}`;
+        }
+    }
+
     getFallbackEmojiGroups() {
         const groups = new Map();
         let convertedCount = 0;