Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-13 10:38:13 -05:00
Code Issues Activity

🐛 Fix problem with align-self default

Browse source
This commit is contained in:
alonso.torres 2024-02-13 12:21:54 +01:00 • committed by Andrey Antukh
parent 5cbb3f76c7
commit 2bb2d4ca59
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,9 +17,9 @@
(mf/create-context nil))
(mf/defc radio-button
{::mf/wrap-props false}
{::mf/props :obj}
[props]
(let [context (mf/use-ctx context)
(let [context (mf/use-ctx context)
icon (unchecked-get props "icon")
id (unchecked-get props "id")
value (unchecked-get props "value")
@ -27,7 +27,10 @@
title (unchecked-get props "title")
unique-key (unchecked-get props "unique-key")
icon-class (unchecked-get props "icon-class")
type (or (unchecked-get props "type") "radio")
type (or (unchecked-get props "type")
(if (unchecked-get context "allow-empty")
"checkbox"
"radio"))
on-change (unchecked-get context "on-change")
selected (unchecked-get context "selected")
@ -59,14 +62,15 @@
:checked checked?}]]))
(mf/defc radio-buttons
{::mf/wrap-props false}
{::mf/props :obj}
[props]
(let [children (unchecked-get props "children")
on-change (unchecked-get props "on-change")
selected (unchecked-get props "selected")
name (unchecked-get props "name")
class (unchecked-get props "class")
wide (unchecked-get props "wide")
(let [children (unchecked-get props "children")
on-change (unchecked-get props "on-change")
selected (unchecked-get props "selected")
name (unchecked-get props "name")
class (unchecked-get props "class")
wide (unchecked-get props "wide")
allow-empty? (unchecked-get props "allow-empty")
encode-fn (d/nilv (unchecked-get props "encode-fn") identity)
decode-fn (d/nilv (unchecked-get props "encode-fn") identity)
@ -87,7 +91,8 @@
(mf/deps on-change)
(fn [event]
(let [input-node (dom/get-target event)
value (dom/get-target-val event)]
value (dom/get-target-val event)
value (when (not= value selected) value)]
(when (fn? on-change)
(do (on-change (decode-fn value) event)
(dom/blur! input-node))))))
@ -98,7 +103,8 @@
:on-change on-change'
:name name
:encode-fn encode-fn
:decode-fn decode-fn})]
:decode-fn decode-fn
:allow-empty allow-empty?})]
[:& (mf/provider context) {:value context-value}
[:div {:class (dm/str class " " (stl/css :radio-btn-wrapper))

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

@ -230,7 +230,8 @@
[{:keys [is-col? align-self on-change] :as props}]
[:& radio-buttons {:selected (d/name align-self)
:on-change on-change
:name "flex-align-self"}
:name "flex-align-self"
:allow-empty true}
[:& radio-button {:value "start"
:icon (get-layout-flex-icon :align-self :start is-col?)
:title "Align self start"