@sequent-org/moodboard 1.4.23 → 1.4.25

package/package.json

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

package/src/tools/object-tools/selection/TextEditorInteractionController.js

@@ -221,6 +221,9 @@ export function bindTextEditorInteractions(controller, {
 export function closeTextEditorFromState(controller, commit) {
     const textarea = controller.textEditor.textarea;
     if (!textarea) return;
+    const wrapper = controller.textEditor.wrapper || null;
+    const removeDomListeners = controller.textEditor._removeDomListeners || null;
+    const placeholderStyleEl = controller.textEditor._phStyle || null;
     const value = textarea.value.trim();
     const commitValue = commit && value.length > 0;
     const objectType = controller.textEditor.objectType || 'text';
@@ -252,7 +255,17 @@ export function closeTextEditorFromState(controller, commit) {
         }
     }
 
-    textarea.remove();
+    if (typeof removeDomListeners === 'function') {
+        try { removeDomListeners(); } catch (_) {}
+    }
+    if (placeholderStyleEl && typeof placeholderStyleEl.remove === 'function') {
+        try { placeholderStyleEl.remove(); } catch (_) {}
+    }
+    if (wrapper && typeof wrapper.remove === 'function') {
+        wrapper.remove();
+    } else {
+        textarea.remove();
+    }
     controller.textEditor = { active: false, objectId: null, textarea: null, world: null, objectType: 'text' };
     if (!commitValue) {
         if (shouldDeleteEmptyNewCreation) {

package/src/tools/object-tools/selection/TextEditorSyncService.js

@@ -6,32 +6,28 @@ export function createRegularTextAutoSize({
     wrapper,
     minWBound,
     minHBound,
-    effectiveFontPx,
-    computeLineHeightPx,
+    onSizeChange,
 }) {
     const MAX_AUTO_WIDTH = 360;
-    const BASELINE_FIX = 2;
 
     return () => {
         textarea.style.width = 'auto';
         textarea.style.height = 'auto';
 
-        const naturalW = textarea.scrollWidth + 1;
-        const targetW = Math.min(MAX_AUTO_WIDTH, Math.max(minWBound, naturalW));
+        const naturalW = Math.max(1, Math.ceil(textarea.scrollWidth + 1));
+        const targetW = Math.round(Math.min(MAX_AUTO_WIDTH, Math.max(minWBound, naturalW)));
         textarea.style.width = `${targetW}px`;
         wrapper.style.width = `${targetW}px`;
 
         textarea.style.height = 'auto';
-        const adjust = BASELINE_FIX;
-        const computed = (typeof window !== 'undefined') ? window.getComputedStyle(textarea) : null;
-        const lineH = (computed ? parseFloat(computed.lineHeight) : computeLineHeightPx(effectiveFontPx)) + 10;
-        const rawH = textarea.scrollHeight;
-        const lines = lineH > 0 ? Math.max(1, Math.round(rawH / lineH)) : 1;
-        const targetH = lines <= 1
-            ? Math.max(minHBound, Math.max(1, lineH - BASELINE_FIX))
-            : Math.max(minHBound, Math.max(1, rawH - adjust));
+        const naturalH = Math.max(1, Math.ceil(textarea.scrollHeight));
+        const targetH = Math.round(Math.max(minHBound, naturalH));
         textarea.style.height = `${targetH}px`;
         wrapper.style.height = `${targetH}px`;
+
+        if (typeof onSizeChange === 'function') {
+            onSizeChange({ widthPx: targetW, heightPx: targetH });
+        }
     };
 }
 

package/src/tools/object-tools/selection/TextInlineEditorController.js

@@ -143,6 +143,8 @@ export function openTextEditor(object, create = false) {
     // Базовые стили вынесены в CSS (.moodboard-text-editor)
 
     const textarea = createTextEditorTextarea(content || '');
+    // Без доступного статичного HTML-элемента (часто при create) не оставляем Caveat как fallback.
+    textarea.style.fontFamily = isNote ? 'Caveat, Arial, cursive' : 'Roboto, Arial, sans-serif';
 
     // Вычисляем межстрочный интервал; подгоняем к реальным значениям HTML-отображения
     let lhInitial = computeTextEditorLineHeightPx(effectiveFontPx);
@@ -380,7 +382,7 @@ export function openTextEditor(object, create = false) {
     }
 
     // Для записок размеры уже установлены выше, пропускаем эту логику
-    if (!isNote) {
+    if (!isNote && !create) {
         if (initialWpx) {
             textarea.style.width = `${initialWpx}px`;
             wrapper.style.width = `${initialWpx}px`;
@@ -391,13 +393,29 @@ export function openTextEditor(object, create = false) {
         }
     }
     // Автоподгон
+    const syncRegularTextSizeToObject = !isNote && objectId
+        ? ({ widthPx, heightPx }) => {
+            try {
+                const scaleX = (worldLayerRef?.scale?.x) || 1;
+                const widthWorld = Math.max(1, Math.round(widthPx * viewRes / scaleX));
+                const heightWorld = Math.max(1, Math.round(heightPx * viewRes / scaleX));
+                const posReq = { objectId, position: null };
+                this.eventBus.emit(Events.Tool.GetObjectPosition, posReq);
+                this.eventBus.emit(Events.Tool.ResizeUpdate, {
+                    object: objectId,
+                    size: { width: widthWorld, height: heightWorld },
+                    position: posReq.position || { x: position.x, y: position.y },
+                });
+            } catch (_) {}
+        }
+        : null;
+
     const autoSize = createRegularTextAutoSize({
         textarea,
         wrapper,
         minWBound,
         minHBound,
-        effectiveFontPx,
-        computeLineHeightPx: computeTextEditorLineHeightPx,
+        onSizeChange: syncRegularTextSizeToObject,
     });
 
     // Вызываем autoSize только для обычного текста