@sequent-org/moodboard 1.4.2 → 1.4.4

package/package.json

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

package/src/core/HistoryManager.js

@@ -18,8 +18,6 @@ export class HistoryManager {
         // Флаг для предотвращения зацикливания при undo/redo
         this.isExecutingCommand = false;
         this._listenersAttached = false;
-        this._onUndo = () => this.undo();
-        this._onRedo = () => this.redo();
         this._onDebug = () => this.debugHistory();
 
         this.initEventListeners();
@@ -28,10 +26,6 @@ export class HistoryManager {
     initEventListeners() {
         if (this._listenersAttached) return;
         this._listenersAttached = true;
-        // Слушаем события клавиатуры
-        this.eventBus.on(Events.Keyboard.Undo, this._onUndo);
-        this.eventBus.on(Events.Keyboard.Redo, this._onRedo);
-
         // Для отладки
         this.eventBus.on(Events.History.Debug, this._onDebug);
     }
@@ -253,8 +247,6 @@ export class HistoryManager {
      */
     destroy() {
         this.clear();
-        this.eventBus.off(Events.Keyboard.Undo, this._onUndo);
-        this.eventBus.off(Events.Keyboard.Redo, this._onRedo);
         this.eventBus.off(Events.History.Debug, this._onDebug);
         this._listenersAttached = false;
     }

package/src/core/SaveManager.js

@@ -133,6 +133,7 @@ export class SaveManager {
                 // Эмитируем событие успешного сохранения
                 this.eventBus.emit(Events.Save.Success, {
                     data: saveData,
+                    response,
                     timestamp: new Date().toISOString()
                 });
             } else {

package/src/core/index.js

@@ -226,13 +226,6 @@ export class CoreMoodBoard {
                     historySize: data.historySize,
                 });
             }
-
-            
-            // Можно здесь обновить состояние кнопок Undo/Redo в UI
-            this.eventBus.emit(Events.UI.UpdateHistoryButtons, {
-                canUndo: data.canUndo,
-                canRedo: data.canRedo
-            });
         });
     }
 

package/src/core/keyboard/KeyboardSelectionActions.js

