@sequent-org/moodboard 1.2.115 → 1.2.117

package/package.json

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

package/src/tools/ToolManager.js

@@ -484,6 +484,60 @@ export class ToolManager {
             return;
         }
 
+        const nonImageFiles = files.filter(f => !f.type || !f.type.startsWith('image/'));
+        if (nonImageFiles.length > 0) {
+            let index = 0;
+            for (const file of nonImageFiles) {
+                const offset = 25 * index++;
+                const position = { x: x + offset, y: y + offset };
+                const fallbackProps = {
+                    fileName: file.name || 'file',
+                    fileSize: file.size || 0,
+                    mimeType: file.type || 'application/octet-stream',
+                    formattedSize: null,
+                    url: null,
+                    width: 120,
+                    height: 140
+                };
+                try {
+                    if (this.core && this.core.fileUploadService) {
+                        const uploadResult = await this.core.fileUploadService.uploadFile(file, file.name || 'file');
+                        this.eventBus.emit(Events.UI.ToolbarAction, {
+                            type: 'file',
+                            id: 'file',
+                            position,
+                            properties: {
+                                fileName: uploadResult.name,
+                                fileSize: uploadResult.size,
+                                mimeType: uploadResult.mimeType,
+                                formattedSize: uploadResult.formattedSize,
+                                url: uploadResult.url,
+                                width: 120,
+                                height: 140
+                            },
+                            fileId: uploadResult.fileId || uploadResult.id || null
+                        });
+                    } else {
+                        this.eventBus.emit(Events.UI.ToolbarAction, {
+                            type: 'file',
+                            id: 'file',
+                            position,
+                            properties: fallbackProps
+                        });
+                    }
+                } catch (error) {
+                    console.warn('Ошибка загрузки файла через drag-and-drop:', error);
+                    this.eventBus.emit(Events.UI.ToolbarAction, {
+                        type: 'file',
+                        id: 'file',
+                        position,
+                        properties: fallbackProps
+                    });
+                }
+            }
+            return;
+        }
+
         // 2) Перетаскивание с другой вкладки: HTML/URI/PLAIN
         const html = dt.getData('text/html');
         if (html && html.includes('<img')) {

package/src/tools/object-tools/DrawingTool.js

@@ -322,6 +322,12 @@ export class DrawingTool extends BaseTool {
         return { x: local.x, y: local.y };
     }
 
+    _worldToGlobal(x, y) {
+        if (!this.world || typeof this.world.toGlobal !== 'function') return { x, y };
+        const global = this.world.toGlobal(new PIXI.Point(x, y));
+        return { x: global.x, y: global.y };
+    }
+
     _getWorldLayer() {
         if (!this.app || !this.app.stage) return null;
         const world = this.app.stage.getChildByName && this.app.stage.getChildByName('worldLayer');
@@ -333,12 +339,14 @@ export class DrawingTool extends BaseTool {
         const req = { objects: [] };
         this.emit('get:all:objects', req);
         const objects = req.objects || [];
+        const prevGlobal = this._worldToGlobal(prev.x, prev.y);
+        const currGlobal = this._worldToGlobal(p.x, p.y);
         // Радиус воздействия ластика (связан с отображаемой толщиной)
         const radius = 8;
-        const segMinX = Math.min(prev.x, p.x) - radius;
-        const segMaxX = Math.max(prev.x, p.x) + radius;
-        const segMinY = Math.min(prev.y, p.y) - radius;
-        const segMaxY = Math.max(prev.y, p.y) + radius;
+        const segMinX = Math.min(prevGlobal.x, currGlobal.x) - radius;
+        const segMaxX = Math.max(prevGlobal.x, currGlobal.x) + radius;
+        const segMinY = Math.min(prevGlobal.y, currGlobal.y) - radius;
+        const segMaxY = Math.max(prevGlobal.y, currGlobal.y) + radius;
 
         for (const item of objects) {
             const id = item.id;
@@ -368,8 +376,8 @@ export class DrawingTool extends BaseTool {
                     const scaleY = baseH ? (b.height / baseH) : 1;
                     const eraserThresh = Math.max(6, (props.strokeWidth || 2) / 2 + radius);
                     // трансформируем сегмент ластика в локальные координаты фигуры
-                    const localPrev = pixi.toLocal(new PIXI.Point(prev.x, prev.y));
-                    const localCurr = pixi.toLocal(new PIXI.Point(p.x, p.y));
+                    const localPrev = pixi.toLocal(new PIXI.Point(prevGlobal.x, prevGlobal.y));
+                    const localCurr = pixi.toLocal(new PIXI.Point(currGlobal.x, currGlobal.y));
                     // Проверяем пересечение с каждым отрезком рисунка
                     for (let i = 0; i < pts.length - 1 && !intersects; i++) {
                         const ax = pts[i].x * scaleX;