Merge pull request #6445 from penpot/elenatorro-11044-fix-parsing-text-spaces

🐛 Fix parsing text spaces

frontend/src/app/main/data/workspace/transforms.cljs

@@ -1194,6 +1194,4 @@
                origin
                (:transform shape (gmt/matrix))
                (:transform-inverse shape (gmt/matrix)))}}]
-
-        (.log js/console (clj->js modifiers))
         (rx/of (dwm/set-wasm-modifiers modifiers))))))

frontend/src/app/render_wasm/api/texts.cljs

@@ -10,8 +10,7 @@
    [app.render-wasm.helpers :as h]
    [app.render-wasm.mem :as mem]
    [app.render-wasm.serializers :as sr]
-   [app.render-wasm.wasm :as wasm]
-   [clojure.string :as str]))
+   [app.render-wasm.wasm :as wasm]))
 
 (defn utf8->buffer [text]
   (let [encoder (js/TextEncoder.)]
@@ -21,8 +20,7 @@
   ;; buffer has the following format:
   ;; [<num-leaves> <paragraph_attributes> <leaves_attributes> <text>]
   [leaves paragraph text]
-  (let [leaves (filter #(not (str/blank? (:text %))) leaves)
-        num-leaves (count leaves)
+  (let [num-leaves (count leaves)
         paragraph-attr-size 48
         leaf-attr-size 52
         metadata-size (+ 1 paragraph-attr-size (* num-leaves leaf-attr-size))

render-wasm/src/shapes/text.rs

@@ -125,11 +125,11 @@ impl TextContent {
                     let text: String = leaf.apply_text_transform(paragraph.text_transform);
                     builder.push_style(&stroke_style);
                     builder.add_text(&text);
+                    builder.pop();
+                }
                 let p = builder.build();
                 stroke_paragraphs.push(p);
             }
-                builder.reset();
-            }
             paragraph_group.push(stroke_paragraphs);
         }
         paragraph_group
@@ -451,8 +451,11 @@ impl RawTextData {
         }
 
         let text_utf8 = buffer[offset..text_end].to_vec();
-        let text = String::from_utf8(text_utf8).expect("Invalid UTF-8 text");
+        if text_utf8.is_empty() {
+            return (String::new(), text_end);
+        }
 
+        let text = String::from_utf8_lossy(&text_utf8).to_string();
         (text, text_end)
     }
 }