@@ -10,11 +10,11 @@ export class KeyboardSelectionActions {
         switch (actionId) {
             case 'undo':
                 return () => {
-                    this.eventBus.emit(Events.Keyboard.Undo);
+                    this.eventBus.emit(Events.UI.LoadPrevVersion);
                 };
             case 'redo':
                 return () => {
-                    this.eventBus.emit(Events.Keyboard.Redo);
+                    this.eventBus.emit(Events.UI.LoadNextVersion);
                 };
             case 'select-all':
                 return () => {

package/src/moodboard/integration/MoodBoardEventBindings.js

@@ -91,40 +91,25 @@ export function bindToolbarEvents(board) {
         if (!moodboardId) return;
         if (!Number.isFinite(targetVersion) || targetVersion < 1) return;
         try {
-            await board.loadFromApi(moodboardId, targetVersion, { fallbackToSeedOnError: false });
-
-            // В append-only модели откат/переход по версии фиксируем новой записью,
-            // чтобы дальнейшие изменения шли от нового head и не теряли "будущее".
-            const restoreSnapshot = board.coreMoodboard?.getBoardData?.();
-            if (restoreSnapshot && board.coreMoodboard?.apiClient) {
-                const saveResult = await board.coreMoodboard.apiClient.saveBoard(
-                    moodboardId,
-                    restoreSnapshot,
-                    { actionType: 'history_restore' }
-                );
-                const restoredVersion = Number(saveResult?.historyVersion);
-                if (Number.isFinite(restoredVersion) && restoredVersion > 0) {
-                    board.currentLoadedVersion = restoredVersion;
-                    board.coreMoodboard.eventBus.emit(Events.UI.UpdateHistoryButtons, {
-                        canUndo: restoredVersion > 1,
-                        canRedo: false,
-                    });
-                }
-            }
+            await board.loadFromApi(moodboardId, targetVersion, {
+                fallbackToSeedOnError: false,
+                historyNavigation: true,
+            });
         } catch (error) {
             console.warn(`⚠️ Не удалось загрузить версию ${targetVersion}:`, error?.message || error);
         }
     };
 
     board.coreMoodboard.eventBus.on(Events.UI.LoadPrevVersion, () => {
-        const current = Number(board.currentLoadedVersion);
+        const current = Number(board.historyCursorVersion);
         if (!Number.isFinite(current) || current <= 1) return;
         loadVersion(current - 1);
     });
 
     board.coreMoodboard.eventBus.on(Events.UI.LoadNextVersion, () => {
-        const current = Number(board.currentLoadedVersion);
-        if (!Number.isFinite(current)) return;
+        const current = Number(board.historyCursorVersion);
+        const head = Number(board.historyHeadVersion);
+        if (!Number.isFinite(current) || !Number.isFinite(head) || current >= head) return;
         loadVersion(current + 1);
     });
 }
@@ -154,8 +139,19 @@ export function bindSaveCallbacks(board) {
         return;
     }
 
-    if (typeof board.options.onSave === 'function') {
-        board.coreMoodboard.eventBus.on('save:success', (data) => {
+    board.coreMoodboard.eventBus.on('save:success', (data) => {
+        const savedVersion = Number(data?.response?.historyVersion);
+        if (Number.isFinite(savedVersion) && savedVersion > 0) {
+            board.currentLoadedVersion = savedVersion;
+            board.historyHeadVersion = savedVersion;
+            board.historyCursorVersion = savedVersion;
+            board.coreMoodboard.eventBus.emit(Events.UI.UpdateHistoryButtons, {
+                canUndo: savedVersion > 1,
+                canRedo: false,
+            });
+        }
+
+        if (typeof board.options.onSave === 'function') {
             try {
                 let screenshot = null;
                 if (board.coreMoodboard.pixi && board.coreMoodboard.pixi.app && board.coreMoodboard.pixi.app.view) {
@@ -171,9 +167,11 @@ export function bindSaveCallbacks(board) {
             } catch (error) {
                 console.warn('⚠️ Ошибка в коллбеке onSave:', error);
             }
-        });
+        }
+    });
 
-        board.coreMoodboard.eventBus.on('save:error', (data) => {
+    board.coreMoodboard.eventBus.on('save:error', (data) => {
+        if (typeof board.options.onSave === 'function') {
             try {
                 board.options.onSave({
                     success: false,
@@ -183,6 +181,6 @@ export function bindSaveCallbacks(board) {
             } catch (error) {
                 console.warn('⚠️ Ошибка в коллбеке onSave:', error);
             }
-        });
-    }
+        }
+    });
 }

package/src/moodboard/integration/MoodBoardLoadApi.js

@@ -17,6 +17,21 @@ export function getCsrfToken(board) {
         || '';
 }
 
+function resolveMoodboardApiBase(board) {
+    const raw = String(board?.options?.apiUrl || '').trim();
+    if (!raw) return '/api/v2/moodboard';
+
+    // Совместимость с legacy конфигом: /api/moodboard -> /api/v2/moodboard
+    if (raw.endsWith('/api/moodboard')) {
+        return raw.replace(/\/api\/moodboard$/, '/api/v2/moodboard');
+    }
+    if (raw.endsWith('/api/moodboard/')) {
+        return raw.replace(/\/api\/moodboard\/$/, '/api/v2/moodboard/');
+    }
+
+    return raw;
+}
+
 function normalizeLoadedPayload(payload, moodboardIdFallback) {
     const state = (payload?.state && typeof payload.state === 'object')
         ? payload.state
@@ -36,6 +51,7 @@ function normalizeLoadedPayload(payload, moodboardIdFallback) {
 
 export async function loadExistingBoard(board, version = null, options = {}) {
     const fallbackToSeedOnError = options?.fallbackToSeedOnError !== false;
+    const historyNavigation = options?.historyNavigation === true;
     try {
         const boardId = board.options.boardId;
 
@@ -47,11 +63,12 @@ export async function loadExistingBoard(board, version = null, options = {}) {
             return;
         }
 
-        console.log(`📦 MoodBoard: загружаем доску ${boardId} с ${board.options.apiUrl}`);
+        const apiBase = resolveMoodboardApiBase(board);
+        console.log(`📦 MoodBoard: загружаем доску ${boardId} с ${apiBase}`);
 
-        const baseUrl = board.options.apiUrl.endsWith('/')
-            ? `${board.options.apiUrl}${boardId}`
-            : `${board.options.apiUrl}/${boardId}`;
+        const baseUrl = apiBase.endsWith('/')
+            ? `${apiBase}${boardId}`
+            : `${apiBase}/${boardId}`;
         const loadUrl = Number.isFinite(version) ? `${baseUrl}/${version}` : baseUrl;
 
         const response = await fetch(loadUrl, {
@@ -71,14 +88,20 @@ export async function loadExistingBoard(board, version = null, options = {}) {
 
         if (apiResponse?.success && payload) {
             const normalizedData = normalizeLoadedPayload(payload, boardId);
-            board.currentLoadedVersion = Number(normalizedData.version) || null;
+            const loadedVersion = Number(normalizedData.version) || null;
+            board.currentLoadedVersion = loadedVersion;
+            board.historyCursorVersion = loadedVersion;
+            if (!historyNavigation) {
+                board.historyHeadVersion = loadedVersion;
+            }
             console.log('✅ MoodBoard: данные загружены с сервера', normalizedData);
             board.dataManager.loadData(normalizedData);
             if (board?.coreMoodboard?.eventBus) {
+                const cursor = Number(board.historyCursorVersion);
+                const head = Number(board.historyHeadVersion);
                 board.coreMoodboard.eventBus.emit(Events.UI.UpdateHistoryButtons, {
-                    canUndo: Number(board.currentLoadedVersion) > 1,
-                    // Верхнюю границу версий backend не возвращает, поэтому оставляем переход вперед доступным.
-                    canRedo: true,
+                    canUndo: Number.isFinite(cursor) && cursor > 1,
+                    canRedo: Number.isFinite(cursor) && Number.isFinite(head) && cursor < head,
                 });
             }
             invokeOnLoad(board, { success: true, data: normalizedData });