@sequent-org/moodboard 1.2.119 → 1.3.1

package/src/core/commands/UpdateNoteStyleCommand.js

@@ -0,0 +1,88 @@
+/**
+ * Команда изменения стиля записки (шрифт, размер, цвет текста, фон) для системы Undo/Redo.
+ * Поддерживает: fontFamily, fontSize, textColor, backgroundColor (все в object.properties).
+ */
+import { BaseCommand } from './BaseCommand.js';
+import { Events } from '../events/Events.js';
+
+const NOTE_STYLE_PROPS = ['fontFamily', 'fontSize', 'textColor', 'backgroundColor'];
+
+export class UpdateNoteStyleCommand extends BaseCommand {
+    /**
+     * @param {Object} coreMoodboard — ядро доски
+     * @param {string} objectId — id объекта записки
+     * @param {string} property — имя свойства (fontFamily | fontSize | textColor | backgroundColor)
+     * @param {*} oldValue — прежнее значение
+     * @param {*} newValue — новое значение
+     */
+    constructor(coreMoodboard, objectId, property, oldValue, newValue) {
+        super('update_note_style', `Изменить ${_propertyLabel(property)}`);
+        this.coreMoodboard = coreMoodboard;
+        this.objectId = objectId;
+        this.property = property;
+        this.oldValue = oldValue;
+        this.newValue = newValue;
+    }
+
+    execute() {
+        this._apply(this.newValue);
+    }
+
+    undo() {
+        this._apply(this.oldValue);
+    }
+
+    canMergeWith(otherCommand) {
+        return otherCommand instanceof UpdateNoteStyleCommand &&
+               otherCommand.objectId === this.objectId &&
+               otherCommand.property === this.property;
+    }
+
+    mergeWith(otherCommand) {
+        if (!this.canMergeWith(otherCommand)) {
+            throw new Error('Cannot merge commands');
+        }
+        this.newValue = otherCommand.newValue;
+        this.timestamp = otherCommand.timestamp;
+    }
+
+    _apply(value) {
+        const { coreMoodboard, objectId, property } = this;
+        const objects = coreMoodboard.state.getObjects();
+        const object = objects.find((obj) => obj.id === objectId);
+        if (!object) return;
+
+        if (!object.properties) object.properties = {};
+        object.properties[property] = value;
+        coreMoodboard.state.markDirty();
+
+        const pixiObject = coreMoodboard.pixi?.objects?.get(objectId);
+        if (pixiObject?._mb?.instance) {
+            const instance = pixiObject._mb.instance;
+            if (instance.setStyle) {
+                const styleUpdates = { [property]: value };
+                instance.setStyle(styleUpdates);
+            }
+        }
+
+        if (pixiObject?._mb) {
+            if (!pixiObject._mb.properties) pixiObject._mb.properties = {};
+            pixiObject._mb.properties[property] = value;
+        }
+
+        coreMoodboard.eventBus.emit(Events.Object.StateChanged, {
+            objectId,
+            updates: { properties: { [property]: value } },
+        });
+    }
+}
+
+function _propertyLabel(property) {
+    const labels = {
+        fontFamily: 'шрифт',
+        fontSize: 'размер шрифта',
+        textColor: 'цвет текста',
+        backgroundColor: 'фон',
+    };
+    return labels[property] || property;
+}

package/src/core/commands/UpdateTextStyleCommand.js

