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

🐛 Fix problem with changing cell type in grid

Browse source
This commit is contained in:
alonso.torres 2024-02-22 11:42:54 +01:00 • committed by Andrey Antukh
parent f4d513b622
commit 337f52e1bf
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
frontend/src/app/main/ui/components/radio_buttons.cljs
View file

@ -59,7 +59,7 @@
(mf/defc radio-buttons (mf/defc radio-buttons
{::mf/props :obj} {::mf/props :obj}
[{:keys [children on-change selected class wide encode-fn decode-fn] :as props}] [{:keys [children on-change selected class wide encode-fn decode-fn allow-empty] :as props}]
(let [encode-fn (d/nilv encode-fn identity) (let [encode-fn (d/nilv encode-fn identity)
decode-fn (d/nilv decode-fn identity) decode-fn (d/nilv decode-fn identity)
nitems (if (array? children) nitems (if (array? children)
@ -75,14 +75,17 @@
on-change' on-change'
(mf/use-fn (mf/use-fn
(mf/deps on-change) (mf/deps selected on-change)
(fn [event] (fn [event]
(let [input (dom/get-target event) (let [input (dom/get-target event)
value (dom/get-target-val event) value (dom/get-target-val event)
value (when (not= value selected) value)]
;; Only allow null values when the "allow-empty" prop is true
value (when (or (not allow-empty)
(not= value selected)) value)]
(when (fn? on-change) (when (fn? on-change)
(on-change (decode-fn value) event) (on-change (decode-fn value) event))
(dom/blur! input))))) (dom/blur! input))))
context-value context-value
(mf/spread-obj props {:on-change on-change' (mf/spread-obj props {:on-change on-change'

1
frontend/src/app/main/ui/workspace/sidebar/options/menus/grid_cell.cljs
View file

@ -48,6 +48,7 @@
[:div {:class (stl/css :self-align-menu)} [:div {:class (stl/css :self-align-menu)}
[:& radio-buttons {:selected (d/name alignment) [:& radio-buttons {:selected (d/name alignment)
:on-change handle-set-alignment :on-change handle-set-alignment
:allow-empty true
:name (dm/str "flex-align-items-" type)} :name (dm/str "flex-align-items-" type)}
[:& radio-button {:value "start" [:& radio-button {:value "start"
:icon (if is-col? i/align-self-row-left-refactor i/align-self-column-top-refactor) :icon (if is-col? i/align-self-row-left-refactor i/align-self-column-top-refactor)