Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-09 00:28:20 -05:00
Code Issues Activity

🐛 Fix layer drag enabled on chrome when is readonly

Browse source
This commit is contained in:
Pablo Alba 2022-11-30 16:20:50 +01:00 • committed by Andrey Antukh
parent b45a0a979b
commit d8bb62c498
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/app/main/ui/hooks.cljs
View file

@ -110,7 +110,7 @@
on-drag-start on-drag-start
(fn [event] (fn [event]
(if disabled (if (or disabled (not draggable?))
(dom/prevent-default event) (dom/prevent-default event)
(do (do
(dom/stop-propagation event) (dom/stop-propagation event)

32
frontend/src/app/main/ui/workspace/sidebar/assets.cljs
View file

@ -414,9 +414,11 @@
on-component-drag-start on-component-drag-start
(mf/use-fn (mf/use-fn
(mf/deps component selected-components item-ref on-drag-start) (mf/deps component selected-components item-ref on-drag-start workspace-read-only?)
(fn [event] (fn [event]
(on-asset-drag-start event component selected-components item-ref :components on-drag-start)))] (if workspace-read-only?
(dom/prevent-default event)
(on-asset-drag-start event component selected-components item-ref :components on-drag-start))))]
[:div {:ref item-ref [:div {:ref item-ref
:class (dom/classnames :class (dom/classnames
@ -795,9 +797,11 @@
on-grahic-drag-start on-grahic-drag-start
(mf/use-fn (mf/use-fn
(mf/deps object selected-objects item-ref on-drag-start) (mf/deps object selected-objects item-ref on-drag-start workspace-read-only?)
(fn [event] (fn [event]
(on-asset-drag-start event object selected-objects item-ref :graphics on-drag-start)))] (if workspace-read-only?
(dom/prevent-default event)
(on-asset-drag-start event object selected-objects item-ref :graphics on-drag-start))))]
[:div {:ref item-ref [:div {:ref item-ref
:class-name (dom/classnames :class-name (dom/classnames
@ -1190,10 +1194,10 @@
(if (or multi-colors? multi-assets?) (if (or multi-colors? multi-assets?)
(on-assets-delete) (on-assets-delete)
(let [undo-id (uuid/next)] (let [undo-id (uuid/next)]
(st/emit! (dwu/start-undo-transaction undo-id) (st/emit! (dwu/start-undo-transaction undo-id)
(dwl/delete-color color) (dwl/delete-color color)
(dwl/sync-file file-id file-id :colors (:id color)) (dwl/sync-file file-id file-id :colors (:id color))
(dwu/commit-undo-transaction undo-id)))))) (dwu/commit-undo-transaction undo-id))))))
rename-color-clicked rename-color-clicked
(fn [event] (fn [event]
@ -1262,9 +1266,11 @@
on-color-drag-start on-color-drag-start
(mf/use-fn (mf/use-fn
(mf/deps color selected-colors item-ref) (mf/deps color selected-colors item-ref workspace-read-only?)
(fn [event] (fn [event]
(on-asset-drag-start event color selected-colors item-ref :colors identity)))] (if workspace-read-only?
(dom/prevent-default event)
(on-asset-drag-start event color selected-colors item-ref :colors identity))))]
(mf/use-effect (mf/use-effect
(mf/deps (:editing @state)) (mf/deps (:editing @state))
@ -1574,9 +1580,11 @@
on-typography-drag-start on-typography-drag-start
(mf/use-fn (mf/use-fn
(mf/deps typography selected-typographies item-ref) (mf/deps typography selected-typographies item-ref workspace-read-only?)
(fn [event] (fn [event]
(on-asset-drag-start event typography selected-typographies item-ref :typographies identity)))] (if workspace-read-only?
(dom/prevent-default event)
(on-asset-drag-start event typography selected-typographies item-ref :typographies identity))))]
[:div.typography-container {:ref item-ref [:div.typography-container {:ref item-ref
:draggable (not workspace-read-only?) :draggable (not workspace-read-only?)