@@ -0,0 +1,90 @@
+/**
+ * Команда изменения свойств текста (шрифт, размер, цвет, фон) для системы Undo/Redo.
+ * Поддерживает: fontFamily, fontSize, color, backgroundColor.
+ */
+import { BaseCommand } from './BaseCommand.js';
+import { Events } from '../events/Events.js';
+import { syncPixiTextProperties } from '../../ui/text-properties/TextPropertiesPanelMapper.js';
+
+export class UpdateTextStyleCommand extends BaseCommand {
+    /**
+     * @param {Object} coreMoodboard — ядро доски
+     * @param {string} objectId — id объекта
+     * @param {string} property — имя свойства (fontFamily | fontSize | color | backgroundColor)
+     * @param {*} oldValue — прежнее значение
+     * @param {*} newValue — новое значение
+     */
+    constructor(coreMoodboard, objectId, property, oldValue, newValue) {
+        super('update_text_style', `Изменить ${_propertyLabel(property)}`);
+        this.coreMoodboard = coreMoodboard;
+        this.objectId = objectId;
+        this.property = property;
+        this.oldValue = oldValue;
+        this.newValue = newValue;
+    }
+
+    execute() {
+        this._apply(this.newValue);
+    }
+
+    undo() {
+        this._apply(this.oldValue);
+    }
+
+    canMergeWith(otherCommand) {
+        return otherCommand instanceof UpdateTextStyleCommand &&
+               otherCommand.objectId === this.objectId &&
+               otherCommand.property === this.property;
+    }
+
+    mergeWith(otherCommand) {
+        if (!this.canMergeWith(otherCommand)) {
+            throw new Error('Cannot merge commands');
+        }
+        this.newValue = otherCommand.newValue;
+        this.timestamp = otherCommand.timestamp;
+    }
+
+    _apply(value) {
+        const objects = this.coreMoodboard.state.getObjects();
+        const object = objects.find((obj) => obj.id === this.objectId);
+        if (!object) return;
+
+        const { property } = this;
+
+        if (property === 'fontFamily') {
+            if (!object.properties) object.properties = {};
+            object.properties.fontFamily = value;
+        } else {
+            object[property] = value;
+        }
+
+        this.coreMoodboard.state.markDirty();
+
+        const pixiObject = this.coreMoodboard.pixi?.objects?.get(this.objectId);
+        if (pixiObject && pixiObject._mb) {
+            if (!pixiObject._mb.properties) pixiObject._mb.properties = {};
+            pixiObject._mb.properties[property] = value;
+        }
+
+        syncPixiTextProperties(this.coreMoodboard.eventBus, this.objectId, { [property]: value });
+
+        const updates = property === 'fontFamily'
+            ? { properties: { fontFamily: value } }
+            : { [property]: value };
+        this.coreMoodboard.eventBus.emit(Events.Object.StateChanged, {
+            objectId: this.objectId,
+            updates,
+        });
+    }
+}
+
+function _propertyLabel(property) {
+    const labels = {
+        fontFamily: 'шрифт',
+        fontSize: 'размер шрифта',
+        color: 'цвет текста',
+        backgroundColor: 'фон текста',
+    };
+    return labels[property] || property;
+}

package/src/core/commands/index.js

@@ -2,6 +2,7 @@
 export { BaseCommand } from './BaseCommand.js';
 export { CreateObjectCommand } from './CreateObjectCommand.js';
 export { DeleteObjectCommand } from './DeleteObjectCommand.js';
+export { GroupDeleteCommand } from './GroupDeleteCommand.js';
 export { MoveObjectCommand } from './MoveObjectCommand.js';
 export { ResizeObjectCommand } from './ResizeObjectCommand.js';
 export { CopyObjectCommand } from './CopyObjectCommand.js';
@@ -12,3 +13,8 @@ export { GroupResizeCommand } from './GroupResizeCommand.js';
 export { ReorderZCommand } from './ReorderZCommand.js';
 export { GroupReorderZCommand } from './GroupReorderZCommand.js';
 export { EditFileNameCommand } from './EditFileNameCommand.js';
+export { UpdateContentCommand } from './UpdateContentCommand.js';
+export { UpdateTextStyleCommand } from './UpdateTextStyleCommand.js';
+export { UpdateNoteStyleCommand } from './UpdateNoteStyleCommand.js';
+export { UpdateFramePropertiesCommand } from './UpdateFramePropertiesCommand.js';
+export { UpdateFrameTypeCommand } from './UpdateFrameTypeCommand.js';

package/src/core/events/Events.js

@@ -107,6 +107,7 @@ export const Events = {
 		Pasted: 'object:pasted',
 		StateChanged: 'state:changed',
 		FileNameChange: 'object:filename:change',
+		ContentChange: 'object:content:change',
 	},
 
 	History: {
@@ -126,6 +127,9 @@ export const Events = {
 	Grid: {
 		BoardDataChanged: 'board:data-changed',
 	},
+	Viewport: {
+		Changed: 'viewport:changed',
+	},
 
 	Board: {
 		Loaded: 'board:loaded',
@@ -137,6 +141,8 @@ export const Events = {
 		FileCanceled: 'place:file:canceled',
 		ImageSelected: 'place:image:selected',
 		ImageCanceled: 'place:image:canceled',
+		ImageObject2Selected: 'place:image-object2:selected',
+		ImageObject2Canceled: 'place:image-object2:canceled',
 		GhostShow: 'place:ghost:show',
 		GhostHide: 'place:ghost:hide',
 		GhostUpdate: 'place:ghost:update',