diff --git a/CHANGES.md b/CHANGES.md index a1256b0cc5..6290c2e416 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -47,6 +47,7 @@ - Fix multi level library dependencies [Taiga #12155](https://tree.taiga.io/project/penpot/issue/12155) - Fix component context menu options order in assets tab [Taiga #11941](https://tree.taiga.io/project/penpot/issue/11941) - Fix error updating library [Taiga #12218](https://tree.taiga.io/project/penpot/issue/12218) +- Fix Restoring a variant in another file makes it overlap the existing variant [Taiga #12049](https://tree.taiga.io/project/penpot/issue/12049) ## 2.10.1 (Unreleased) diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs index a2f970a965..821603a545 100644 --- a/frontend/src/app/main/data/workspace/libraries.cljs +++ b/frontend/src/app/main/data/workspace/libraries.cljs @@ -710,11 +710,14 @@ (fn [ids] (let [parent-ids (when update-layout? (map #(-> (get objects %) :parent-id) ids))] - (rx/of - (dws/select-shapes ids) - dwz/zoom-to-selected-shape + (rx/concat + (rx/of + (dws/select-shapes ids) + dwz/zoom-to-selected-shape) (when update-layout? - (ptk/data-event :layout/update {:ids parent-ids}))))) + (->> (rx/of (ptk/data-event :layout/update {:ids parent-ids})) + ;; Delay so the navigation can finish + (rx/delay 250)))))) redirect-to-page (fn [page-id ids]