Merge branch 'devt' into fix-more-styles

Author: cursork

dist/assets/index-CSheNIRS.js

@@ -475,10 +475,19 @@ const App = () => {
           if (myInfo.length !== 2) {
             myInfo = Info;
           }
-          const strings = myInfo && myInfo[0];
-          const font = JSON.parse(
-            getObjectById(dataRef.current, myInfo && myInfo[1])
-          );
+          // Check if myInfo[1] is a valid font reference or just another text line
+          // If it's not found as an object, treat the whole array as text (no font)
+          let strings, font;
+          const possibleFont = getObjectById(dataRef.current, myInfo && myInfo[1]);
+          if (possibleFont) {
+            // myInfo[1] is a valid font reference
+            strings = myInfo[0];
+            font = JSON.parse(possibleFont);
+          } else {
+            // myInfo[1] is not a font - treat whole array as text lines
+            strings = myInfo;
+            font = null;
+          }
           const textDimensions = Text.calculateTextDimensions(strings, font);
           const event = JSON.stringify({ WX: { Info: [textDimensions.height, textDimensions.width], WGID } });
           return webSocket.send(event);

src/App.jsx

@@ -46,6 +46,7 @@ const calculateTextDimensions = (lines, font) => {
   if (!lines || (Array.isArray(lines) && lines.length === 0)) {
     return { height: 0, width: 0 };
   }
+  //console.log('calculateTextDimensions input:', { lines, font, fontPName: font?.Properties?.PName, fontSize: font?.Properties?.Size });
   // Ensure lines is an array
   const linesArray = Array.isArray(lines) ? lines : [lines];
 
@@ -65,14 +66,20 @@ const calculateTextDimensions = (lines, font) => {
     lineHeight = (font.Properties.Size * scale) + 'px';
   }
 
+  const fontStyles = getFontStyles(font);
   linesArray.forEach(line => {
     const lineDiv = document.createElement('div');
     lineDiv.style.margin = '0';
     lineDiv.style.padding = '0';
     lineDiv.textContent = line;
     lineDiv.style.display = 'block'; // Start each on a new line
     lineDiv.style.lineHeight = lineHeight;
-    Object.assign(lineDiv.style, getFontStyles(font));
+    if (font?.Properties?.Size) {
+      fontStyles.fontSize = (font.Properties.Size * scale) + 'px';
+    } else {
+      fontStyles.fontSize = (12 * scale) + 'px';
+    }
+    Object.assign(lineDiv.style, fontStyles);
     container.appendChild(lineDiv);
   });