✨ Fix problems with export/import

frontend/src/app/main/ui/shapes/export.cljs

@@ -109,7 +109,8 @@
 
         (cond-> text?
           (-> (add! :grow-type)
-              (add! :content (comp json/encode uuid->string))))
+              (add! :content (comp json/encode uuid->string))
+              (add! :position-data (comp json/encode uuid->string))))
 
         (cond-> mask?
           (obj/set! "penpot:masked-group" "true"))
@@ -138,6 +139,7 @@
     (into {} (map prefix-entry) m)))
 
 (defn- export-grid-data [{:keys [grids]}]
+  (when (d/not-empty? grids)
     (mf/html
      [:> "penpot:grids" #js {}
       (for [{:keys [type display params]} grids]
@@ -150,7 +152,7 @@
                (obj/set! "penpot:opacity" (get-in params [:color :opacity]))
                (obj/set! "penpot:type" (d/name type))
                (cond-> (some? display)
-               (obj/set! "penpot:display" (str display))))]))]))
+                 (obj/set! "penpot:display" (str display))))]))])))
 
 (mf/defc export-flows
   [{:keys [flows]}]

frontend/src/app/main/ui/shapes/text/svg_text.cljs

@@ -23,9 +23,15 @@
   [props]
   
   (let [render-id (mf/use-ctx muc/render-ctx)
-        {:keys [position-data] :as shape} (obj/get props "shape")
+        {:keys [x y width height position-data] :as shape} (obj/get props "shape")
         transform (str (gsh/transform-matrix shape))
-        group-props (-> #js {:transform transform}
+
+        ;; These position attributes are not really necesary but they are convenient for for the export
+        group-props (-> #js {:transform transform
+                             :x x
+                             :y y
+                             :width width
+                             :height height}
                         (attrs/add-style-attrs shape render-id))
         get-gradient-id
         (fn [index]
@@ -40,7 +46,6 @@
                                :attr :fill-color-gradient
                                :shape data}]))])
 
-     [:& shape-custom-stroke {:shape shape}
      [:> :g group-props
       (for [[index data] (d/enumerate position-data)]
         (let [props (-> #js {:x (:x data)
@@ -55,6 +60,7 @@
                                              :direction (if (:rtl? data) "rtl" "ltr")
                                              :whiteSpace "pre"}
                                         (attrs/add-fill data (get-gradient-id index)))})]
-           [:> :text props (:text data)]))]]]))
+          [:& shape-custom-stroke {:shape shape}
+           [:> :text props (:text data)]]))]]))
 
 

frontend/src/app/main/ui/workspace/shapes/text.cljs

@@ -178,7 +178,6 @@
     (mf/use-layout-effect
      (mf/deps show-svg-text?)
      (fn []
-       (let []
        (when-not show-svg-text?
          ;; There is no position data we need to calculate it even if no change has happened
          ;; this usualy happens the first time a text is rendered
@@ -197,7 +196,7 @@
 
        (fn []
          (when-let [sid (mf/ref-val sid-ref)]
-             (rx/dispose! sid))))))
+           (rx/dispose! sid)))))
 
     [:> shape-container {:shape shape}
      ;; We keep hidden the shape when we're editing so it keeps track of the size

frontend/src/app/util/import/parser.cljs

@@ -185,7 +185,7 @@
          (d/deep-mapm
           (fn [pair] (->> pair (mapv convert)))))))
 
-(def search-data-node? #{:rect :image :path :text :circle})
+(def search-data-node? #{:rect :image :path :circle})
 
 (defn get-svg-data
   [type node]
@@ -200,6 +200,13 @@
              (map #(:attrs %))
              (reduce add-attrs node-attrs)))
 
+      (= type :text)
+      (->> node
+           (node-seq)
+           (filter #(contains? #{:g :foreignObject} (:tag %)))
+           (map #(:attrs %))
+           (reduce add-attrs node-attrs))
+
       (= type :frame)
       (let [svg-node (->> node :content (d/seek #(= "frame-background" (get-in % [:attrs :class]))))]
         (merge (add-attrs {} (:attrs svg-node)) node-attrs))
@@ -482,7 +489,8 @@
   [props node]
   (-> props
       (assoc :grow-type     (get-meta node :grow-type keyword))
-      (assoc :content   (get-meta node :content (comp string->uuid json/decode)))))
+      (assoc :content       (get-meta node :content (comp string->uuid json/decode)))
+      (assoc :position-data (get-meta node :position-data (comp string->uuid json/decode)))))
 
 (defn add-group-data
   [props node]