Merge pull request #2212 from penpot/palba-fix-move-artboards-on-comments

🐛 Fix artboards moving with comment tool selected

CHANGES.md

@@ -21,6 +21,7 @@
 - Fix unexpected removal of guides on copy&paste frames [Taiga #3887](https://tree.taiga.io/project/penpot/issue/3887) by @andrewzhurov
 - Fix props preserving on copy&paste texts [Taiga #3629](https://tree.taiga.io/project/penpot/issue/3629) by @andrewzhurov
 - Fix unexpected layers ungrouping on moving it [Taiga #3932](https://tree.taiga.io/project/penpot/issue/3932) by @andrewzhurov
+- Fix artboards moving with comment tool selected [Taiga #3938](https://tree.taiga.io/project/penpot/issue/3938)
 
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)

frontend/src/app/main/ui/workspace/viewport/actions.cljs

@@ -16,6 +16,7 @@
    [app.main.data.workspace.libraries :as dwl]
    [app.main.data.workspace.media :as dwm]
    [app.main.data.workspace.path :as dwdp]
+   [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.streams :as ms]
    [app.main.ui.workspace.viewport.utils :as utils]
@@ -124,10 +125,11 @@
    (mf/deps selected)
    (fn [event id]
      (let [shift? (kbd/shift? event)
-           selected? (contains? selected id)]
+           selected? (contains? selected id)
+           selected-drawtool (deref refs/selected-drawing-tool)]
        (st/emit! (when (or shift? (not selected?))
                    (dw/select-shape id shift?))
-                 (when (not shift?)
+                 (when (and (nil? selected-drawtool) (not shift?))
                    (dw/start-move-selected)))))))
 
 (defn on-frame-enter