3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-30 05:36:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix keep cells when create component inside grid layout

Browse source
This commit is contained in:
alonso.torres 2024-01-18 17:16:16 +01:00
parent 4c7e565f6a
commit 26af5c7847
6 changed files with 68 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
frontend/src/app/main/data/workspace/libraries.cljs
View file

@ -1010,12 +1010,16 @@
(rx/of (dch/commit-changes (assoc changes ;; TODO a ver qué pasa con esto
:file-id file-id))))
(when-not (empty? updated-frames)
(->> (rx/from updated-frames)
(rx/mapcat (fn [shape]
(rx/of
(dwt/clear-thumbnail file-id (:page-id shape) (:id shape) "frame")
(when-not (= (:frame-id shape) uuid/zero)
(dwt/clear-thumbnail file-id (:page-id shape) (:frame-id shape) "frame")))))))
(rx/merge
(rx/of (ptk/data-event :layout/update (map :id updated-frames)))
(->> (rx/from updated-frames)
(rx/mapcat
(fn [shape]
(rx/of
(dwt/clear-thumbnail file-id (:page-id shape) (:id shape) "frame")
(when-not (= (:frame-id shape) uuid/zero)
(dwt/clear-thumbnail file-id (:page-id shape) (:frame-id shape) "frame"))))))))
(when (not= file-id library-id)
;; When we have just updated the library file, give some time for the
;; update to finish, before marking this file as synced.

5
frontend/src/app/main/ui/workspace/context_menu.cljs
View file

@ -106,8 +106,9 @@
[:span {:class (stl/css :title)} title]
(when shortcut
[:span {:class (stl/css :shortcut)}
(for [sc (scd/split-sc shortcut)]
[:span {:class (stl/css :shortcut-key)} sc])])
(for [[idx sc] (d/enumerate (scd/split-sc shortcut))]
[:span {:key (dm/str shortcut "-" idx)
:class (stl/css :shortcut-key)} sc])])
(when (> (count children) 1)
[:span {:class (stl/css :submenu-icon)} i/arrow-refactor])

3
frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
View file

@ -555,7 +555,8 @@
:on-change #(set-justify % type)
:name (dm/str "grid-justify-items-" (d/name type))}
(for [justify [:start :center :end :space-around :space-between :stretch]]
[:& radio-button {:value (d/name justify)
[:& radio-button {:key (dm/str "justify-item-" (d/name justify))
:value (d/name justify)
:icon (get-layout-grid-icon-refactor :justify-items justify is-col?)
:title (dm/str "Justify items " (d/name justify))
:id (dm/str "justify-items-" (d/name justify) "-" (d/name type))}])]))