mirror of
https://github.com/penpot/penpot.git
synced 2026-09-06 12:09:24 +00:00
🐛 Fix shapes flyout in toolbar only opens with the space key, and doesn't close when pressed again (#11331)
This commit is contained in:
parent
93ac6d8338
commit
fc207a1768
@ -149,16 +149,26 @@
|
|||||||
|
|
||||||
on-main-key-down
|
on-main-key-down
|
||||||
(mf/use-fn
|
(mf/use-fn
|
||||||
|
(mf/deps open)
|
||||||
(fn [event]
|
(fn [event]
|
||||||
(cond
|
(cond
|
||||||
(kbd/space? event)
|
(and open (kbd/esc? event))
|
||||||
|
(reset! open* false)
|
||||||
|
|
||||||
|
(or (kbd/enter? event) (kbd/space? event))
|
||||||
|
(do
|
||||||
|
(dom/prevent-default event)
|
||||||
|
(if open
|
||||||
|
(reset! open* false)
|
||||||
|
(do
|
||||||
|
(cancel-timer! close-timer*)
|
||||||
|
(reset! open* true))))
|
||||||
|
|
||||||
|
(kbd/down-arrow? event)
|
||||||
(do
|
(do
|
||||||
(dom/prevent-default event)
|
(dom/prevent-default event)
|
||||||
(cancel-timer! close-timer*)
|
(cancel-timer! close-timer*)
|
||||||
(reset! open* true))
|
(reset! open* true)))))
|
||||||
|
|
||||||
(and open (kbd/esc? event))
|
|
||||||
(reset! open* false))))
|
|
||||||
|
|
||||||
on-flyout-key-down
|
on-flyout-key-down
|
||||||
(mf/use-fn
|
(mf/use-fn
|
||||||
@ -218,7 +228,10 @@
|
|||||||
:aria-expanded open
|
:aria-expanded open
|
||||||
:has-tooltip false
|
:has-tooltip false
|
||||||
:icon default-icon
|
:icon default-icon
|
||||||
:on-click on-select-tool
|
:on-click (fn [event]
|
||||||
|
(cancel-timer! open-timer*)
|
||||||
|
(cancel-timer! close-timer*)
|
||||||
|
(on-select-tool event))
|
||||||
:on-key-down on-main-key-down
|
:on-key-down on-main-key-down
|
||||||
:data-tool (name default-tool)}]
|
:data-tool (name default-tool)}]
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user