0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-15 17:21:17 -05:00

Merge branch 'andrew-fixes-backports' into staging

This commit is contained in:
Andrey Antukh 2022-08-03 09:27:09 +02:00
commit fdc01cfed5
3 changed files with 7 additions and 9 deletions

View file

@ -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!)

View file

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

View file

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