Merge branch 'andrew-fixes-backports' into staging

CHANGES.md

@@ -40,6 +40,9 @@
 - Fix font rendering on grid thumbnails [Taiga #3473](https://tree.taiga.io/project/penpot/issue/3473)
 - Fix Drag and drop font assets in groups [Taiga #3763](https://tree.taiga.io/project/penpot/issue/3763)
 - Fix copy and paste layers order [Taiga #1617](https://tree.taiga.io/project/penpot/issue/1617)
+- Fix unexpected removal of guides on copy&paste frames [Taiga #3887](https://tree.taiga.io/project/penpot/issue/3887) by @andrewzhurov
+- Fix props preserving on copy&paste texts [Taiga #3629](https://tree.taiga.io/project/penpot/issue/3629) by @andrewzhurov
+
 
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)

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

@@ -425,11 +425,9 @@
                                                       (assoc :position (if (= (:axis %) :x)
                                                                          (+ (:position %) (- (:x new-frame) (:x frame)))
                                                                          (+ (:position %) (- (:y new-frame) (:y frame))))))))]
-
+                        (cond-> g
-                        (if-not (empty? new-guides)
+                          (not-empty new-guides)
-                          (conj g
+                          (conj (into {} (map (juxt :id identity) new-guides))))))
-                                (into {} (map (juxt :id identity) new-guides)))
-                          {})))
                     guides
                     frames)]
     (-> (pcb/with-page changes page)

frontend/src/app/util/text_editor_impl.js

@@ -378,10 +378,7 @@ export function insertText(state, text, attrs, inlineStyles) {
   );
 
   blockArray = blockArray.map((b) => {
-    if (b.getText() === "") {
+      return mergeBlockData(b, attrs);
-      return mergeBlockData(b, attrs)
-    }
-    return b;
   });
 
   const fragment = BlockMapBuilder.createFromArray(blockArray);