3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-04 14:41:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2658 from penpot/palba-inspect-bugs

Browse source 
Fix inspect bugs
This commit is contained in:
Andrey Antukh 2022-12-13 13:16:27 +01:00 • committed by GitHub
commit 27c4cdb5f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/app/main/ui/viewer/handoff/right_sidebar.cljs
View file

@ -7,6 +7,7 @@
(ns app.main.ui.viewer.handoff.right-sidebar (ns app.main.ui.viewer.handoff.right-sidebar
(:require (:require
[app.main.data.workspace :as dw] [app.main.data.workspace :as dw]
[app.main.store :as st]
[app.main.ui.components.shape-icon :as si] [app.main.ui.components.shape-icon :as si]
[app.main.ui.components.tab-container :refer [tab-container tab-element]] [app.main.ui.components.tab-container :refer [tab-container tab-element]]
[app.main.ui.icons :as i] [app.main.ui.icons :as i]
@ -73,7 +74,7 @@
:shapes shapes :shapes shapes
:on-expand (fn [] :on-expand (fn []
(when (= from :workspace) (when (= from :workspace)
(dw/set-inspect-expanded (not expanded))) (st/emit! (dw/set-inspect-expanded (not @expanded))))
(swap! expanded not)) (swap! expanded not))
:from from}]]]]] :from from}]]]]]
[:div.empty [:div.empty
@ -81,5 +82,4 @@
[:div (tr "handoff.empty.select")] [:div (tr "handoff.empty.select")]
[:span.tool-window-bar-icon i/help] [:span.tool-window-bar-icon i/help]
[:div (tr "handoff.empty.help")] [:div (tr "handoff.empty.help")]
[:button.btn-primary.action {:on-click #(dom/open-new-window "https://help.penpot.app/user-guide/inspect/")} (tr "handoff.empty.more-info")] [:button.btn-primary.action {:on-click #(dom/open-new-window "https://help.penpot.app/user-guide/inspect/")} (tr "handoff.empty.more-info")]])]]))
])]]))

2
frontend/src/app/main/ui/workspace/viewport.cljs
View file

@ -154,7 +154,7 @@
on-frame-enter (actions/on-frame-enter frame-hover) on-frame-enter (actions/on-frame-enter frame-hover)
on-frame-leave (actions/on-frame-leave frame-hover) on-frame-leave (actions/on-frame-leave frame-hover)
on-frame-select (actions/on-frame-select selected) on-frame-select (actions/on-frame-select selected workspace-read-only?)
disable-events? (contains? layout :comments) disable-events? (contains? layout :comments)
show-comments? (= drawing-tool :comments) show-comments? (= drawing-tool :comments)

6
frontend/src/app/main/ui/workspace/viewport/actions.cljs
View file

@ -125,16 +125,16 @@
(st/emit! (dw/start-move-selected)))))))) (st/emit! (dw/start-move-selected))))))))
(defn on-frame-select (defn on-frame-select
[selected] [selected workspace-read-only?]
(mf/use-callback (mf/use-callback
(mf/deps selected) (mf/deps selected workspace-read-only?)
(fn [event id] (fn [event id]
(let [shift? (kbd/shift? event) (let [shift? (kbd/shift? event)
selected? (contains? selected id) selected? (contains? selected id)
selected-drawtool (deref refs/selected-drawing-tool)] selected-drawtool (deref refs/selected-drawing-tool)]
(st/emit! (when (or shift? (not selected?)) (st/emit! (when (or shift? (not selected?))
(dw/select-shape id shift?)) (dw/select-shape id shift?))
(when (and (nil? selected-drawtool) (not shift?)) (when (and (nil? selected-drawtool) (not shift?) (not workspace-read-only?))
(dw/start-move-selected))))))) (dw/start-move-selected)))))))
(defn on-frame-enter (defn on-frame-enter

3
frontend/src/app/main/ui/workspace/viewport/widgets.cljs
View file

@ -97,8 +97,7 @@
(when (= 1 (.-which event)) (when (= 1 (.-which event))
(dom/prevent-default event) (dom/prevent-default event)
(dom/stop-propagation event) (dom/stop-propagation event)
(when-not workspace-read-only? (on-frame-select event (:id frame))))))
(on-frame-select event (:id frame)))))))
on-double-click on-double-click
(mf/use-callback (mf/use-callback