mirror of
https://github.com/penpot/penpot.git
synced 2025-01-22 14:39:45 -05:00
🐛 Fix problem with moving+selection not working properly
This commit is contained in:
parent
d29215a282
commit
2c21a049e1
3 changed files with 19 additions and 10 deletions
|
@ -23,6 +23,7 @@
|
|||
- Fix expand libraries when search results are present [Taiga #7876](https://tree.taiga.io/project/penpot/issue/7876)
|
||||
- Fix color palette default library [Taiga #8029](https://tree.taiga.io/project/penpot/issue/8029)
|
||||
- Component Library is lost after exporting/importing in .zip format [Github #4672](https://github.com/penpot/penpot/issues/4672)
|
||||
- Fix problem with moving+selection not working properly [Taiga #7943](https://tree.taiga.io/project/penpot/issue/7943)
|
||||
|
||||
## 2.0.3
|
||||
|
||||
|
|
|
@ -431,7 +431,7 @@
|
|||
(watch [_ state stream]
|
||||
(let [initial (deref ms/mouse-position)
|
||||
|
||||
stopper (mse/drag-stopper stream)
|
||||
stopper (mse/drag-stopper stream {:interrupt? false})
|
||||
zoom (get-in state [:workspace-local :zoom] 1)
|
||||
|
||||
;; We toggle the selection so we don't have to wait for the event
|
||||
|
|
|
@ -72,12 +72,20 @@
|
|||
(defn drag-stopper
|
||||
"Creates a stream to stop drag events. Takes into account the mouse and also
|
||||
if the window loses focus or the esc key is pressed."
|
||||
[stream]
|
||||
(rx/merge
|
||||
(->> stream
|
||||
(rx/filter blur-event?))
|
||||
(->> stream
|
||||
(rx/filter mouse-event?)
|
||||
(rx/filter mouse-up-event?))
|
||||
(->> stream
|
||||
(rx/filter #(= % :interrupt)))))
|
||||
([stream]
|
||||
(drag-stopper stream nil))
|
||||
([stream {:keys [blur? up-mouse? interrupt?] :or {blur? true up-mouse? true interrupt? true}}]
|
||||
(rx/merge
|
||||
(if blur?
|
||||
(->> stream
|
||||
(rx/filter blur-event?))
|
||||
(rx/empty))
|
||||
(if up-mouse?
|
||||
(->> stream
|
||||
(rx/filter mouse-event?)
|
||||
(rx/filter mouse-up-event?))
|
||||
(rx/empty))
|
||||
(if interrupt?
|
||||
(->> stream
|
||||
(rx/filter #(= % :interrupt)))
|
||||
(rx/empty)))))
|
||||
|
|
Loading…
Add table
Reference in a new issue