@sequent-org/moodboard 1.4.15 → 1.4.19

package/package.json

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

package/src/ui/toolbar/ToolbarPopupsController.js

@@ -470,7 +470,11 @@ export class ToolbarPopupsController {
                             const target = 64;
                             const targetW = target;
                             const targetH = target;
-                            const placementSrc = this.resolveEmojiPlacementSrc(cat, emojiCode, url);
+                            const placementSrc = this.resolveEmojiPlacementSrc(cat, emojiCode, url, isInline);
+                            if (!placementSrc) {
+                                console.warn('Emoji placement skipped: cannot resolve public src', { cat, emojiCode, url });
+                                return;
+                            }
                             this.toolbar.eventBus.emit(Events.Keyboard.ToolSelect, { tool: 'place' });
                             this.toolbar.eventBus.emit(Events.Place.Set, {
                                 type: 'image',
@@ -509,7 +513,11 @@ export class ToolbarPopupsController {
                     const target = 64;
                     const targetW = target;
                     const targetH = target;
-                    const placementSrc = this.resolveEmojiPlacementSrc(cat, emojiCode, url);
+                    const placementSrc = this.resolveEmojiPlacementSrc(cat, emojiCode, url, isInline);
+                    if (!placementSrc) {
+                        console.warn('Emoji placement skipped: cannot resolve public src', { cat, emojiCode, url });
+                        return;
+                    }
 
                     this.toolbar.eventBus.emit(Events.Place.Set, {
                         type: 'image',
@@ -535,22 +543,26 @@ export class ToolbarPopupsController {
         this.toolbar.container.appendChild(this.toolbar.emojiPopupEl);
     }
 
-    resolveEmojiPlacementSrc(category, emojiCode, fallbackUrl) {
+    resolveEmojiPlacementSrc(category, emojiCode, fallbackUrl, isInline = false) {
         const basePath = this.getEmojiBasePath();
-        if (!emojiCode || !basePath) {
-            return fallbackUrl;
+        if (emojiCode && basePath) {
+            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}`;
+            }
         }
 
-        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}`;
-        }
+        const fallback = typeof fallbackUrl === 'string' ? fallbackUrl.trim() : '';
+        if (!fallback) return null;
+        if (/^data:/i.test(fallback) || /^blob:/i.test(fallback)) return null;
+        if (fallback.includes('/node_modules/')) return null;
+        return fallback;
     }
 
     getFallbackEmojiGroups() {
@@ -619,35 +631,31 @@ export class ToolbarPopupsController {
     }
 
     getEmojiBasePath() {
-        if (this.toolbar.emojiBasePath) {
-            return this.toolbar.emojiBasePath.endsWith('/') ? this.toolbar.emojiBasePath : this.toolbar.emojiBasePath + '/';
-        }
+        const normalize = (value) => {
+            if (!value || typeof value !== 'string') return null;
+            const trimmed = value.trim();
+            if (!trimmed) return null;
+            if (trimmed.includes('/node_modules/')) return null;
+            return trimmed.endsWith('/') ? trimmed : `${trimmed}/`;
+        };
 
-        if (window.MOODBOARD_BASE_PATH) {
-            const basePath = window.MOODBOARD_BASE_PATH.endsWith('/') ? window.MOODBOARD_BASE_PATH : window.MOODBOARD_BASE_PATH + '/';
-            return `${basePath}src/assets/emodji/`;
+        const fromOptions = normalize(this.toolbar.emojiBasePath);
+        if (fromOptions) {
+            return fromOptions;
         }
 
-        try {
-            const currentModuleUrl = import.meta.url;
-            const emojiUrl = new URL('../assets/emodji/', currentModuleUrl).href;
-            return emojiUrl;
-        } catch (error) {
-            console.warn('⚠️ Не удалось определить путь через import.meta.url:', error);
+        const fromExplicitGlobal = normalize(window.MOODBOARD_EMOJI_BASE_PATH);
+        if (fromExplicitGlobal) {
+            return fromExplicitGlobal;
         }
 
-        try {
-            const currentScript = document.currentScript;
-            if (currentScript && currentScript.src) {
-                const scriptUrl = new URL(currentScript.src);
-                const baseUrl = new URL('../assets/emodji/', scriptUrl).href;
-                return baseUrl;
-            }
-        } catch (error) {
-            console.warn('⚠️ Не удалось определить путь через currentScript:', error);
+        if (window.MOODBOARD_BASE_PATH) {
+            const basePath = window.MOODBOARD_BASE_PATH.endsWith('/') ? window.MOODBOARD_BASE_PATH : window.MOODBOARD_BASE_PATH + '/';
+            const fromGlobalBase = normalize(`${basePath}emodji/`);
+            if (fromGlobalBase) return fromGlobalBase;
         }
 
-        return '/src/assets/emodji/';
+        return '/emodji/';
     }
 
     toggleEmojiPopup(anchorButton) {